rename getters in ConfigfileEvaluator

src/main/java/de/tla2b/analysis/TypeChecker.java

@@ -96,7 +96,7 @@ public class TypeChecker extends BuiltInOPs implements ASTConstants, BBuildIns,
 		evalDefinitions(moduleNode.getOpDefs());
 
 		if (conEval != null) {
-			for (Entry<OpDeclNode, OpDefNode> entry : conEval.getConstantOverrideTable().entrySet()) {
+			for (Entry<OpDeclNode, OpDefNode> entry : conEval.getConstantOverrides().entrySet()) {
 				OpDeclNode con = entry.getKey();
 				if (!bConstList.contains(con)) {
 					continue;

src/main/java/de/tla2b/config/ConfigfileEvaluator.java

@@ -452,7 +452,7 @@ public class ConfigfileEvaluator {
 		return initNode;
 	}
 
-	public Map<OpDeclNode, OpDefNode> getConstantOverrideTable() {
+	public Map<OpDeclNode, OpDefNode> getConstantOverrides() {
 		return constantOverrides;
 	}
 
@@ -472,7 +472,7 @@ public class ConfigfileEvaluator {
 		return bConstantList;
 	}
 
-	public Map<OpDefNode, OpDefNode> getOperatorOverrideTable() {
+	public Map<OpDefNode, OpDefNode> getOperatorOverrides() {
 		return operatorOverrides;
 	}
 

src/main/java/de/tla2b/config/ModuleOverrider.java

@@ -14,8 +14,8 @@ public class ModuleOverrider extends BuiltInOPs implements ASTConstants {
 
 	private ModuleOverrider(ModuleNode moduleNode, ConfigfileEvaluator conEval) {
 		this.moduleNode = moduleNode;
-		this.constantOverrideTable = conEval.getConstantOverrideTable();
-		this.operatorOverrideTable = conEval.getOperatorOverrideTable();
+		this.constantOverrideTable = conEval.getConstantOverrides();
+		this.operatorOverrideTable = conEval.getOperatorOverrides();
 		this.operatorAssignments = conEval.getOperatorAssignments();
 	}
 

src/main/java/de/tla2b/translation/BDefinitionsFinder.java

@@ -8,9 +8,7 @@ import de.tla2b.global.TranslationGlobals;
 import tla2sany.semantic.*;
 import tlc2.tool.ToolGlobals;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public class BDefinitionsFinder extends AbstractASTVisitor implements ASTConstants, ToolGlobals, TranslationGlobals {
@@ -18,8 +16,8 @@ public class BDefinitionsFinder extends AbstractASTVisitor implements ASTConstan
 
 	public BDefinitionsFinder(SpecAnalyser specAnalyser) {
 		if (specAnalyser.getConfigFileEvaluator() != null) {
-			bDefinitionsSet.addAll(specAnalyser.getConfigFileEvaluator().getConstantOverrideTable().values());
-			bDefinitionsSet.addAll(specAnalyser.getConfigFileEvaluator().getOperatorOverrideTable().values());
+			bDefinitionsSet.addAll(specAnalyser.getConfigFileEvaluator().getConstantOverrides().values());
+			bDefinitionsSet.addAll(specAnalyser.getConfigFileEvaluator().getOperatorOverrides().values());
 		}
 
 		for (BOperation op : specAnalyser.getBOperations()) {

src/main/java/de/tla2b/translation/BMacroHandler.java

@@ -18,7 +18,7 @@ public class BMacroHandler extends AbstractASTVisitor {
 			OpDefNode def = moduleNode.getOpDefs()[i];
 			if (specAnalyser.getUsedDefinitions().contains(def)) {
 				if (conEval != null
-					&& conEval.getConstantOverrideTable()
+					&& conEval.getConstantOverrides()
 					.containsValue(def)) {
 					continue;
 				}

src/main/java/de/tla2b/translation/UsedDefinitionsFinder.java

@@ -25,11 +25,11 @@ public class UsedDefinitionsFinder extends AbstractASTVisitor implements ASTCons
 		// hence it is important not to try and translate all of them and only the used ones
 
 		if (specAnalyser.getConfigFileEvaluator() != null) {
-			Collection<OpDefNode> cons = specAnalyser.getConfigFileEvaluator().getConstantOverrideTable().values();
+			Collection<OpDefNode> cons = specAnalyser.getConfigFileEvaluator().getConstantOverrides().values();
 			for (OpDefNode def : cons) {
 				visitExprNode(def.getBody());
 			}
-			Collection<OpDefNode> ops = specAnalyser.getConfigFileEvaluator().getOperatorOverrideTable().values();
+			Collection<OpDefNode> ops = specAnalyser.getConfigFileEvaluator().getOperatorOverrides().values();
 			for (OpDefNode def : ops) {
 				visitExprNode(def.getBody());
 			}

src/main/java/de/tla2bAst/BAstCreator.java

@@ -182,7 +182,7 @@ public class BAstCreator extends BuiltInOPs
 		for (int i = 0; i < moduleNode.getOpDefs().length; i++) {
 			OpDefNode def = moduleNode.getOpDefs()[i];
 			if (specAnalyser.getBDefinitions().contains(def)) {
-				if (conEval != null && conEval.getConstantOverrideTable().containsValue(def)) {
+				if (conEval != null && conEval.getConstantOverrides().containsValue(def)) {
 					DebugUtils.printVeryVerboseMsg("Not creating B DEFINITION (in Override Table) " + def.getName() + " " + def);
 					continue;
 				}
@@ -416,7 +416,7 @@ public class BAstCreator extends BuiltInOPs
 		}
 
 		if (conEval != null) {
-			for (Entry<OpDeclNode, OpDefNode> entry : conEval.getConstantOverrideTable().entrySet()) {
+			for (Entry<OpDeclNode, OpDefNode> entry : conEval.getConstantOverrides().entrySet()) {
 				OpDeclNode con = entry.getKey();
 				OpDefNode generatedDef = entry.getValue();
 				OpDefNode def;
@@ -816,10 +816,10 @@ public class BAstCreator extends BuiltInOPs
 				params.add(visitExprOrOpArgNodeExpression(n.getArgs()[i]));
 			}
 
-			if (conEval != null && conEval.getConstantOverrideTable().containsValue(def)) {
+			if (conEval != null && conEval.getConstantOverrides().containsValue(def)) {
 				// used constants name instead of the definition overriding the
 				// constant
-				Iterator<Entry<OpDeclNode, OpDefNode>> iter = conEval.getConstantOverrideTable().entrySet().iterator();
+				Iterator<Entry<OpDeclNode, OpDefNode>> iter = conEval.getConstantOverrides().entrySet().iterator();
 				String name = null;
 				while (iter.hasNext()) {
 					Entry<OpDeclNode, OpDefNode> entry = iter.next();