### Eclipse Workspace Patch 1.0 #P JOSM Index: src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 4304) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (working copy) @@ -289,8 +289,8 @@ BorderFactory.createCompoundBorder( BorderFactory.createLineBorder(Color.GRAY), BorderFactory.createEmptyBorder(5,5,5,5) - ) - )); + ) + )); GridBagConstraints gc = new GridBagConstraints(); gc.anchor = GridBagConstraints.NORTHWEST; gc.fill = GridBagConstraints.HORIZONTAL; @@ -427,8 +427,8 @@ BorderFactory.createCompoundBorder( BorderFactory.createLineBorder(Color.GRAY), BorderFactory.createEmptyBorder(5,5,5,5) - ) - )); + ) + )); ItemListener userRestrictionChangeHandler = new UserRestrictionChangedHandler(); GridBagConstraints gc = new GridBagConstraints(); @@ -492,13 +492,13 @@ public void startUserInput() { if (JosmUserIdentityManager.getInstance().isAnonymous()) { - lblRestrictedToMyself.setText("Only changesets owned by myself (disabled. JOSM is currently run by an anonymous user)"); + lblRestrictedToMyself.setText(tr("Only changesets owned by myself (disabled. JOSM is currently run by an anonymous user)")); rbRestrictToMyself.setEnabled(false); if (rbRestrictToMyself.isSelected()) { rbRestrictToUid.setSelected(true); } } else { - lblRestrictedToMyself.setText("Only changesets owned by myself"); + lblRestrictedToMyself.setText(tr("Only changesets owned by myself")); rbRestrictToMyself.setEnabled(true); rbRestrictToMyself.setSelected(true); } @@ -554,7 +554,7 @@ tr("Invalid user ID"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidUserId") - ); + ); } protected void alertInvalidUserName() { @@ -564,7 +564,7 @@ tr("Invalid user name"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidUserName") - ); + ); } public void displayMessageIfInvalid() { @@ -747,8 +747,8 @@ BorderFactory.createCompoundBorder( BorderFactory.createLineBorder(Color.GRAY), BorderFactory.createEmptyBorder(5,5,5,5) - ) - )); + ) + )); // -- changesets closed after a specific date/time // @@ -811,7 +811,7 @@ return valClosedAfterDate1.isValid() && valClosedAfterTime1.isValid(); else if (rbClosedAfterAndCreatedBefore.isSelected()) return valClosedAfterDate2.isValid() && valClosedAfterTime2.isValid() - && valCreatedBeforeDate.isValid() && valCreatedBeforeTime.isValid(); + && valCreatedBeforeDate.isValid() && valCreatedBeforeTime.isValid(); // should not happen return true; } @@ -863,12 +863,12 @@ this, tr( "Please enter valid date/time values to restrict
" - + "the query to a specific time range." - ), - tr("Invalid date/time values"), - JOptionPane.ERROR_MESSAGE, - HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidDateTimeValues") - ); + + "the query to a specific time range." + ), + tr("Invalid date/time values"), + JOptionPane.ERROR_MESSAGE, + HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidDateTimeValues") + ); } @@ -929,8 +929,8 @@ BorderFactory.createCompoundBorder( BorderFactory.createLineBorder(Color.GRAY), BorderFactory.createEmptyBorder(5,5,5,5) - ) - )); + ) + )); } public boolean isValidChangesetQuery() { @@ -949,12 +949,12 @@ this, tr( "Please enter valid longitude/latitude values to restrict
" + - "the changeset query to a specific bounding box." - ), - tr("Invalid bounding box"), - JOptionPane.ERROR_MESSAGE, - HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidBoundingBox") - ); + "the changeset query to a specific bounding box." + ), + tr("Invalid bounding box"), + JOptionPane.ERROR_MESSAGE, + HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidBoundingBox") + ); } } @@ -1061,15 +1061,15 @@ public String getStandardTooltipText() { return tr( "Please enter a date in the usual format for your locale.
" - + "Example: {0}
" - + "Example: {1}
" - + "Example: {2}
" - + "Example: {3}
", - DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()).format(new Date()), - DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault()).format(new Date()), - DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault()).format(new Date()), - DateFormat.getDateInstance(DateFormat.FULL, Locale.getDefault()).format(new Date()) - ); + + "Example: {0}
" + + "Example: {1}
" + + "Example: {2}
" + + "Example: {3}
", + DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()).format(new Date()), + DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault()).format(new Date()), + DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault()).format(new Date()), + DateFormat.getDateInstance(DateFormat.FULL, Locale.getDefault()).format(new Date()) + ); } @Override @@ -1125,15 +1125,15 @@ public String getStandardTooltipText() { return tr( "Please enter a valid time in the usual format for your locale.
" - + "Example: {0}
" - + "Example: {1}
" - + "Example: {2}
" - + "Example: {3}
", - DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(new Date()), - DateFormat.getTimeInstance(DateFormat.MEDIUM, Locale.getDefault()).format(new Date()), - DateFormat.getTimeInstance(DateFormat.LONG, Locale.getDefault()).format(new Date()), - DateFormat.getTimeInstance(DateFormat.FULL, Locale.getDefault()).format(new Date()) - ); + + "Example: {0}
" + + "Example: {1}
" + + "Example: {2}
" + + "Example: {3}
", + DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(new Date()), + DateFormat.getTimeInstance(DateFormat.MEDIUM, Locale.getDefault()).format(new Date()), + DateFormat.getTimeInstance(DateFormat.LONG, Locale.getDefault()).format(new Date()), + DateFormat.getTimeInstance(DateFormat.FULL, Locale.getDefault()).format(new Date()) + ); } @Override