Code cleanup and formatting. Migrated to java 1.8.

[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / string / WildCardMatcher.java

diff --git a/src/main/java/eu/svjatoslav/commons/string/WildCardMatcher.java b/src/main/java/eu/svjatoslav/commons/string/WildCardMatcher.java
index e7fa56b..0da1738 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/string/WildCardMatcher.java
+++ b/src/main/java/eu/svjatoslav/commons/string/WildCardMatcher.java
@@ -11,94 +11,93 @@ package eu.svjatoslav.commons.string;
 
 public class WildCardMatcher {
 
-       /**
-        * Allow only for * in wildcards
-        */
-       private static boolean checkWildCardEnd(final String wildcardExpression,
-                       int wildCardPosition) {
-               for (; wildCardPosition < wildcardExpression.length(); wildCardPosition++) {
-                       final char wildCardChar = wildcardExpression
-                                       .charAt(wildCardPosition);
-                       if (wildCardChar != '*')
-                               return false;
-               }
-
-               return true;
-       }
-
-       /**
-        * <pre>
-        * Test input string against wildcard expression.
-        * * -- corresponds to any amount of characters.
-        * ? -- corresponds to any single character.
-        * </pre>
-        *
-        * @param inputString
-        *            input string
-        * @param wildcardExpression
-        *            wildcard expression
-        * @return <code>true</code> if input string matches input pattern
-        */
-       public static boolean match(final String inputString,
-                       final String wildcardExpression) {
-
-               if (inputString == null)
-                       return false;
-
-               if (wildcardExpression == null)
-                       return false;
-
-               int i;
-
-               for (i = 0; i < inputString.length(); i++) {
-                       if (i >= wildcardExpression.length())
-                               return false;
-                       final char wildCardChar = wildcardExpression.charAt(i);
-                       if (wildCardChar == '*')
-                               return matchPiece(inputString, i, wildcardExpression, i + 1);
-                       if (wildCardChar != '?')
-                               if (inputString.charAt(i) != wildCardChar)
-                                       return false;
-               }
-
-               return checkWildCardEnd(wildcardExpression, i);
-       }
-
-       private static boolean matchPiece(final String inputString,
-                       final int inputStringIndex, final String wildcardExpression,
-                       final int wildCardExpressionIndex) {
-
-               int wildCardPosition = wildCardExpressionIndex;
-
-               for (int i = inputStringIndex; i < inputString.length(); i++) {
-
-                       wildCardPosition = wildCardExpressionIndex;
-
-                       subMatchAttempt: {
-
-                               for (int j = i; j < inputString.length(); j++) {
-                                       if (wildCardPosition >= wildcardExpression.length())
-                                               break subMatchAttempt;
-                                       final char wildCardChar = wildcardExpression
-                                                       .charAt(wildCardPosition);
-
-                                       if (wildCardChar == '*')
-                                               return matchPiece(inputString, j, wildcardExpression,
-                                                               wildCardPosition + 1);
-
-                                       if (wildCardChar != '?')
-                                               if (inputString.charAt(j) != wildCardChar)
-                                                       break subMatchAttempt;
-
-                                       wildCardPosition++;
-                               }
-
-                               return checkWildCardEnd(wildcardExpression, wildCardPosition);
-                       }
-
-               }
-
-               return checkWildCardEnd(wildcardExpression, wildCardPosition);
-       }
+    /**
+     * Allow only for * in wildcards
+     */
+    private static boolean checkWildCardEnd(final String wildcardExpression,
+                                            int wildCardPosition) {
+        for (; wildCardPosition < wildcardExpression.length(); wildCardPosition++) {
+            final char wildCardChar = wildcardExpression
+                    .charAt(wildCardPosition);
+            if (wildCardChar != '*')
+                return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * <pre>
+     * Test input string against wildcard expression.
+     * * -- corresponds to any amount of characters.
+     * ? -- corresponds to any single character.
+     * </pre>
+     *
+     * @param inputString        input string
+     * @param wildcardExpression wildcard expression
+     * @return <code>true</code> if input string matches input pattern
+     */
+    public static boolean match(final String inputString,
+                                final String wildcardExpression) {
+
+        if (inputString == null)
+            return false;
+
+        if (wildcardExpression == null)
+            return false;
+
+        int i;
+
+        for (i = 0; i < inputString.length(); i++) {
+            if (i >= wildcardExpression.length())
+                return false;
+            final char wildCardChar = wildcardExpression.charAt(i);
+            if (wildCardChar == '*')
+                return matchPiece(inputString, i, wildcardExpression, i + 1);
+            if (wildCardChar != '?')
+                if (inputString.charAt(i) != wildCardChar)
+                    return false;
+        }
+
+        return checkWildCardEnd(wildcardExpression, i);
+    }
+
+    private static boolean matchPiece(final String inputString,
+                                      final int inputStringIndex, final String wildcardExpression,
+                                      final int wildCardExpressionIndex) {
+
+        int wildCardPosition = wildCardExpressionIndex;
+
+        for (int i = inputStringIndex; i < inputString.length(); i++) {
+
+            wildCardPosition = wildCardExpressionIndex;
+
+            subMatchAttempt:
+            {
+
+                for (int j = i; j < inputString.length(); j++) {
+                    if (wildCardPosition >= wildcardExpression.length())
+                        break subMatchAttempt;
+                    final char wildCardChar = wildcardExpression
+                            .charAt(wildCardPosition);
+
+                    if (wildCardChar == '*')
+                        return matchPiece(inputString, j, wildcardExpression,
+                                wildCardPosition + 1);
+
+                    if (wildCardChar != '?')
+                        if (inputString.charAt(j) != wildCardChar)
+                            break subMatchAttempt;
+
+                    wildCardPosition++;
+                }
+
+                return checkWildCardEnd(wildcardExpression, wildCardPosition);
+            }
+
+        }
+
+        return checkWildCardEnd(wildcardExpression, wildCardPosition);
+    }
 
 }