Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/gui/io
- Timestamp:
- 2015-06-02T16:41:37+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/io
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java
r7005 r8444 73 73 for (Changeset cs: changesets) { 74 74 if (canceled) return; 75 if (cs == null || cs.getId() <= 0 || ! 75 if (cs == null || cs.getId() <= 0 || !cs.isOpen()) { 76 76 continue; 77 77 } -
trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java
r8308 r8444 100 100 return; 101 101 } 102 if (! 102 if (!(anObject instanceof Changeset)) return; 103 103 Changeset cs = (Changeset)anObject; 104 if (cs.getId() == 0 || ! 104 if (cs.getId() == 0 || !cs.isOpen()) return; 105 105 Changeset candidate = getChangesetById(cs.getId()); 106 106 if (candidate == null) return; -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r8412 r8444 410 410 @Override 411 411 public void actionPerformed(ActionEvent e) { 412 if (! 412 if (!confirmSaveLayerInfosOK()) 413 413 return; 414 414 launchSafeAndUploadTask(); -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
r8308 r8444 204 204 public boolean hasUnsavedData() { 205 205 for (SaveLayerInfo info: layerInfo) { 206 if (info.isDoUploadToServer() && ! 206 if (info.isDoUploadToServer() && !UploadOrSaveState.OK.equals(info.getUploadState())) 207 207 return true; 208 if (info.isDoSaveToFile() && ! 208 if (info.isDoSaveToFile() && !UploadOrSaveState.OK.equals(info.getSaveState())) 209 209 return true; 210 210 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
r8426 r8444 242 242 } 243 243 244 public List<OsmPrimitive> getPrimitives(int 244 public List<OsmPrimitive> getPrimitives(int[] indices) { 245 245 if (indices == null || indices.length == 0) 246 246 return Collections.emptyList(); -
trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java
r8404 r8444 88 88 UploadStrategy strategy = fromPreference(v); 89 89 if (strategy == null) { 90 Main.warn(tr("Unexpected value for key ''{0}'' in preferences, got ''{1}''", "osm-server.upload-strategy", v 90 Main.warn(tr("Unexpected value for key ''{0}'' in preferences, got ''{1}''", "osm-server.upload-strategy", v)); 91 91 return DEFAULT_UPLOAD_STRATEGY; 92 92 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
r8388 r8444 330 330 331 331 lblMultiChangesetPoliciesHeader.setText(tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. Which strategy do you want to use?</html>", numUploadedObjects)); 332 if (!rbFillOneChangeset.isSelected() && ! 332 if (!rbFillOneChangeset.isSelected() && !rbUseMultipleChangesets.isSelected()) { 333 333 rbUseMultipleChangesets.setSelected(true); 334 334 }
Note:
See TracChangeset
for help on using the changeset viewer.