Fixes gradient NPEs and fixes duplicate fill entries

Author: egrimate

src/com/mxgraph/svg2xml/Svg2Xml.java

@@ -500,7 +500,12 @@ else if (aspectRatio.toLowerCase().equals("variable"))
 						//16. compare the new style with the old one, and add the differences to the XML
 						styleDiff = getStyleDiff(oldStyle, currStyle);
 					}
-
+					
+//					if (currStyle.getStrokeColor() == "")
+//					{
+//						currStyle.setStrokeColor("none");
+//					}
+					
 					appendStyle(destDoc.getElementsByTagName("foreground").item(0), styleDiff, destConfigDoc, nextElement);
 
 					//18. translate the SVG element into XML
@@ -667,11 +672,11 @@ static String getStrokeString(XmlStyle currStyle)
 		String fc = currStyle.getFillColor();
 		String sc = currStyle.getStrokeColor();
 
-		if (!fc.equals("none") && !sc.equals("none"))
+		if (!fc.equals("none") && !sc.equals("none") && !sc.equals(""))
 		{
 			return "fillstroke";
 		}
-		else if (!fc.equals("none") && sc.equals("none"))
+		else if (!fc.equals("none"))
 		{
 			return "fill";
 		}
@@ -1386,7 +1391,10 @@ private Map<String, String> parseFillDefs(Node root)
 						if (currEl.getNodeName().equals("linearGradient") || currEl.getNodeName().equals("radialGradient"))
 						{
 							String avgColor = getAvgGradientColor(currEl); 
-							fillTable.put(currEl.getAttribute("id"), avgColor);
+							if (avgColor != null)
+							{
+								fillTable.put(currEl.getAttribute("id"), avgColor);
+							}
 						}
 
 						fillTable.putAll(parseFillDefs(currChild));
@@ -1422,7 +1430,10 @@ private Map<String, String> parseStrokeDefs(Node root)
 						if (currEl.getNodeName().equals("linearGradient") || currEl.getNodeName().equals("radialGradient"))
 						{
 							String avgColor = getAvgGradientColor(currEl); 
-							strokeTable.put(currEl.getAttribute("id"), avgColor);
+							if (avgColor != null)
+							{
+								strokeTable.put(currEl.getAttribute("id"), avgColor);
+							}
 						}
 
 						strokeTable.putAll(parseStrokeDefs(currChild));
@@ -1462,13 +1473,13 @@ private String getAvgGradientColor(Element element)
 						Color col = new Color(0, 0, 0);
 						String colS = currEl.getAttribute("stop-color");
 
-						if (colS.charAt(0) == '#')
+						if (colS == null || colS.equals("")) 
 						{
-							col = Color.decode(colS);
+							return null;
 						}
-						else if (colS == null || colS.equals("")) 
+						else if (colS.charAt(0) == '#')
 						{
-							return null;
+							col = Color.decode(colS);
 						}
 						else 
 						{

src/com/mxgraph/svg2xml/XmlStyle.java

@@ -109,6 +109,14 @@ public void setStrokeWidth(String strokeWidth)
 	{
 		if(strokeWidth != null)
 		{
+			strokeWidth = strokeWidth.replaceAll("mm", "");
+			strokeWidth = strokeWidth.replaceAll("pc", "");
+			strokeWidth = strokeWidth.replaceAll("pt", "");
+			strokeWidth = strokeWidth.replaceAll("in", "");
+			strokeWidth = strokeWidth.replaceAll("cm", "");
+			strokeWidth = strokeWidth.replaceAll("px", "");
+			strokeWidth = strokeWidth.replaceAll("%", "");
+			strokeWidth = strokeWidth.replaceAll("\\s","");
 			this.strokeWidth = strokeWidth;
 		}
 	}