[JPP-Devel] SVN: [4560] core/trunk/src

[<jum...@li...>]

Revision: 4560
          http://sourceforge.net/p/jump-pilot/code/4560
Author:   michaudm
Date:     2015-12-03 22:33:08 +0000 (Thu, 03 Dec 2015)
Log Message:
-----------
Fix bug and improve compatibility between SLD and ColorThemingStyle

Modified Paths:
--------------
    core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/XBasicStyle.java
    core/trunk/src/org/openjump/util/CustomTexturePaint.java
    core/trunk/src/org/openjump/util/SLDImporter.java

Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/XBasicStyle.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/XBasicStyle.java	2015-12-03 17:56:51 UTC (rev 4559)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/XBasicStyle.java	2015-12-03 22:33:08 UTC (rev 4560)
@@ -13,7 +13,7 @@
  */
 public class XBasicStyle extends BasicStyle {
 
-    VertexStyle vertexStyle;
+    VertexStyle vertexStyle = new SquareVertexStyle();
 
     public XBasicStyle() {} // for java2xml
 

Modified: core/trunk/src/org/openjump/util/CustomTexturePaint.java
===================================================================
--- core/trunk/src/org/openjump/util/CustomTexturePaint.java	2015-12-03 17:56:51 UTC (rev 4559)
+++ core/trunk/src/org/openjump/util/CustomTexturePaint.java	2015-12-03 22:33:08 UTC (rev 4560)
@@ -38,6 +38,8 @@
 
 package org.openjump.util;
 
+import org.apache.log4j.Logger;
+
 import static com.vividsolutions.jump.I18N.get;
 import static com.vividsolutions.jump.I18N.getMessage;
 import static java.awt.Color.black;
@@ -70,6 +72,8 @@
  */
 public class CustomTexturePaint implements Paint {
 
+    private static final Logger LOG = Logger.getLogger(CustomTexturePaint.class);
+
     private TexturePaint texturePaint;
 
     private URL url;
@@ -99,6 +103,13 @@
             setUrl(url.toExternalForm());
         } catch (IOException e) {
             // ignore IOs
+            LOG.error("Could not load texture from URL '" + url + "'", e);
+            BufferedImage img = new BufferedImage(300, 20, TYPE_INT_ARGB);
+            Graphics g = img.getGraphics();
+            g.setColor(black);
+            g.drawString(get("org.openjump.util.CustomTexturePaint.no-image-chosen"), 25, 10);
+            g.dispose();
+            texturePaint = new TexturePaint(img, new Rectangle2D.Float(0, 0, img.getWidth(), img.getHeight()));
         }
     }
 

Modified: core/trunk/src/org/openjump/util/SLDImporter.java
===================================================================
--- core/trunk/src/org/openjump/util/SLDImporter.java	2015-12-03 17:56:51 UTC (rev 4559)
+++ core/trunk/src/org/openjump/util/SLDImporter.java	2015-12-03 22:33:08 UTC (rev 4560)
@@ -61,17 +61,12 @@
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.xpath.XPathExpressionException;
 
+import com.vividsolutions.jump.workbench.ui.renderer.style.*;
 import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import com.vividsolutions.jump.util.Range;
-import com.vividsolutions.jump.workbench.ui.renderer.style.BasicStyle;
-import com.vividsolutions.jump.workbench.ui.renderer.style.ColorThemingStyle;
-import com.vividsolutions.jump.workbench.ui.renderer.style.LabelStyle;
-import com.vividsolutions.jump.workbench.ui.renderer.style.SquareVertexStyle;
-import com.vividsolutions.jump.workbench.ui.renderer.style.Style;
-import com.vividsolutions.jump.workbench.ui.renderer.style.VertexStyle;
 
 import de.latlon.deejump.plugin.style.BitmapVertexStyle;
 import de.latlon.deejump.plugin.style.CircleVertexStyle;
@@ -287,13 +282,13 @@
      * @param rule
      * @return a corresponding BasicStyle
      */
-    public static BasicStyle getBasicStyle(Element rule) {
+    public static XBasicStyle getBasicStyle(Element rule) {
         if (rule == null) {
             return null;
         }
 
         try {
-            BasicStyle style = new BasicStyle();
+            XBasicStyle style = new XBasicStyle();
             style.setRenderingFill(false);
             style.setRenderingFillPattern(false);
             style.setRenderingLine(false);