Feature token vbl simplification

.appveyor.yml

@@ -41,7 +41,7 @@ deploy:
     artifact: MapTool-Jar, MapTool-Windows, MapTool-Linux
     draft: false
     prerelease: true
-    force_update: true
+    force_update: false
     on:
       APPVEYOR_REPO_TAG: true
 on_success:

.travis.yml

@@ -10,7 +10,7 @@ install:
   - cd ..
   - mkdir java
   - cd java
-  - wget http://www.nerps.net/jdk10/jdk-10.0.2_osx-x64_bin.dmg
+  - wget http://maptool.craigs-stuff.net/java/jdk-10.0.2_osx-x64_bin.dmg
   - MOUNTDEV=$(hdiutil mount jdk-10.0.2_osx-x64_bin.dmg | awk '/dev.disk/{print$1}')
   - echo $MOUNTDEV
   - MOUNTDIR="$(mount | grep JDK | awk '{$1=$2="";sub(" [(].*","");sub("^  ","");print}')"

CHANGE_LOG.md

@@ -2,10 +2,12 @@ Maptool 1.6.0
 =====
 **Highlights**
 - New dialog and frame functions support HTML5, JavaScript and CSS.
+- Movement Blocking Layer - Now you can make those Force Fields that would block movement but not sight.
 - Look & Feel themes can now be selected from the Themes menu.  More enhancements to come.
 - Pre-defined Campaign Property sets can now be selected and loaded in the Campaign Properties dialog.
 
 **Enhancements**
+- [#1216][i1216] Movement Blocking Layer - similar VBL, but specifically for blocking movement and not sight or light.
 - [#1210][i1210] RADIO and LIST fields for `input()` function now support a DELIMITER option.
 - [#1107][i1107] Using the line drawing tools while holding Alt will snap to grid centers.
 - [#972][i972] New macro functions for HTML5 compatible dialogs and frames.
@@ -25,15 +27,18 @@ Maptool 1.6.0
 - [#1204][i1204] `getToken*` was throwing an exception if a string was passed to the `layer` option. Fixed.
 
 **Other**
+- [#1253][i1253] MD5 key generation wasn't thread-safe. Fixed.
 - [#1219][i1219] Javadocs generated via `gradlew javadoc` switched to HTML5.
 - [#1189][i1189] Unit tests added for JSON macro functions.
 
+[i1253]: https://github.com/RPTools/maptool/issues/1253
 [i1243]: https://github.com/RPTools/maptool/issues/1243
 [i1236]: https://github.com/RPTools/maptool/issues/1236
 [i1231]: https://github.com/RPTools/maptool/issues/1231
 [i1228]: https://github.com/RPTools/maptool/issues/1228
 [i1225]: https://github.com/RPTools/maptool/issues/1225
 [i1219]: https://github.com/RPTools/maptool/issues/1219
+[i1216]: https://github.com/RPTools/maptool/issues/1216
 [i1210]: https://github.com/RPTools/maptool/issues/1210
 [i1206]: https://github.com/RPTools/maptool/issues/1206
 [i1204]: https://github.com/RPTools/maptool/issues/1204
@@ -44,6 +49,24 @@ Maptool 1.6.0
 [i891]: https://github.com/RPTools/maptool/issues/891
 [i221]: https://github.com/RPTools/maptool/issues/221
 
+Maptool 1.5.13
+=====
+**Highlights**
+- Bug fix release to correct several JSON related issues.
+
+**Bug Fixes**
+- [#1296][i1296] Exception thrown when trying to read Hero Lab .por files that are missing the XML statblock. Exception caught and error reported.
+- [#1236][i1236] `getTokens/getTokenNames()` was failing if `setState` or `unsetState` options were used. Fixed.
+- [#1228][i1228] `getLastPath()` and other token move functions that made use of pathPointsToJsonArray were broken. Fixed.
+- [#1206][i1206] Unknown json functions would return null instead of an error. Fixed.
+- [#1204][i1204] Layer condition of `getTokens/getTokenNames()` weren't accepting accepting a string for a single layer. Fixed.
+
+[i1296]: https://github.com/RPTools/maptool/issues/1296
+[i1236]: https://github.com/RPTools/maptool/issues/1236
+[i1228]: https://github.com/RPTools/maptool/issues/1228
+[i1206]: https://github.com/RPTools/maptool/issues/1206
+[i1204]: https://github.com/RPTools/maptool/issues/1204
+
 Maptool 1.5.11/12
 =====
 **Highlights**

build.gradle

@@ -246,7 +246,7 @@ dependencies {
     implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.16.1'	// https://mvnrepository.com/artifact/org.locationtech.jts/jts-core
 
     // For RESTful functions
-    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.2.2'
+    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.3.0'
 
     // Better JSON functions...
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'		// https://mvnrepository.com/artifact/com.google.code.gson/gson

src/main/java/net/rptools/lib/FileUtil.java

@@ -84,37 +84,24 @@ public static byte[] getBytes(File file) throws IOException {
 
   public static Object objFromResource(String res) throws IOException {
     XStream xs = getConfiguredXStream();
-    InputStream is = null;
-    try {
-      is = FileUtil.class.getClassLoader().getResourceAsStream(res);
+    try (InputStream is = FileUtil.class.getClassLoader().getResourceAsStream(res)) {
       return xs.fromXML(new InputStreamReader(is, "UTF-8"));
-    } finally {
-      IOUtils.closeQuietly(is);
     }
   }
 
   public static byte[] loadResource(String resource) throws IOException {
-    InputStream is = null;
-    try {
-      is = FileUtil.class.getClassLoader().getResourceAsStream(resource);
+    try (InputStream is = FileUtil.class.getClassLoader().getResourceAsStream(resource)) {
       if (is == null) {
         throw new IOException("Resource \"" + resource + "\" cannot be opened as stream.");
       }
       return IOUtils.toByteArray(new InputStreamReader(is, "UTF-8"), "UTF-8");
-    } finally {
-      IOUtils.closeQuietly(is);
     }
   }
 
   public static List<String> getLines(File file) throws IOException {
-    List<String> list;
-    FileReader fr = new FileReader(file);
-    try {
-      list = IOUtils.readLines(fr);
-    } finally {
-      fr.close();
+    try (FileReader fr = new FileReader(file)) {
+      return IOUtils.readLines(fr);
     }
-    return list;
   }
 
   public static void saveResource(String resource, File destDir) throws IOException {
@@ -126,15 +113,9 @@ public static void saveResource(String resource, File destDir) throws IOExceptio
   public static void saveResource(String resource, File destDir, String filename)
       throws IOException {
     File outFilename = new File(destDir, filename);
-    InputStream inStream = null;
-    OutputStream outStream = null;
-    try {
-      inStream = FileUtil.class.getResourceAsStream(resource);
-      outStream = new BufferedOutputStream(new FileOutputStream(outFilename));
+    try (InputStream inStream = FileUtil.class.getResourceAsStream(resource);
+        OutputStream outStream = new BufferedOutputStream(new FileOutputStream(outFilename))) {
       IOUtils.copy(inStream, outStream);
-    } finally {
-      IOUtils.closeQuietly(inStream);
-      IOUtils.closeQuietly(outStream);
     }
   }
 
@@ -170,12 +151,8 @@ public static String getNameWithoutExtension(URL url) {
   }
 
   public static byte[] getBytes(URL url) throws IOException {
-    InputStream is = null;
-    try {
-      is = url.openStream();
+    try (InputStream is = url.openStream()) {
       return IOUtils.toByteArray(is);
-    } finally {
-      IOUtils.closeQuietly(is);
     }
   }
 
@@ -374,12 +351,8 @@ public static void unzip(URL url, File destDir) throws IOException {
     if (url == null) throw new IOException("URL cannot be null");
 
     InputStream is = url.openStream();
-    ZipInputStream zis = null;
-    try {
-      zis = new ZipInputStream(new BufferedInputStream(is));
+    try (ZipInputStream zis = new ZipInputStream(new BufferedInputStream(is))) {
       unzip(zis, destDir);
-    } finally {
-      IOUtils.closeQuietly(zis);
     }
   }
 
@@ -391,34 +364,25 @@ public static void unzip(ZipInputStream in, File destDir) throws IOException {
     File absDestDir = destDir.getAbsoluteFile();
 
     // Pull out the files
-    OutputStream out = null;
     ZipEntry entry = null;
-    try {
-      while ((entry = in.getNextEntry()) != null) {
-        if (entry.isDirectory()) continue;
+    while ((entry = in.getNextEntry()) != null) {
+      if (entry.isDirectory()) continue;
 
-        // Prepare file destination
-        File entryFile = new File(absDestDir, entry.getName());
-        entryFile.getParentFile().mkdirs();
+      // Prepare file destination
+      File entryFile = new File(absDestDir, entry.getName());
+      entryFile.getParentFile().mkdirs();
 
-        out = new FileOutputStream(entryFile);
+      try (OutputStream out = new FileOutputStream(entryFile)) {
         IOUtils.copy(in, out);
-        IOUtils.closeQuietly(out);
-        in.closeEntry();
       }
-    } finally {
-      IOUtils.closeQuietly(out);
+      in.closeEntry();
     }
   }
 
   public static void unzipFile(File sourceFile, File destDir) throws IOException {
     if (!sourceFile.exists()) throw new IOException("source file does not exist: " + sourceFile);
 
-    ZipFile zipFile = null;
-    InputStream is = null;
-    OutputStream os = null;
-    try {
-      zipFile = new ZipFile(sourceFile);
+    try (ZipFile zipFile = new ZipFile(sourceFile)) {
       Enumeration<? extends ZipEntry> entries = zipFile.entries();
 
       while (entries.hasMoreElements()) {
@@ -430,18 +394,10 @@ public static void unzipFile(File sourceFile, File destDir) throws IOException {
         file.getParentFile().mkdirs();
 
         // System.out.println("Writing file: " + path);
-        is = zipFile.getInputStream(entry);
-        os = new BufferedOutputStream(new FileOutputStream(path));
-        copyWithClose(is, os);
-        IOUtils.closeQuietly(is);
-        IOUtils.closeQuietly(os);
-      }
-    } finally {
-      IOUtils.closeQuietly(is);
-      IOUtils.closeQuietly(os);
-      try {
-        if (zipFile != null) zipFile.close();
-      } catch (Exception e) {
+        try (InputStream is = zipFile.getInputStream(entry);
+            OutputStream os = new BufferedOutputStream(new FileOutputStream(path))) {
+          IOUtils.copy(is, os);
+        }
       }
     }
   }
@@ -462,10 +418,13 @@ public static void copyWithoutClose(InputStream is, OutputStream os) throws IOEx
   /**
    * Copies all bytes from InputStream to OutputStream, and close both streams before returning.
    *
+   * @deprecated not in use. Use {@link IOUtils#copy(InputStream, OutputStream)} instead and
+   *     try-with-resources
    * @param is input stream to read data from.
    * @param os output stream to write data to.
    * @throws IOException
    */
+  @Deprecated
   public static void copyWithClose(InputStream is, OutputStream os) throws IOException {
     try {
       IOUtils.copy(is, os);