Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/data/osm
- Timestamp:
- 2017-08-24T22:53:50+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java
r12630 r12636 96 96 */ 97 97 public void executeFilters() { 98 DataSet ds = Main .getLayerManager().getEditDataSet();98 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 99 99 changed = false; 100 100 if (ds == null) { … … 145 145 */ 146 146 public void executeFilters(Collection<? extends OsmPrimitive> primitives) { 147 DataSet ds = Main .getLayerManager().getEditDataSet();147 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 148 148 if (ds == null) 149 149 return; … … 197 197 198 198 private static void updateMap() { 199 OsmDataLayer editLayer = Main .getLayerManager().getEditLayer();199 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer(); 200 200 if (editLayer != null) { 201 201 editLayer.invalidate(); … … 207 207 */ 208 208 public void clearFilterFlags() { 209 DataSet ds = Main .getLayerManager().getEditDataSet();209 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 210 210 if (ds != null) { 211 211 FilterWorker.clearFilterFlags(ds.allPrimitives()); -
trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
r12537 r12636 12 12 import javax.swing.SwingUtilities; 13 13 14 import org.openstreetmap.josm.Main;15 14 import org.openstreetmap.josm.data.osm.DataSet; 16 15 import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter.Listener; 16 import org.openstreetmap.josm.gui.MainApplication; 17 17 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent; 18 18 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener; … … 152 152 */ 153 153 public DatasetEventManager() { 154 Main .getLayerManager().addActiveLayerChangeListener(this);154 MainApplication.getLayerManager().addActiveLayerChangeListener(this); 155 155 } 156 156 -
trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
r12537 r12636 11 11 import javax.swing.SwingUtilities; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.data.SelectionChangedListener; 15 14 import org.openstreetmap.josm.data.osm.DataSelectionListener; 16 15 import org.openstreetmap.josm.data.osm.DataSet; 17 16 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode; 17 import org.openstreetmap.josm.gui.MainApplication; 18 18 import org.openstreetmap.josm.gui.layer.MainLayerManager; 19 19 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent; … … 105 105 */ 106 106 protected SelectionEventManager() { 107 MainLayerManager layerManager = Main .getLayerManager();107 MainLayerManager layerManager = MainApplication.getLayerManager(); 108 108 // We do not allow for destructing this object. 109 109 // Currently, this is a singleton class, so this is not required. … … 212 212 inEDTListeners.clear(); 213 213 immedatelyListeners.clear(); 214 Main .getLayerManager().addAndFireActiveLayerChangeListener(this);214 MainApplication.getLayerManager().addAndFireActiveLayerChangeListener(this); 215 215 } 216 216 } -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
r12630 r12636 12 12 import java.util.concurrent.CopyOnWriteArrayList; 13 13 14 import org.openstreetmap.josm.Main;15 14 import org.openstreetmap.josm.data.osm.Changeset; 16 15 import org.openstreetmap.josm.data.osm.IPrimitive; … … 42 41 if (historyDataSet == null) { 43 42 historyDataSet = new HistoryDataSet(); 44 Main .getLayerManager().addLayerChangeListener(historyDataSet);43 MainApplication.getLayerManager().addLayerChangeListener(historyDataSet); 45 44 } 46 45 return historyDataSet; … … 228 227 public void layerRemoving(LayerRemoveEvent e) { 229 228 if (!MainApplication.isDisplayingMapView()) return; 230 if (Main .getLayerManager().getLayers().isEmpty()) {229 if (MainApplication.getLayerManager().getLayers().isEmpty()) { 231 230 data.clear(); 232 231 fireCacheCleared(); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
r11779 r12636 28 28 import org.openstreetmap.josm.data.projection.Projection; 29 29 import org.openstreetmap.josm.data.projection.ProjectionChangeListener; 30 import org.openstreetmap.josm.gui.MainApplication; 30 31 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent; 31 32 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener; … … 51 52 Main.addProjectionChangeListener(this); 52 53 DataSet.addSelectionListener(this); 53 Main .getLayerManager().addLayerChangeListener(this);54 MainApplication.getLayerManager().addLayerChangeListener(this); 54 55 } 55 56
Note:
See TracChangeset
for help on using the changeset viewer.