upgrade gradle, fixed IntelliJ warnings, update against API dicelib changes introduced in dicelib related to RPTools/maptool#1898

Author: nmeier

.gitignore

@@ -1,6 +1,23 @@
-.idea/
-.gradle/
-.settings
-.classpath
+# OS generated files
+################################################################################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+
+# Others
+################################################################################
+.gradle
 build/
-src/main/java/net/rptools/dicetool/dicetool/
+/bin/
+target/
+out/
+/releases/
+*.log
+*~
+\${sys:appHome}/
+/.idea

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Sat Mar 04 13:37:30 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

gradlew

@@ -33,7 +33,6 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
@@ -57,8 +56,7 @@ public class MainFrame extends JFrame {
     private static final long serialVersionUID = -5149326446698624828L;
 
     private static String version;
-    
-    private final JMenuBar menuBar;
+
 	private final JTabbedPane customRollTab;
 	private final JLabel statusBar;
 
@@ -68,9 +66,9 @@ public class MainFrame extends JFrame {
 
 	private final AboutDialog aboutDialog;
 
-	private List<CustomRollPanel> rollPanels = new ArrayList<CustomRollPanel>();
+	private List<CustomRollPanel> rollPanels = new ArrayList<>();
 
-	private List<RollListener> rollListeners = new ArrayList<RollListener>();
+	private final List<RollListener> rollListeners = new ArrayList<>();
 
 	private static final String EXPRESSION_SYNTAX =
 		"bags (non cumulative rolls):\n"
@@ -105,7 +103,7 @@ public MainFrame() {
 		}
 
 		String credits = "";
-        String version = "";
+        String version;
         Image logo = null;
         try {
             credits = new String(FileUtil.loadResource("java/net.rptools.dicetool.dicetool/credits.html"));
@@ -117,9 +115,9 @@ public MainFrame() {
         	ioe.printStackTrace();
         }
 		aboutDialog = new AboutDialog(this, logo, credits);
-		
 
-		menuBar = new JMenuBar();
+
+		JMenuBar menuBar = new JMenuBar();
 		JMenu menu = new JMenu("File");
 		menu.setMnemonic('F');
 		menuBar.add(menu);
@@ -168,8 +166,6 @@ public void actionPerformed(ActionEvent e) {
             private static final long serialVersionUID = -7511992886537497232L;
 
             public void actionPerformed(ActionEvent e) {
-				RowListModel tm = resultPanel.getTableModel();
-
 				JOptionPane.showMessageDialog(
 						MainFrame.this,
 					"Random: "
@@ -213,8 +209,7 @@ public void actionPerformed(ActionEvent e) {
 		panel.add(dicePanel);
 
 		customRollTab = new JTabbedPane(JTabbedPane.TOP, JTabbedPane.SCROLL_TAB_LAYOUT);
-		for (Iterator i = rollPanels.iterator(); i.hasNext(); ) {
-			CustomRollPanel rollPanel = (CustomRollPanel) i.next();
+		for (CustomRollPanel rollPanel : rollPanels) {
 			customRollTab.add(rollPanel);
 		}
 
@@ -282,16 +277,14 @@ public void actionPerformed(ActionEvent e) {
 	}
 
 	public void roll(String definition) {
-		ExpressionParser parser = new ExpressionParser(resolver);
+		ExpressionParser parser = new ExpressionParser();
 
 
 		try {
 			//List xps = ExpressionFactory.getExpressions(definition, variablePanel.getVariables());
-	
-			for (Iterator i = rollListeners.iterator(); i.hasNext();) {
-				RollListener l = (RollListener) i.next();
-	
-				l.rolled(Collections.singletonList(parser.evaluate(definition).format()));
+
+			for (RollListener l : rollListeners) {
+				l.rolled(Collections.singletonList(parser.evaluate(definition, resolver).format()));
 			}
 		} catch (ParserException e) {
 			JOptionPane.showMessageDialog(this, e.getMessage());
@@ -397,8 +390,7 @@ public void saveRollPanelPreferences(Preferences rootPrefs) {
 		prefs.putBoolean("tabbed", true);
 
 		int index = 0;
-		for (Iterator i = rollPanels.iterator(); i.hasNext(); index++) {
-			CustomRollPanel rollPanel = (CustomRollPanel) i.next();
+		for (CustomRollPanel rollPanel : rollPanels) {
 
 			String name = rollPanel.getName();
 			prefs.put("TabName" + index, name);
@@ -435,12 +427,10 @@ public void exportPreferences(File file, int tabIndex) {
 
 		try {
 			tabPrefs.exportSubtree(new FileOutputStream(file));
-		} catch (IOException e) {
-			e.printStackTrace(System.err);
-		} catch (BackingStoreException e) {
+		} catch (IOException | BackingStoreException e) {
 			e.printStackTrace(System.err);
 		}
-		
+
 	}
 
 /*	public void convertPreferences() {