Changeset 804 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2008-08-17T14:45:48+02:00 (16 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r795 r804 112 112 } 113 113 synchronized public String get(final String key) { 114 putDefault(key, null); 114 115 if (override.containsKey(key)) 115 116 return override.get(key); … … 119 120 } 120 121 synchronized public String get(final String key, final String def) { 121 if(!defaults.containsKey(key)) 122 defaults.put(key, def); 123 else if(!defaults.get(key).equals(def)) 124 System.out.println("Defaults for " + key + " differ: " + def + " != " + defaults.get(key)); 122 putDefault(key, def); 125 123 if (override.containsKey(key)) 126 124 return override.get(key); … … 148 146 return defaults; 149 147 } 148 synchronized public void putDefault(final String key, final String def) { 149 if(!defaults.containsKey(key) || defaults.get(key) == null) 150 defaults.put(key, def); 151 else if(def != null && !defaults.get(key).equals(def)) 152 System.out.println("Defaults for " + key + " differ: " + def + " != " + defaults.get(key)); 153 } 150 154 151 155 synchronized public boolean getBoolean(final String key) { 156 putDefault(key, null); 152 157 if (override.containsKey(key)) 153 158 return override.get(key) == null ? false : Boolean.parseBoolean(override.get(key)); … … 155 160 } 156 161 synchronized public boolean getBoolean(final String key, final boolean def) { 157 if(!defaults.containsKey(key)) 158 defaults.put(key, Boolean.toString(def)); 159 else if(!defaults.get(key).equals(Boolean.toString(def))) 160 System.out.println("Defaults for " + key + " differ: " + def + " != " + defaults.get(key)); 162 putDefault(key, Boolean.toString(def)); 161 163 if (override.containsKey(key)) 162 164 return override.get(key) == null ? def : Boolean.parseBoolean(override.get(key)); … … 285 287 * @return a Color object for the configured colour, or the default value if none configured. 286 288 */ 287 public static Color getPreferencesColor(String colName, Color def) {288 String colStr = Main.pref.get("color."+colName);289 synchronized public Color getColor(String colName, Color def) { 290 String colStr = get("color."+colName); 289 291 if (colStr.equals("")) { 290 Main.pref.put("color."+colName, ColorHelper.color2html(def));292 put("color."+colName, ColorHelper.color2html(def)); 291 293 return def; 292 294 } 293 295 return ColorHelper.html2color(colStr); 296 } 297 // only for compatibility. Don't use any more. 298 public static Color getPreferencesColor(String colName, Color def) 299 { 300 return Main.pref.getColor(colName, def); 301 } 302 303 /** 304 * Convenience method for accessing colour preferences. 305 * 306 * @param colName name of the colour 307 * @param specName name of the special colour settings 308 * @param def default value 309 * @return a Color object for the configured colour, or the default value if none configured. 310 */ 311 synchronized public Color getColor(String colName, String specName, Color def) { 312 String colStr = get("color."+specName); 313 if(colStr.equals("")) 314 { 315 colStr = get("color."+colName); 316 if (colStr.equals("")) { 317 put("color."+colName, ColorHelper.color2html(def)); 318 return def; 319 } 320 } 321 putDefault("color."+colName, ColorHelper.color2html(def)); 322 return ColorHelper.html2color(colStr); 323 } 324 synchronized public void putColor(String colName, Color val) { 325 put("color."+colName, ColorHelper.color2html(val)); 294 326 } 295 327 -
trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
r786 r804 370 370 // Shows areas before non-areas 371 371 public void visitAll(DataSet data) { 372 inactiveColor = Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY);373 selectedColor = Preferences.getPreferencesColor(marktr("selected"), Color.YELLOW);374 nodeColor = Preferences.getPreferencesColor(marktr("node"), Color.RED);375 dfltWayColor = Preferences.getPreferencesColor(marktr("way"), darkblue);376 incompleteColor = Preferences.getPreferencesColor(marktr("incomplete way"), darkerblue);377 backgroundColor = Preferences.getPreferencesColor(marktr("background"), Color.BLACK);378 untaggedColor = Preferences.getPreferencesColor(marktr("untagged"),Color.GRAY);379 textColor = Preferences.getPreferencesColor (marktr("text"), Color.WHITE);372 inactiveColor = Main.pref.getColor(marktr("inactive"), Color.DARK_GRAY); 373 selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW); 374 nodeColor = Main.pref.getColor(marktr("node"), Color.RED); 375 dfltWayColor = Main.pref.getColor(marktr("way"), darkblue); 376 incompleteColor = Main.pref.getColor(marktr("incomplete way"), darkerblue); 377 backgroundColor = Main.pref.getColor(marktr("background"), Color.BLACK); 378 untaggedColor = Main.pref.getColor(marktr("untagged"),Color.GRAY); 379 textColor = Main.pref.getColor (marktr("text"), Color.WHITE); 380 380 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction"); 381 381 showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only"); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java
r786 r804 92 92 93 93 public void visitAll(DataSet data) { 94 inactiveColor = Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY);95 selectedColor = Preferences.getPreferencesColor(marktr("selected"), Color.WHITE);96 nodeColor = Preferences.getPreferencesColor(marktr("node"), Color.RED);97 dfltWayColor = Preferences.getPreferencesColor(marktr("way"), darkblue);98 relationColor = Preferences.getPreferencesColor(marktr("relation"), teal);99 untaggedWayColor = Preferences.getPreferencesColor(marktr("untagged way"), darkgreen);100 incompleteColor = Preferences.getPreferencesColor(marktr("incomplete way"), darkerblue);101 backgroundColor = Preferences.getPreferencesColor(marktr("background"), Color.BLACK);94 inactiveColor = Main.pref.getColor(marktr("inactive"), Color.DARK_GRAY); 95 selectedColor = Main.pref.getColor(marktr("selected"), Color.WHITE); 96 nodeColor = Main.pref.getColor(marktr("node"), Color.RED); 97 dfltWayColor = Main.pref.getColor(marktr("way"), darkblue); 98 relationColor = Main.pref.getColor(marktr("relation"), teal); 99 untaggedWayColor = Main.pref.getColor(marktr("untagged way"), darkgreen); 100 incompleteColor = Main.pref.getColor(marktr("incomplete way"), darkerblue); 101 backgroundColor = Main.pref.getColor(marktr("background"), Color.BLACK); 102 102 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction"); 103 103 showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only"); … … 344 344 */ 345 345 public static Color getPreferencesColor(String name, Color dflt) { 346 return Preferences.getPreferencesColor(name, dflt);346 return Main.pref.getColor(name, dflt); 347 347 } 348 348 }
Note:
See TracChangeset
for help on using the changeset viewer.