- Timestamp:
- 2008-08-17T14:45:48+02:00 (16 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r655 r804 2 2 package org.openstreetmap.josm.actions.mapmode; 3 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 … … 81 82 82 83 //putValue("help", "Action/AddNode/Autnode"); 83 selectedColor = Preferences.getPreferencesColor("selected", Color.YELLOW);84 selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW); 84 85 85 86 drawHelperLine = Main.pref.getBoolean("draw.helper-line", true); -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r655 r804 2 2 package org.openstreetmap.josm.actions.mapmode; 3 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 … … 83 84 try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","200")); } catch (NumberFormatException x) {} 84 85 try { initialMoveThreshold = Integer.parseInt(Main.pref.get("edit.initial-move-threshold","5")); } catch (NumberFormatException x) {} 85 selectedColor = Preferences.getPreferencesColor("selected", Color.YELLOW);86 selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW); 86 87 } 87 88 -
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 } -
trunk/src/org/openstreetmap/josm/gui/MapScaler.java
r627 r804 3 3 package org.openstreetmap.josm.gui; 4 4 5 import static org.openstreetmap.josm.tools.I18n.marktr; 6 7 import java.awt.Color; 5 8 import java.awt.Graphics; 6 9 import java.awt.geom.Rectangle2D; … … 32 35 String text = dist > 1000 ? (Math.round(dist/100)/10.0)+"km" : Math.round(dist*10)/10+"m"; 33 36 Rectangle2D bound = g.getFontMetrics().getStringBounds(text, g); 34 g.setColor( ColorHelper.html2color(Main.pref.get("color.scale", "#ffffff")));37 g.setColor(Main.pref.getColor(marktr("scale"), Color.white)); 35 38 g.drawLine(0, 5, 99, 5); 36 39 g.drawLine(0, 0, 0, 10); -
trunk/src/org/openstreetmap/josm/gui/MapView.java
r775 r804 215 215 216 216 Graphics2D tempG = offscreenBuffer.createGraphics(); 217 tempG.setColor( Preferences.getPreferencesColor("background", Color.BLACK));217 tempG.setColor(Main.pref.getColor("background", Color.BLACK)); 218 218 tempG.fillRect(0, 0, getWidth(), getHeight()); 219 219 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r758 r804 137 137 */ 138 138 public void paintConflicts(final Graphics g, final NavigatableComponent nc) { 139 Color preferencesColor = Preferences.getPreferencesColor("conflict", Color.gray);139 Color preferencesColor = Main.pref.getColor("conflict", Color.gray); 140 140 if (preferencesColor.equals(Color.BLACK)) 141 141 return; -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java
r803 r804 135 135 } 136 136 } 137 if(s1.length() == 0 && s2.length() != 0) 138 return 1; 139 else if(s2.length() == 0 && s1.length() != 0) 140 return -1; 137 141 138 142 // Default handling if the role name is nothing like "stop_xx" … … 152 156 int roleResult = compareRole(r1.role, r2.role); 153 157 154 if (roleResult == 0) { 155 return compareMemebers(r1.member, r2.member); 156 } 158 if (roleResult == 0) 159 roleResult = compareMemebers(r1.member, r2.member); 157 160 158 161 return roleResult; -
trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
r768 r804 3 3 package org.openstreetmap.josm.gui.layer; 4 4 5 import static org.openstreetmap.josm.tools.I18n.marktr; 5 6 import static org.openstreetmap.josm.tools.I18n.tr; 6 7 import static org.openstreetmap.josm.tools.I18n.trn; … … 135 136 color.addActionListener(new ActionListener() { 136 137 public void actionPerformed(ActionEvent e) { 137 String col = Main.pref.get("color.layer "+name, Main.pref.get("color.gps point", ColorHelper.color2html(Color.gray))); 138 JColorChooser c = new JColorChooser(ColorHelper.html2color(col)); 138 JColorChooser c = new JColorChooser(Main.pref.getColor(marktr("gps point"), "layer "+name, Color.gray)); 139 139 Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")}; 140 int answer = JOptionPane.showOptionDialog(Main.parent, c, tr("Choose a color"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, null, options, options[0]); 140 int answer = JOptionPane.showOptionDialog(Main.parent, c, tr("Choose a color"), JOptionPane.OK_CANCEL_OPTION, 141 JOptionPane.PLAIN_MESSAGE, null, options, options[0]); 141 142 switch (answer) { 142 143 case 0: 143 Main.pref.put ("color.layer "+name, ColorHelper.color2html(c.getColor()));144 Main.pref.putColor("layer "+name, c.getColor()); 144 145 break; 145 146 case 1: 146 147 return; 147 148 case 2: 148 Main.pref.put ("color.layer "+name, null);149 Main.pref.putColor("layer "+name, null); 149 150 break; 150 151 } … … 367 368 ****************************************************************/ 368 369 Long startTime = System.currentTimeMillis(); 369 String gpsCol = Main.pref.get("color.gps point"); 370 String gpsColSpecial = Main.pref.get("color.layer "+name); 371 Color neutralColor; 372 if (!gpsColSpecial.equals("")) { 373 neutralColor = ColorHelper.html2color(gpsColSpecial); 374 } else if (!gpsCol.equals("")) { 375 neutralColor = ColorHelper.html2color(gpsCol); 376 } else{ 377 neutralColor = Color.GRAY; 378 } 370 Color neutralColor = Main.pref.getColor(marktr("gps point"), "layer "+name, Color.GRAY); 379 371 boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force"); // also draw lines between points belonging to different segments 380 372 boolean direction = Main.pref.getBoolean("draw.rawgps.direction"); // draw direction arrows on the lines … … 399 391 (!neutralColor.equals(computeCacheColorUsed)) || 400 392 (computeCacheColored != colored))) { 401 System.out.println("(re-)computing gpx line styles, reason: CCIS=" + computeCacheInSync + " CCMLLU=" + (computeCacheMaxLineLengthUsed != maxLineLength) + " CCCU=" + (!neutralColor.equals(computeCacheColorUsed)) + " CCC=" + (computeCacheColored != colored));393 // System.out.println("(re-)computing gpx line styles, reason: CCIS=" + computeCacheInSync + " CCMLLU=" + (computeCacheMaxLineLengthUsed != maxLineLength) + " CCCU=" + (!neutralColor.equals(computeCacheColorUsed)) + " CCC=" + (computeCacheColored != colored)); 402 394 computeCacheMaxLineLengthUsed = maxLineLength; 403 395 computeCacheInSync = false; … … 524 516 ********** STEP 3d - DRAW LARGE POINTS ************************* 525 517 ****************************************************************/ 526 518 if (large) { 527 519 g.setColor(neutralColor); 528 520 for (GpxTrack trk : data.tracks) { -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r795 r804 157 157 Point p1 = mv.getPoint(en1); 158 158 Point p2 = mv.getPoint(en2); 159 Color color = inactive ? Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY) :160 Preferences.getPreferencesColor(marktr("downloaded Area"), Color.YELLOW);159 Color color = inactive ? Main.pref.getColor(marktr("inactive"), Color.DARK_GRAY) : 160 Main.pref.getColor(marktr("downloaded Area"), Color.YELLOW); 161 161 g.setColor(color); 162 162 g.drawRect(Math.min(p1.x,p2.x), Math.min(p1.y, p2.y), Math.abs(p2.x-p1.x), Math.abs(p2.y-p1.y)); -
trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
r627 r804 2 2 package org.openstreetmap.josm.gui.layer; 3 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 import static org.openstreetmap.josm.tools.I18n.trn; … … 227 228 228 229 @Override public void paint(Graphics g, MapView mv) { 229 String gpsCol = Main.pref.get("color.gps point"); 230 String gpsColSpecial = Main.pref.get("color.layer "+name); 231 if (!gpsColSpecial.equals("")) 232 g.setColor(ColorHelper.html2color(gpsColSpecial)); 233 else if (!gpsCol.equals("")) 234 g.setColor(ColorHelper.html2color(gpsCol)); 235 else 236 g.setColor(Color.GRAY); 230 g.setColor(Main.pref.getColor(marktr("gps point"), "layer "+name, Color.gray)); 237 231 Point old = null; 238 232 … … 329 323 color.addActionListener(new ActionListener(){ 330 324 public void actionPerformed(ActionEvent e) { 331 String col = Main.pref.get("color.layer "+name, Main.pref.get("color.gps point", ColorHelper.color2html(Color.gray))); 332 JColorChooser c = new JColorChooser(ColorHelper.html2color(col)); 325 JColorChooser c = new JColorChooser(Main.pref.getColor(marktr("gps point"), "layer "+name, Color.gray)); 333 326 Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")}; 334 int answer = JOptionPane.showOptionDialog(Main.parent, c, tr("Choose a color"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, null, options, options[0]); 327 int answer = JOptionPane.showOptionDialog(Main.parent, c, tr("Choose a color"), JOptionPane.OK_CANCEL_OPTION, 328 JOptionPane.PLAIN_MESSAGE, null, options, options[0]); 335 329 switch (answer) { 336 330 case 0: 337 Main.pref.put ("color.layer "+name, ColorHelper.color2html(c.getColor()));331 Main.pref.putColor("layer "+name, c.getColor()); 338 332 break; 339 333 case 1: 340 334 return; 341 335 case 2: 342 Main.pref.put ("color.layer "+name, null);336 Main.pref.putColor("layer "+name, null); 343 337 break; 344 338 } -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r794 r804 2 2 package org.openstreetmap.josm.gui.layer.markerlayer; 3 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 import static org.openstreetmap.josm.tools.I18n.trn; … … 135 136 boolean mousePressedTmp = mousePressed; 136 137 Point mousePos = mv.getMousePosition(); 137 String mkrCol = Main.pref.get("color.gps marker"); 138 String mkrColSpecial = Main.pref.get("color.layer "+name); 139 String mkrTextShow = Main.pref.get("marker.show "+name, "show"); 140 141 if (!mkrColSpecial.equals("")) 142 g.setColor(ColorHelper.html2color(mkrColSpecial)); 143 else if (!mkrCol.equals("")) 144 g.setColor(ColorHelper.html2color(mkrCol)); 145 else 146 g.setColor(Color.GRAY); 138 String mkrTextShow = Main.pref.get("marker.show "+name, "show"); 139 140 g.setColor(Main.pref.getColor(marktr("gps marker"), "layer "+name, Color.gray)); 147 141 148 142 for (Marker mkr : data) { … … 183 177 color.addActionListener(new ActionListener(){ 184 178 public void actionPerformed(ActionEvent e) { 185 String col = Main.pref.get("color.layer "+name, Main.pref.get("color.gps marker", ColorHelper.color2html(Color.gray))); 186 JColorChooser c = new JColorChooser(ColorHelper.html2color(col)); 179 JColorChooser c = new JColorChooser(Main.pref.getColor(marktr("gps marker"), "layer "+name, Color.gray)); 187 180 Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")}; 188 int answer = JOptionPane.showOptionDialog(Main.parent, c, tr("Choose a color"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, null, options, options[0]); 181 int answer = JOptionPane.showOptionDialog(Main.parent, c, tr("Choose a color"), JOptionPane.OK_CANCEL_OPTION, 182 JOptionPane.PLAIN_MESSAGE, null, options, options[0]); 189 183 switch (answer) { 190 184 case 0: 191 Main.pref.put ("color.layer "+name, ColorHelper.color2html(c.getColor()));185 Main.pref.putColor("layer "+name, c.getColor()); 192 186 break; 193 187 case 1: 194 188 return; 195 189 case 2: 196 Main.pref.put ("color.layer "+name, null);190 Main.pref.putColor("layer "+name, null); 197 191 break; 198 192 } -
trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java
r798 r804 151 151 marktr("relation"), ColorHelper.color2html(SimplePaintVisitor.teal), 152 152 marktr("selected"), ColorHelper.color2html(Color.white), 153 marktr("gps marker"), ColorHelper.color2html(Color.gray), 153 154 marktr("gps point"), ColorHelper.color2html(Color.gray), 154 155 marktr("conflict"), ColorHelper.color2html(Color.gray), … … 157 158 }; 158 159 for (int i = 0; i < cp.length/2; ++i) 160 { 159 161 if (!Main.pref.hasKey("color."+cp[i*2])) 160 162 Main.pref.put("color."+cp[i*2], cp[i*2+1]); 163 Main.pref.putDefault("color."+cp[i*2], cp[i*2+1]); 164 } 161 165 } 162 166 -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
r627 r804 61 61 62 62 addTab(null, ImageProvider.get("preferences", icon), p); 63 setToolTipTextAt(getTabCount()-1, desc);63 setToolTipTextAt(getTabCount()-1, "<html>"+desc+"</html>"); 64 64 return p; 65 65 }
Note:
See TracChangeset
for help on using the changeset viewer.