fixes more Sonar complaints + Maven dependencies + demo jar

fathzer · Sep 2, 2024 · 6ef73a5 · 6ef73a5
1 parent 0c6fd20
commit 6ef73a5
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 85 deletions.
diff --git a/javaluator-demo/pom.xml b/javaluator-demo/pom.xml
@@ -1,62 +1,73 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.fathzer</groupId>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.fathzer</groupId>
 		<artifactId>javaluator-parent-pom</artifactId>
 		<version>1.0.1</version>
-  </parent>
-  <artifactId>javaluator-demo</artifactId>
-  <version>3.0.3</version>
-  
+	</parent>
+	<artifactId>javaluator-demo</artifactId>
+	<version>3.0.3</version>
+
 	<properties>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<maven.install.skip>true</maven.install.skip>
 		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
 
-    <dependencies>
-  	<dependency>
-  		<groupId>com.fathzer</groupId>
-  		<artifactId>javaluator</artifactId>
-			<version>3.0.4</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>com.fathzer</groupId>
-  		<artifactId>ajlib</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>com.fathzer</groupId>
+			<artifactId>javaluator</artifactId>
+			<version>3.0.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fathzer</groupId>
+			<artifactId>ajlib</artifactId>
 			<version>0.3.16</version>
-  	</dependency>
-  </dependencies>
-  
-  <build>
-  	<plugins>
-  		<plugin>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-shade-plugin</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
 				<version>3.5.3</version>
-	        <configuration>
+				<configuration>
 					<finalName>javaluator-demo</finalName>
-	          <minimizeJar>true</minimizeJar>
-              <transformers>
+					<minimizeJar>true</minimizeJar>
+					<transformers>
 						<transformer
 							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <manifestEntries>
-                    <Main-Class>com.fathzer.soft.javaluator.demo.DemoApplet</Main-Class>
-                  </manifestEntries>
-                </transformer>
-              </transformers>
-	        </configuration>
-	        <executions>
-	          <execution>
-	            <phase>package</phase>
-	            <goals>
-	              <goal>shade</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-  		</plugin>
-  	</plugins>
-  </build>
-
+							<manifestEntries>
+								<Main-Class>com.fathzer.soft.javaluator.demo.DemoApplet</Main-Class>
+							</manifestEntries>
+						</transformer>
+					</transformers>
+					<filters>
+						<filter>
+							<artifact>*:*</artifact>
+							<excludes>
+								<exclude>module-info.class</exclude>
+								<exclude>META-INF/*.SF</exclude>
+								<exclude>META-INF/*.DSA</exclude>
+								<exclude>META-INF/*.RSA</exclude>
+							</excludes>
+						</filter>
+					</filters>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
diff --git a/javaluator-demo/src/main/java/com/fathzer/soft/javaluator/demo/DemoPanel.java b/javaluator-demo/src/main/java/com/fathzer/soft/javaluator/demo/DemoPanel.java
@@ -5,8 +5,6 @@
 
 import java.awt.GridBagLayout;
 import java.awt.GridBagConstraints;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
 import java.awt.Insets;
 
 import javax.swing.border.TitledBorder;
@@ -86,18 +84,16 @@ private JLabel getLblNewLabel() {
 	private TextWidget getExpression() {
 		if (expression == null) {
 			expression = new TextWidget();
-			expression.addPropertyChangeListener(TextWidget.TEXT_PROPERTY, new PropertyChangeListener() {
-				public void propertyChange(PropertyChangeEvent evt) {
-					try {
-						String exp = expression.getText();
-						Object result = exp.length()==0 ? exp : getEvaluator().evaluate(exp);
-						getResultLabel().setText(result.toString());
-						resultLabel.setIcon(null);
-						resultLabel.setForeground(Color.BLACK);
-					} catch (IllegalArgumentException e) {
-						getResultLabel().setText("error: "+e);
-						resultLabel.setForeground(Color.RED);
-					}
+			expression.addPropertyChangeListener(TextWidget.TEXT_PROPERTY, evt -> {
+				try {
+					String exp = expression.getText();
+					Object result = exp.length()==0 ? exp : getEvaluator().evaluate(exp);
+					getResultLabel().setText(result.toString());
+					resultLabel.setIcon(null);
+					resultLabel.setForeground(Color.BLACK);
+				} catch (IllegalArgumentException e) {
+					getResultLabel().setText("error: "+e);
+					resultLabel.setForeground(Color.RED);
 				}
 			});
 			expression.setColumns(30);

diff --git a/javaluator-demo/src/main/java/com/fathzer/soft/javaluator/demo/FunctionTableModel.java b/javaluator-demo/src/main/java/com/fathzer/soft/javaluator/demo/FunctionTableModel.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import javax.swing.table.AbstractTableModel;
@@ -16,11 +15,7 @@ public class FunctionTableModel extends AbstractTableModel {
 
 	public FunctionTableModel(Collection<Function> collection) {
 		this.functions = new ArrayList<>(collection);
-		Collections.sort(this.functions, new Comparator<Function>() {
-			public int compare(Function f1, Function f2) {
-				return f1.getName().compareTo(f2.getName());
-			}
-		});
+		Collections.sort(this.functions, (f1,f2) -> f1.getName().compareTo(f2.getName()));
 	}
 
 	public int getColumnCount() {

diff --git a/javaluator-demo/src/main/java/com/fathzer/soft/javaluator/demo/OperatorTableModel.java b/javaluator-demo/src/main/java/com/fathzer/soft/javaluator/demo/OperatorTableModel.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import javax.swing.table.AbstractTableModel;
@@ -16,11 +15,7 @@ public class OperatorTableModel extends AbstractTableModel {
 
 	public OperatorTableModel(Collection<Operator> collection) {
 		this.operators = new ArrayList<>(collection);
-		Collections.sort(this.operators, new Comparator<Operator>() {
-			public int compare(Operator o1, Operator o2) {
-				return o1.getPrecedence()-o2.getPrecedence();
-			}
-		});
+		Collections.sort(this.operators, (o1, o2) -> o1.getPrecedence()-o2.getPrecedence());
 	}
 
 	public int getColumnCount() {

diff --git a/javaluator-examples/pom.xml b/javaluator-examples/pom.xml
@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>com.fathzer</groupId>
 			<artifactId>javaluator</artifactId>
-			<version>3.0.4</version>
+			<version>3.0.5</version>
 		</dependency>
 	</dependencies>
 

diff --git a/javaluator-examples/src/main/java/module-info.java b/javaluator-examples/src/main/java/module-info.java
@@ -1,3 +1,4 @@
 module javaluator.examples {
+    exports com.fathzer.soft.javaluator.examples;
     requires javaluator;
 }
diff --git a/javaluator/src/main/java/com/fathzer/soft/javaluator/DoubleEvaluator.java b/javaluator/src/main/java/com/fathzer/soft/javaluator/DoubleEvaluator.java
@@ -144,12 +144,7 @@ public enum Style {
 
 	private static Parameters defaultParameters;
 	private static final Pattern SCIENTIFIC_NOTATION_PATTERN = Pattern.compile("([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)[eE][+-]?\\d+)$");
-	private static final ThreadLocal<NumberFormat> FORMATTER = new ThreadLocal<NumberFormat>() {
-	  @Override
-	  protected NumberFormat initialValue() {
-	  	return NumberFormat.getNumberInstance(Locale.US);
-	  }
-	};
+	private static final ThreadLocal<NumberFormat> FORMATTER = ThreadLocal.withInitial(() -> NumberFormat.getNumberInstance(Locale.US));
 
 	/** Gets a copy of DoubleEvaluator standard default parameters.
 	 * <br>The returned parameters contains all the predefined operators, functions and constants.

diff --git a/javaluator/src/main/java/com/fathzer/soft/javaluator/Tokenizer.java b/javaluator/src/main/java/com/fathzer/soft/javaluator/Tokenizer.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -70,12 +69,7 @@ private static Pattern delimitersToRegexp(List<String> delimiters) {
 		// the longer may be before the shorter (&& should be before &) or the regexpr
 		// parser will recognize && as two &.
 		//TODO Create a test to verify that operators that includes others are working
-		Collections.sort(delimiters, new Comparator<String>() {
-			@Override
-			public int compare(String o1, String o2) {
-				return o2.compareTo(o1);
-			}
-		});
+		Collections.sort(delimiters, (o1, o2) -> o2.compareTo(o1));
 		// Build a string that will contain the regular expression
 		StringBuilder result = new StringBuilder();
 		result.append('(');