diff --git a/monticore-runtime/src/main/java/de/monticore/antlr4/MCErrorListener.java b/monticore-runtime/src/main/java/de/monticore/antlr4/MCErrorListener.java index d1a2907a45..c4ea1fd560 100644 --- a/monticore-runtime/src/main/java/de/monticore/antlr4/MCErrorListener.java +++ b/monticore-runtime/src/main/java/de/monticore/antlr4/MCErrorListener.java @@ -128,7 +128,7 @@ && containsRule(((Parser) recognizer).getExpectedTokens(), recognizer.getVocabul parser.setErrors(true); } - private static List extractNoKeywordTokens(Recognizer recognizer, Set> epsilonRules) { + protected static List extractNoKeywordTokens(Recognizer recognizer, Set> epsilonRules) { Pattern nokeywordPattern = Pattern.compile("nokeyword_(.*)_[0-9]*"); // Turn the next expected rules into a human readable format: List noKeywordRules = epsilonRules.stream().map(r -> { diff --git a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/freemarker/SimpleHashFactory.java b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/freemarker/SimpleHashFactory.java index 4b1bc86896..5c2a8411f2 100644 --- a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/freemarker/SimpleHashFactory.java +++ b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/freemarker/SimpleHashFactory.java @@ -19,19 +19,18 @@ */ // STATE SMELL PN public class SimpleHashFactory { - + private static SimpleHashFactory theInstance; - - private SimpleHashFactory() { + + SimpleHashFactory() { + theInstance = this; // use empty logger to suppress default free marker log behaviour System.setProperty(Logger.SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY, Logger.LIBRARY_NAME_NONE); } public static SimpleHashFactory getInstance() { if (theInstance == null) { - synchronized (SimpleHashFactory.class) { - theInstance = new SimpleHashFactory(); - } + new SimpleHashFactory(); } return theInstance; } diff --git a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/artifacts/ReportingNameHelper.java b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/artifacts/ReportingNameHelper.java index cd2bdb1b35..807d297463 100644 --- a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/artifacts/ReportingNameHelper.java +++ b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/artifacts/ReportingNameHelper.java @@ -10,7 +10,7 @@ public class ReportingNameHelper { /** * Constructor for de.monticore.generating.templateengine.reporting.artifacts.ReportingNameHelper. */ - private ReportingNameHelper() { + ReportingNameHelper() { } public static Path getPath(String outputDir, String qualifiedFilename, String fileextension) { diff --git a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/commons/StatisticsHandler.java b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/commons/StatisticsHandler.java index 21f2600bf7..df5265d123 100644 --- a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/commons/StatisticsHandler.java +++ b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/commons/StatisticsHandler.java @@ -27,7 +27,7 @@ static ExecutorService getReportSendingExecutorService() { return _reportSendingExecutorService; } - private static void sendRequest(URI url, String data, String type) throws IOException, InterruptedException { + static void sendRequest(URI url, String data, String type) throws IOException, InterruptedException { HttpURLConnection connection = (HttpURLConnection) url.toURL().openConnection(); connection.setRequestMethod("POST"); connection.setRequestProperty("STAT_TYPE", type); diff --git a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/reporter/DetailedReporter.java b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/reporter/DetailedReporter.java index ffdc9c08f3..4879966896 100644 --- a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/reporter/DetailedReporter.java +++ b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/reporter/DetailedReporter.java @@ -245,7 +245,7 @@ protected static String calculateLine(String value) { ReportingConstants.REPORTING_ROW_LENGTH); } - private void reportTemplateAction(ASTNode astNode, String templatename, + void reportTemplateAction(ASTNode astNode, String templatename, String actionType) { String startString = actionType + getLineStart(astNode); String line = startString + Layouter.getSpaceString( diff --git a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/reporter/StatisticsReporter.java b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/reporter/StatisticsReporter.java index 427e0cbfa7..e025cdec2b 100644 --- a/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/reporter/StatisticsReporter.java +++ b/monticore-runtime/src/main/java/de/monticore/generating/templateengine/reporting/reporter/StatisticsReporter.java @@ -83,7 +83,7 @@ public void flush(ASTNode ast) { closeFile(); } - private void putVersion() { + void putVersion() { try { Properties properties = new Properties(); properties.load(this.getClass().getResourceAsStream("/buildInfo.properties")); diff --git a/monticore-runtime/src/main/java/de/monticore/io/MontiCoreClassLoader.java b/monticore-runtime/src/main/java/de/monticore/io/MontiCoreClassLoader.java index c162e7b46b..a53f1c4dfe 100644 --- a/monticore-runtime/src/main/java/de/monticore/io/MontiCoreClassLoader.java +++ b/monticore-runtime/src/main/java/de/monticore/io/MontiCoreClassLoader.java @@ -8,7 +8,7 @@ public class MontiCoreClassLoader extends URLClassLoader { - private final ClassLoader parent; + protected final ClassLoader parent; public MontiCoreClassLoader(URL[] urls) { super(urls); diff --git a/monticore-runtime/src/main/java/de/monticore/io/paths/MCPath.java b/monticore-runtime/src/main/java/de/monticore/io/paths/MCPath.java index cf9fd8a0b4..4787514b55 100644 --- a/monticore-runtime/src/main/java/de/monticore/io/paths/MCPath.java +++ b/monticore-runtime/src/main/java/de/monticore/io/paths/MCPath.java @@ -332,7 +332,7 @@ void invalidateCaches() { } // A List of all file systems opened for jars. - private static Map openedJarFileSystems = new HashMap<>(); + final static Map openedJarFileSystems = new HashMap<>(); public static FileSystem getJarFS(File jar) { if(openedJarFileSystems.containsKey(jar)){ diff --git a/monticore-runtime/src/main/java/de/monticore/symboltable/SymbolWithScopeOfUnknownKindDeSer.java b/monticore-runtime/src/main/java/de/monticore/symboltable/SymbolWithScopeOfUnknownKindDeSer.java index 8073e7a66e..62fdfca8ea 100644 --- a/monticore-runtime/src/main/java/de/monticore/symboltable/SymbolWithScopeOfUnknownKindDeSer.java +++ b/monticore-runtime/src/main/java/de/monticore/symboltable/SymbolWithScopeOfUnknownKindDeSer.java @@ -17,8 +17,8 @@ */ public class SymbolWithScopeOfUnknownKindDeSer implements ISymbolDeSer { - private final IDeSer parent; - private final Supplier scopeFactory; + protected final IDeSer parent; + protected final Supplier scopeFactory; /** * Creates a new {@code SymbolWithScopeOfUnknownKindDeSer}. diff --git a/monticore-runtime/src/main/java/de/monticore/symboltable/serialization/JsonPrinter.java b/monticore-runtime/src/main/java/de/monticore/symboltable/serialization/JsonPrinter.java index f878fdcc24..5a81ac3ad9 100644 --- a/monticore-runtime/src/main/java/de/monticore/symboltable/serialization/JsonPrinter.java +++ b/monticore-runtime/src/main/java/de/monticore/symboltable/serialization/JsonPrinter.java @@ -515,7 +515,7 @@ else if (!currElements.isEmpty() && currElements.peek().isJsonObject()) { } } - private JsonObject getParentObject() { + protected JsonObject getParentObject() { if (currElements.isEmpty()) { Log.error("0xA0613 JsonPrinter detected an invalid nesting of Json. " + "Cannot add a member as the first element of a Json String!"); diff --git a/monticore-runtime/src/main/java/de/monticore/tf/runtime/ValueComparator.java b/monticore-runtime/src/main/java/de/monticore/tf/runtime/ValueComparator.java index 5273a8cbd5..36a4a2f330 100644 --- a/monticore-runtime/src/main/java/de/monticore/tf/runtime/ValueComparator.java +++ b/monticore-runtime/src/main/java/de/monticore/tf/runtime/ValueComparator.java @@ -6,7 +6,7 @@ public class ValueComparator implements Comparator { - private Map data = null; + protected Map data = null; public ValueComparator(Map data) { this.data = data; diff --git a/monticore-runtime/src/main/java/de/monticore/tf/runtime/matching/ModelTraversal.java b/monticore-runtime/src/main/java/de/monticore/tf/runtime/matching/ModelTraversal.java index 0a24d9c00a..75bf66de43 100644 --- a/monticore-runtime/src/main/java/de/monticore/tf/runtime/matching/ModelTraversal.java +++ b/monticore-runtime/src/main/java/de/monticore/tf/runtime/matching/ModelTraversal.java @@ -13,7 +13,7 @@ public class ModelTraversal { protected Map parents= new HashMap<>(); protected Stack currentparents = new Stack<>(); - private final E traverser; + protected final E traverser; protected ModelTraversal(E traverser) { this.traverser = traverser; diff --git a/monticore-runtime/src/main/java/de/monticore/tf/runtime/matching/ModelTraversalVisitor.java b/monticore-runtime/src/main/java/de/monticore/tf/runtime/matching/ModelTraversalVisitor.java index 8a98367d8c..919cf7bea1 100644 --- a/monticore-runtime/src/main/java/de/monticore/tf/runtime/matching/ModelTraversalVisitor.java +++ b/monticore-runtime/src/main/java/de/monticore/tf/runtime/matching/ModelTraversalVisitor.java @@ -9,7 +9,7 @@ public class ModelTraversalVisitor implements IVisitor { - private final ModelTraversal modelTraversal; + protected final ModelTraversal modelTraversal; protected ModelTraversalVisitor( ModelTraversal modelTraversal) {