refactoring

Author: raydac

jcp/pom.xml

@@ -580,7 +580,7 @@ List<File> processConfigFiles() throws IOException {
             if (this.context.isVerbose()) {
               this.context.logForVerbose(String
                   .format("Registering global variable '%s' = '%s' (%s:%d)", name,
-                      result.toString(), file.getName(), readStringIndex + 1));
+                      result, file.getName(), readStringIndex + 1));
             }
           } catch (Exception unexpected) {
             throwPreprocessorException("Can't process the global variable definition", trimmed,

jcp/src/main/java/com/igormaznitsa/jcp/JcpPreprocessor.java

@@ -21,14 +21,12 @@ public boolean processCommandLineKey(final String key, final PreprocessorContext
     if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String tail = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
 
-      if (tail.isEmpty()) {
-        result = true;
-      } else {
+      if (!tail.isEmpty()) {
         final PreprocessorExtension preprocessorExtension =
             PreprocessorUtils.findAndInstantiatePreprocessorExtensionForClassName(tail);
         context.addPreprocessorExtension(preprocessorExtension);
-        result = true;
       }
+      result = true;
     }
     return result;
   }

jcp/src/main/java/com/igormaznitsa/jcp/cmdline/ActionPreprocessorExtensionHandler.java

@@ -434,14 +434,14 @@ public PreprocessingState preprocessFile(final PreprocessingState state,
     return this.preprocessFileWithNotification(state, context, true);
   }
 
+  @SuppressWarnings("StringEquality")
   private void flushTextBufferForRemovedComments(
       final AtomicReference<Map.Entry<String, String>> firstDetectedUncommentLinePtr,
       final int stringIndex,
       final List<String> textPieces,
       final ResettablePrinter resettablePrinter,
       final PreprocessingState state,
-      final PreprocessorContext context)
-      throws IOException {
+      final PreprocessorContext context) {
 
     final Map.Entry<String, String> firstUncommentLine =
         firstDetectedUncommentLinePtr.getAndSet(null);

jcp/src/main/java/com/igormaznitsa/jcp/containers/FileInfoContainer.java

@@ -193,7 +193,7 @@ private ExpressionTreeElement evalFunction(final ExpressionTreeElement functionE
         return new ExpressionTreeElement(result, stack, sources);
       } catch (NoSuchMethodException unexpected) {
         throw this.context.makeException(
-            "[Expression]Can't find a function method to process data [" + signature.toString() +
+            "[Expression]Can't find a function method to process data [" + signature +
                 ']', unexpected);
       } catch (Exception unexpected) {
         final Throwable cause = unexpected.getCause();
@@ -202,7 +202,7 @@ private ExpressionTreeElement evalFunction(final ExpressionTreeElement functionE
         }
         throw this.context.makeException(
             "[Expression]Can't execute a function method to process data [" +
-                function.getClass().getName() + '.' + signature.toString() + ']', unexpected);
+                function.getClass().getName() + '.' + signature + ']', unexpected);
       }
     }
   }

jcp/src/main/java/com/igormaznitsa/jcp/expression/Expression.java

@@ -169,7 +169,7 @@ public ExpressionItem readExpression(final PushbackReader reader, final Expressi
           }
         } else if (nextItem == SpecialItem.BRACKET_OPENING) {
           if (prev != null && prev.getExpressionItemType() == ExpressionItemType.VARIABLE) {
-            final String text = "Unknown function detected [" + prev.toString() + ']';
+            final String text = "Unknown function detected [" + prev + ']';
             throw context.makeException(text, null);
           }
 

jcp/src/main/java/com/igormaznitsa/jcp/expression/ExpressionParser.java

@@ -27,6 +27,7 @@
 import com.igormaznitsa.jcp.expression.Value;
 import com.igormaznitsa.jcp.expression.ValueType;
 import com.igormaznitsa.jcp.extension.PreprocessorExtension;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -56,9 +57,7 @@ public FunctionDefinedByUser(final String name, final int argsNumber,
 
     final ValueType[] types = new ValueType[argsNumber];
 
-    for (int li = 0; li < argsNumber; li++) {
-      types[li] = ValueType.ANY;
-    }
+    Arrays.fill(types, ValueType.ANY);
     this.argTypes = new ValueType[][] {types};
   }
 

jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionDefinedByUser.java

@@ -36,7 +36,7 @@
 /**
  * The Function makes preprocessing of a file and return result as a string value. It uses the current preprocessor context as the context for preprocessing the file.
  *
- * @author Igor Maznitsa (http://www.igormaznitsa.com)
+ * @author Igor Maznitsa (<a href="https://www.igormaznitsa.com">...</a>)
  */
 public class FunctionEVALFILE extends AbstractFunction {
 

jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionEVALFILE.java

@@ -39,7 +39,7 @@ public int getArity() {
   @Override
 
   public String getReference() {
-    return "additive operator (string concatenation supported)";
+    return "additive operator (supports string concatenation)";
   }
 
   @Override

jcp/src/main/java/com/igormaznitsa/jcp/expression/operators/OperatorADD.java

@@ -39,7 +39,7 @@ public int getArity() {
   @Override
 
   public String getReference() {
-    return "conditional-AND and bitwise-AND";
+    return "conditional AND & bitwise AND";
   }
 
   @Override