Resolving conflicts

devonfw · Sep 27, 2019 · 8389906 · 8389906
2 parents 4ace141 + d4be6e2
commit 8389906
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...t/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/InputInterpreterImpl.java b/...t/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/InputInterpreterImpl.java
@@ -61,6 +61,19 @@ public Object read(String type, Path path, Charset inputCharset, Object... addit
     @Override
     public Object read(Path path, Charset inputCharset, Object... additionalArguments) throws InputReaderException {
         Set<String> keySet = PluginRegistry.getTriggerInterpreterKeySet();
+        // We first try to find an input reader that is most likely readable
+        for (String s : keySet) {
+            try {
+                if (isMostLikelyReadable(s, path)) {
+                    return getInputReader(s).read(path, inputCharset, additionalArguments);
+                }
+            } catch (InputReaderException e) {
+                // nothing to do.
+            }
+        }
+
+        // No input reader is most likely readable, then we try with every of them until we find the correct
+        // one
         for (String s : keySet) {
             try {
                 return getInputReader(s).read(path, inputCharset, additionalArguments);

diff --git a/cobigen/cobigen-core-parent/pom.xml b/cobigen/cobigen-core-parent/pom.xml
@@ -12,7 +12,7 @@
   </parent>
 
   <properties>
-    <cobigencore.version>5.3.4</cobigencore.version>
+    <cobigencore.version>5.3.5-SNAPSHOT</cobigencore.version>
   </properties>
 
   <modules>