Skip to content

Commit 3a3f15a

Browse files
committed
decrease non-determinism*
HashSet -> LinkedHashSet HashMap -> LinkedHashMap
1 parent 8dc8540 commit 3a3f15a

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

ref-code-adaptation/src/main/java/de/monticore/codeAdaption/CodeAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void adapt(
5151
ASTCDCompilationUnit refCD = JavaLoader.loadCD(referenceCD);
5252
ASTCDCompilationUnit conCD = JavaLoader.loadCD(concreteCD);
5353

54-
Set<ASTOrdinaryCompilationUnit> adaptedCode = new HashSet<>();
54+
Set<ASTOrdinaryCompilationUnit> adaptedCode = new LinkedHashSet<>();
5555

5656
for (String mapping : mappings) {
5757

ref-code-adaptation/src/main/java/de/monticore/codeAdaption/handler/BasicUpdateHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public BasicUpdateHandler(
6060
public void handleUpdate(Set<ASTOrdinaryCompilationUnit> javaFiles) {
6161

6262
// Collect elements of each type
63-
Set<JavaAstElemCollector> typeElements = new HashSet<>();
63+
Set<JavaAstElemCollector> typeElements = new LinkedHashSet<>();
6464
for (ASTOrdinaryCompilationUnit ast : javaFiles) {
6565

6666
// collect code elements

ref-code-adaptation/src/main/java/de/monticore/codeAdaption/matcher/MatcherHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static String mkTemplateFormInfix(String name, List<ISymbol> infixList) {
9292
public static List<ISymbol> cleanReferences(String name, List<ISymbol> infixList) {
9393
List<String> refs =
9494
infixList.stream().map(ref -> ref.getName().toLowerCase()).collect(Collectors.toList());
95-
Map<Integer, ISymbol> refMap = new HashMap<>();
95+
Map<Integer, ISymbol> refMap = new LinkedHashMap<>();
9696

9797
for (int i = 0; i < refs.size(); i++) {
9898
refMap.put(name.toLowerCase().indexOf(refs.get(i)), infixList.get(i));
@@ -189,7 +189,7 @@ public static List<ISymbol> cleanReferences(List<ISymbol> references) {
189189
return references;
190190
}
191191

192-
Set<ISymbol> temps = new HashSet<>(references);
192+
Set<ISymbol> temps = new LinkedHashSet<>(references);
193193
for (ISymbol symbol : temps) {
194194
for (ISymbol symbol1 : temps) {
195195
if (!symbol.equals(symbol1) && (matchInfix(symbol.getName(), symbol1.getName()))) {

ref-code-adaptation/src/main/java/de/monticore/codeAdaption/updater/spoonUpdater/SpoonUpdater.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public class SpoonUpdater implements CodeUpdater {
2626
private File outputDir;
2727
private Launcher launcher;
2828
private CtModel spoonModel;
29-
private final Map<ASTTypeDeclaration, CtType<?>> typeMap = new HashMap<>();
30-
private final Map<ASTMethodDeclaration, CtMethod<?>> methodMap = new HashMap<>();
29+
private final Map<ASTTypeDeclaration, CtType<?>> typeMap = new LinkedHashMap<>();
30+
private final Map<ASTMethodDeclaration, CtMethod<?>> methodMap = new LinkedHashMap<>();
3131

3232
@Override
3333
public void setCodePath(Path path) {

ref-code-adaptation/src/main/java/de/monticore/codeAdaption/utils/AdapterUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
public class AdapterUtils {
2222

2323
public static Set<ASTCDType> getAllCDTypes(ASTCDCompilationUnit cd) {
24-
Set<ASTCDType> res = new HashSet<>();
24+
Set<ASTCDType> res = new LinkedHashSet<>();
2525
res.addAll(cd.getCDDefinition().getCDClassesList());
2626
res.addAll(cd.getCDDefinition().getCDInterfacesList());
2727
res.addAll(cd.getCDDefinition().getCDEnumsList());

ref-code-adaptation/src/main/java/de/monticore/codeAdaption/utils/JavaLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public static void writeFile(Path path, String content) {
167167
* @return A set of Java files represented as ASTOrdinaryCompilationUnit.
168168
*/
169169
public static Set<ASTOrdinaryCompilationUnit> readJavaCode(Path directoryPath) {
170-
Set<File> res = new HashSet<>();
170+
Set<File> res = new LinkedHashSet<>();
171171
readJavaCode(directoryPath, res);
172172
return res.stream().map(JavaLoader::loadJava).collect(Collectors.toSet());
173173
}
@@ -179,7 +179,7 @@ public static Set<ASTOrdinaryCompilationUnit> readJavaCode(Path directoryPath) {
179179
* @return A set of Java files as File objects.
180180
*/
181181
public static Set<File> readJavaFile(Path directoryPath) {
182-
Set<File> res = new HashSet<>();
182+
Set<File> res = new LinkedHashSet<>();
183183
readJavaCode(directoryPath, res);
184184
return res;
185185
}

ref-code-adaptation/src/main/java/de/monticore/codeAdaption/utils/visitors/JavaAstElemCollector.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
public class JavaAstElemCollector implements JavaDSLVisitor2 {
2020
private final List<ASTTypeDeclaration> typeDeclarations = new ArrayList<>();
21-
private final Map<ASTTypeDeclaration, TypeElementCollector> typeElements = new HashMap<>();
21+
private final Map<ASTTypeDeclaration, TypeElementCollector> typeElements = new LinkedHashMap<>();
2222

2323
@Override
2424
public void visit(ASTClassDeclaration node) {
@@ -109,8 +109,8 @@ class TypeElementCollector implements JavaDSLVisitor2, JavaLightVisitor2 {
109109
List<ASTFieldDeclaration> fieldDeclarations = new ArrayList<>();
110110
List<ASTMCType> supertypesDeclarations = new ArrayList<>();
111111

112-
Map<ASTMethodDeclaration, List<ASTLocalVariableDeclaration>> localVarsMap = new HashMap<>();
113-
Map<ASTMethodDeclaration, List<ASTFormalParameter>> formalParamsMap = new HashMap<>();
112+
Map<ASTMethodDeclaration, List<ASTLocalVariableDeclaration>> localVarsMap = new LinkedHashMap<>();
113+
Map<ASTMethodDeclaration, List<ASTFormalParameter>> formalParamsMap = new LinkedHashMap<>();
114114

115115
@Override
116116
public void visit(ASTMethodDeclaration node) {

ref-code-adaptation/src/main/java/de/monticore/codeAdaption/validator/CodeValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public boolean isValid(ASTCDCompilationUnit refCD, Path refCode) {
112112
asts.forEach(ast -> runCoCosPhase2(ast, refCD));
113113

114114
// check that all elements matched
115-
Set<ASTTypeDeclaration> allType = new HashSet<>();
115+
Set<ASTTypeDeclaration> allType = new LinkedHashSet<>();
116116
for (ASTOrdinaryCompilationUnit ast : asts) {
117117
JavaAstElemCollector collector = new JavaAstElemCollector();
118118
JavaDSLTraverser traverser = JavaDSLMill.traverser();

0 commit comments

Comments
 (0)