Changeset 13453

Timestamp:

Sep 11, 2019 3:51:16 PM (3 months ago)

Author:

molsson

Message:

#5835 Fixed a bug from r13431 in TestAnnotationizer.java when using option -f.

File:

• trunk/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/util/TestAnnotationizer.java (modified) (4 diffs)

trunk/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/util/TestAnnotationizer.java

@@ -159 +159 @@
         @SuppressWarnings("resource")
         BufferedReader in = cont ? new BufferedReader(new InputStreamReader(System.in)) : null;
-        String packageName = getPackageName(filePath);
         while (cont) {
             if (hasInputFilePath) {
@@ -165 +164 @@
                 String[] parts = line.split(",");
                 filePath = parts[0];
-                packageName = getPackageName(filePath);
-                modelName = packageName + "." + parts[1];
+                modelName = getPackageName(filePath) + "." + parts[1];
             } else if (all_models) {
                 modelName = allModelsIterator.next();
@@ -177 +175 @@
                     System.exit(0);
                 }
-                modelName = composeModelName(packageName, given);
+                modelName = composeModelName(getPackageName(filePath), given);
             }
             
-            if (inputlang == Lang.none)
+            if (inputlang == Lang.none) {
                 lang = filePath.contains("Optimica") ? Lang.optimica : Lang.modelica;
-            else {
+            } else {
                 lang = inputlang;
             }
@@ -295 +293 @@
 
     private static String composeModelName(String extracted, String entered) {
-        if (entered == null)
-            return extracted;
-        else if (entered.contains("."))
-            return entered;
-        else
-            return extracted + "." + entered;
+        if (entered == null) {
+            return extracted;
+        } else if (entered.contains(".")) {
+            return entered;
+        } else {
+            return extracted + "." + entered;
+        }
     }