Changeset 12672 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2017-08-27T17:07:54+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r12643 r12672 218 218 */ 219 219 public void refreshView() { 220 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();220 DataSet editDs = MainApplication.getLayerManager().getEditDataSet(); 221 221 synchronized (this) { 222 conflicts = edit Layer == null ? new ConflictCollection() : editLayer.getConflicts();222 conflicts = editDs == null ? new ConflictCollection() : editDs.getConflicts(); 223 223 } 224 224 GuiHelper.runInEDT(() -> { -
trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java
r12213 r12672 11 11 import org.openstreetmap.josm.data.coor.EastNorth; 12 12 import org.openstreetmap.josm.data.osm.BBox; 13 import org.openstreetmap.josm.data.osm.DataSet; 13 14 import org.openstreetmap.josm.data.osm.Node; 14 15 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 16 17 import org.openstreetmap.josm.data.osm.RelationMember; 17 18 import org.openstreetmap.josm.data.osm.Way; 18 import org.openstreetmap.josm.gui.layer.OsmDataLayer;19 19 import org.openstreetmap.josm.tools.Geometry; 20 20 import org.openstreetmap.josm.tools.date.DateUtils; … … 29 29 30 30 private final StringBuilder s = new StringBuilder(); 31 private final OsmDataLayer layer;32 33 InspectPrimitiveDataText( OsmDataLayer layer) {34 this. layer = layer;31 private final DataSet ds; 32 33 InspectPrimitiveDataText(DataSet ds) { 34 this.ds = ds; 35 35 } 36 36 … … 226 226 227 227 void addConflicts(OsmPrimitive o) { 228 Conflict<?> c = layer.getConflicts().getConflictForMy(o);228 Conflict<?> c = ds.getConflicts().getConflictForMy(o); 229 229 if (c != null) { 230 230 add(tr("In conflict with: ")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
r12663 r12672 22 22 23 23 import org.openstreetmap.josm.Main; 24 import org.openstreetmap.josm.data.osm.DataSet; 24 25 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 25 26 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 28 29 import org.openstreetmap.josm.gui.MainApplication; 29 30 import org.openstreetmap.josm.gui.NavigatableComponent; 30 import org.openstreetmap.josm.gui.layer.OsmDataLayer;31 31 import org.openstreetmap.josm.gui.mappaint.Cascade; 32 32 import org.openstreetmap.josm.gui.mappaint.ElemStyles; … … 53 53 54 54 protected transient List<OsmPrimitive> primitives; 55 protected transient OsmDataLayer layer;56 55 private boolean mappaintTabLoaded; 57 56 private boolean editcountTabLoaded; … … 60 59 * Constructs a new {@code InspectPrimitiveDialog}. 61 60 * @param primitives collection of primitives 62 * @param layer data layer 61 * @param data data set 62 * @since 12672 (signature) 63 63 */ 64 public InspectPrimitiveDialog(final Collection<OsmPrimitive> primitives, OsmDataLayer layer) {64 public InspectPrimitiveDialog(final Collection<OsmPrimitive> primitives, DataSet data) { 65 65 super(Main.parent, tr("Advanced object info"), tr("Close")); 66 66 this.primitives = new ArrayList<>(primitives); 67 this.layer = layer;68 67 setRememberWindowGeometry(getClass().getName() + ".geometry", 69 68 WindowGeometry.centerInWindow(Main.parent, new Dimension(750, 550))); … … 72 71 final JTabbedPane tabs = new JTabbedPane(); 73 72 74 tabs.addTab(tr("data"), genericMonospacePanel(new JPanel(), buildDataText( layer, this.primitives)));73 tabs.addTab(tr("data"), genericMonospacePanel(new JPanel(), buildDataText(data, this.primitives))); 75 74 76 75 final JPanel pMapPaint = new JPanel(); … … 106 105 } 107 106 108 protected static String buildDataText( OsmDataLayer layer, List<OsmPrimitive> primitives) {109 InspectPrimitiveDataText dt = new InspectPrimitiveDataText( layer);107 protected static String buildDataText(DataSet data, List<OsmPrimitive> primitives) { 108 InspectPrimitiveDataText dt = new InspectPrimitiveDataText(data); 110 109 primitives.stream() 111 110 .sorted(OsmPrimitiveComparator.orderingWaysRelationsNodes().thenComparing(OsmPrimitiveComparator.comparingNames())) -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
r12636 r12672 136 136 return; 137 137 } 138 DataSetMerger visitor = new DataSetMerger(MainApplication.getLayerManager().getEditLayer().data, ds); 138 DataSet editData = MainApplication.getLayerManager().getEditDataSet(); 139 DataSetMerger visitor = new DataSetMerger(editData, ds); 139 140 visitor.merge(); 140 141 if (!visitor.getConflicts().isEmpty()) { 141 MainApplication.getLayerManager().getEditLayer().getConflicts().add(visitor.getConflicts());142 editData.getConflicts().add(visitor.getConflicts()); 142 143 } 143 144 final RelationTreeModel model = (RelationTreeModel) getModel();
Note:
See TracChangeset
for help on using the changeset viewer.