Changeset 14143 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2018-08-12T14:27:32+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java
r14134 r14143 7 7 import java.util.Objects; 8 8 9 import org.openstreetmap.josm.Main;10 9 import org.openstreetmap.josm.command.Command; 11 10 import org.openstreetmap.josm.data.osm.DataSet; 11 import org.openstreetmap.josm.data.osm.OsmDataManager; 12 12 import org.openstreetmap.josm.spi.preferences.Config; 13 13 import org.openstreetmap.josm.tools.CheckParameterUtil; … … 291 291 if (commands.isEmpty()) 292 292 return; 293 DataSet ds = Main.main.getEditDataSet();293 DataSet ds = OsmDataManager.getInstance().getEditDataSet(); 294 294 if (ds != null) { 295 295 ds.beginUpdate(); -
trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java
r13434 r14143 98 98 */ 99 99 public void executeFilters() { 100 DataSet ds = Main.main.getActiveDataSet();100 DataSet ds = OsmDataManager.getInstance().getActiveDataSet(); 101 101 changed = false; 102 102 if (ds == null) { … … 150 150 */ 151 151 public void executeFilters(Collection<? extends OsmPrimitive> primitives) { 152 DataSet ds = Main.main.getEditDataSet();152 DataSet ds = OsmDataManager.getInstance().getEditDataSet(); 153 153 if (ds == null) 154 154 return; … … 209 209 */ 210 210 public void clearFilterFlags() { 211 DataSet ds = Main.main.getEditDataSet();211 DataSet ds = OsmDataManager.getInstance().getEditDataSet(); 212 212 if (ds != null) { 213 213 FilterWorker.clearFilterFlags(ds.allPrimitives()); -
trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
r13942 r14143 18 18 import java.util.Set; 19 19 20 import org.openstreetmap.josm.Main;21 20 import org.openstreetmap.josm.data.coor.EastNorth; 22 21 import org.openstreetmap.josm.data.coor.LatLon; … … 24 23 import org.openstreetmap.josm.data.osm.DataSet; 25 24 import org.openstreetmap.josm.data.osm.Node; 25 import org.openstreetmap.josm.data.osm.OsmDataManager; 26 26 import org.openstreetmap.josm.data.osm.OsmPrimitive; 27 27 import org.openstreetmap.josm.data.osm.QuadBuckets; … … 169 169 mindist = Config.getPref().getDouble(PREFIX + ".node_way_distance", 10.0); 170 170 minmiddledist = Config.getPref().getDouble(PREFIX + ".way_way_distance", 0.0); 171 DataSet dataSet = Main.main != null ? Main.main.getEditDataSet() : null;171 DataSet dataSet = OsmDataManager.getInstance().getEditDataSet(); 172 172 dsArea = dataSet == null ? null : dataSet.getDataSourceArea(); 173 173 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
r12691 r14143 9 9 import java.util.Set; 10 10 11 import org.openstreetmap.josm.Main;12 11 import org.openstreetmap.josm.command.Command; 13 12 import org.openstreetmap.josm.data.osm.DataSet; 13 import org.openstreetmap.josm.data.osm.OsmDataManager; 14 14 import org.openstreetmap.josm.data.osm.OsmPrimitive; 15 15 import org.openstreetmap.josm.data.osm.Relation; … … 142 142 public void startTest(ProgressMonitor monitor) { 143 143 super.startTest(monitor); 144 DataSet ds = Main.main.getEditDataSet();144 DataSet ds = OsmDataManager.getInstance().getEditDataSet(); 145 145 if (ds == null) 146 146 return;
Note:
See TracChangeset
for help on using the changeset viewer.