### Eclipse Workspace Patch 1.0
#P JOSM
|
|
|
|
| 46 | 46 | * The property for the upload strategy |
| 47 | 47 | */ |
| 48 | 48 | public final static String UPLOAD_STRATEGY_SPECIFICATION_PROP = |
| 49 | | UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification"; |
| | 49 | UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification"; |
| 50 | 50 | |
| 51 | 51 | private static final Color BG_COLOR_ERROR = new Color(255,224,224); |
| 52 | 52 | |
| … |
… |
|
| 223 | 223 | int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize(); |
| 224 | 224 | pnlMultiChangesetPolicyPanel.setVisible( |
| 225 | 225 | maxChunkSize > 0 && numUploadedObjects > maxChunkSize |
| 226 | | ); |
| | 226 | ); |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | public void setNumUploadedObjects(int numUploadedObjects) { |
| … |
… |
|
| 326 | 326 | numUploadedObjects, |
| 327 | 327 | maxChunkSize, |
| 328 | 328 | OsmApi.getOsmApi().getBaseUrl() |
| 329 | | ) |
| 330 | | ); |
| | 329 | ) |
| | 330 | ); |
| 331 | 331 | rbStrategy.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setSelected(true); |
| 332 | 332 | lblNumRequests.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setVisible(false); |
| 333 | 333 | |
| 334 | | lblMultiChangesetPoliciesHeader.setText(tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. What strategy do you want to use?</html>", numUploadedObjects)); |
| | 334 | 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)); |
| 335 | 335 | if (!rbFillOneChangeset.isSelected() && ! rbUseMultipleChangesets.isSelected()) { |
| 336 | 336 | rbUseMultipleChangesets.setSelected(true); |
| 337 | 337 | } |
| … |
… |
|
| 355 | 355 | } else { |
| 356 | 356 | lblNumRequests.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY).setText( |
| 357 | 357 | trn("({0} request)", "({0} requests)", numUploadedObjects, numUploadedObjects) |
| 358 | | ); |
| | 358 | ); |
| 359 | 359 | lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setText(tr("(# requests unknown)")); |
| 360 | 360 | int chunkSize = getChunkSize(); |
| 361 | 361 | if (chunkSize == UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) { |
| … |
… |
|
| 364 | 364 | int chunks = (int)Math.ceil((double)numUploadedObjects / (double)chunkSize); |
| 365 | 365 | lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setText( |
| 366 | 366 | trn("({0} request)", "({0} requests)", chunks, chunks) |
| 367 | | ); |
| | 367 | ); |
| 368 | 368 | } |
| 369 | 369 | } |
| 370 | 370 | } |
| … |
… |
|
| 441 | 441 | if (evt.getSource() == tfChunkSize |
| 442 | 442 | && evt.getPropertyName().equals("enabled") |
| 443 | 443 | && (Boolean)evt.getNewValue() |
| 444 | | ) { |
| | 444 | ) { |
| 445 | 445 | valiateChunkSize(); |
| 446 | 446 | } |
| 447 | 447 | } |