New release v2.20.13 - minor changes to compare function

Author: jpaulm

build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'java-library'
 
 }
 
-version = '2.20.12'
+version = '2.20.13'
 
 group = 'com.jpaulmorrison'
 
@@ -135,7 +135,7 @@ description = "Create default maven directory structure"
             groupId = 'com.jpaulmorrison'
             artifactId = 'drawfbp'       
 
-            version = '2.20.12'
+            version = '2.20.13'
             from components.java
 
 

build/resources/main/help/comparing.html

@@ -21,7 +21,7 @@ <h1>Comparing Diagrams</h1>
 select another diagram file to compare against, using the FileChooser dialog. </p>
 <p>For certain types of mismatch, a separate frame will apear with more information - this will 
 disappear, along with the   
-mismatch indicators (see below), when you select "Diagram/Clear Compare Indicators".
+mismatch indicators (see below), when you select "Diagram/Clear Visible Indicators".
 <p>When you have selected one, you will see the current diagram with a number of blocks and/or arrows marked with letter codes in circles.
 </p>
 <p>The letter codes are as follows:

build/resources/main/help/diagram.html

@@ -22,7 +22,7 @@ <h1>Diagram</h1>
   <li style="color: rgb(0, 153, 0);">"New Block"</li>
   <li style="color: rgb(0, 153, 0);">"Create Image"</li>
   <li style="color: rgb(0, 153, 0);">"Compare Diagrams"</li>
-  <li style="color: rgb(0, 153, 0);">"Clear Compare Indicators"</li>
+  <li style="color: rgb(0, 153, 0);">"Clear Visible Indicators"</li>
   <li style="color: rgb(0, 153, 0);">"Block-related Actions"</li>
   <li style="color: rgb(0, 153, 0);">"Arrow-related Actions"</li>
   </ul>

build/scripts/drawfbp

@@ -80,7 +80,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/drawfbp-2.20.12.jar:$APP_HOME/lib/javaGeom-0.11.1.jar:$APP_HOME/lib/javahelp-2.0.05.jar
+CLASSPATH=$APP_HOME/lib/drawfbp-2.20.13.jar:$APP_HOME/lib/javaGeom-0.11.1.jar:$APP_HOME/lib/javahelp-2.0.05.jar
 
 
 # Determine the Java command to use to start the JVM.

build/scripts/drawfbp.bat

@@ -82,7 +82,7 @@ set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\drawfbp-2.20.12.jar;%APP_HOME%\lib\javaGeom-0.11.1.jar;%APP_HOME%\lib\javahelp-2.0.05.jar
+set CLASSPATH=%APP_HOME%\lib\drawfbp-2.20.13.jar;%APP_HOME%\lib\javaGeom-0.11.1.jar;%APP_HOME%\lib\javahelp-2.0.05.jar
 
 
 @rem Execute drawfbp

build/tmp/jar/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Implementation-Title: DrawFBP
-Implementation-Version: 2.20.12
+Implementation-Version: 2.20.13
 Class-Path: javaGeom-0.11.1.jar javahelp-2.0.05.jar
 Main-Class: com.jpaulmorrison.graphics.DrawFBP
 

build/tmp/javadoc/javadoc.options

@@ -1,10 +1,10 @@
 -Xdoclint:none 
 -classpath 'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\build\\classes\\java\\main;C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\build\\resources\\main;C:\\Users\\Paul\\.gradle\\caches\\modules-2\\files-2.1\\math.geom2d\\javaGeom\\0.11.1\\5951b33da14e56c9e2b1f741b9ba3531401393b6\\javaGeom-0.11.1.jar;C:\\Users\\Paul\\.gradle\\caches\\modules-2\\files-2.1\\javax.help\\javahelp\\2.0.05\\ca70822c47a67fc3a11670270567c2d01566dae1\\javahelp-2.0.05.jar'
 -d 'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\build\\docs\\javadoc'
--doctitle 'drawfbp 2.20.12 API'
+-doctitle 'drawfbp 2.20.13 API'
 -notimestamp 
 -quiet 
--windowtitle 'drawfbp 2.20.12 API'
+-windowtitle 'drawfbp 2.20.13 API'
 'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\src\\main\\java\\com\\jpaulmorrison\\graphics\\AInPort.java'
 'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\src\\main\\java\\com\\jpaulmorrison\\graphics\\AOutPort.java'
 'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\src\\main\\java\\com\\jpaulmorrison\\graphics\\Arrow.java'

src/main/java/com/jpaulmorrison/graphics/DrawFBP.java

@@ -1072,7 +1072,7 @@ public JMenuBar createMenuBar() {
 		menuItem = new JMenuItem("Compare Diagrams");
 		editMenu.add(menuItem);
 		menuItem.addActionListener(this);
-		menuItem = new JMenuItem("Clear Compare Indicators");
+		menuItem = new JMenuItem("Clear Visible Indicators");
 		editMenu.add(menuItem);
 		menuItem.addActionListener(this);
 		editMenu.addSeparator();
@@ -1423,7 +1423,7 @@ public void actionPerformed(ActionEvent e) {
 			return;
 		}
 
-		if (s.equals("Clear Compare Indicators")) {
+		if (s.equals("Clear Visible Indicators")) {
 
 			for (Block bl : curDiag.blocks.values()) {
 				bl.compareFlag = null;
@@ -4103,7 +4103,7 @@ void compare(int tabNo) {
 		for (Block ob : oldDiag.blocks.values()) {
 			if (ob.compareFlag == null) {
 				ob.compareFlag = "O";
-				String ce = new String("Block with name '" + driver.cleanDesc(ob, false) + "' omitted from other diagram\n\n"); 
+				String ce = new String("Block with name '" + driver.cleanDesc(ob, false) + "' omitted from this diagram\n\n"); 
 
 				mismatches.add(ce);
 			}

src/main/java/com/jpaulmorrison/graphics/VersionAndTimestamp.java

@@ -5,10 +5,10 @@
 
 public final class VersionAndTimestamp {
 
-	static String version = "2.20.12";
+	static String version = "2.20.13";
 
 
-	static String date = "Sept. 28, 2020"; 
+	static String date = "Oct. 16, 2020"; 
 
 
 	static String getVersion() {

src/main/resources/help/comparing.html

@@ -21,7 +21,7 @@ <h1>Comparing Diagrams</h1>
 select another diagram file to compare against, using the FileChooser dialog. </p>
 <p>For certain types of mismatch, a separate frame will apear with more information - this will 
 disappear, along with the   
-mismatch indicators (see below), when you select "Diagram/Clear Compare Indicators".
+mismatch indicators (see below), when you select "Diagram/Clear Visible Indicators".
 <p>When you have selected one, you will see the current diagram with a number of blocks and/or arrows marked with letter codes in circles.
 </p>
 <p>The letter codes are as follows: