New release 2.20.17 - bug in closedown fixed

jpaulm · Nov 10, 2020 · 8f875a8 · 8f875a8
1 parent f7a9df3
commit 8f875a8
Show file tree

Hide file tree

Showing 22 changed files with 115 additions and 73 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,10 +23,16 @@ apply plugin: 'application'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: 'java-library'
+
+gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:unchecked"
+    }
+}
 
 }
 
-version = '2.20.16'
+version = '2.20.17'
 
 group = 'com.jpaulmorrison'
 
@@ -135,7 +141,7 @@ description = "Create default maven directory structure"
             groupId = 'com.jpaulmorrison'
             artifactId = 'drawfbp'       
 
-            version = '2.20.16'
+            version = '2.20.17'
             from components.java
 
 

diff --git a/build/distributions/drawfbp-2.20.17.tar b/build/distributions/drawfbp-2.20.17.tar
diff --git a/build/distributions/drawfbp-2.20.17.zip b/build/distributions/drawfbp-2.20.17.zip
diff --git a/build/libs/drawfbp-2.20.16-javadoc.jar.asc b/build/libs/drawfbp-2.20.16-javadoc.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABCgAGBQJfpsOSAAoJEIoqalWqx6keUVoH/1a2HGEDDLESAG+3Lm8Cmk2s
+MvmGs0xSNR3FVgZXbWYp5fSLcLOaH/XwEEvrKqjf5AM3CfdPlkd1k1Dgib6jrh8L
+Wof5b9jT1n7/9KUsxCl83RvkA3XKXqztLEv5xI7gxPVomXNk/e81j/1GsU9w1uWJ
+pCwu8dWRWjnC6SmIQZXNaW5m359s0xmB7yH49JiRBxedUnPgDwhIMMWbKBOnAJPF
+lPJ7+R65OI8gWF5UTpkqSpaSDTLO4zlREOZHLgxi3HswUHjEkqcbKSqRMNOychYR
+CGUb6HOeuI9I4KEt661N/M8S4FWrdVC/mzqVg4tXvQSWnwagu1uDBRSLVXhqefs=
+=6FnA
+-----END PGP SIGNATURE-----
diff --git a/build/libs/drawfbp-2.20.16-sources.jar.asc b/build/libs/drawfbp-2.20.16-sources.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABCgAGBQJfpsOSAAoJEIoqalWqx6keAsAH/3Zp71V9//y+BG8X/4wtN/CE
+jH/1bbfAqScQOIAnywOWNrwC47LNziBRW5UipC9OL3m9J7meNWzm7pRpoWn5tCKP
+ISQu4PPrlv/b/SASEMWL6jHjyj3IG9WYvjy1DEDEZOVBW/jbHsSx8wr15qVuWm+U
+PWzVKVyUjkje6HiGwNM3z47eEDeFpujlBbed0g2/OF3Wgoj4MjceJGhRZC/AOJsa
+GWAFnqjKvbITaUFw4VTpSUnzD54JjiMJA2S2+PJ0UxrFeYVBVIS3W7fGBItW4U7g
+pry4bpXkjeKQaeiuTekEjv1p/p8tlciRiNGxaygsxyBTafIzRz6TZhOxuYAEXiM=
+=QRC+
+-----END PGP SIGNATURE-----
diff --git a/build/libs/drawfbp-2.20.16.jar.asc b/build/libs/drawfbp-2.20.16.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABCgAGBQJfpsOSAAoJEIoqalWqx6kePJkH/jDph5Cy75Ni000F9ySjAFxO
+WoSPK8mWtwkMo5qgmrPaEHWPUjpidv5GnWZTT/BAZovee7zMk9AjCfFMXvjZq7cP
+beP1O1G40MGOBd3qDdDwFU4VxpewWTFF0JUdorbnbyD9zxe9aNRVXmwSd3GrkArD
+D+xykd5+md460cymwfJ9AWrAJ0rIfTn7wkJKVed38En8Z1qVDMFUXoTYGncyEawR
+iR3ADkB+OAdm0ealMz8lM04z9KQa9Ow407nMz6+yWDlvNcKbTHrBPR36jHodel44
+jq2vkZiBbghE2QStLsRrUWLsCRCiZPIjoIvRevNUW2eLBPT3K76aFAk9LpHBiVQ=
+=WIEI
+-----END PGP SIGNATURE-----
diff --git a/build/libs/drawfbp-2.20.17-javadoc.jar b/build/libs/drawfbp-2.20.17-javadoc.jar
diff --git a/build/libs/drawfbp-2.20.17-sources.jar b/build/libs/drawfbp-2.20.17-sources.jar
diff --git a/build/libs/drawfbp-2.20.17.jar b/build/libs/drawfbp-2.20.17.jar
diff --git a/build/publications/mavenJava/module.json b/build/publications/mavenJava/module.json
@@ -3,15 +3,15 @@
   "component": {
     "group": "com.jpaulmorrison",
     "module": "drawfbp",
-    "version": "2.20.15",
+    "version": "2.20.16",
     "attributes": {
       "org.gradle.status": "release"
     }
   },
   "createdBy": {
     "gradle": {
       "version": "6.5.1",
-      "buildId": "qncg2ldqdzekthd3gybwdp4cmy"
+      "buildId": "gft3hs4fvrebloj6xk764yhrl4"
     }
   },
   "variants": [
@@ -26,13 +26,13 @@
       },
       "files": [
         {
-          "name": "drawfbp-2.20.15.jar",
-          "url": "drawfbp-2.20.15.jar",
-          "size": 1386134,
-          "sha512": "ab5f5d36550a40ee878d333d0dbb0fe49d0dfa84be417fd91631177cf8c97041aed3957fef3fba3d84a55326936bf6ee8af6c8b7a94fd77f6627d32c416ac5ad",
-          "sha256": "d6284076b37e0875a927b1b62ffef3cbcbc7e28b275ca1c693015271d63b7065",
-          "sha1": "e02508c1b965d391747c897d2eb01196bd5efae9",
-          "md5": "9abc476b5a3d155db782eef3a5267f6a"
+          "name": "drawfbp-2.20.16.jar",
+          "url": "drawfbp-2.20.16.jar",
+          "size": 1386136,
+          "sha512": "37ae114a1c55cb2c9d2e8a11868e35dc7e0953d418c9f91119850bb8334da9f7e7baf05b732ec4a24a9f7fb56ba5d182b8397b2dc5cfbaed17276edbe7bf347f",
+          "sha256": "e04de10f9c678e9d481010c5e1c027efe3f693820c4f52afc3b4f3dfb1f748bf",
+          "sha1": "f01f22cc9cf184c1c8a31196db7a5a1a5f0b136a",
+          "md5": "2ba776e005c38471f59be5602543d564"
         }
       ]
     },
@@ -63,13 +63,13 @@
       ],
       "files": [
         {
-          "name": "drawfbp-2.20.15.jar",
-          "url": "drawfbp-2.20.15.jar",
-          "size": 1386134,
-          "sha512": "ab5f5d36550a40ee878d333d0dbb0fe49d0dfa84be417fd91631177cf8c97041aed3957fef3fba3d84a55326936bf6ee8af6c8b7a94fd77f6627d32c416ac5ad",
-          "sha256": "d6284076b37e0875a927b1b62ffef3cbcbc7e28b275ca1c693015271d63b7065",
-          "sha1": "e02508c1b965d391747c897d2eb01196bd5efae9",
-          "md5": "9abc476b5a3d155db782eef3a5267f6a"
+          "name": "drawfbp-2.20.16.jar",
+          "url": "drawfbp-2.20.16.jar",
+          "size": 1386136,
+          "sha512": "37ae114a1c55cb2c9d2e8a11868e35dc7e0953d418c9f91119850bb8334da9f7e7baf05b732ec4a24a9f7fb56ba5d182b8397b2dc5cfbaed17276edbe7bf347f",
+          "sha256": "e04de10f9c678e9d481010c5e1c027efe3f693820c4f52afc3b4f3dfb1f748bf",
+          "sha1": "f01f22cc9cf184c1c8a31196db7a5a1a5f0b136a",
+          "md5": "2ba776e005c38471f59be5602543d564"
         }
       ]
     },
@@ -83,13 +83,13 @@
       },
       "files": [
         {
-          "name": "drawfbp-2.20.15-sources.jar",
-          "url": "drawfbp-2.20.15-sources.jar",
-          "size": 403551,
-          "sha512": "944259b0a9ed639834805f95f4f7e43c520111eb7719693007a6bbb9bd02d9ee822ddb150e1e5d077b0c6c95877e5ca0c78ad5400798338cb01deb25748a7df9",
-          "sha256": "76c9a4132aa4666d27c7c96863bc754123fbc6aa9b280a13324738dde19f00f7",
-          "sha1": "628fd781e16b7c467efe6a9d08a4c239634c508e",
-          "md5": "f33d539556bac6cb6de5261db660330d"
+          "name": "drawfbp-2.20.16-sources.jar",
+          "url": "drawfbp-2.20.16-sources.jar",
+          "size": 403544,
+          "sha512": "3dc984f5dcb2e690bbd5ed5dbdd335bf375751c8878af9ca4661e772dca138d68764fef6db4794323b798548971bc7e5cb252c3a86f4d9b22ff5ed8bd1bc6791",
+          "sha256": "bd9f38a68af118dc13f426261b0e7f76f2f2e44eea93126b498b275cfce20479",
+          "sha1": "3d2a99e1ce2174613c8061a82278070a84aed9fd",
+          "md5": "7209e7b59c6f078f89292cbe14220ea9"
         }
       ]
     },
@@ -103,13 +103,13 @@
       },
       "files": [
         {
-          "name": "drawfbp-2.20.15-javadoc.jar",
-          "url": "drawfbp-2.20.15-javadoc.jar",
-          "size": 172037,
-          "sha512": "58a5fe455df0dd70a6c2422728bec46ea026450530e87e71ed43b3b4e6817f6e06918e067514c58bb1b701ecf05123e397de288e709f74dda8bf2f91e3059eca",
-          "sha256": "5194ea0e71c23a2c83b4f7349b88fe7d600ef4d7cde7ac43d4c1f95317098695",
-          "sha1": "91bc92b0e15ef555be2095814f91f594a2b66466",
-          "md5": "145b4981c9b48a32e8010b1e04f53ac6"
+          "name": "drawfbp-2.20.16-javadoc.jar",
+          "url": "drawfbp-2.20.16-javadoc.jar",
+          "size": 172058,
+          "sha512": "e09d355f7d873476b5894cb5589b93a484d9d289bc8b7dd579828ccb84a5ac7d710c8fe2c1d4138403a9b304975b6f0c31b127f59c690a35ba0e78f53cd719e3",
+          "sha256": "9f4ba5edaa4f73bf785003163553323c278b9dbbdfb44da192808099d311d1dd",
+          "sha1": "bf12d6402ab29327289645320f48d48b70c5da46",
+          "md5": "2c92ee9d0ef3becc522ebf7bc7c5cd00"
         }
       ]
     }

diff --git a/build/publications/mavenJava/module.json.asc b/build/publications/mavenJava/module.json.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: BCPG v1.64
 
-iQEcBAABCgAGBQJfoC0zAAoJEIoqalWqx6ke0agH/3spedt5GbaRTsBLH1LiJ5/X
-+h+S5QODZLyHmQwxB7MiYI8fBQ+MEHesVAmW7ZQI3EETnJXy1FZi7nnBuK6S7p2z
-5IOwC3/jqEn6vxzZneIMSTgF6eKB0ZFnAHGcYda4CX7ioiAWrogKPjAR1xbcidTu
-YQedoBEdk10XQb/PzQv/SQWSuLercoMUUq/MmmZ9tV9Cyu4W/ntY3Fhq/vimYMx1
-MpYgdjgJdpeCoM8FsDGqyA8O2OWWFIbeTxrOZGhAdauGDzqM9WPWrKGsmesZ0cwH
-P1/OqF+oIV3p0MakYd5x1tPwDYKo5x3hreFtPexxkDAJOPz5Tyndfh+FxKXj0GQ=
-=oJMo
+iQEcBAABCgAGBQJfpsOSAAoJEIoqalWqx6kedFgH/j9KEGvVFNdmwbejUsd3gdr2
+floNleSeyNDJZSN+wDKRCCk2lcoXmaj1DGQSbipxCrsoh57etIaG1dS/oGIoNgLO
+gQXGFshpyVWy5XDBaXNAD6KE8h0eP1GBMdGUXEPXt6ayAjjum5AOaM0IXkdCNpEa
+FzG43jaV8Q2piw+W1Yw8eXeD/O6xQkaVCIVU71Xi9qnM8LXCxW+jgUZqa9+VkJMs
+8lcedn/JtR4IQsMEANBWWtiAQVEoapQks61pLV+35ZR7YmGYIrO8xvO2443aFo/c
+ERq/GdW5l568VkQMjuM7OkU/+VKAR4dRHER6+tVykyi69uhObfKzES29v8LduQ0=
+=kLym
 -----END PGP SIGNATURE-----
diff --git a/build/publications/mavenJava/pom-default.xml b/build/publications/mavenJava/pom-default.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jpaulmorrison</groupId>
   <artifactId>drawfbp</artifactId>
-  <version>2.20.15</version>
+  <version>2.20.16</version>
   <name>DrawFBP</name>
   <description>Diagramming Tool for Flow-Based Programming</description>
   <url>https://github.com/jpaulm/drawfbp</url>

diff --git a/build/publications/mavenJava/pom-default.xml.asc b/build/publications/mavenJava/pom-default.xml.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: BCPG v1.64
 
-iQEcBAABCgAGBQJfoC0zAAoJEIoqalWqx6kevIcIAJ6GpxOkDzrGyAAxgMS1f3kn
-QkelpHUScXhAJUEtiLibIpUW1yOPZeKdGcBVdZwoTuTELqGW78R9d9ccyPeZCk9P
-J9aqWFJSGatcWLamgNMUH6kfqEmF2GklUoOCt8vb9SAA64KIU86Bla0x591M+I0z
-G+oo3aF1RM0whh+r4G9cVy4p+u8RUk6kNIuE/S+sdO4JQmOo/wKpReKqcFa/V5jU
-4X6WI8tdZ4Ut1o7vCm8nZ1FStiap3gjQwmPYr3nW8YMMKwYXkiQrbYlMdA93xGJu
-Tp78fORLwIT229H+TXVdIDk0FaZUT+uh4xY5ZO7qYoFKAz6eFop6zGCwJiUBQl8=
-=r3UE
+iQEcBAABCgAGBQJfpsOSAAoJEIoqalWqx6kebVUIAKUbXzmN4huWe/KqlKtDPI1Z
+2OKeAO8sEtGAw1+5xgLTT5KkkplzkENOjvRsQPWkIZouQzrNngtTlQDtfiIf2sQe
+ix2F7oEnygVGp8ajchLEP/Ecsd8odISxND76Qti+J8qavEoXelqbX1hiac4x7IDn
+z5sOfpMEGCTJoMqtJOorE1ZvnhyJCzBaYZIsutStmzt4AcPsP7yj7sxxpDvXS8Pk
+AUPVfyunnBoeDYy2t0gGrNHB/BbGEYejjExmXQF3Q36/XKvEhMyntSO5TIqzju4o
+zTUX1dDQA8Rk9FmY+zQ+AVEBZRgDs7Ebw5RguemnGgH2/v6YbeqGxWATdM0mxCc=
+=vOAe
 -----END PGP SIGNATURE-----
diff --git a/build/scripts/drawfbp b/build/scripts/drawfbp
@@ -80,7 +80,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/drawfbp-2.20.16.jar:$APP_HOME/lib/javaGeom-0.11.1.jar:$APP_HOME/lib/javahelp-2.0.05.jar
+CLASSPATH=$APP_HOME/lib/drawfbp-2.20.17.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.

diff --git a/build/scripts/drawfbp.bat b/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.16.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.17.jar;%APP_HOME%\lib\javaGeom-0.11.1.jar;%APP_HOME%\lib\javahelp-2.0.05.jar
 
 
 @rem Execute drawfbp

diff --git a/build/tmp/jar/MANIFEST.MF b/build/tmp/jar/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Implementation-Title: DrawFBP
-Implementation-Version: 2.20.16
+Implementation-Version: 2.20.17
 Class-Path: javaGeom-0.11.1.jar javahelp-2.0.05.jar
 Main-Class: com.jpaulmorrison.graphics.DrawFBP
 
diff --git a/build/tmp/javadoc/javadoc.options b/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.16 API'
+-doctitle 'drawfbp 2.20.17 API'
 -notimestamp 
 -quiet 
--windowtitle 'drawfbp 2.20.16 API'
+-windowtitle 'drawfbp 2.20.17 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'

diff --git a/build/tmp/publishMavenJavaPublicationToMavenRepository/module-maven-metadata.xml b/build/tmp/publishMavenJavaPublicationToMavenRepository/module-maven-metadata.xml
@@ -3,11 +3,11 @@
   <groupId>com.jpaulmorrison</groupId>
   <artifactId>drawfbp</artifactId>
   <versioning>
-    <latest>2.20.15</latest>
-    <release>2.20.15</release>
+    <latest>2.20.16</latest>
+    <release>2.20.16</release>
     <versions>
-      <version>2.20.15</version>
+      <version>2.20.16</version>
     </versions>
-    <lastUpdated>20201102160125</lastUpdated>
+    <lastUpdated>20201107155618</lastUpdated>
   </versioning>
 </metadata>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.jpaulmorrison</groupId>
 <artifactId>drawfbp</artifactId>
-<version>2.20.16</version>
+<version>2.20.17</version>
 <name>DrawFBP</name>
 <description>Diagramming Tool for Flow-Based Programming</description>
 <url>https://github.com/jpaulm/drawfbp</url>
@@ -34,17 +34,17 @@ John Paul Rodker Morrison (Software architect/developer)
 <url>https://github.com/jpaulm.git</url>
 </scm>
 <dependencies>
-<dependency>
-<groupId>math.geom2d</groupId>
-<artifactId>javaGeom</artifactId>
-<version>0.11.1</version>
-<scope>runtime</scope>
-</dependency>
-<dependency>
-<groupId>javax.help</groupId>
-<artifactId>javahelp</artifactId>
-<version>2.0.05</version>
-<scope>runtime</scope>
-</dependency>
+	<dependency>
+		<groupId>math.geom2d</groupId>
+		<artifactId>javaGeom</artifactId>
+		<version>0.11.1</version>
+		<scope>runtime</scope>
+	</dependency>
+	<dependency>
+		<groupId>javax.help</groupId>
+		<artifactId>javahelp</artifactId>
+		<version>2.0.05</version>
+		<scope>runtime</scope>
+	</dependency>
 </dependencies>
 </project>
diff --git a/src/main/java/com/jpaulmorrison/graphics/DrawFBP.java b/src/main/java/com/jpaulmorrison/graphics/DrawFBP.java
@@ -5483,8 +5483,10 @@ else if (!closeTab(true)) {
 				}
 			}
 
-			saveProp("currentDiagram", curDiag.diagFile.getAbsolutePath());
-			saveProp("currentDiagramDir", curDiag.diagFile.getParent());
+			if (curDiag != null && curDiag.diagFile != null) {
+				saveProp("currentDiagram", curDiag.diagFile.getAbsolutePath());
+				saveProp("currentDiagramDir", curDiag.diagFile.getParent());
+			}
 			saveProp("scalingfactor", scalingFactor + "");
 			saveProp("x", getX() + "");
 			saveProp("y", getY() + "");

diff --git a/src/main/java/com/jpaulmorrison/graphics/MyFileChooser.java b/src/main/java/com/jpaulmorrison/graphics/MyFileChooser.java
@@ -613,6 +613,7 @@ void setSuggestedName(String s) {
 		suggestedName = s;
 	}
 
+	@SuppressWarnings("unchecked")
 	private void showList() {
 
 		LinkedList<String> ll = new LinkedList<String>();

diff --git a/src/main/java/com/jpaulmorrison/graphics/VersionAndTimestamp.java b/src/main/java/com/jpaulmorrison/graphics/VersionAndTimestamp.java
@@ -5,10 +5,10 @@
 
 public final class VersionAndTimestamp {
 
-	static String version = "2.20.16";
+	static String version = "2.20.17";
 
 
-	static String date = "Nov. 7, 2020"; 
+	static String date = "Nov. 10, 2020"; 
 
 
 	static String getVersion() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ case "`uname`" in @@
         ;;
     esac
-    CLASSPATH=$APP_HOME/lib/drawfbp-2.20.16.jar:$APP_HOME/lib/javaGeom-0.11.1.jar:$APP_HOME/lib/javahelp-2.0.05.jar
+    CLASSPATH=$APP_HOME/lib/drawfbp-2.20.17.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.
@@ Expand Down @@