Changeset 3825 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2011-01-27T21:36:30+01:00 (13 years ago)

Author:

bastiK

Message:

move some code

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyles.java (modified) (8 diffs)
• MapPaintStyles.java (modified) (2 diffs)
• xml/XmlStyleSource.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java ) (5 diffs)
• xml/XmlStyleSourceHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -20 +18 @@
 import org.openstreetmap.josm.gui.mappaint.xml.LinePrototype;
 import org.openstreetmap.josm.gui.mappaint.xml.LinemodPrototype;
-import org.openstreetmap.josm.gui.mappaint.xml.Prototype;
+import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
 import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.Predicate;
 
 public class ElemStyles {
-    private List<StyleSource> styleSources;
+    private List<XmlStyleSource> styleSources;
 
     public ElemStyles()
     {
-        styleSources = new ArrayList<StyleSource>();
+        styleSources = new ArrayList<XmlStyleSource>();
     }
 
-    public void add(StyleSource style) {
+    public void add(XmlStyleSource style) {
         styleSources.add(style);
     }
 
-    public Collection<StyleSource> getStyleSources() {
-        return new FilteredCollection<StyleSource>(styleSources, new Predicate<StyleSource>() {
+    public Collection<XmlStyleSource> getStyleSources() {
+        return new FilteredCollection<XmlStyleSource>(styleSources, new Predicate<XmlStyleSource>() {
 
             String name = Main.pref.get("mappaint.style", "standard");
 
             @Override
-            public boolean evaluate(StyleSource s) {
+            public boolean evaluate(XmlStyleSource s) {
                 return equal(s.getPrefName(), name);
             }
@@ -50 +48 @@
 
     public static class WayPrototypesRecord {
-        LinePrototype line;
-        List<LinemodPrototype> linemods;
-        AreaPrototype area;
+        public LinePrototype line;
+        public List<LinemodPrototype> linemods;
+        public AreaPrototype area;
 
         public List<ElemStyle> createStyles() {
@@ -97 +95 @@
     public IconPrototype getNode(OsmPrimitive osm) {
         IconPrototype icon = null;
-        for (StyleSource s : getStyleSources()) {
+        for (XmlStyleSource s : getStyleSources()) {
             icon = s.getNode(osm, icon);
         }
@@ -105 +103 @@
     private WayPrototypesRecord get(OsmPrimitive osm, boolean forceArea) {
         WayPrototypesRecord p = new WayPrototypesRecord();
-        for (StyleSource s : getStyleSources()) {
+        for (XmlStyleSource s : getStyleSources()) {
             s.get(osm, forceArea || !(osm instanceof Way) || ((Way) osm).isClosed(), p);
         }
@@ -112 +110 @@
 
     public boolean hasAreas() {
-        for (StyleSource s : getStyleSources()) {
+        for (XmlStyleSource s : getStyleSources()) {
             if (s.hasAreas())
                 return true;
@@ -120 +118 @@
 
     public boolean isArea(OsmPrimitive osm) {
-        for (StyleSource s : getStyleSources()) {
+        for (XmlStyleSource s : getStyleSources()) {
             if (s.isArea(osm))
                 return true;
@@ -160 +158 @@
         Set<String> names = new HashSet<String>();
         names.add("standard");
-        for (StyleSource s : styleSources) {
+        for (XmlStyleSource s : styleSources) {
             if (s.name != null) {
                 names.add(s.name);

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
+import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
 import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSourceHandler;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -77 +78 @@
 
         for (SourceEntry entry : sourceEntries) {
-            StyleSource style = new StyleSource(entry);
+            XmlStyleSource style = new XmlStyleSource(entry);
             try {
                 XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(style));

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.mappaint;
+package org.openstreetmap.josm.gui.mappaint.xml;
 
 import java.util.Collection;
@@ -8 +8 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -16 +14 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles.WayPrototypesRecord;
-import org.openstreetmap.josm.gui.mappaint.xml.AreaPrototype;
-import org.openstreetmap.josm.gui.mappaint.xml.IconPrototype;
-import org.openstreetmap.josm.gui.mappaint.xml.LinePrototype;
-import org.openstreetmap.josm.gui.mappaint.xml.LinemodPrototype;
-import org.openstreetmap.josm.gui.mappaint.xml.Prototype;
-import org.openstreetmap.josm.gui.mappaint.xml.XmlCondition;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 
-public class StyleSource extends SourceEntry {
+public class XmlStyleSource extends SourceEntry {
 
     public final HashMap<String, IconPrototype> icons = new HashMap<String, IconPrototype>();
@@ -37 +29 @@
     public boolean hasError = false;
 
-    public StyleSource(String url, String name, String shortdescription) {
+    public XmlStyleSource(String url, String name, String shortdescription) {
         super(url, name, shortdescription, true);
     }
 
-    public StyleSource(SourceEntry entry) {
+    public XmlStyleSource(SourceEntry entry) {
         super(entry.url, entry.name, entry.shortdescription, entry.active);
     }
@@ -217 +209 @@
         return name == null ? "standard" : name;
     }
-
-    /**
-     * String to show in menus and error messages.
-     * @return Usually the shortdescription, but can be the file name
-     * if no shortdescription is available.
-     */
-    public String getDisplayString() {
-        if (shortdescription != null)
-            return shortdescription;
-        /**
-         * extract file part from url, e.g.:
-         * http://www.test.com/file.xml?format=text  --> file.xml
-         */
-        Pattern p = Pattern.compile("([^/\\\\]*?)([?].*)?$");
-        Matcher m = p.matcher(url);
-        if (m.find()) {
-            return m.group(1);
-        } else {
-            System.err.println("Warning: Unexpected URL format: "+url);
-            return url;
-        }
-    }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.xml.sax.Attributes;
@@ -21 +20 @@
     private RuleElem rule = new RuleElem();
 
-    StyleSource style;
+    XmlStyleSource style;
 
     static class RuleElem {
@@ -45 +44 @@
     }
 
-    public XmlStyleSourceHandler(StyleSource style) {
+    public XmlStyleSourceHandler(XmlStyleSource style) {
         this.style = style;
         inDoc=inRule=inCondition=inLine=inIcon=inArea=false;