Changeset 3426 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2010-08-08T14:05:15+02:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
r3336 r3426 93 93 UploadSelectionDialog dialog = new UploadSelectionDialog(); 94 94 Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(getEditLayer().data.getSelected()); 95 Collection<OsmPrimitive> deletedCandi ates = getDeletedPrimitives(getEditLayer().data);96 if (modifiedCandidates.isEmpty() && deletedCandi ates.isEmpty()) {95 Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(getEditLayer().data); 96 if (modifiedCandidates.isEmpty() && deletedCandidates.isEmpty()) { 97 97 JOptionPane.showMessageDialog( 98 98 Main.parent, … … 105 105 dialog.populate( 106 106 modifiedCandidates, 107 deletedCandi ates107 deletedCandidates 108 108 ); 109 109 dialog.setVisible(true); -
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r3422 r3426 900 900 } 901 901 902 public void cle nupDeletedPrimitives() {902 public void cleanupDeletedPrimitives() { 903 903 beginUpdate(); 904 904 try { -
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r3423 r3426 94 94 // 95 95 Collection<? extends OsmPrimitive> candidates = null; 96 switch (source.getType()) {96 switch (source.getType()) { 97 97 case NODE: candidates = targetDataSet.getNodes(); break; 98 case WAY: candidates = targetDataSet.getWays(); break;98 case WAY: candidates = targetDataSet.getWays(); break; 99 99 case RELATION: candidates = targetDataSet.getRelations(); break; 100 100 default: throw new AssertionError(); … … 134 134 } 135 135 136 protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException {136 protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException { 137 137 PrimitiveId targetId = mergedMap.get(mergeSource.getPrimitiveId()); 138 138 if (targetId == null) -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r3416 r3426 398 398 399 399 // if uploaded, clean the modified flags as well 400 data.cle nupDeletedPrimitives();400 data.cleanupDeletedPrimitives(); 401 401 for (OsmPrimitive p: data.allPrimitives()) { 402 402 if (processed.contains(p)) {
Note:
See TracChangeset
for help on using the changeset viewer.