Changeset 14214 in josm for trunk/src/org/openstreetmap/josm/gui/io
- Timestamp:
- 2018-09-01T15:29:15+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/io
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
r14153 r14214 89 89 GuiHelper.runInEDTAndWait(() -> { 90 90 CredentialDialog dialog; 91 if (requestorType .equals(RequestorType.PROXY))91 if (requestorType == RequestorType.PROXY) 92 92 dialog = getHttpProxyCredentialDialog( 93 93 username, password, host, agent.getSaveUsernameAndPasswordCheckboxText()); -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
r12452 r14214 213 213 public boolean hasUnsavedData() { 214 214 for (SaveLayerInfo info: layerInfo) { 215 if (info.isDoUploadToServer() && !UploadOrSaveState.OK.equals(info.getUploadState()))215 if (info.isDoUploadToServer() && UploadOrSaveState.OK != info.getUploadState()) 216 216 return true; 217 if (info.isDoSaveToFile() && !UploadOrSaveState.OK.equals(info.getSaveState()))217 if (info.isDoSaveToFile() && UploadOrSaveState.OK != info.getSaveState()) 218 218 return true; 219 219 } … … 224 224 int ret = 0; 225 225 for (SaveLayerInfo info: layerInfo) { 226 if (UploadOrSaveState.CANCELED .equals(info.getSaveState())227 || UploadOrSaveState.CANCELED .equals(info.getUploadState())) {226 if (UploadOrSaveState.CANCELED == info.getSaveState() 227 || UploadOrSaveState.CANCELED == info.getUploadState()) { 228 228 ret++; 229 229 } … … 235 235 int ret = 0; 236 236 for (SaveLayerInfo info: layerInfo) { 237 if (UploadOrSaveState.FAILED .equals(info.getSaveState())238 || UploadOrSaveState.FAILED .equals(info.getUploadState())) {237 if (UploadOrSaveState.FAILED == info.getSaveState() 238 || UploadOrSaveState.FAILED == info.getUploadState()) { 239 239 ret++; 240 240 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
r12452 r14214 86 86 public void propertyChange(PropertyChangeEvent evt) { 87 87 if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { 88 setVisible(Mode.UPLOADING_AND_SAVING .equals(evt.getNewValue()));88 setVisible(Mode.UPLOADING_AND_SAVING == evt.getNewValue()); 89 89 } 90 90 getParent().validate(); -
trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
r14153 r14214 559 559 560 560 UploadStrategySpecification strategy = dialog.getUploadStrategySpecification(); 561 if (strategy.getStrategy() .equals(UploadStrategy.CHUNKED_DATASET_STRATEGY)561 if (strategy.getStrategy() == UploadStrategy.CHUNKED_DATASET_STRATEGY 562 562 && strategy.getChunkSize() == UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) { 563 563 warnIllegalChunkSize(); -
trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
r13654 r14214 73 73 protected OsmPrimitive getPrimitive(OsmPrimitiveType type, long id) { 74 74 for (OsmPrimitive p: toUpload) { 75 if (OsmPrimitiveType.from(p) .equals(type)&& p.getId() == id)75 if (OsmPrimitiveType.from(p) == type && p.getId() == id) 76 76 return p; 77 77 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
r14153 r14214 161 161 return false; 162 162 } 163 if (strategy.getPolicy() == null || strategy.getPolicy() .equals(MaxChangesetSizeExceededPolicy.ABORT)) {163 if (strategy.getPolicy() == null || strategy.getPolicy() == MaxChangesetSizeExceededPolicy.ABORT) { 164 164 strategy.setPolicy(askMaxChangesetSizeExceedsPolicy()); 165 165 } … … 355 355 if (lastException instanceof ChangesetClosedException) { 356 356 ChangesetClosedException e = (ChangesetClosedException) lastException; 357 if (e.getSource() .equals(ChangesetClosedException.Source.UPDATE_CHANGESET)) {357 if (e.getSource() == ChangesetClosedException.Source.UPDATE_CHANGESET) { 358 358 handleFailedUpload(lastException); 359 359 return; … … 362 362 /* do nothing if unknown policy */ 363 363 return; 364 if (e.getSource() .equals(ChangesetClosedException.Source.UPLOAD_DATA)) {364 if (e.getSource() == ChangesetClosedException.Source.UPLOAD_DATA) { 365 365 switch(strategy.getPolicy()) { 366 366 case ABORT: -
trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
r12846 r14214 256 256 rbStrategy.get(strategy.getStrategy()).setSelected(true); 257 257 tfChunkSize.setEnabled(strategy.getStrategy() == UploadStrategy.CHUNKED_DATASET_STRATEGY); 258 if (strategy.getStrategy() .equals(UploadStrategy.CHUNKED_DATASET_STRATEGY)) {258 if (strategy.getStrategy() == UploadStrategy.CHUNKED_DATASET_STRATEGY) { 259 259 if (strategy.getChunkSize() != UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) { 260 260 tfChunkSize.setText(Integer.toString(strategy.getChunkSize()));
Note:
See TracChangeset
for help on using the changeset viewer.