9.5.4 release

ChangeLog

@@ -1,3 +1,7 @@
+03-DEC-2018: 9.5.4
+
+- Fixes possible NPE in Desktop app
+
 03-DEC-2018: 9.5.3
 
 - Uses mxGraph 3.9.11 beta 7

VERSION

@@ -1 +1 @@
-9.5.3
+9.5.4

src/main/java/com/mxgraph/io/gliffy/importer/GliffyDiagramConverter.java

@@ -393,7 +393,7 @@ public class GliffyDiagramConverter
 				double rads = Math.toRadians(object.rotation);
 				double cos = Math.cos(rads);
 				double sin = Math.sin(rads);
-				waypoint = Utils.getRotatedPoint(waypoint, cos, sin, pivot);
+				waypoint = mxUtils.getRotatedPoint(waypoint, cos, sin, pivot);
 			}
 
 			mxPoints.add(waypoint);

src/main/java/com/mxgraph/online/Utils.java

@@ -195,21 +195,6 @@ public class Utils
 		}
 	}
 
-	/**
-	 * Rotates the given point by the given cos and sin.
-	 */
-	public static mxPoint getRotatedPoint(mxPoint pt, double cos, double sin,
-			mxPoint c)
-	{
-		double x = pt.getX() - c.getX();
-		double y = pt.getY() - c.getY();
-
-		double x1 = x * cos - y * sin;
-		double y1 = y * cos + x * sin;
-
-		return new mxPoint(x1 + c.getX(), y1 + c.getY());
-	}
-
 	/**
 	 * Rotates the given geometry (in place) by the given rotation (in degrees).
 	 */

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 12/03/2018 04:53 PM
+# 12/03/2018 07:26 PM
 
 app.html
 index.html?offline=1

src/main/webapp/js/diagramly/ElectronApp.js

@@ -455,7 +455,6 @@ FeedbackDialog.feedbackUrl = 'https://log.draw.io/email';
 			{
 				var library = new LocalLibrary(this, data, fileEntry.name);
 				library.fileObject = fileEntry;
-				library.stat = stat;
 				this.loadLibrary(library);
 			}
 			catch (e)
@@ -478,9 +477,13 @@ FeedbackDialog.feedbackUrl = 'https://log.draw.io/email';
         {
 			this.readGraphFile(fn, mxUtils.bind(this, function(err)
 			{
-				this.ui.handleError(err);
+				this.handleError(err);
 			}), paths[0]);
         }
+        else
+        {
+        	this.spinner.stop();
+        }
 	};
 
 	App.prototype.readGraphFile = function(fn, fnErr, path)
@@ -660,7 +663,7 @@ FeedbackDialog.feedbackUrl = 'https://log.draw.io/email';
 	
 	LocalFile.prototype.isConflict = function(stat)
 	{
-		return stat.mtimeMs != this.stat.mtimeMs;
+		return stat != null && this.stat != null && stat.mtimeMs != this.stat.mtimeMs;
 	};
 	
 	LocalFile.prototype.saveFile = function(revision, success, error, unloading, overwrite)
@@ -733,7 +736,7 @@ FeedbackDialog.feedbackUrl = 'https://log.draw.io/email';
 					{
 						fs.stat(this.fileObject.path, mxUtils.bind(this, function(err, stat)
 						{
-							if (stat != null && this.isConflict(stat))
+							if (this.isConflict(stat))
 							{
 								this.inConflictState = true;
 								errorWrapper();
@@ -779,6 +782,10 @@ FeedbackDialog.feedbackUrl = 'https://log.draw.io/email';
 					this.fileObject.type = 'utf-8';
 					fn();
 				}
+		        else
+		        {
+	            	this.ui.spinner.stop();
+		        }
 			}
 			else
 			{