Small improvement

javaparser · Mar 19, 2017 · 7cafa15 · 7cafa15
1 parent c044004
commit 7cafa15
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...rser-core/src/main/java/com/github/javaparser/ast/validator/chunks/ModifierValidator.java b/...rser-core/src/main/java/com/github/javaparser/ast/validator/chunks/ModifierValidator.java
@@ -151,9 +151,7 @@ private <T extends NodeWithModifiers<?> & NodeWithRange<?>> void validateModifie
         if (hasStrictfp) {
             validateAtMostOneOf(n, reporter, NATIVE, STRICTFP);
         } else {
-            final List<Modifier> newModifiers = new ArrayList<>(asList(allowedModifiers));
-            newModifiers.remove(STRICTFP);
-            allowedModifiers = newModifiers.toArray(new Modifier[0]);
+            allowedModifiers = removeModifierFromArray(STRICTFP, allowedModifiers);
         }
         for (Modifier m : n.getModifiers()) {
             if (!arrayContains(allowedModifiers, m)) {
@@ -162,6 +160,13 @@ private <T extends NodeWithModifiers<?> & NodeWithRange<?>> void validateModifie
         }
     }
 
+    private Modifier[] removeModifierFromArray(Modifier m, Modifier[] allowedModifiers) {
+        final List<Modifier> newModifiers = new ArrayList<>(asList(allowedModifiers));
+        newModifiers.remove(m);
+        allowedModifiers = newModifiers.toArray(new Modifier[0]);
+        return allowedModifiers;
+    }
+
     private boolean arrayContains(Object[] items, Object searchItem) {
         for (Object o : items) {
             if (o == searchItem) {