0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eclipse plugin: remove empty lines in the resulting file

Browse source
This commit is contained in:
Timotei Dolean 2010-07-08 22:06:28 +00:00
parent 2498a95efe
commit 547b8cd9c9
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
utils/java/eclipse_plugin/src/wesnoth_eclipse_plugin/utils/StringUtils.java
View file

@ -72,8 +72,8 @@ public class StringUtils
* @param removeTrailing removes or not the preceding 'character' characters
* @return
*/
public static String
removeIncorrectCharacters(String target, char character, boolean removeTrailing, boolean removePreceding)
public static String removeIncorrectCharacters(String target, char character,
boolean removeTrailing, boolean removePreceding)
{
StringBuilder resString = new StringBuilder();
@ -86,7 +86,8 @@ public class StringUtils
continue;
}
if (target.charAt(i) == character && ((removeTrailing && i == target.length()) || (removePreceding && i == 0)))
if (target.charAt(i) == character &&
((removeTrailing && i == target.length()) || (removePreceding && i == 0)))
{
continue;
}
@ -152,7 +153,7 @@ public class StringUtils
{
// get the current indentation
Pattern pattern = Pattern.compile("[\t ]*");
Matcher matcher = pattern.matcher(source);
Matcher matcher = pattern.matcher(string);
String indent = "";
if (matcher.find())
{

25
utils/java/eclipse_plugin/src/wesnoth_eclipse_plugin/wizards/TemplateProvider.java
View file

@ -9,6 +9,8 @@ import java.io.FileReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import wesnoth_eclipse_plugin.Logger;
import wesnoth_eclipse_plugin.utils.Pair;
@ -43,7 +45,9 @@ public class TemplateProvider
Logger.print("reading templates...");
Logger.print(pluginFullPath_ + templatesFile);
BufferedReader reader = new BufferedReader(new FileReader(getClass().getProtectionDomain().getCodeSource().getLocation().getPath() + templatesFile));
BufferedReader reader =
new BufferedReader(new FileReader(getClass().getProtectionDomain().getCodeSource().getLocation().getPath()
+ templatesFile));
BufferedReader tmpReader;
String line, tmpLine, content;
@ -93,30 +97,39 @@ public class TemplateProvider
String result = "";
String[] template = StringUtils.getLines(tmpTemplate);
boolean skipLine;
for (int i = 0; i < template.length; ++i)
{
skipLine = false;
for (ReplaceableParameter param : parameters)
{
if (template[i].contains(param.paramName))
{
template[i] = template[i].replace(param.paramName, param.paramValue);
template[i] = StringUtils.replaceWithIndent(template[i], param.paramName, param.paramValue);
if (!templateName.equals("build_xml") && (param.paramValue == null || param.paramValue.isEmpty()))
{
// we don't have any value supplied -
// let's comment that line (if it's not already
// commented)
// let's comment that line (if it's not already commented)
// or remove it if it's empty
if (!(StringUtils.startsWith(template[i], "#")))
{
template[i] = "#" + template[i];
Pattern pattern = Pattern.compile("#[\t ]*");
Matcher matcher = pattern.matcher(template[i]);
if (matcher.matches())
{
skipLine = true;
System.out.println("Skipping line");
}
}
}
}
}
result += template[i] + "\n";
if (skipLine == false)
result += template[i] + "\n";
}
return result;
}