Changeset 14361 in josm

Timestamp:

2018-10-25T22:03:02+02:00 (6 years ago)

Author:

Don-vip

Message:

see #14319, see #16838 - fix another NPE / regression from svgSalamander 1.1.2 (causing unit test failure in DXF plugin)

see ​https://github.com/blackears/svgSalamander/pull/34

File:

• trunk/src/com/kitfox/svg/Tspan.java (modified) (12 diffs)

trunk/src/com/kitfox/svg/Tspan.java

@@ -4 +4 @@
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or 
+ * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  *
- *   - Redistributions of source code must retain the above 
+ *   - Redistributions of source code must retain the above
  *     copyright notice, this list of conditions and the following
  *     disclaimer.
  *   - Redistributions in binary form must reproduce the above
  *     copyright notice, this list of conditions and the following
- *     disclaimer in the documentation and/or other materials 
+ *     disclaimer in the documentation and/or other materials
  *     provided with the distribution.
  *
@@ -27 +27 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- * 
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
  * projects can be found at http://www.kitfox.com
@@ -36 +36 @@
 package com.kitfox.svg;
 
-import com.kitfox.svg.util.FontSystem;
-import com.kitfox.svg.xml.StyleAttribute;
 import java.awt.Graphics2D;
 import java.awt.Shape;
@@ -45 +43 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
+
+import com.kitfox.svg.util.FontSystem;
+import com.kitfox.svg.xml.StyleAttribute;
 
 /**
@@ -229 +230 @@
         //Get font
         Font font = diagram.getUniverse().getFont(fontFamily);
-        if (font == null)
+        if (font == null && fontFamily != null)
         {
             font = FontSystem.createFont(fontFamily, fontStyle, fontWeight, (int)fontSize);
@@ -243 +244 @@
         float cursorX = (float)cursor.getX();
         float cursorY = (float)cursor.getY();
-    
+
         String drawText = this.text;
         drawText = drawText.trim();
@@ -255 +256 @@
                 cursorX += dx[i];
             }
-            
+
             if (y != null && i < y.length)
             {
@@ -263 +264 @@
                 cursorY += dy[i];
             }
-            
+
             xform.setToIdentity();
             xform.setToTranslation(cursorX, cursorY);
@@ -322 +323 @@
 //            }
 ////            i++;
-//            
+//
 //            xform.setToIdentity();
 //            xform.setToTranslation(cursorX, cursorY);
@@ -342 +343 @@
 //            cursorX += glyphMetrics.getAdvance() + letterSpacing;
 //        }
-//        
+//
 //        cursor.setLocation(cursorX, cursorY);
 //    }
@@ -351 +352 @@
         float cursorX = 0;
         float cursorY = 0;
-    
+
         if (x != null)
         {
@@ -439 +440 @@
         float cursorX = 0;
         float cursorY = 0;
-    
+
         FontRenderContext frc = g.getFontRenderContext();