14.0.2 release

ChangeLog

@@ -1,3 +1,7 @@
+15-DEC-2020: 14.0.2
+
+- Improves Lucidchart import
+
 10-DEC-2020: 14.0.1
 
 - Uses minimal UI on iPad Mini and smaller

VERSION

@@ -1 +1 @@
-14.0.1
+14.0.2

etc/build/build.xml

@@ -127,6 +127,7 @@
 				<file name="Sidebar-FluidPower.js" />
 				<file name="Sidebar-GCP.js" />
 				<file name="Sidebar-GCP2.js" />
+				<file name="Sidebar-General.js" />
 				<file name="Sidebar-Gmdl.js" />
 				<file name="Sidebar-IBM.js" />
 				<file name="Sidebar-Infographic.js" />

etc/docker/README.md

@@ -8,46 +8,4 @@ In that repository:
 * docker-compose to run draw.io integrated within nextcloud
 * docker-compose to run draw.io with PlantUML support
 * docker-compose to run draw.io self-contained without any dependency on draw.io website (with the export server, plantUml, Google Drive support, OneDrive support, and EMF conversion support (for VSDX export)
-
-
-# HTTPS SSL Certificate via Let's Encrypt
-
-### Prerequisites:
-
-1. A Linux machine connected to the Internet with ports 443 and 80 open
-1. A domain/subdomain name pointing to this machine's IP address. (e.g., drawio.example.com)
-
-### Method:
-
-1. Using jgraph/drawio docker image, run the following command
-`docker run -it -m1g -e LETS_ENCRYPT_ENABLED=true -e PUBLIC_DNS=drawio.example.com --rm --name="draw" -p 80:80 -p 443:8443 jgraph/drawio`
-Notice that mapping port 80 to container's port 80 allows certbot to work in stand-alone mode. Mapping port 443 to container's port 8443 allows the container tomcat to serve https requests directly.
-
-# Changing draw.io configuration
-
-## Method 1 (Build you custom image with setting pre-loaded)
-
-1. Edit PreConfig.js & PostConfig.js files (next to Dockerfile in debian or alpine folders)
-1. Build the docker image
-
-## Method 2 (Using existing running docker container)
-
-1. Edit PreConfig.js & PostConfig.js files (next to Dockerfile in debian or alpine folders)
-1. Copy these files to docker container 
-
-```
-docker cp PreConfig.js draw:/usr/local/tomcat/webapps/draw/js/
-docker cp PostConfig.js draw:/usr/local/tomcat/webapps/draw/js/
-```
-
-## Method 3 (Bind configuration files into the container when started)
-
-1. This method allows changing the configuration files directly on the host without invoking any other docker commands. It can be used for testing
-1. Edit PreConfig.js & PostConfig.js files (next to Dockerfile in debian or alpine folders)
-1. From within the directory that contained the configuration files, run the following command to start docker container
-1. Note: self-contained docker-compose file already mount the configuration files into the container
-
-```
-docker run -it  --rm --name="draw" --mount type=bind,source="$(pwd)"/PreConfig.js,target=/usr/local/tomcat/webapps/draw/js/PreConfig.js --mount type=bind,source="$(pwd)"/PostConfig.js,target=/usr/local/tomcat/webapps/draw/js/PostConfig.js -p 8080:8080 -p 8443:8443 fjudith/draw.io
-```
-
+* And more...

src/main/grapheditor/Shapes.js

@@ -503,6 +503,18 @@
 	
 	mxCellRenderer.registerShape('note2', NoteShape2);
 
+	NoteShape2.prototype.getLabelMargins = function(rect)
+	{
+		if (mxUtils.getValue(this.style, 'boundedLbl', false))
+		{
+			var size = mxUtils.getValue(this.style, 'size', 15);
+			
+			return new mxRectangle(0, Math.min(rect.height * this.scale, size * this.scale), 0, 0);
+		}
+		
+		return null;
+	};
+
 	// Flexible cube Shape
 	function IsoCubeShape2()
 	{
@@ -747,7 +759,7 @@
 		c.fillAndStroke();
 		
 		c.setShadow(false);
-
+	
 		var sym = mxUtils.getValue(this.style, 'folderSymbol', null);
 		
 		if (sym == 'triangle')
@@ -762,8 +774,52 @@
 	};
 
 	mxCellRenderer.registerShape('folder', FolderShape);
+
+	FolderShape.prototype.getLabelMargins = function(rect)
+	{
+		if (mxUtils.getValue(this.style, 'boundedLbl', false))
+		{
+			var sizeY = mxUtils.getValue(this.style, 'tabHeight', 15) * this.scale;
+
+			if (mxUtils.getValue(this.style, 'labelInHeader', false))
+			{
+				var sizeX = mxUtils.getValue(this.style, 'tabWidth', 15) * this.scale;
+				var sizeY = mxUtils.getValue(this.style, 'tabHeight', 15) * this.scale;
+				var rounded = mxUtils.getValue(this.style, 'rounded', false);
+				var absArcSize = mxUtils.getValue(this.style, 'absoluteArcSize', false);
+				var arcSize = parseFloat(mxUtils.getValue(this.style, 'arcSize', this.arcSize));
+				
+				if (!absArcSize)
+				{
+					arcSize = Math.min(rect.width, rect.height) * arcSize;
+				}
+				
+				arcSize = Math.min(arcSize, rect.width * 0.5, (rect.height - sizeY) * 0.5);
+					
+				if (!rounded)
+				{
+					arcSize = 0;
+				}
+
+				if (mxUtils.getValue(this.style, 'tabPosition', this.tabPosition) == 'left')
+				{
+					return new mxRectangle(arcSize, 0, Math.min(rect.width, rect.width - sizeX), Math.min(rect.height, rect.height - sizeY));
+				}
+				else
+				{
+					return new mxRectangle(Math.min(rect.width, rect.width - sizeX), 0, arcSize, Math.min(rect.height, rect.height - sizeY));
+				}
+			}
+			else
+			{
+				return new mxRectangle(0, Math.min(rect.height, sizeY), 0, 0);
+			}
+		}
+		
+		return null;
+	};
 	
-	// Folder Shape, supports tabWidth, tabHeight styles
+	// UML State Shape, supports tabWidth, tabHeight styles
 	function UMLStateShape()
 	{
 		mxCylinder.call(this);
@@ -775,15 +831,11 @@
 	{
 		c.translate(x, y);
 		
-//		var dx = Math.max(0, Math.min(w, parseFloat(mxUtils.getValue(this.style, 'tabWidth', this.tabWidth))));
-//		var dy = Math.max(0, Math.min(h, parseFloat(mxUtils.getValue(this.style, 'tabHeight', this.tabHeight))));
-//		var tp = mxUtils.getValue(this.style, 'tabPosition', this.tabPosition);
 		var rounded = mxUtils.getValue(this.style, 'rounded', false);
 		var absArcSize = mxUtils.getValue(this.style, 'absoluteArcSize', false);
 		var arcSize = parseFloat(mxUtils.getValue(this.style, 'arcSize', this.arcSize));
 		var connPoint = mxUtils.getValue(this.style, 'umlStateConnection', null);
 		
-		
 		if (!absArcSize)
 		{
 			arcSize = Math.min(w, h) * arcSize;
@@ -816,7 +868,7 @@
 		c.fillAndStroke();
 		
 		c.setShadow(false);
-
+	
 		var sym = mxUtils.getValue(this.style, 'umlStateSymbol', null);
 		
 		if (sym == 'collapseState')
@@ -830,7 +882,7 @@
 			c.lineTo(w - 20, h - 15);
 			c.stroke();
 		}
-
+	
 		if (connPoint == 'connPointRefEntry')
 		{
 			c.ellipse(0, h * 0.5 - 10, 20, 20);
@@ -848,10 +900,25 @@
 			c.lineTo(5, h * 0.5 + 5);
 			c.stroke();
 		}
-};
+	};
 
 	mxCellRenderer.registerShape('umlState', UMLStateShape);
 
+	UMLStateShape.prototype.getLabelMargins = function(rect)
+	{
+		if (mxUtils.getValue(this.style, 'boundedLbl', false))
+		{
+			var connPoint = mxUtils.getValue(this.style, 'umlStateConnection', null);
+			
+			if (connPoint != null)
+			{
+				return new mxRectangle(10 * this.scale, 0, 0, 0);
+			}
+		}
+		
+		return null;
+	};
+
 	// Card shape
 	function CardShape()
 	{
@@ -1489,6 +1556,7 @@
 		
 		return rect;
 	};
+
 	ProcessShape.prototype.paintForeground = function(c, x, y, w, h)
 	{
 		var isFixedSize = mxUtils.getValue(this.style, 'fixedSize', this.fixedSize);
@@ -1502,8 +1570,7 @@
 		{
 			inset = w * Math.max(0, Math.min(1, inset));
 		}
-		
-
+	
 		if (this.isRounded)
 		{
 			var f = mxUtils.getValue(this.style, mxConstants.STYLE_ARCSIZE,
@@ -1876,7 +1943,247 @@
 	// Replaces existing actor shape
 	mxCellRenderer.registerShape('umlActor', UmlActorShape);
 	
-	// UML Boundary Shape
+	////////////// UML Input Pin Shape ///////////////
+	function mxShapeUMLInputPin(bounds, fill, stroke, strokewidth)
+	{
+		mxShape.call(this);
+		this.bounds = bounds;
+		this.fill = fill;
+		this.stroke = stroke;
+		this.strokewidth = (strokewidth != null) ? strokewidth : 1;
+		this.dx = 0.5;
+	};
+
+	/**
+	* Extends mxShape.
+	*/
+	mxUtils.extend(mxShapeUMLInputPin, mxActor);
+
+	mxShapeUMLInputPin.prototype.cst = {INPUT_PIN : 'mxgraph.uml.inputPin'};
+
+	mxShapeUMLInputPin.prototype.paintVertexShape = function(c, x, y, w, h)
+	{
+		c.translate(x, y);
+	
+		c.begin();
+		c.moveTo(0, 0);
+		c.lineTo(w, 0);
+		c.lineTo(w, h);
+		c.lineTo(0, h);
+		c.close();
+		c.fillAndStroke();
+		
+		c.setShadow(false);
+		
+		c.begin();
+		c.moveTo(w * 0.75, h * 0.5);
+		c.lineTo(w * 0.25, h * 0.5);
+		c.moveTo(w * 0.4, h * 0.4);
+		c.lineTo(w * 0.25, h * 0.5);
+		c.lineTo(w * 0.4, h * 0.6);
+		c.stroke();
+	};
+	
+	mxCellRenderer.registerShape(mxShapeUMLInputPin.prototype.cst.INPUT_PIN, mxShapeUMLInputPin);
+	
+	mxShapeUMLInputPin.prototype.constraints = null;
+
+	////////////// UML Behaviour Shape ///////////////
+	function mxShapeUMLBehaviorAction(bounds, fill, stroke, strokewidth)
+	{
+		mxShape.call(this);
+		this.bounds = bounds;
+		this.fill = fill;
+		this.stroke = stroke;
+		this.strokewidth = (strokewidth != null) ? strokewidth : 1;
+		this.dx = 0.5;
+	};
+	
+	mxUtils.extend(mxShapeUMLBehaviorAction, mxActor);
+	
+	mxShapeUMLBehaviorAction.prototype.cst = {BEHAVIOR_ACTION : 'mxgraph.uml.behaviorAction'};
+	
+	/**
+	* Function: paintVertexShape
+	* 
+	* Paints the vertex shape.
+	*/
+	mxShapeUMLBehaviorAction.prototype.paintVertexShape = function(c, x, y, w, h)
+	{
+		c.translate(x, y);
+	
+		var rounded = mxUtils.getValue(this.style, 'rounded', false);
+		var absArcSize = mxUtils.getValue(this.style, 'absoluteArcSize', false);
+		var arcSize = parseFloat(mxUtils.getValue(this.style, 'arcSize', this.arcSize));
+		
+		if (!absArcSize)
+		{
+			arcSize = Math.min(w, h) * arcSize;
+		}
+		
+		arcSize = Math.min(arcSize, w * 0.5, h * 0.5);
+		
+		if (!rounded)
+		{
+			arcSize = 0;
+		}
+		
+		c.begin();
+		
+		if (rounded)
+		{
+			c.moveTo(0, arcSize);
+			c.arcTo(arcSize, arcSize, 0, 0, 1, arcSize, 0);
+			c.lineTo(w - arcSize, 0);
+			c.arcTo(arcSize, arcSize, 0, 0, 1, w, arcSize);
+			c.lineTo(w, h - arcSize);
+			c.arcTo(arcSize, arcSize, 0, 0, 1, w - arcSize, h);
+			c.lineTo(arcSize, h);
+			c.arcTo(arcSize, arcSize, 0, 0, 1, 0, h - arcSize);
+		}
+		else
+		{
+			c.moveTo(0, 0);
+			c.lineTo(w, 0);
+			c.lineTo(w, h);
+			c.lineTo(0, h);
+		}
+		
+		c.close();
+		c.fillAndStroke();
+		
+		c.setShadow(false);
+	
+		if (w >= 60 && h >= 40)
+		{
+			c.begin();
+			c.moveTo(w - 60, h * 0.5 + 20);
+			c.lineTo(w - 60, h * 0.5);
+			c.lineTo(w - 20, h * 0.5);
+			c.lineTo(w - 20, h * 0.5 + 20);
+			c.moveTo(w - 40, h * 0.5 - 20);
+			c.lineTo(w - 40, h * 0.5 + 20);
+			c.stroke();
+		}
+	};
+	
+	mxCellRenderer.registerShape(mxShapeUMLBehaviorAction.prototype.cst.BEHAVIOR_ACTION, mxShapeUMLBehaviorAction);
+	
+	mxShapeUMLBehaviorAction.prototype.constraints = null;
+
+	////////////// UML Action Shape ///////////////
+	function mxShapeUMLAction(bounds, fill, stroke, strokewidth)
+	{
+		mxShape.call(this);
+		this.bounds = bounds;
+		this.fill = fill;
+		this.stroke = stroke;
+		this.strokewidth = (strokewidth != null) ? strokewidth : 1;
+		this.dx = 0.5;
+	};
+
+	/**
+	* Extends mxShape.
+	*/
+	mxUtils.extend(mxShapeUMLAction, mxActor);
+
+	mxShapeUMLAction.prototype.cst = {ACTION : 'mxgraph.uml.action'};
+
+	/**
+	* Function: paintVertexShape
+	* 
+	* Paints the vertex shape.
+	*/
+	mxShapeUMLAction.prototype.paintVertexShape = function(c, x, y, w, h)
+	{
+		c.translate(x, y);
+
+		var absArcSize = mxUtils.getValue(this.style, 'absoluteArcSize', false);
+		var arcSize = parseFloat(mxUtils.getValue(this.style, 'arcSize', this.arcSize));
+		
+		if (!absArcSize)
+		{
+			arcSize = Math.min(w, h) * arcSize;
+		}
+		
+		arcSize = Math.min(arcSize, w * 0.5, h * 0.5);
+		
+		c.begin();
+		c.moveTo(0, arcSize);
+		c.arcTo(arcSize, arcSize, 0, 0, 1, arcSize, 0);
+		c.lineTo(w - arcSize - 10, 0);
+		c.arcTo(arcSize, arcSize, 0, 0, 1, w - 10, arcSize);
+		c.lineTo(w - 10, h - arcSize);
+		c.arcTo(arcSize, arcSize, 0, 0, 1, w - arcSize - 10, h);
+		c.lineTo(arcSize, h);
+		c.arcTo(arcSize, arcSize, 0, 0, 1, 0, h - arcSize);
+		c.close();
+		c.fillAndStroke();
+		
+		c.rect(w - 10, h * 0.5 - 10, 10, 20);
+		c.fillAndStroke();
+	};
+
+	mxCellRenderer.registerShape(mxShapeUMLAction.prototype.cst.ACTION, mxShapeUMLAction);
+
+	mxShapeUMLAction.prototype.constraints = null;
+
+	////////////// UML Action Parameter Shape ///////////////
+	function mxShapeUMLActionParams(bounds, fill, stroke, strokewidth)
+	{
+		mxShape.call(this);
+		this.bounds = bounds;
+		this.fill = fill;
+		this.stroke = stroke;
+		this.strokewidth = (strokewidth != null) ? strokewidth : 1;
+		this.dx = 0.5;
+	};
+
+	mxUtils.extend(mxShapeUMLActionParams, mxActor);
+
+	mxShapeUMLActionParams.prototype.cst = {ACTION_PARAMS : 'mxgraph.uml.actionParams'};
+
+	mxShapeUMLActionParams.prototype.paintVertexShape = function(c, x, y, w, h)
+	{
+		c.translate(x, y);
+
+		var absArcSize = mxUtils.getValue(this.style, 'absoluteArcSize', false);
+		var arcSize = parseFloat(mxUtils.getValue(this.style, 'arcSize', this.arcSize));
+		
+		if (!absArcSize)
+		{
+			arcSize = Math.min(w, h) * arcSize;
+		}
+		
+		arcSize = Math.min(arcSize, w * 0.5, h * 0.5);
+		
+		c.begin();
+		c.moveTo(20, arcSize);
+		c.arcTo(arcSize, arcSize, 0, 0, 1, 20 + arcSize, 0);
+		c.lineTo(w - arcSize, 0);
+		c.arcTo(arcSize, arcSize, 0, 0, 1, w, arcSize);
+		c.lineTo(w, h - arcSize);
+		c.arcTo(arcSize, arcSize, 0, 0, 1, w - arcSize, h);
+		c.lineTo(20 + arcSize, h);
+		c.arcTo(arcSize, arcSize, 0, 0, 1, 20, h - arcSize);
+		c.close();
+		c.fillAndStroke();
+		
+		c.rect(5, h * 0.5 - 17, 20, 34);
+		c.fillAndStroke();
+		
+		c.rect(0, h * 0.5 - 13, 10, 10);
+		c.fillAndStroke();
+		
+		c.rect(0, h * 0.5 + 3, 10, 10);
+		c.fillAndStroke();
+	};
+
+	mxCellRenderer.registerShape(mxShapeUMLActionParams.prototype.cst.ACTION_PARAMS, mxShapeUMLActionParams);
+
+	mxShapeUMLActionParams.prototype.constraints = null;
+
+	////////////// UML Boundary Shape ///////////////
 	function UmlBoundaryShape()
 	{
 		mxShape.call(this);
@@ -4539,7 +4846,7 @@
 		// Exposes custom handles
 		Graph.createHandle = createHandle;
 		Graph.handleFactory = handleFactory;
-		
+
 		var vertexHandlerCreateCustomHandles = mxVertexHandler.prototype.createCustomHandles;
 
 		mxVertexHandler.prototype.createCustomHandles = function()
@@ -4616,7 +4923,22 @@
 		Graph.createHandle = function() {};
 		Graph.handleFactory = {};
 	}
-	 
+	
+	handleFactory['note'] = function(state)
+	{
+		return [createHandle(state, ['size'], function(bounds)
+		{
+			var size = Math.max(0, Math.min(bounds.width, Math.min(bounds.height, parseFloat(
+				mxUtils.getValue(this.state.style, 'size', NoteShape.prototype.size)))));
+			
+			return new mxPoint(bounds.x + bounds.width - size, bounds.y + size);
+		}, function(bounds, pt)
+		{
+			this.state.style['size'] = Math.round(Math.max(0, Math.min(Math.min(bounds.width, bounds.x + bounds.width - pt.x),
+					Math.min(bounds.height, pt.y - bounds.y))));
+		})];
+	};
+
 	 var isoHVector = new mxPoint(1, 0);
 	 var isoVVector = new mxPoint(1, 0);
 		

src/main/java/com/mxgraph/io/mxCellCodec.java

@@ -0,0 +1,231 @@
+/**
+ * Copyright (c) 2006, Gaudenz Alder
+ */
+package com.mxgraph.io;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import com.mxgraph.model.mxCell;
+
+/**
+ * Codec for mxCells. This class is created and registered
+ * dynamically at load time and used implicitely via mxCodec
+ * and the mxCodecRegistry.
+ */
+public class mxCellCodec extends mxObjectCodec
+{
+
+	/**
+	 * Constructs a new cell codec.
+	 */
+	public mxCellCodec()
+	{
+		this(new mxCell(), null, new String[] { "parent", "source", "target" },
+				null);
+	}
+
+	/**
+	 * Constructs a new cell codec for the given template.
+	 */
+	public mxCellCodec(Object template)
+	{
+		this(template, null, null, null);
+	}
+
+	/**
+	 * Constructs a new cell codec for the given arguments.
+	 */
+	public mxCellCodec(Object template, String[] exclude, String[] idrefs,
+			Map<String, String> mapping)
+	{
+		super(template, exclude, idrefs, mapping);
+	}
+
+	/**
+	 * Excludes user objects that are XML nodes.
+	 */
+	public boolean isExcluded(Object obj, String attr, Object value,
+			boolean write)
+	{
+		return exclude.contains(attr)
+				|| (write && attr.equals("value") && value instanceof Node && ((Node) value)
+						.getNodeType() == Node.ELEMENT_NODE);
+	}
+
+	/**
+	 * Encodes an mxCell and wraps the XML up inside the
+	 * XML of the user object (inversion).
+	 */
+	public Node afterEncode(mxCodec enc, Object obj, Node node)
+	{
+		if (obj instanceof mxCell)
+		{
+			mxCell cell = (mxCell) obj;
+
+			if (cell.getValue() instanceof Node)
+			{
+				// Wraps the graphical annotation up in the
+				// user object (inversion) by putting the
+				// result of the default encoding into
+				// a clone of the user object (node type 1)
+				// and returning this cloned user object.
+				Element tmp = (Element) node;
+				node = enc.getDocument().importNode((Node) cell.getValue(),
+						true);
+				node.appendChild(tmp);
+
+				// Moves the id attribute to the outermost
+				// XML node, namely the node which denotes
+				// the object boundaries in the file.
+				String id = tmp.getAttribute("id");
+				((Element) node).setAttribute("id", id);
+				tmp.removeAttribute("id");
+			}
+		}
+
+		return node;
+	}
+
+	/**
+	 * Decodes an mxCell and uses the enclosing XML node as
+	 * the user object for the cell (inversion).
+	 */
+	public Node beforeDecode(mxCodec dec, Node node, Object obj)
+	{
+		Element inner = (Element) node;
+
+		if (obj instanceof mxCell)
+		{
+			mxCell cell = (mxCell) obj;
+			String classname = getName();
+			String nodeName = node.getNodeName();
+			
+			// Handles aliased names
+			if (!nodeName.equals(classname))
+			{
+				String tmp = mxCodecRegistry.aliases.get(nodeName);
+				
+				if (tmp != null)
+				{
+					nodeName = tmp;
+				}
+			}
+
+			if (!nodeName.equals(classname))
+			{
+				// Passes the inner graphical annotation node to the
+				// object codec for further processing of the cell.
+				Node tmp = inner.getElementsByTagName(classname).item(0);
+
+				if (tmp != null && tmp.getParentNode() == node)
+				{
+					inner = (Element) tmp;
+
+					// Removes annotation and whitespace from node
+					Node tmp2 = tmp.getPreviousSibling();
+
+					while (tmp2 != null && tmp2.getNodeType() == Node.TEXT_NODE)
+					{
+						Node tmp3 = tmp2.getPreviousSibling();
+
+						if (tmp2.getTextContent().trim().length() == 0)
+						{
+							tmp2.getParentNode().removeChild(tmp2);
+						}
+
+						tmp2 = tmp3;
+					}
+
+					// Removes more whitespace
+					tmp2 = tmp.getNextSibling();
+
+					while (tmp2 != null && tmp2.getNodeType() == Node.TEXT_NODE)
+					{
+						Node tmp3 = tmp2.getPreviousSibling();
+
+						if (tmp2.getTextContent().trim().length() == 0)
+						{
+							tmp2.getParentNode().removeChild(tmp2);
+						}
+
+						tmp2 = tmp3;
+					}
+
+					tmp.getParentNode().removeChild(tmp);
+				}
+				else
+				{
+					inner = null;
+				}
+
+				// Creates the user object out of the XML node
+				Element value = (Element) node.cloneNode(true);
+				cell.setValue(value);
+				String id = value.getAttribute("id");
+
+				if (id != null)
+				{
+					cell.setId(id);
+					value.removeAttribute("id");
+				}
+			}
+			else
+			{
+				cell.setId(((Element) node).getAttribute("id"));
+			}
+
+			// Preprocesses and removes all Id-references
+			// in order to use the correct encoder (this)
+			// for the known references to cells (all).
+			if (inner != null && idrefs != null)
+			{
+				Iterator<String> it = idrefs.iterator();
+
+				while (it.hasNext())
+				{
+					String attr = it.next();
+					String ref = inner.getAttribute(attr);
+
+					if (ref != null && ref.length() > 0)
+					{
+						inner.removeAttribute(attr);
+						Object object = dec.objects.get(ref);
+
+						if (object == null)
+						{
+							object = dec.lookup(ref);
+						}
+
+						if (object == null)
+						{
+							// Needs to decode forward reference
+							Node element = dec.getElementById(ref);
+
+							if (element != null)
+							{
+								mxObjectCodec decoder = mxCodecRegistry
+										.getCodec(element.getNodeName());
+
+								if (decoder == null)
+								{
+									decoder = this;
+								}
+
+								object = decoder.decode(dec, element);
+							}
+						}
+
+						setFieldValue(obj, attr, object);
+					}
+				}
+			}
+		}
+
+		return inner;
+	}
+
+}

src/main/java/com/mxgraph/io/mxChildChangeCodec.java

@@ -0,0 +1,166 @@
+/**
+ * Copyright (c) 2006, Gaudenz Alder
+ */
+package com.mxgraph.io;
+
+import java.util.Map;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import com.mxgraph.model.mxGraphModel.mxChildChange;
+import com.mxgraph.model.mxICell;
+
+/**
+ * Codec for mxChildChanges. This class is created and registered
+ * dynamically at load time and used implicitely via mxCodec
+ * and the mxCodecRegistry.
+ */
+public class mxChildChangeCodec extends mxObjectCodec
+{
+
+	/**
+	 * Constructs a new model codec.
+	 */
+	public mxChildChangeCodec()
+	{
+		this(new mxChildChange(), new String[] { "model", "child",
+				"previousIndex" }, new String[] { "parent", "previous" }, null);
+	}
+
+	/**
+	 * Constructs a new model codec for the given arguments.
+	 */
+	public mxChildChangeCodec(Object template, String[] exclude,
+			String[] idrefs, Map<String, String> mapping)
+	{
+		super(template, exclude, idrefs, mapping);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mxgraph.io.mxObjectCodec#isReference(java.lang.Object, java.lang.String, java.lang.Object, boolean)
+	 */
+	@Override
+	public boolean isReference(Object obj, String attr, Object value,
+			boolean isWrite)
+	{
+		if (attr.equals("child") && obj instanceof mxChildChange
+				&& (((mxChildChange) obj).getPrevious() != null || !isWrite))
+		{
+			return true;
+		}
+
+		return idrefs.contains(attr);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mxgraph.io.mxObjectCodec#afterEncode(com.mxgraph.io.mxCodec, java.lang.Object, org.w3c.dom.Node)
+	 */
+	@Override
+	public Node afterEncode(mxCodec enc, Object obj, Node node)
+	{
+		if (obj instanceof mxChildChange)
+		{
+			mxChildChange change = (mxChildChange) obj;
+			Object child = change.getChild();
+
+			if (isReference(obj, "child", child, true))
+			{
+				// Encodes as reference (id)
+				mxCodec.setAttribute(node, "child", enc.getId(child));
+			}
+			else
+			{
+				// At this point, the encoder is no longer able to know which cells
+				// are new, so we have to encode the complete cell hierarchy and
+				// ignore the ones that are already there at decoding time. Note:
+				// This can only be resolved by moving the notify event into the
+				// execute of the edit.
+				enc.encodeCell((mxICell) child, node, true);
+			}
+		}
+
+		return node;
+	}
+
+	/**
+	 * Reads the cells into the graph model. All cells are children of the root
+	 * element in the node.
+	 */
+	public Node beforeDecode(mxCodec dec, Node node, Object into)
+	{
+		if (into instanceof mxChildChange)
+		{
+			mxChildChange change = (mxChildChange) into;
+
+			if (node.getFirstChild() != null
+					&& node.getFirstChild().getNodeType() == Node.ELEMENT_NODE)
+			{
+				// Makes sure the original node isn't modified
+				node = node.cloneNode(true);
+
+				Node tmp = node.getFirstChild();
+				change.setChild(dec.decodeCell(tmp, false));
+
+				Node tmp2 = tmp.getNextSibling();
+				tmp.getParentNode().removeChild(tmp);
+				tmp = tmp2;
+
+				while (tmp != null)
+				{
+					tmp2 = tmp.getNextSibling();
+
+					if (tmp.getNodeType() == Node.ELEMENT_NODE)
+					{
+						// Ignores all existing cells because those do not need
+						// to be re-inserted into the model. Since the encoded
+						// version of these cells contains the new parent, this
+						// would leave to an inconsistent state on the model
+						// (ie. a parent change without a call to
+						// parentForCellChanged).
+						String id = ((Element) tmp).getAttribute("id");
+
+						if (dec.lookup(id) == null)
+						{
+							dec.decodeCell(tmp, true);
+						}
+					}
+
+					tmp.getParentNode().removeChild(tmp);
+					tmp = tmp2;
+				}
+			}
+			else
+			{
+				String childRef = ((Element) node).getAttribute("child");
+				change.setChild((mxICell) dec.getObject(childRef));
+			}
+		}
+
+		return node;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mxgraph.io.mxObjectCodec#afterDecode(com.mxgraph.io.mxCodec, org.w3c.dom.Node, java.lang.Object)
+	 */
+	@Override
+	public Object afterDecode(mxCodec dec, Node node, Object obj)
+	{
+		if (obj instanceof mxChildChange)
+		{
+			mxChildChange change = (mxChildChange) obj;
+
+			// Cells are encoded here after a complete transaction so the previous
+			// parent must be restored on the cell for the case where the cell was
+			// added. This is needed for the local model to identify the cell as a
+			// new cell and register the ID.
+			((mxICell) change.getChild()).setParent((mxICell) change
+					.getPrevious());
+			change.setPrevious(change.getParent());
+			change.setPreviousIndex(change.getIndex());
+		}
+
+		return obj;
+	}
+
+}

src/main/java/com/mxgraph/io/mxCodec.java

@@ -0,0 +1,490 @@
+/**
+ * Copyright (c) 2012, JGraph Ltd
+ */
+package com.mxgraph.io;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import com.mxgraph.model.mxCell;
+import com.mxgraph.model.mxCellPath;
+import com.mxgraph.model.mxICell;
+import com.mxgraph.util.mxDomUtils;
+
+/**
+ * XML codec for Java object graphs. In order to resolve forward references
+ * when reading files the XML document that contains the data must be passed
+ * to the constructor.
+ */
+public class mxCodec
+{
+
+	private static final Logger log = Logger.getLogger(mxCodec.class.getName());
+
+	/**
+	 * Holds the owner document of the codec.
+	 */
+	protected Document document;
+
+	/**
+	 * Maps from IDs to objects.
+	 */
+	protected Map<String, Object> objects = new Hashtable<String, Object>();
+
+	/**
+	 * Maps from IDs to elements.
+	 */
+	protected Map<String, Node> elements = null;
+
+	/**
+	 * Specifies if default values should be encoded. Default is false.
+	 */
+	protected boolean encodeDefaults = false;
+
+	/**
+	 * Constructs an XML encoder/decoder with a new owner document.
+	 */
+	public mxCodec()
+	{
+		this(mxDomUtils.createDocument());
+	}
+
+	/**
+	 * Constructs an XML encoder/decoder for the specified owner document.
+	 * 
+	 * @param document Optional XML document that contains the data. If no document
+	 * is specified then a new document is created using mxUtils.createDocument
+	 */
+	public mxCodec(Document document)
+	{
+		if (document == null)
+		{
+			document = mxDomUtils.createDocument();
+		}
+
+		this.document = document;
+	}
+
+	/**
+	 * Returns the owner document of the codec.
+	 * 
+	 * @return Returns the owner document.
+	 */
+	public Document getDocument()
+	{
+		return document;
+	}
+
+	/**
+	 * Sets the owner document of the codec.
+	 */
+	public void setDocument(Document value)
+	{
+		document = value;
+	}
+
+	/**
+	 * Returns if default values of member variables should be encoded.
+	 */
+	public boolean isEncodeDefaults()
+	{
+		return encodeDefaults;
+	}
+
+	/**
+	 * Sets if default values of member variables should be encoded.
+	 */
+	public void setEncodeDefaults(boolean encodeDefaults)
+	{
+		this.encodeDefaults = encodeDefaults;
+	}
+
+	/**
+	 * Returns the object lookup table.
+	 */
+	public Map<String, Object> getObjects()
+	{
+		return objects;
+	}
+
+	/**
+	 * Assoiates the given object with the given ID.
+	 * 
+	 * @param id ID for the object to be associated with.
+	 * @param object Object to be associated with the ID.
+	 * @return Returns the given object.
+	 */
+	public Object putObject(String id, Object object)
+	{
+		return objects.put(id, object);
+	}
+
+	/**
+	 * Returns the decoded object for the element with the specified ID in
+	 * {@link #document}. If the object is not known then {@link #lookup(String)}
+	 * is used to find an object. If no object is found, then the element with
+	 * the respective ID from the document is parsed using {@link #decode(Node)}.
+	 * 
+	 * @param id ID of the object to be returned.
+	 * @return Returns the object for the given ID.
+	 */
+	public Object getObject(String id)
+	{
+		Object obj = null;
+
+		if (id != null)
+		{
+			obj = objects.get(id);
+
+			if (obj == null)
+			{
+				obj = lookup(id);
+
+				if (obj == null)
+				{
+					Node node = getElementById(id);
+
+					if (node != null)
+					{
+						obj = decode(node);
+					}
+				}
+			}
+		}
+
+		return obj;
+	}
+
+	/**
+	 * Hook for subclassers to implement a custom lookup mechanism for cell IDs.
+	 * This implementation always returns null.
+	 * 
+	 * @param id ID of the object to be returned.
+	 * @return Returns the object for the given ID.
+	 */
+	public Object lookup(String id)
+	{
+		return null;
+	}
+
+	/**
+	 * Returns the element with the given ID from the document.
+	 * 
+	 * @param id ID of the element to be returned.
+	 * @return Returns the element for the given ID.
+	 */
+	public Node getElementById(String id)
+	{
+		if (elements == null)
+		{
+			elements = new Hashtable<String, Node>();
+			addElement(document.getDocumentElement());
+		}
+		
+		return elements.get(id);
+	}
+	
+	/**
+	 * Adds the given element to <elements> if it has an ID.
+	 */
+	protected void addElement(Node node)
+	{
+		if (node instanceof Element)
+		{
+			String id = ((Element) node).getAttribute("id");
+			
+			if (id != null && !elements.containsKey(id))
+			{
+				elements.put(id,  node);
+			}
+		}
+		
+		node = node.getFirstChild();
+		
+		while (node != null)
+		{
+			addElement(node);
+			node = node.getNextSibling();
+		}
+	}
+
+	/**
+	 * Returns the ID of the specified object. This implementation calls
+	 * reference first and if that returns null handles the object as an
+	 * mxCell by returning their IDs using mxCell.getId. If no ID exists for
+	 * the given cell, then an on-the-fly ID is generated using
+	 * mxCellPath.create.
+	 * 
+	 * @param obj Object to return the ID for.
+	 * @return Returns the ID for the given object.
+	 */
+	public String getId(Object obj)
+	{
+		String id = null;
+
+		if (obj != null)
+		{
+			id = reference(obj);
+
+			if (id == null && obj instanceof mxICell)
+			{
+				id = ((mxICell) obj).getId();
+
+				if (id == null)
+				{
+					// Uses an on-the-fly Id
+					id = mxCellPath.create((mxICell) obj);
+
+					if (id.length() == 0)
+					{
+						id = "root";
+					}
+				}
+			}
+		}
+
+		return id;
+	}
+
+	/**
+	 * Hook for subclassers to implement a custom method for retrieving IDs from
+	 * objects. This implementation always returns null.
+	 * 
+	 * @param obj Object whose ID should be returned.
+	 * @return Returns the ID for the given object.
+	 */
+	public String reference(Object obj)
+	{
+		return null;
+	}
+
+	/**
+	 * Encodes the specified object and returns the resulting XML node.
+	 * 
+	 * @param obj Object to be encoded.
+	 * @return Returns an XML node that represents the given object.
+	 */
+	public Node encode(Object obj)
+	{
+		Node node = null;
+
+		if (obj != null)
+		{
+			String name = mxCodecRegistry.getName(obj);
+			mxObjectCodec enc = mxCodecRegistry.getCodec(name);
+
+			if (enc != null)
+			{
+				node = enc.encode(this, obj);
+			}
+			else
+			{
+				if (obj instanceof Node)
+				{
+					node = ((Node) obj).cloneNode(true);
+				}
+				else
+				{
+					log.log(Level.FINEST, "No codec for " + name);
+				}
+			}
+		}
+
+		return node;
+	}
+
+	/**
+	 * Decodes the given XML node using {@link #decode(Node, Object)}.
+	 * 
+	 * @param node XML node to be decoded.
+	 * @return Returns an object that represents the given node.
+	 */
+	public Object decode(Node node)
+	{
+		return decode(node, null);
+	}
+
+	/**
+	 * Decodes the given XML node. The optional "into" argument specifies an
+	 * existing object to be used. If no object is given, then a new
+	 * instance is created using the constructor from the codec.
+	 * 
+	 * The function returns the passed in object or the new instance if no
+	 * object was given.
+	 * 
+	 * @param node XML node to be decoded.
+	 * @param into Optional object to be decodec into.
+	 * @return Returns an object that represents the given node.
+	 */
+	public Object decode(Node node, Object into)
+	{
+		Object obj = null;
+
+		if (node != null && node.getNodeType() == Node.ELEMENT_NODE)
+		{
+			mxObjectCodec codec = mxCodecRegistry.getCodec(node.getNodeName());
+
+			try
+			{
+				if (codec != null)
+				{
+					obj = codec.decode(this, node, into);
+				}
+				else
+				{
+					obj = node.cloneNode(true);
+					((Element) obj).removeAttribute("as");
+				}
+			}
+			catch (Exception e)
+			{
+				log.log(Level.FINEST, "Cannot decode " + node.getNodeName(), e);
+			}
+		}
+
+		return obj;
+	}
+
+	/**
+	 * Encoding of cell hierarchies is built-into the core, but is a
+	 * higher-level function that needs to be explicitely used by the
+	 * respective object encoders (eg. mxModelCodec, mxChildChangeCodec
+	 * and mxRootChangeCodec). This implementation writes the given cell
+	 * and its children as a (flat) sequence into the given node. The
+	 * children are not encoded if the optional includeChildren is false.
+	 * The function is in charge of adding the result into the given node
+	 * and has no return value.
+	 * 
+	 * @param cell mxCell to be encoded.
+	 * @param node Parent XML node to add the encoded cell into.
+	 * @param includeChildren Boolean indicating if the method
+	 * should include all descendents.
+	 */
+	public void encodeCell(mxICell cell, Node node, boolean includeChildren)
+	{
+		node.appendChild(encode(cell));
+
+		if (includeChildren)
+		{
+			int childCount = cell.getChildCount();
+
+			for (int i = 0; i < childCount; i++)
+			{
+				encodeCell(cell.getChildAt(i), node, includeChildren);
+			}
+		}
+	}
+
+	/**
+	 * Decodes cells that have been encoded using inversion, ie. where the
+	 * user object is the enclosing node in the XML, and restores the group
+	 * and graph structure in the cells. Returns a new <mxCell> instance
+	 * that represents the given node.
+	 * 
+	 * @param node XML node that contains the cell data.
+	 * @param restoreStructures Boolean indicating whether the graph
+	 * structure should be restored by calling insert and insertEdge on the
+	 * parent and terminals, respectively.
+	 * @return Graph cell that represents the given node.
+	 */
+	public mxICell decodeCell(Node node, boolean restoreStructures)
+	{
+		mxICell cell = null;
+
+		if (node != null && node.getNodeType() == Node.ELEMENT_NODE)
+		{
+			// Tries to find a codec for the given node name. If that does
+			// not return a codec then the node is the user object (an XML node
+			// that contains the mxCell, aka inversion).
+			mxObjectCodec decoder = mxCodecRegistry
+					.getCodec(node.getNodeName());
+
+			// Tries to find the codec for the cell inside the user object.
+			// This assumes all node names inside the user object are either
+			// not registered or they correspond to a class for cells.
+			if (!(decoder instanceof mxCellCodec))
+			{
+				Node child = node.getFirstChild();
+
+				while (child != null && !(decoder instanceof mxCellCodec))
+				{
+					decoder = mxCodecRegistry.getCodec(child.getNodeName());
+					child = child.getNextSibling();
+				}
+
+				String name = mxCell.class.getSimpleName();
+				decoder = mxCodecRegistry.getCodec(name);
+			}
+
+			if (!(decoder instanceof mxCellCodec))
+			{
+				String name = mxCell.class.getSimpleName();
+				decoder = mxCodecRegistry.getCodec(name);
+			}
+
+			cell = (mxICell) decoder.decode(this, node);
+
+			if (restoreStructures)
+			{
+				insertIntoGraph(cell);
+			}
+		}
+
+		return cell;
+	}
+	
+	/**
+	 * Inserts the given cell into its parent and terminal cells.
+	 */
+	public void insertIntoGraph(mxICell cell)
+	{
+		mxICell parent = cell.getParent();
+		mxICell source = cell.getTerminal(true);
+		mxICell target = cell.getTerminal(false);
+
+		// Fixes possible inconsistencies during insert into graph
+		cell.setTerminal(null, false);
+		cell.setTerminal(null, true);
+		cell.setParent(null);
+		
+		if (parent != null)
+		{
+			parent.insert(cell);
+		}
+
+		if (source != null)
+		{
+			source.insertEdge(cell, true);
+		}
+
+		if (target != null)
+		{
+			target.insertEdge(cell, false);
+		}
+	}
+
+	/**
+	 * Sets the attribute on the specified node to value. This is a
+	 * helper method that makes sure the attribute and value arguments
+	 * are not null.
+	 *
+	 * @param node XML node to set the attribute for.
+	 * @param attribute Name of the attribute whose value should be set.
+	 * @param value New value of the attribute.
+	 */
+	public static void setAttribute(Node node, String attribute, Object value)
+	{
+		if (node.getNodeType() == Node.ELEMENT_NODE && attribute != null
+				&& value != null)
+		{
+			((Element) node).setAttribute(attribute, String.valueOf(value));
+		}
+	}
+
+}

src/main/java/com/mxgraph/io/mxCodecRegistry.java

@@ -0,0 +1,259 @@
+/**
+ * Copyright (c) 2007, Gaudenz Alder
+ */
+package com.mxgraph.io;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.mxgraph.model.mxGraphModel.mxCollapseChange;
+import com.mxgraph.model.mxGraphModel.mxGeometryChange;
+import com.mxgraph.model.mxGraphModel.mxStyleChange;
+import com.mxgraph.model.mxGraphModel.mxValueChange;
+import com.mxgraph.model.mxGraphModel.mxVisibleChange;
+
+/**
+ * Singleton class that acts as a global registry for codecs. See
+ * {@link mxCodec} for an example.
+ */
+public class mxCodecRegistry
+{
+
+	private static final Logger log = Logger.getLogger(mxCodecRegistry.class.getName());
+
+	/**
+	 * Maps from constructor names to codecs.
+	 */
+	protected static Hashtable<String, mxObjectCodec> codecs = new Hashtable<String, mxObjectCodec>();
+
+	/**
+	 * Maps from classnames to codecnames.
+	 */
+	protected static Hashtable<String, String> aliases = new Hashtable<String, String>();
+
+	/**
+	 * Holds the list of known packages. Packages are used to prefix short
+	 * class names (eg. mxCell) in XML markup.
+	 */
+	protected static List<String> packages = new ArrayList<String>();
+
+	// Registers the known codecs and package names
+	static
+	{
+		addPackage("com.mxgraph");
+		addPackage("com.mxgraph.util");
+		addPackage("com.mxgraph.model");
+		addPackage("com.mxgraph.view");
+		addPackage("java.lang");
+		addPackage("java.util");
+
+		register(new mxObjectCodec(new ArrayList<Object>()));
+		register(new mxModelCodec());
+		register(new mxCellCodec());
+		register(new mxStylesheetCodec());
+
+		register(new mxRootChangeCodec());
+		register(new mxChildChangeCodec());
+		register(new mxTerminalChangeCodec());
+		register(new mxGenericChangeCodec(new mxValueChange(), "value"));
+		register(new mxGenericChangeCodec(new mxStyleChange(), "style"));
+		register(new mxGenericChangeCodec(new mxGeometryChange(), "geometry"));
+		register(new mxGenericChangeCodec(new mxCollapseChange(), "collapsed"));
+		register(new mxGenericChangeCodec(new mxVisibleChange(), "visible"));
+	}
+
+	/**
+	 * Registers a new codec and associates the name of the template constructor
+	 * in the codec with the codec object. Automatically creates an alias if the
+	 * codename and the classname are not equal.
+	 */
+	public static mxObjectCodec register(mxObjectCodec codec)
+	{
+		if (codec != null)
+		{
+			String name = codec.getName();
+			codecs.put(name, codec);
+
+			String classname = getName(codec.getTemplate());
+
+			if (!classname.equals(name))
+			{
+				addAlias(classname, name);
+			}
+		}
+
+		return codec;
+	}
+
+	/**
+	 * Adds an alias for mapping a classname to a codecname.
+	 */
+	public static void addAlias(String classname, String codecname)
+	{
+		aliases.put(classname, codecname);
+	}
+
+	/**
+	 * Returns a codec that handles the given object, which can be an object
+	 * instance or an XML node.
+	 * 
+	 * @param name Java class name.
+	 */
+	public static mxObjectCodec getCodec(String name)
+	{
+		String tmp = aliases.get(name);
+
+		if (tmp != null)
+		{
+			name = tmp;
+		}
+
+		mxObjectCodec codec = codecs.get(name);
+
+		// Registers a new default codec for the given name
+		// if no codec has been previously defined.
+		if (codec == null)
+		{
+			Object instance = getInstanceForName(name);
+
+			if (instance != null)
+			{
+				try
+				{
+					codec = new mxObjectCodec(instance);
+					register(codec);
+				}
+				catch (Exception e)
+				{
+					log.log(Level.FINEST, "Failed to create and register a codec for the name: " + name, e);
+				}
+			}
+			else
+			{
+				log.log(Level.FINEST, "Failed to create codec for " + name);
+			}
+		}
+
+		return codec;
+	}
+
+	/**
+	 * Adds the given package name to the list of known package names.
+	 * 
+	 * @param packagename Name of the package to be added.
+	 */
+	public static void addPackage(String packagename)
+	{
+		packages.add(packagename);
+	}
+
+	/**
+	 * Creates and returns a new instance for the given class name.
+	 * 
+	 * @param name Name of the class to be instantiated.
+	 * @return Returns a new instance of the given class.
+	 */
+	public static Object getInstanceForName(String name)
+	{
+		Class<?> clazz = getClassForName(name);
+
+		if (clazz != null)
+		{
+			if (clazz.isEnum())
+			{
+				// For an enum, use the first constant as the default instance
+				return clazz.getEnumConstants()[0];
+			}
+			else
+			{
+				try
+				{
+					return clazz.newInstance();
+				}
+				catch (Exception e)
+				{
+					log.log(Level.FINEST, "Failed to construct class instance for " + name, e);
+				}
+			}
+		}
+
+		log.log(Level.FINEST, "Failed to construct instance for " + name);
+
+		return null;
+	}
+
+	/**
+	 * Returns a class that corresponds to the given name.
+	 * 
+	 * @param name
+	 * @return Returns the class for the given name.
+	 */
+	public static Class<?> getClassForName(String name)
+	{
+		try
+		{
+			return Class.forName(name);
+		}
+		catch (Exception e)
+		{
+			log.log(Level.FINEST, "Failed to get a class object for " + name, e);
+		}
+
+		for (int i = 0; i < packages.size(); i++)
+		{
+			String s = packages.get(i);
+			String nameWithPackage = s + "." + name;
+
+			try
+			{
+				return Class.forName(nameWithPackage);
+			}
+			catch (Exception e)
+			{
+				log.log(Level.FINEST, "Failed to get a class object for " + nameWithPackage, e);
+			}
+		}
+
+		log.log(Level.FINEST, "Class " + name + " not found");
+		return null;
+	}
+
+	/**
+	 * Returns the name that identifies the codec associated
+	 * with the given instance..
+	 *
+	 * The I/O system uses unqualified classnames, eg. for a
+	 * <code>com.mxgraph.model.mxCell</code> this returns
+	 * <code>mxCell</code>.
+	 * 
+	 * @param instance Instance whose node name should be returned.
+	 * @return Returns a string that identifies the codec.
+	 */
+	public static String getName(Object instance)
+	{
+		Class<? extends Object> type = instance.getClass();
+
+		if (type.isArray() || Collection.class.isAssignableFrom(type)
+				|| Map.class.isAssignableFrom(type))
+		{
+			return "Array";
+		}
+		else
+		{
+			if (packages.contains(type.getPackage().getName()))
+			{
+				return type.getSimpleName();
+			}
+			else
+			{
+				return type.getName();
+			}
+		}
+	}
+
+}

src/main/java/com/mxgraph/io/mxGdCodec.java

@@ -0,0 +1,179 @@
+/**
+ * Copyright (c) 2010-2012, JGraph Ltd
+ */
+package com.mxgraph.io;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.mxgraph.model.mxGraphModel;
+import com.mxgraph.view.mxGraph;
+
+/**
+ * Parses a GD .txt file and imports it in the given graph.<br/>
+ * This class depends from the classes contained in
+ * com.mxgraph.io.gd.
+ */
+public class mxGdCodec
+{
+	private static final Logger log = Logger.getLogger(mxGdCodec.class.getName());
+
+	/**
+	 * Represents the different states in the parse of a file.
+	 */
+	public enum mxGDParseState
+	{
+		START, NUM_NODES, PARSING_NODES, PARSING_EDGES
+	}
+
+	/**
+	 * Map with the vertex cells added in the addNode method.
+	 */
+	protected static HashMap<String, Object> cellsMap = new HashMap<String, Object>();
+
+	/**
+	 * Parses simple GD format and populate the specified graph
+	 * @param input GD file to be parsed
+	 * @param graph Graph where the parsed graph is included.
+	 */
+	public static void decode(String input, mxGraph graph)
+	{
+		BufferedReader br = new BufferedReader(new StringReader(input));
+		mxGDParseState state = mxGDParseState.START;
+		Object parent = graph.getDefaultParent();
+
+		graph.getModel().beginUpdate();
+		
+		try
+		{
+			String line = br.readLine().trim();
+			while (line != null)
+			{
+				switch (state)
+				{
+					case START:
+					{
+						if (!line.startsWith("#"))
+						{
+							state = mxGDParseState.NUM_NODES;
+						}
+						else
+						{
+							break;
+						}
+					}
+					case NUM_NODES:
+					{
+						if (!line.startsWith("#"))
+						{
+							int numVertices = Integer.valueOf(line);
+							
+							for (int i = 0; i < numVertices; i++)
+							{
+								String label = String.valueOf(i);
+								Object vertex = graph.insertVertex(parent, label, label,
+										0, 0, 10, 10);
+								
+								cellsMap.put(label, vertex);
+							}
+						}
+						else
+						{
+							state = mxGDParseState.PARSING_EDGES;
+						}
+						
+						break;
+					}
+					case PARSING_NODES:
+					{
+						if (line.startsWith("# Edges"))
+						{
+							state = mxGDParseState.PARSING_EDGES;
+						}
+						else if (!line.equals(""))
+						{
+							String[] items = line.split(",");
+							if (items.length != 5)
+							{
+								throw new Exception("Error in parsing");
+							}
+							else
+							{
+								double x = Double.valueOf(items[1]);
+								double y = Double.valueOf(items[2]);
+								double width = Double.valueOf(items[3]);
+								double height = Double.valueOf(items[4]);
+								
+								
+								//Set the node name as label.
+								String label = items[0];
+
+								//Insert a new vertex in the graph
+								Object vertex = graph.insertVertex(parent, label, label,
+										x - width / 2.0, y - height / 2.0, width,
+										height);
+								
+								cellsMap.put(label, vertex);
+							}
+						}
+						break;
+					}
+					case PARSING_EDGES:
+					{
+						if (!line.equals(""))
+						{
+							String[] items = line.split(" ");
+							if (items.length != 2)
+							{
+								throw new Exception("Error in parsing");
+							}
+							else
+							{
+								Object source = cellsMap.get(items[0]);
+								Object target = cellsMap.get(items[1]);
+
+								graph.insertEdge(parent, null, "", source, target);
+							}
+						}
+						break;
+					}
+				}
+
+				line = br.readLine();
+			}
+		}
+		
+		catch (Exception e)
+		{
+			log.log(Level.FINEST, "Failed to decode", e);
+		}
+		finally
+		{
+			graph.getModel().endUpdate();
+		}
+	}
+	
+	/**
+	 * Generates a GD text output with the cells in the graph.
+	 * The implementation only uses the cells located in the default parent.
+	 * @param graph Graph with the cells.
+	 * @return The GD document generated.
+	 */
+	public static String encode(mxGraph graph)
+	{
+		StringBuilder builder = new StringBuilder();
+		
+		Object parent = graph.getDefaultParent();
+		Object[] vertices = mxGraphModel.getChildCells(graph.getModel(), parent, true, false);
+		
+		builder.append("# Number of Nodes (0-" + String.valueOf(vertices.length - 1) + ")");
+		builder.append(String.valueOf(vertices.length));
+		
+		// TODO
+
+		return builder.toString();
+	}
+}

src/main/java/com/mxgraph/io/mxGenericChangeCodec.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2006, Gaudenz Alder
+ */
+package com.mxgraph.io;
+
+import java.util.Map;
+
+import org.w3c.dom.Node;
+
+/**
+ * Codec for mxChildChanges. This class is created and registered
+ * dynamically at load time and used implicitely via mxCodec
+ * and the mxCodecRegistry.
+ */
+public class mxGenericChangeCodec extends mxObjectCodec
+{
+	/**
+	 * 
+	 */
+	protected String fieldname;
+
+	/**
+	 * Constructs a new model codec.
+	 */
+	public mxGenericChangeCodec(Object template, String fieldname)
+	{
+		this(template, new String[] { "model", "previous" },
+				new String[] { "cell" }, null, fieldname);
+	}
+
+	/**
+	 * Constructs a new model codec for the given arguments.
+	 */
+	public mxGenericChangeCodec(Object template, String[] exclude,
+			String[] idrefs, Map<String, String> mapping, String fieldname)
+	{
+		super(template, exclude, idrefs, mapping);
+
+		this.fieldname = fieldname;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mxgraph.io.mxObjectCodec#afterDecode(com.mxgraph.io.mxCodec, org.w3c.dom.Node, java.lang.Object)
+	 */
+	@Override
+	public Object afterDecode(mxCodec dec, Node node, Object obj)
+	{
+		Object cell = getFieldValue(obj, "cell");
+
+		if (cell instanceof Node)
+		{
+			setFieldValue(obj, "cell", dec.decodeCell((Node) cell, false));
+		}
+
+		setFieldValue(obj, "previous", getFieldValue(obj, fieldname));
+
+		return obj;
+	}
+
+}

src/main/java/com/mxgraph/io/mxModelCodec.java

@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2006-2013, Gaudenz Alder, David Benson
+ */
+package com.mxgraph.io;
+
+import java.util.Map;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import com.mxgraph.model.mxGraphModel;
+import com.mxgraph.model.mxICell;
+
+/**
+ * Codec for mxGraphModels. This class is created and registered
+ * dynamically at load time and used implicitly via mxCodec
+ * and the mxCodecRegistry.
+ */
+public class mxModelCodec extends mxObjectCodec
+{
+
+	/**
+	 * Constructs a new model codec.
+	 */
+	public mxModelCodec()
+	{
+		this(new mxGraphModel());
+	}
+
+	/**
+	 * Constructs a new model codec for the given template.
+	 */
+	public mxModelCodec(Object template)
+	{
+		this(template, null, null, null);
+	}
+
+	/**
+	 * Constructs a new model codec for the given arguments.
+	 */
+	public mxModelCodec(Object template, String[] exclude, String[] idrefs,
+			Map<String, String> mapping)
+	{
+		super(template, exclude, idrefs, mapping);
+	}
+
+	/**
+	 * Encodes the given mxGraphModel by writing a (flat) XML sequence
+	 * of cell nodes as produced by the mxCellCodec. The sequence is
+	 * wrapped-up in a node with the name root.
+	 */
+	protected void encodeObject(mxCodec enc, Object obj, Node node)
+	{
+		if (obj instanceof mxGraphModel)
+		{
+			Node rootNode = enc.document.createElement("root");
+			mxGraphModel model = (mxGraphModel) obj;
+			enc.encodeCell((mxICell) model.getRoot(), rootNode, true);
+			node.appendChild(rootNode);
+		}
+	}
+
+	/**
+	 * Reads the cells into the graph model. All cells are children of the root
+	 * element in the node.
+	 */
+	public Node beforeDecode(mxCodec dec, Node node, Object into)
+	{
+		if (node instanceof Element)
+		{
+			Element elt = (Element) node;
+			mxGraphModel model = null;
+
+			if (into instanceof mxGraphModel)
+			{
+				model = (mxGraphModel) into;
+			}
+			else
+			{
+				model = new mxGraphModel();
+			}
+
+			// Reads the cells into the graph model. All cells
+			// are children of the root element in the node.
+			Node root = elt.getElementsByTagName("root").item(0);
+			mxICell rootCell = null;
+
+			if (root != null)
+			{
+				Node tmp = root.getFirstChild();
+
+				while (tmp != null)
+				{
+					mxICell cell = dec.decodeCell(tmp, true);
+
+					if (cell != null && cell.getParent() == null)
+					{
+						rootCell = cell;
+					}
+
+					tmp = tmp.getNextSibling();
+				}
+
+				root.getParentNode().removeChild(root);
+			}
+
+			// Sets the root on the model if one has been decoded
+			if (rootCell != null)
+			{
+				model.setRoot(rootCell);
+			}
+		}
+
+		return node;
+	}
+
+}

src/main/java/com/mxgraph/io/mxRootChangeCodec.java

@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) 2006-2013, Gaudenz Alder, David Benson
+ */
+package com.mxgraph.io;
+
+import java.util.Map;
+
+import org.w3c.dom.Node;
+
+import com.mxgraph.model.mxGraphModel.mxRootChange;
+import com.mxgraph.model.mxICell;
+
+/**
+ * Codec for mxChildChanges. This class is created and registered
+ * dynamically at load time and used implicitly via mxCodec
+ * and the mxCodecRegistry.
+ */
+public class mxRootChangeCodec extends mxObjectCodec
+{
+
+	/**
+	 * Constructs a new model codec.
+	 */
+	public mxRootChangeCodec()
+	{
+		this(new mxRootChange(), new String[] { "model", "previous", "root" },
+				null, null);
+	}
+
+	/**
+	 * Constructs a new model codec for the given arguments.
+	 */
+	public mxRootChangeCodec(Object template, String[] exclude,
+			String[] idrefs, Map<String, String> mapping)
+	{
+		super(template, exclude, idrefs, mapping);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mxgraph.io.mxObjectCodec#afterEncode(com.mxgraph.io.mxCodec, java.lang.Object, org.w3c.dom.Node)
+	 */
+	@Override
+	public Node afterEncode(mxCodec enc, Object obj, Node node)
+	{
+		if (obj instanceof mxRootChange)
+		{
+			enc.encodeCell((mxICell) ((mxRootChange) obj).getRoot(), node, true);
+		}
+
+		return node;
+	}
+
+	/**
+	 * Reads the cells into the graph model. All cells are children of the root
+	 * element in the node.
+	 */
+	public Node beforeDecode(mxCodec dec, Node node, Object into)
+	{
+		if (into instanceof mxRootChange)
+		{
+			mxRootChange change = (mxRootChange) into;
+
+			if (node.getFirstChild() != null
+					&& node.getFirstChild().getNodeType() == Node.ELEMENT_NODE)
+			{
+				// Makes sure the original node isn't modified
+				node = node.cloneNode(true);
+
+				Node tmp = node.getFirstChild();
+				change.setRoot(dec.decodeCell(tmp, false));
+
+				Node tmp2 = tmp.getNextSibling();
+				tmp.getParentNode().removeChild(tmp);
+				tmp = tmp2;
+
+				while (tmp != null)
+				{
+					tmp2 = tmp.getNextSibling();
+
+					if (tmp.getNodeType() == Node.ELEMENT_NODE)
+					{
+						dec.decodeCell(tmp, true);
+					}
+
+					tmp.getParentNode().removeChild(tmp);
+					tmp = tmp2;
+				}
+			}
+		}
+
+		return node;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mxgraph.io.mxObjectCodec#afterDecode(com.mxgraph.io.mxCodec, org.w3c.dom.Node, java.lang.Object)
+	 */
+	@Override
+	public Object afterDecode(mxCodec dec, Node node, Object obj)
+	{
+		if (obj instanceof mxRootChange)
+		{
+			mxRootChange change = (mxRootChange) obj;
+			change.setPrevious(change.getRoot());
+		}
+
+		return obj;
+	}
+
+}

src/main/java/com/mxgraph/io/mxStylesheetCodec.java

@@ -0,0 +1,209 @@
+/**
+ * Copyright (c) 2006-2013, JGraph Ltd
+ */
+package com.mxgraph.io;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import com.mxgraph.util.mxUtils;
+import com.mxgraph.view.mxStylesheet;
+
+/**
+ * Codec for mxStylesheets. This class is created and registered
+ * dynamically at load time and used implicitely via mxCodec
+ * and the mxCodecRegistry.
+ */
+public class mxStylesheetCodec extends mxObjectCodec
+{
+
+	/**
+	 * Constructs a new model codec.
+	 */
+	public mxStylesheetCodec()
+	{
+		this(new mxStylesheet());
+	}
+
+	/**
+	 * Constructs a new stylesheet codec for the given template.
+	 */
+	public mxStylesheetCodec(Object template)
+	{
+		this(template, null, null, null);
+	}
+
+	/**
+	 * Constructs a new model codec for the given arguments.
+	 */
+	public mxStylesheetCodec(Object template, String[] exclude,
+			String[] idrefs, Map<String, String> mapping)
+	{
+		super(template, exclude, idrefs, mapping);
+	}
+
+	/**
+	 * Encodes the given mxStylesheet.
+	 */
+	public Node encode(mxCodec enc, Object obj)
+	{
+		Element node = enc.document.createElement(getName());
+
+		if (obj instanceof mxStylesheet)
+		{
+			mxStylesheet stylesheet = (mxStylesheet) obj;
+			Iterator<Map.Entry<String, Map<String, Object>>> it = stylesheet
+					.getStyles().entrySet().iterator();
+
+			while (it.hasNext())
+			{
+				Map.Entry<String, Map<String, Object>> entry = it.next();
+
+				Element styleNode = enc.document.createElement("add");
+				String stylename = entry.getKey();
+				styleNode.setAttribute("as", stylename);
+
+				Map<String, Object> style = entry.getValue();
+				Iterator<Map.Entry<String, Object>> it2 = style.entrySet()
+						.iterator();
+
+				while (it2.hasNext())
+				{
+					Map.Entry<String, Object> entry2 = it2.next();
+					Element entryNode = enc.document.createElement("add");
+					entryNode.setAttribute("as",
+							String.valueOf(entry2.getKey()));
+					entryNode.setAttribute("value", getStringValue(entry2));
+					styleNode.appendChild(entryNode);
+				}
+
+				if (styleNode.getChildNodes().getLength() > 0)
+				{
+					node.appendChild(styleNode);
+				}
+			}
+		}
+
+		return node;
+	}
+
+	/**
+	 * Returns the string for encoding the given value.
+	 */
+	protected String getStringValue(Map.Entry<String, Object> entry)
+	{
+		if (entry.getValue() instanceof Boolean)
+		{
+			return ((Boolean) entry.getValue()) ? "1" : "0";
+		}
+
+		return entry.getValue().toString();
+	}
+
+	/**
+	 * Decodes the given mxStylesheet.
+	 */
+	public Object decode(mxCodec dec, Node node, Object into)
+	{
+		Object obj = null;
+
+		if (node instanceof Element)
+		{
+			String id = ((Element) node).getAttribute("id");
+			obj = dec.objects.get(id);
+
+			if (obj == null)
+			{
+				obj = into;
+
+				if (obj == null)
+				{
+					obj = cloneTemplate(node);
+				}
+
+				if (id != null && id.length() > 0)
+				{
+					dec.putObject(id, obj);
+				}
+			}
+
+			node = node.getFirstChild();
+
+			while (node != null)
+			{
+				if (!processInclude(dec, node, obj)
+						&& node.getNodeName().equals("add")
+						&& node instanceof Element)
+				{
+					String as = ((Element) node).getAttribute("as");
+
+					if (as != null && as.length() > 0)
+					{
+						String extend = ((Element) node).getAttribute("extend");
+						Map<String, Object> style = (extend != null) ? ((mxStylesheet) obj)
+								.getStyles().get(extend) : null;
+
+						if (style == null)
+						{
+							style = new Hashtable<String, Object>();
+						}
+						else
+						{
+							style = new Hashtable<String, Object>(style);
+						}
+
+						Node entry = node.getFirstChild();
+
+						while (entry != null)
+						{
+							if (entry instanceof Element)
+							{
+								Element entryElement = (Element) entry;
+								String key = entryElement.getAttribute("as");
+
+								if (entry.getNodeName().equals("add"))
+								{
+									String text = entry.getTextContent();
+									Object value = null;
+
+									if (text != null && text.length() > 0)
+									{
+										value = mxUtils.eval(text);
+									}
+									else
+									{
+										value = entryElement
+												.getAttribute("value");
+
+									}
+
+									if (value != null)
+									{
+										style.put(key, value);
+									}
+								}
+								else if (entry.getNodeName().equals("remove"))
+								{
+									style.remove(key);
+								}
+							}
+
+							entry = entry.getNextSibling();
+						}
+
+						((mxStylesheet) obj).putCellStyle(as, style);
+					}
+				}
+
+				node = node.getNextSibling();
+			}
+		}
+
+		return obj;
+	}
+
+}

src/main/java/com/mxgraph/io/mxTerminalChangeCodec.java

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2006, Gaudenz Alder
+ */
+package com.mxgraph.io;
+
+import java.util.Map;
+
+import org.w3c.dom.Node;
+
+import com.mxgraph.model.mxGraphModel.mxTerminalChange;
+
+/**
+ * Codec for mxChildChanges. This class is created and registered
+ * dynamically at load time and used implicitely via mxCodec
+ * and the mxCodecRegistry.
+ */
+public class mxTerminalChangeCodec extends mxObjectCodec
+{
+
+	/**
+	 * Constructs a new model codec.
+	 */
+	public mxTerminalChangeCodec()
+	{
+		this(new mxTerminalChange(), new String[] { "model", "previous" },
+				new String[] { "cell", "terminal" }, null);
+	}
+
+	/**
+	 * Constructs a new model codec for the given arguments.
+	 */
+	public mxTerminalChangeCodec(Object template, String[] exclude,
+			String[] idrefs, Map<String, String> mapping)
+	{
+		super(template, exclude, idrefs, mapping);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mxgraph.io.mxObjectCodec#afterDecode(com.mxgraph.io.mxCodec, org.w3c.dom.Node, java.lang.Object)
+	 */
+	@Override
+	public Object afterDecode(mxCodec dec, Node node, Object obj)
+	{
+		if (obj instanceof mxTerminalChange)
+		{
+			mxTerminalChange change = (mxTerminalChange) obj;
+
+			change.setPrevious(change.getTerminal());
+		}
+
+		return obj;
+	}
+
+}

src/main/webapp/index.html

@@ -249,19 +249,19 @@
 			
 			// Used to request draw.io sources in dev mode
 			var drawDevUrl = document.location.protocol + '//devhost.jgraph.com/drawio/src/main/webapp/';
+			var geBasePath = mxDevUrl + '/grapheditor';
+			var mxBasePath = mxDevUrl + '/mxgraph';
 			
 			if (document.location.protocol == 'file:')
 			{
-				mxDevUrl = '..';
 				drawDevUrl = './';
+				geBasePath = '../grapheditor';
+				mxBasePath = './mxgraph';
 				
 				// Forces includes for dev environment in node.js
 				mxForceIncludes = true;
 			}
 
-			var geBasePath = mxDevUrl + '/grapheditor';
-			var mxBasePath = mxDevUrl + '/mxgraph';
-			
 			mxscript(drawDevUrl + 'js/PreConfig.js');
 			mxscript(drawDevUrl + 'js/diagramly/Init.js');
 			mxscript(geBasePath + '/Init.js');

src/main/webapp/js/diagramly/App.js

@@ -610,7 +610,7 @@ App.main = function(callback, createUi)
 			{
 				var content = mxUtils.getTextContent(scripts[0]);
 				
-				if (CryptoJS.MD5(content).toString() != '215b173a7ec45a4a27e9aab38b696665')
+				if (CryptoJS.MD5(content).toString() != '7ec5b116e26db60a0939c154aef4254a')
 				{
 					console.log('Change bootstrap script MD5 in the previous line:', CryptoJS.MD5(content).toString());
 					alert('[Dev] Bootstrap script change requires update of CSP');

src/main/webapp/js/diagramly/Devel.js

@@ -19,6 +19,8 @@ if (!mxIsElectron && location.protocol !== 'http:')
 				//----------------------------------------------------------//
 				//------------- Bootstrap script in index.html -------------//
 				//----------------------------------------------------------//
+				// Version 14.0.2
+				'\'sha256-gCA3yqbX5kV5cXQOyvSd4v54e8cOLCBlaKU4tuhJF3Y=\' ' +
 				// Version 14.0.1
 				'\'sha256-ZMnCMK9Jg5ijd0Viqw4KAFn39HeC1LrVwervb9uC7Mo=\' ' +
 				// Version 14.0.0
@@ -152,6 +154,7 @@ mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Flowchart.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-FluidPower.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-GCP.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-GCP2.js');
+mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-General.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Gmdl.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-IBM.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Infographic.js');

src/main/webapp/js/diagramly/Extensions.js

@@ -82,6 +82,7 @@ LucidImporter = {};
 			'HotspotBlock': 'strokeColor=none;fillColor=none',
 			'ImageSearchBlock2': 'shape=image',
 			'UserImage2Block': 'shape=image',
+			'ExtShapeBoxBlock': '',
 //Flowchart
 			'ProcessBlock': '',
 			'DecisionBlock': 'rhombus',
@@ -5119,7 +5120,7 @@ LucidImporter = {};
 			
 			// Fixes the case for horizontal swimlanes where we use horizontal=0
 			// and Lucid uses rotation
-			if (deg != 0 && ((action.Class == 'UMLSwimLaneBlockV2') || ((action.Class.indexOf('Rotated') >= 0 || deg == -90 || deg == 270) && (action.Class.indexOf('Pool') >= 0 || action.Class.indexOf('SwimLane') >= 0))))
+			if (deg != 0 && action.Class && ((action.Class == 'UMLSwimLaneBlockV2') || ((action.Class.indexOf('Rotated') >= 0 || deg == -90 || deg == 270) && (action.Class.indexOf('Pool') >= 0 || action.Class.indexOf('SwimLane') >= 0))))
 			{
 				deg += 90;
 				cell.geometry.rotate90();

src/main/webapp/js/diagramly/Menus.js

@@ -1837,7 +1837,7 @@
 						editorUi.spinner.stop();
 						
 						var dlg = new EmbedDialog(editorUi, editorUi.createLink(linkTarget, linkColor,
-							allPages, lightbox, editLink, layers, url, null, null, true));
+							allPages, lightbox, editLink, layers, url, null, ['border=0'], true));
 						editorUi.showDialog(dlg.container, 440, 240, true, true);
 						dlg.init();
 					});

src/main/webapp/js/diagramly/sidebar/Sidebar.js

@@ -79,6 +79,8 @@
 							  'Database', 'End User Computing', 'Developer Tools', 'Game Tech', 'Internet of Things', 'IoT Things', 'IoT Resources', 'Machine Learning', 'Management Governance',
 							  'Media Services', 'Migration Transfer', 'Mobile', 'Network Content Delivery', 'Quantum Technologies', 'Robotics', 'Satellite', 'Security Identity Compliance', 'Storage'];
 
+	Sidebar.prototype.general = ['General', 'Advanced', 'Misc'];
+
 	Sidebar.prototype.office = ['Clouds', 'Communications', 'Concepts', 'Databases', 'Devices', 'Security', 'Servers', 'Services', 'Sites', 'Users'];
 
 	Sidebar.prototype.veeam = ['Data Center', 'Misc', 'Software', 'Storage', 'UsersStatus', 'VASComponents', 'Backup Replication', 'Products', 'VMs and Tape', '2D', '3D'];
@@ -109,7 +111,10 @@
 	/**
 	 *
 	 */
-	Sidebar.prototype.configuration = [{id: 'general', libs: ['general', 'misc', 'advanced']}, {id: 'uml'}, {id: 'search'}, {id: 'er'},
+	Sidebar.prototype.configuration = [
+//									   {id: 'general', libs: ['general', 'misc', 'advanced']}, 
+									   {id: 'general', prefix: 'general', libs: Sidebar.prototype.general},
+									   {id: 'uml'}, {id: 'search'}, {id: 'er'},
 									   {id: 'azure2', prefix: 'azure2', libs: ['AI Machine Learning', 'Analytics', 'App Services', 'Azure Stack', 'Azure VMware Solution', 'Blockchain', 'Compute', 'Containers', 'CXP', 'Databases', 'DevOps', 'General', 'Identity', 'Integration', 'Internet of Things', 'Intune', 'IoT', 'Management Governance', 'Migrate', 'Mixed Reality', 'Monitor', 'Networking', 'Other', 'Preview', 'Security', 'Storage', 'Web']},
 	                                   {id: 'ios', prefix: 'ios', libs: [''/*prefix is library*/, '7icons', '7ui']}, 
 	                                   {id: 'android', prefix: 'android', libs: [''/*prefix is library*/]}, {id: 'aws3d'},
@@ -454,7 +459,8 @@
 		// Defines all entries for the sidebar. This is used in the MoreShapes dialog. Create screenshots using the savesidebar URL parameter and
 		// http://www.alderg.com/merge.html for creating a vertical stack of PNG images if multiple sidebars are part of an entry.
 		this.entries = [{title: mxResources.get('standard'),
-            			entries: [{title: mxResources.get('general'), id: 'general', image: IMAGE_PATH + '/sidebar-general.png'},
+            			entries: [
+            					  {title: mxResources.get('general'), id: 'general', image: IMAGE_PATH + '/sidebar-general.png'},
             			          {title: mxResources.get('basic'), id: 'basic', image: IMAGE_PATH + '/sidebar-basic.png'},
             			          {title: mxResources.get('arrows'), id: 'arrows2', image: IMAGE_PATH + '/sidebar-arrows2.png'},
             			          {title: mxResources.get('clipart'), id: 'clipart', image: IMAGE_PATH + '/sidebar-clipart.png'},
@@ -1030,9 +1036,7 @@
 			}
 		}
 		
-		this.addGeneralPalette(this.customEntries == null);
-		this.addMiscPalette(false);
-		this.addAdvancedPalette(false);
+		this.addGeneralPalette();
 		this.addBasicPalette();
 		this.addStencilPalette('arrows', mxResources.get('arrows'), dir + '/arrows.xml',
 				';html=1;' + mxConstants.STYLE_VERTICAL_LABEL_POSITION + '=bottom;' + mxConstants.STYLE_VERTICAL_ALIGN + '=top;' + mxConstants.STYLE_STROKEWIDTH + '=2;strokeColor=#000000;',

src/main/webapp/resources/dia.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_am.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ar.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_bg.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_bn.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_bs.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ca.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_cs.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_da.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_el.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_eo.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_es.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_et.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_eu.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_fa.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_fi.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_fil.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_fr.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_gl.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_gu.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_he.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_hi.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_hr.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_hu.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_id.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_it.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ja.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_kn.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ko.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_lt.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_lv.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ml.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_mr.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ms.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_my.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_nl.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_no.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_pl.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_pt-br.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_pt.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ro.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ru.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_si.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_sk.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_sl.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_sr.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_sv.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_sw.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_ta.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_te.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_th.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_tr.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_uk.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_vi.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_zh-tw.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/resources/dia_zh.txt

@@ -1071,7 +1071,7 @@ diagUrl=Diagram URL
 showDiag=Show Diagram
 diagPreview=Diagram Preview
 csvFileUrl=CSV File URL
-generate=
+generate=Generate
 selectDiag2Insert=Please select a diagram to insert it.
 errShowingDiag=Unexpected error. Cannot show diagram
 noRecentDiags=No recent diagrams found

src/main/webapp/service-worker.js

@@ -6,11 +6,11 @@ if (workbox)
 	workbox.precaching.precacheAndRoute([
   {
     "url": "js/app.min.js",
-    "revision": "a910759041a203b2a6d19b7bc9da3b09"
+    "revision": "61d231a672b8c271a0ef6bc85ce70bf4"
   },
   {
     "url": "js/extensions.min.js",
-    "revision": "381bc2dd0a645122ea0c4aa7f9a8be27"
+    "revision": "521912d0a99ae4b3bbc41951933feaab"
   },
   {
     "url": "js/stencils.min.js",
@@ -26,7 +26,7 @@ if (workbox)
   },
   {
     "url": "index.html",
-    "revision": "c540e127498dbd3f828d71b206ffefe2"
+    "revision": "0d230ea924531724d0f5cd5f7c645993"
   },
   {
     "url": "open.html",
@@ -58,7 +58,7 @@ if (workbox)
   },
   {
     "url": "js/viewer-static.min.js",
-    "revision": "4bed2100741e0b11e44ac4a87ecf77e8"
+    "revision": "6a5b7c33e5c10a125ef2d8ea073d4dcf"
   },
   {
     "url": "connect/jira/editor-1-3-3.html",
@@ -234,39 +234,39 @@ if (workbox)
   },
   {
     "url": "resources/dia.txt",
-    "revision": "a95c98c307f11594448558c5e8df5763"
+    "revision": "8f69219c45dae79aba8f3c74f6e6513f"
   },
   {
     "url": "resources/dia_am.txt",
-    "revision": "f78de26314c458a3ac9f1f9c8dcfdfae"
+    "revision": "8fcafd92ca4fd7ce46c75a8d890cefef"
   },
   {
     "url": "resources/dia_ar.txt",
-    "revision": "925228735fd3a14d98c26ec419463548"
+    "revision": "ac572c22e5c53204e545d94c3fc5c2bd"
   },
   {
     "url": "resources/dia_bg.txt",
-    "revision": "c7018616fce9d9bd6b8d1eb0837d761c"
+    "revision": "18b460c85ca598cdf39f57d8fd6a6bfb"
   },
   {
     "url": "resources/dia_bn.txt",
-    "revision": "5a0a99df77e255f64ce48175791425da"
+    "revision": "f95e2752e5a76c461ae643dcc6247d27"
   },
   {
     "url": "resources/dia_bs.txt",
-    "revision": "6b46cfc626af3aa58b3a9759f5237c41"
+    "revision": "5871ee838bf6ad5d2e8d7f2a1888ce08"
   },
   {
     "url": "resources/dia_ca.txt",
-    "revision": "cb9dd2e0a4859a779d0f7ba6157f37e9"
+    "revision": "a1b680a782d23e6ec1333c1320c73628"
   },
   {
     "url": "resources/dia_cs.txt",
-    "revision": "b441f4c304bb43f1fd5b3a5e95390c1d"
+    "revision": "114a9c659d9aabe41ff560fe12c1d665"
   },
   {
     "url": "resources/dia_da.txt",
-    "revision": "82d839b04694ebe0881f7bf0cd394ae0"
+    "revision": "fc0fe232d0a8a00d5321be7b7b8c36fc"
   },
   {
     "url": "resources/dia_de.txt",
@@ -274,191 +274,191 @@ if (workbox)
   },
   {
     "url": "resources/dia_el.txt",
-    "revision": "f034d30d71fd79edff3a7a9083221297"
+    "revision": "9b917b2f9a4c6a61147b9642e22dea05"
   },
   {
     "url": "resources/dia_eo.txt",
-    "revision": "15029d4bf866c97a30c6ba82d74cc982"
+    "revision": "b708b8a4c53fd97c841607da962380ed"
   },
   {
     "url": "resources/dia_es.txt",
-    "revision": "754338cbf8fa112aa62d84f8f9601268"
+    "revision": "96ebc09ad9ff72d39ac88676010b2839"
   },
   {
     "url": "resources/dia_et.txt",
-    "revision": "624c3362fdeb19a89af69fcd3d2c32c3"
+    "revision": "590cdfed5b7c40e68d4b2dbcbfa0287e"
   },
   {
     "url": "resources/dia_eu.txt",
-    "revision": "f9f0a0eacff8e2ea0cc4d8941fbf5080"
+    "revision": "d50548870690902740dd44c0b847982d"
   },
   {
     "url": "resources/dia_fa.txt",
-    "revision": "086793dcbd435c7dd283c38d1589190c"
+    "revision": "4839a903fd0c39d7a2da6aaed33bf789"
   },
   {
     "url": "resources/dia_fi.txt",
-    "revision": "2a642b81a44730a158836454ce57e076"
+    "revision": "124b28e12501ac04c18d78d3327499f6"
   },
   {
     "url": "resources/dia_fil.txt",
-    "revision": "c672a11650c1e00da66e58bf049ee94a"
+    "revision": "69b1d4ddfc6ef3bf26dc58af320c3baa"
   },
   {
     "url": "resources/dia_fr.txt",
-    "revision": "ff5fd39114a79ee480df1b352b5fe631"
+    "revision": "1b124dfb0f61ac2f38533596b5156ced"
   },
   {
     "url": "resources/dia_gl.txt",
-    "revision": "e401d8dce5c6e2f0c8e3d7c467b61772"
+    "revision": "d9046507bfcb71bb5f75a035d6a70ce7"
   },
   {
     "url": "resources/dia_gu.txt",
-    "revision": "fa00aa6a9d56ca6b97d8603de0bd7e17"
+    "revision": "4e99f6ab7b2f58ed56ca486b7a959ac8"
   },
   {
     "url": "resources/dia_he.txt",
-    "revision": "724447e9cf78fe53606233c8c56427ea"
+    "revision": "a769cc1e8a1bd321b318b6f16c5e7d21"
   },
   {
     "url": "resources/dia_hi.txt",
-    "revision": "79d637ae06b4fbc91b20d0ce3ed97c1f"
+    "revision": "84a7a4d6570e4ed3a5832663a409e7de"
   },
   {
     "url": "resources/dia_hr.txt",
-    "revision": "c98fa89b8da637b77e17b5d5aebf64b4"
+    "revision": "01d90b53063d751beedd4f8c9fa52a7f"
   },
   {
     "url": "resources/dia_hu.txt",
-    "revision": "df9124b5f8d69d57955afcb37ba77596"
+    "revision": "5a9f40eca7e2be0fb43c8dd4a4e9fb17"
   },
   {
     "url": "resources/dia_id.txt",
-    "revision": "c31143b7a74b3027512b813c3dfb87c0"
+    "revision": "5ed8ac4a22808ce282b1c29593979ab1"
   },
   {
     "url": "resources/dia_it.txt",
-    "revision": "980103dc0e777c77e5cf8cb1e1492121"
+    "revision": "e63e1dabb64dba1ee81b476f3eebe811"
   },
   {
     "url": "resources/dia_ja.txt",
-    "revision": "7df9fdb2e949a997debf48b0f8894ad2"
+    "revision": "00e72975209f73ce276dfd7b0ea67439"
   },
   {
     "url": "resources/dia_kn.txt",
-    "revision": "355f8e2592c8a47c8dc2fe636cb2ab26"
+    "revision": "d91afcaa8d86b2d2f4b2a97663b78882"
   },
   {
     "url": "resources/dia_ko.txt",
-    "revision": "6ec5ea1397be947e618c93a85aa14aef"
+    "revision": "8b13aa1c79408761b9d00ab62642cdf5"
   },
   {
     "url": "resources/dia_lt.txt",
-    "revision": "ce387f112fbc3721b6efa0ae4cc32364"
+    "revision": "2cba7d31cef3e35a48585929a41e055c"
   },
   {
     "url": "resources/dia_lv.txt",
-    "revision": "97a2b4cd7d3f5376e6f3f08595c88086"
+    "revision": "128984149ef57f1fceabfdd7734f0adc"
   },
   {
     "url": "resources/dia_ml.txt",
-    "revision": "c73787de7e331808228dd01072db2051"
+    "revision": "cdc579b42679a63324786e1415134828"
   },
   {
     "url": "resources/dia_mr.txt",
-    "revision": "8d5a3c89c33551f098f491b6dca9f9ba"
+    "revision": "03434ce0cef6316448144b00607dbdc4"
   },
   {
     "url": "resources/dia_ms.txt",
-    "revision": "a58f6e0df875901ee4caa693c73173c0"
+    "revision": "e79d0ef3382465dfd4a222253c1e6960"
   },
   {
     "url": "resources/dia_my.txt",
-    "revision": "a95c98c307f11594448558c5e8df5763"
+    "revision": "8f69219c45dae79aba8f3c74f6e6513f"
   },
   {
     "url": "resources/dia_nl.txt",
-    "revision": "ae4dc35bbc244e467266fdfa507cec11"
+    "revision": "a19417df08fb6630869f38f6cf054fa3"
   },
   {
     "url": "resources/dia_no.txt",
-    "revision": "d7d8a03f4fb71242be03411bcbbc0ddb"
+    "revision": "14681d51c2b310150e20f13d869a0777"
   },
   {
     "url": "resources/dia_pl.txt",
-    "revision": "f4948f04032f8e8a0805126d859bdccf"
+    "revision": "6893f874646899067baeeb6a833c7d9c"
   },
   {
     "url": "resources/dia_pt-br.txt",
-    "revision": "60686f9fe926e6c5a7fd617e3ddf43ce"
+    "revision": "a2b80d029ae4549beb71c92115232618"
   },
   {
     "url": "resources/dia_pt.txt",
-    "revision": "b5573e4f2edb8f274175de7e8e69ea20"
+    "revision": "b6fa7b9c041168cf29af7929e3910fa7"
   },
   {
     "url": "resources/dia_ro.txt",
-    "revision": "52d0115cfb6c4f88f07cfaa3594ac605"
+    "revision": "4d5cd22faf78897c437c6e8c731883c9"
   },
   {
     "url": "resources/dia_ru.txt",
-    "revision": "fc8ba64c382445c31a7757e3406fc19f"
+    "revision": "c140e9c4f64e433b66e81d98b4c44e15"
   },
   {
     "url": "resources/dia_si.txt",
-    "revision": "a95c98c307f11594448558c5e8df5763"
+    "revision": "8f69219c45dae79aba8f3c74f6e6513f"
   },
   {
     "url": "resources/dia_sk.txt",
-    "revision": "47ef313bd2fbb967bd6af1351ea365d6"
+    "revision": "ebe5de01a714397dcfb168ab1ff423de"
   },
   {
     "url": "resources/dia_sl.txt",
-    "revision": "eaa415f455ae004efebb3d4d7d53e068"
+    "revision": "030ec83c580d23344286a5b850ca7f52"
   },
   {
     "url": "resources/dia_sr.txt",
-    "revision": "c4aa45d8f068d7c84bcc731f5365cdd0"
+    "revision": "07691143eef799e6cba14037efeec6b0"
   },
   {
     "url": "resources/dia_sv.txt",
-    "revision": "cad51fff8b9bc129813bed81b3559593"
+    "revision": "f668b2ce8439858fdf065063ab9ad704"
   },
   {
     "url": "resources/dia_sw.txt",
-    "revision": "f9396f256b95faa9e4f47d97cf046fe4"
+    "revision": "738b771953dbb60fb591868944684d1e"
   },
   {
     "url": "resources/dia_ta.txt",
-    "revision": "5c0878a78e5f192c903639e8be234d0f"
+    "revision": "48e4e2d4a0dbbcf800ff18de40c6c10f"
   },
   {
     "url": "resources/dia_te.txt",
-    "revision": "a8f3172033814d33a98b28d07e481d41"
+    "revision": "54eee5e1c1b162413528cb4b5cd50b7e"
   },
   {
     "url": "resources/dia_th.txt",
-    "revision": "8d5f01a0c3deba4513edcb2d6b99b61c"
+    "revision": "ddf78da2f04359e60092f61a21461866"
   },
   {
     "url": "resources/dia_tr.txt",
-    "revision": "56cf92a42c7e80ec8e5fa2b85137ade3"
+    "revision": "cdf138005f7c6839edf11b7890d47bdc"
   },
   {
     "url": "resources/dia_uk.txt",
-    "revision": "cd5d3bc9178fa28a0b116a7edce020c9"
+    "revision": "12f12bf3d1fb6b7227f94cac7b91a83a"
   },
   {
     "url": "resources/dia_vi.txt",
-    "revision": "4f9fdc22d48c6e0cd0259a561384f4af"
+    "revision": "8e7ca1e99ecaaacece3df7a557ffd021"
   },
   {
     "url": "resources/dia_zh-tw.txt",
-    "revision": "992bd40767c5573693081eb5b59a99c4"
+    "revision": "11577eaba44af8217de73aa9a7314370"
   },
   {
     "url": "resources/dia_zh.txt",
-    "revision": "d7f0a7b5415df7aabc47d568a00ce312"
+    "revision": "2367ca64c09e909a80c0eba1b8c13eec"
   },
   {
     "url": "favicon.ico",