fixed issue in connectors

husonlab · Feb 16, 2021 · a2994e6 · a2994e6
1 parent fe1b550
commit a2994e6
Showing 1 changed file with 32 additions and 12 deletions.
diff --git a/src/jloda/util/Basic.java b/src/jloda/util/Basic.java
@@ -2951,7 +2951,7 @@ public static String getAnExistingFileWithGivenExtension(String path, final List
      * @return split string, trimmed
      */
     public static String[] split(String aLine, char splitChar) {
-        return split(aLine, splitChar, Integer.MAX_VALUE);
+        return split(aLine, splitChar, Integer.MAX_VALUE,false);
     }
 
     /**
@@ -2962,6 +2962,18 @@ public static String[] split(String aLine, char splitChar) {
      * @return split string, trimmed
      */
     public static String[] split(String aLine, char splitChar, int maxTokens) {
+        return split(aLine,splitChar,maxTokens,false);
+    }
+
+
+        /**
+         * split string on given character. Note that results are subsequently trimmed
+         *
+         * @param aLine
+         * @param splitChar
+         * @return split string, trimmed
+         */
+    public static String[] split(String aLine, char splitChar, int maxTokens,boolean skipEmptyTokens) {
         aLine = aLine.trim();
         if (aLine.length() == 0 || maxTokens <= 0)
             return new String[0];
@@ -2971,13 +2983,19 @@ public static String[] split(String aLine, char splitChar, int maxTokens) {
 
         // count the number of tokens
         int count = 1;
-        if (maxTokens > 1) {
-            for (int i = 0; i < length; i++) {
-                if (aLine.charAt(i) == splitChar) {
-                    if (count < maxTokens)
-                        count++;
-                    else
-                        break;
+        {
+            int prev = -1;
+            if (maxTokens > 1) {
+                for (int i = 0; i < length; i++) {
+                    if (aLine.charAt(i) == splitChar) {
+                        if (!skipEmptyTokens || i > prev + 1) {
+                            if (count < maxTokens)
+                                count++;
+                            else
+                                break;
+                        }
+                        prev = i;
+                    }
                 }
             }
         }
@@ -2988,10 +3006,12 @@ public static String[] split(String aLine, char splitChar, int maxTokens) {
         int pos = 0;
         for (; pos < length; pos++) {
             if (aLine.charAt(pos) == splitChar) {
-                result[which++] = aLine.substring(prev, pos).trim();
-                prev = pos + 1;
-                if (which == count)
-                    return result;
+                if(!skipEmptyTokens || pos>prev+1) {
+                    result[which++] = aLine.substring(prev, pos).trim();
+                    prev = pos + 1;
+                    if (which == count)
+                        return result;
+                }
             }
         }
         if (pos > prev) {