Changeset 75 in josm for src/org/openstreetmap/josm/data

Timestamp:

2006-03-29T19:11:37+02:00 (18 years ago)

Author:

imi

Message:

• added editable colors
• changed preferences format (again)

Location:

src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (6 diffs)
• osm/visitor/SimplePaintVisitor.java (modified) (8 diffs)

src/org/openstreetmap/josm/data/Preferences.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data;
 
+import java.awt.Color;
+import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -6 +8 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
-import org.openstreetmap.josm.tools.XmlWriter;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-import uk.co.wilson.xml.MinML2;
+import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
+import org.openstreetmap.josm.tools.ColorHelper;
 
 
@@ -59 +60 @@
                 return properties.get(key);
         }
+        synchronized public String get(String key, String def) {
+                String prop = properties.get(key);
+                if (prop == null || prop.equals(""))
+                        return def;
+                return prop;
+        }
+        synchronized public Collection<Entry<String, String>> getAllPrefix(String prefix) {
+                LinkedList<Entry<String,String>> all = new LinkedList<Entry<String,String>>();
+                for (Entry<String,String> e : properties.entrySet())
+                        if (e.getKey().startsWith(prefix))
+                                all.add(e);
+                return all;
+        }
         synchronized public boolean getBoolean(String key) {
                 return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : false;
         }
-        
-        
+
+
         synchronized public void put(String key, String value) {
                 if (value == null)
@@ -83 +97 @@
         public void save() throws IOException {
                 PrintWriter out = new PrintWriter(new FileWriter(getPreferencesDir()+"preferences"));
-                out.println(XmlWriter.header());
-                out.println("<josm>");
-                for (Entry<String, String> e : properties.entrySet()) {
-                        out.print("  <"+e.getKey());
+                for (Entry<String, String> e : properties.entrySet())
                         if (!e.getValue().equals(""))
-                                out.print(" value='"+XmlWriter.encode(e.getValue())+"'");
-                        out.println(" />");
-                }
-                out.println("</josm>");
+                                out.println(e.getKey()+"="+e.getValue());
                 out.close();
         }
@@ -97 +105 @@
 
         public void load() throws IOException {
-                MinML2 reader = new MinML2(){
-                        @Override public void startElement(String ns, String name, String qName, Attributes attr) {
-                                if (name.equals("josm-settings"))
-                                        throw new RuntimeException("old version");
-                                String v = attr.getValue("value");
-                                if (!name.equals("josm"))
-                                        properties.put(name, v == null ? "" : v);
-                        }
-                };
-                try {
-                        reader.parse(new FileReader(getPreferencesDir()+"preferences"));
-                } catch (SAXException e) {
-                        e.printStackTrace();
-                        throw new IOException("Error in preferences file");
+                properties.clear();
+                BufferedReader in = new BufferedReader(new FileReader(getPreferencesDir()+"preferences"));
+                int lineNumber = 0;
+                for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) {
+                        int i = line.indexOf('=');
+                        if (i == -1 || i == 0)
+                                throw new IOException("Malformed config file at line "+lineNumber);
+                        properties.put(line.substring(0,i), line.substring(i+1));
                 }
         }
@@ -118 +120 @@
                 properties.put("laf", "javax.swing.plaf.metal.MetalLookAndFeel");
                 properties.put("projection", "org.openstreetmap.josm.data.projection.Epsg4263");
-                properties.put("osmDataServer", "http://www.openstreetmap.org/api");
+                properties.put("osm-server.url", "http://www.openstreetmap.org/api");
+                properties.put("color.node", ColorHelper.color2html(Color.red));
+                properties.put("color.segment", ColorHelper.color2html(SimplePaintVisitor.darkgreen));
+                properties.put("color.way", ColorHelper.color2html(SimplePaintVisitor.darkblue));
+                properties.put("color.incomplete way", ColorHelper.color2html(SimplePaintVisitor.darkerblue));
+                properties.put("color.selected", ColorHelper.color2html(Color.white));
+                properties.put("color.gps point", ColorHelper.color2html(Color.gray));
         }
 }

src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -5 +5 @@
 import java.awt.Point;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.tools.ColorHelper;
 
 /**
@@ -18 +20 @@
 public class SimplePaintVisitor implements Visitor {
 
-        private final static Color darkerblue = new Color(0,0,96);
-        private final static Color darkblue = new Color(0,0,128);
-        private final static Color darkgreen = new Color(0,128,0);
+        public final static Color darkerblue = new Color(0,0,96);
+        public final static Color darkblue = new Color(0,0,128);
+        public final static Color darkgreen = new Color(0,128,0);
 
         /**
@@ -48 +50 @@
          */
         public void visit(Node n) {
-                drawNode(n, n.isSelected() ? Color.WHITE : Color.RED);
+                drawNode(n, n.isSelected() ? getPreferencesColor("selected", Color.WHITE)
+                                : getPreferencesColor("node", Color.RED));
         }
 
@@ -56 +59 @@
          */
         public void visit(LineSegment ls) {
-                drawLineSegment(ls, darkgreen);
+                drawLineSegment(ls, getPreferencesColor("segment", darkgreen));
         }
 
@@ -65 +68 @@
         public void visit(Way t) {
                 // only to overwrite with blue
-                Color wayColor = darkblue;
+                Color wayColor = getPreferencesColor("way", darkblue);
                 for (LineSegment ls : t.segments) {
                         if (ls.incomplete) {
-                                wayColor = darkerblue;
+                                wayColor = getPreferencesColor("incomplete way", darkerblue);
                                 break;
                         }
@@ -74 +77 @@
                 for (LineSegment ls : t.segments)
                         if (!ls.isSelected()) // selected already in good color
-                                drawLineSegment(ls, t.isSelected() ? Color.WHITE : wayColor);
+                                drawLineSegment(ls, t.isSelected() ? getPreferencesColor("selected", Color.WHITE) : wayColor);
         }
 
@@ -96 +99 @@
                         return;
                 if (ls.isSelected())
-                        col = Color.WHITE;
+                        col = getPreferencesColor("selected", Color.WHITE);
                 g.setColor(col);
                 Point p1 = nc.getPoint(ls.from.eastNorth);
@@ -102 +105 @@
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
         }
+        
+        private Color getPreferencesColor(String colName, Color def) {
+                String colStr = Main.pref.get("color."+colName);
+                if (colStr.equals(""))
+                        return def;
+                return ColorHelper.html2color(colStr);
+        }
 }