Ticket #6682: patch.diff

File patch.diff, 3.2 KB (added by Casiope, 14 years ago)
  • src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

    ### Eclipse Workspace Patch 1.0
    #P JOSM
     
    4646     * The property for the upload strategy
    4747     */
    4848    public final static String UPLOAD_STRATEGY_SPECIFICATION_PROP =
    49         UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification";
     49            UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification";
    5050
    5151    private static final Color BG_COLOR_ERROR = new Color(255,224,224);
    5252
     
    223223        int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize();
    224224        pnlMultiChangesetPolicyPanel.setVisible(
    225225                maxChunkSize > 0 && numUploadedObjects > maxChunkSize
    226         );
     226                );
    227227    }
    228228
    229229    public void setNumUploadedObjects(int numUploadedObjects) {
     
    326326                    numUploadedObjects,
    327327                    maxChunkSize,
    328328                    OsmApi.getOsmApi().getBaseUrl()
    329             )
    330             );
     329                    )
     330                    );
    331331            rbStrategy.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setSelected(true);
    332332            lblNumRequests.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setVisible(false);
    333333
    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));
    335335            if (!rbFillOneChangeset.isSelected() && ! rbUseMultipleChangesets.isSelected()) {
    336336                rbUseMultipleChangesets.setSelected(true);
    337337            }
     
    355355        } else {
    356356            lblNumRequests.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY).setText(
    357357                    trn("({0} request)", "({0} requests)", numUploadedObjects, numUploadedObjects)
    358             );
     358                    );
    359359            lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setText(tr("(# requests unknown)"));
    360360            int chunkSize = getChunkSize();
    361361            if (chunkSize == UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) {
     
    364364                int chunks = (int)Math.ceil((double)numUploadedObjects / (double)chunkSize);
    365365                lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setText(
    366366                        trn("({0} request)", "({0} requests)", chunks, chunks)
    367                 );
     367                        );
    368368            }
    369369        }
    370370    }
     
    441441            if (evt.getSource() == tfChunkSize
    442442                    && evt.getPropertyName().equals("enabled")
    443443                    && (Boolean)evt.getNewValue()
    444             ) {
     444                    ) {
    445445                valiateChunkSize();
    446446            }
    447447        }