- Timestamp:
- 2017-05-11T10:57:14+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r12011 r12119 1078 1078 if ((newValue == null ^ oldValue == null) 1079 1079 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) { 1080 if (Main.map != null) {1081 // This needs to be called first1082 Main.map.mapView.fixProjection();1083 }1084 1080 synchronized (Main.class) { 1085 1081 Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator(); … … 1103 1099 /** 1104 1100 * Register a projection change listener. 1101 * The listener is registered to be weak, so keep a reference of it if you want it to be preserved. 1105 1102 * 1106 1103 * @param listener the listener. Ignored if <code>null</code>. -
trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
r12074 r12119 52 52 import org.openstreetmap.josm.data.preferences.IntegerProperty; 53 53 import org.openstreetmap.josm.data.projection.Projection; 54 import org.openstreetmap.josm.data.projection.ProjectionChangeListener; 54 55 import org.openstreetmap.josm.data.projection.Projections; 55 56 import org.openstreetmap.josm.gui.help.Helpful; … … 171 172 172 173 /** 174 * Main uses weak link to store this, so we need to keep a reference. 175 */ 176 private final ProjectionChangeListener projectionChangeListener = (oldValue, newValue) -> fixProjection(); 177 178 /** 173 179 * Constructs a new {@code NavigatableComponent}. 174 180 */ … … 176 182 setLayout(null); 177 183 state = MapViewState.createDefaultState(getWidth(), getHeight()); 178 // uses weak link. 179 Main.addProjectionChangeListener((oldValue, newValue) -> fixProjection()); 184 Main.addProjectionChangeListener(projectionChangeListener); 180 185 } 181 186
Note:
See TracChangeset
for help on using the changeset viewer.