Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
r8509 r8510 50 50 UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification"; 51 51 52 private static final Color BG_COLOR_ERROR = new Color(255, 224,224);52 private static final Color BG_COLOR_ERROR = new Color(255, 224, 224); 53 53 54 54 private transient Map<UploadStrategy, JRadioButton> rbStrategy; … … 92 92 gc.gridwidth = 4; 93 93 gc.fill = GridBagConstraints.HORIZONTAL; 94 gc.insets = new Insets(0, 0,3,0);94 gc.insets = new Insets(0, 0, 3, 0); 95 95 gc.anchor = GridBagConstraints.FIRST_LINE_START; 96 96 pnl.add(new JMultilineLabel(tr("Please select the upload strategy:")), gc); … … 173 173 tfChunkSize.addFocusListener(strategyChangeListener); 174 174 tfChunkSize.addActionListener(strategyChangeListener); 175 for (UploadStrategy strategy: UploadStrategy.values()) {175 for (UploadStrategy strategy: UploadStrategy.values()) { 176 176 rbStrategy.get(strategy).addItemListener(strategyChangeListener); 177 177 } … … 190 190 gc.weightx = 1.0; 191 191 pnlMultiChangesetPolicyPanel.add(lblMultiChangesetPoliciesHeader = new JMultilineLabel( 192 tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. Which strategy do you want to use?</html>", 192 tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. " + 193 "Which strategy do you want to use?</html>", 193 194 numUploadedObjects)), gc); 194 195 gc.gridy = 1; … … 214 215 gc.weighty = 0.0; 215 216 gc.anchor = GridBagConstraints.NORTHWEST; 216 gc.insets = new Insets(3, 3,3,3);217 gc.insets = new Insets(3, 3, 3, 3); 217 218 218 219 add(buildUploadStrategyPanel(), gc); … … 234 235 235 236 public void setNumUploadedObjects(int numUploadedObjects) { 236 this.numUploadedObjects = Math.max(numUploadedObjects, 0);237 this.numUploadedObjects = Math.max(numUploadedObjects, 0); 237 238 updateNumRequestsLabels(); 238 239 } … … 264 265 break; 265 266 } 266 if (pnlMultiChangesetPolicyPanel.isVisible()) {267 if (pnlMultiChangesetPolicyPanel.isVisible()) { 267 268 if (rbFillOneChangeset.isSelected()) { 268 269 spec.setPolicy(MaxChangesetSizeExceededPolicy.FILL_ONE_CHANGESET_AND_RETURN_TO_UPLOAD_DIALOG); … … 292 293 try { 293 294 return Integer.parseInt(tfChunkSize.getText().trim()); 294 } catch (NumberFormatException e) {295 } catch (NumberFormatException e) { 295 296 return UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE; 296 297 } … … 312 313 chunkSize = Integer.parseInt(tfChunkSize.getText().trim()); 313 314 Main.pref.putInteger("osm-server.upload-strategy.chunk-size", chunkSize); 314 } catch (NumberFormatException e) {315 } catch (NumberFormatException e) { 315 316 // don't save invalid value to preferences 316 317 } … … 325 326 lbl.setToolTipText(tr("<html>Cannot upload {0} objects in one request because the<br>" 326 327 + "max. changeset size {1} on server ''{2}'' is exceeded.</html>", 327 numUploadedObjects, 328 maxChunkSize, 329 OsmApi.getOsmApi().getBaseUrl() 328 numUploadedObjects, maxChunkSize, OsmApi.getOsmApi().getBaseUrl() 330 329 ) 331 330 ); … … 334 333 335 334 lblMultiChangesetPoliciesHeader.setText( 336 tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. Which strategy do you want to use?</html>", 335 tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. " + 336 "Which strategy do you want to use?</html>", 337 337 numUploadedObjects)); 338 338 if (!rbFillOneChangeset.isSelected() && !rbUseMultipleChangesets.isSelected()) { … … 364 364 lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setText(tr("(# requests unknown)")); 365 365 } else { 366 int chunks = (int) Math.ceil((double)numUploadedObjects / (double)chunkSize);366 int chunks = (int) Math.ceil((double) numUploadedObjects / (double) chunkSize); 367 367 lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setText( 368 368 trn("({0} request)", "({0} requests)", chunks, chunks) … … 379 379 public void propertyChange(PropertyChangeEvent evt) { 380 380 if (evt.getPropertyName().equals(UploadedObjectsSummaryPanel.NUM_OBJECTS_TO_UPLOAD_PROP)) { 381 setNumUploadedObjects((Integer) evt.getNewValue());381 setNumUploadedObjects((Integer) evt.getNewValue()); 382 382 } 383 383 } … … 388 388 Component c = e.getComponent(); 389 389 if (c instanceof JosmTextField) { 390 JosmTextField tf = (JosmTextField) c;390 JosmTextField tf = (JosmTextField) c; 391 391 tf.selectAll(); 392 392 } 393 393 } 394 394 395 @Override 395 396 public void focusLost(FocusEvent e) {} … … 426 427 chunkSize, maxChunkSize, OsmApi.getOsmApi().getBaseUrl())); 427 428 } 428 } catch (NumberFormatException e) {429 } catch (NumberFormatException e) { 429 430 setErrorFeedback(tfChunkSize, tr("Value ''{0}'' is not a number. Please enter an integer > 1", 430 431 tfChunkSize.getText().trim())); … … 453 454 if (evt.getSource() == tfChunkSize 454 455 && "enabled".equals(evt.getPropertyName()) 455 && (Boolean) evt.getNewValue()456 && (Boolean) evt.getNewValue() 456 457 ) { 457 458 validateChunkSize();
Note:
See TracChangeset
for help on using the changeset viewer.