Changeset 2990 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java
- Timestamp:
- 2010-02-15T09:03:57+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java
r2745 r2990 7 7 import java.awt.event.ActionEvent; 8 8 import java.awt.event.ActionListener; 9 10 9 import java.util.Collection; 11 10 … … 110 109 String projname = proj.getClass().getName(); 111 110 Collection<String> prefs = null; 112 if(projHasPrefs(proj)) 111 if(projHasPrefs(proj)) { 113 112 prefs = ((ProjectionSubPrefs) proj).getPreferences(projSubPrefPanel); 113 } 114 114 115 115 Main.pref.put("projection", projname); … … 143 143 { 144 144 setProjection(Main.pref.get("projection", Mercator.class.getName()), 145 Main.pref.getCollection("projection.sub", null));145 Main.pref.getCollection("projection.sub", null)); 146 146 } 147 147 … … 167 167 String sname = name.substring(name.lastIndexOf(".")+1); 168 168 Main.pref.putCollection("projection.sub."+sname, coll); 169 if(projHasPrefs(Main.proj)) 169 if(projHasPrefs(Main.proj)) { 170 170 ((ProjectionSubPrefs) Main.proj).setPreferences(coll); 171 } 171 172 if(b != null && (!Main.proj.getClass().getName().equals(oldProj.getClass().getName()) || Main.proj.hashCode() != oldProj.hashCode())) 172 173 { … … 181 182 public SBPanel(Projection pr) 182 183 { 183 super();184 p = pr;184 super(); 185 p = pr; 185 186 } 186 187 @Override 187 188 public void paint(java.awt.Graphics g) 188 189 { 189 super.paint(g);190 ((ProjectionSubPrefs) p).setPreferences(((ProjectionSubPrefs) p).getPreferences(this));191 updateMeta(p);192 } 193 } ;190 super.paint(g); 191 ((ProjectionSubPrefs) p).setPreferences(((ProjectionSubPrefs) p).getPreferences(this)); 192 updateMeta(p); 193 } 194 } 194 195 195 196 /** … … 228 229 String name = proj.getClass().getName(); 229 230 String sname = name.substring(name.lastIndexOf(".")+1); 230 if(projHasPrefs(proj)) 231 if(projHasPrefs(proj)) { 231 232 ((ProjectionSubPrefs) proj).setPreferences(Main.pref.getCollection("projection.sub."+sname, null)); 233 } 232 234 if (name.equals(Main.pref.get("projection", Mercator.class.getName()))) { 233 235 projectionCombo.setSelectedIndex(i);
Note:
See TracChangeset
for help on using the changeset viewer.