don't let the users define path variables with reserved names

This commit is contained in:
peter
2011-01-26 15:58:11 +01:00
parent 436840bcf6
commit 4e6b0b7e0a
@@ -137,6 +137,10 @@ public class PathMacroTable extends Table {
}
private boolean hasMacroWithName(String name) {
if (PathMacros.getInstance().getSystemMacroNames().contains(name)) {
return true;
}
for (Pair<String, String> macro : myMacros) {
if (name.equals(macro.getFirst())) {
return true;
@@ -264,6 +268,8 @@ public class PathMacroTable extends Table {
private static class EditValidator implements PathMacroEditor.Validator {
public boolean checkName(String name) {
if (name.length() == 0) return false;
if (PathMacros.getInstance().getSystemMacroNames().contains(name)) return false;
return PathMacrosCollector.MACRO_PATTERN.matcher("$" + name + "$").matches();
}