Changeset 23950 in osm for applications/editors/josm/plugins

Timestamp:

2010-10-31T02:37:55+01:00 (14 years ago)

Author:

oliverw

Message:

Change header format string for better translation.

File:

• applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java

@@ -60 +60 @@
 @SuppressWarnings("serial")
 public class AddressEditDialog extends JDialog implements ActionListener, ListSelectionListener, IAddressEditContainerListener {
-        private static final String UNRESOLVED_HEADER_FMT = tr("Unresolved Addresses (%d)");
-        private static final String STREET_HEADER_FMT = tr("Streets (%d)");
+        private static final String UNRESOLVED_ADDRESS = tr("Unresolved Addresses");
+        private static final String STREETS = tr("Streets");
+        private static final String UNRESOLVED_HEADER_FMT = tr("%s (%d)");
+        private static final String STREET_HEADER_FMT = tr("%s (%d)");
         private static final String OK_COMMAND = tr("Close");
         private static final String SELECT_AND_CLOSE = tr("Select and close");
@@ -109 +111 @@
                         streetPanel.add(scroll1, BorderLayout.CENTER);
                         
-                        streetLabel = createHeaderLabel(STREET_HEADER_FMT, editContainer.getNumberOfStreets());
+                        streetLabel = createHeaderLabel(STREET_HEADER_FMT,
+                                        STREETS,
+                                        editContainer.getNumberOfStreets());
                         streetPanel.add(streetLabel, BorderLayout.NORTH);
                         streetPanel.setMinimumSize(new Dimension(350, 300));
@@ -124 +128 @@
                         unresolvedPanel.add(scroll2, BorderLayout.CENTER);
                         unresolvedAddressesLabel = createHeaderLabel(
-                                        UNRESOLVED_HEADER_FMT, editContainer.getNumberOfUnresolvedAddresses());
+                                        UNRESOLVED_HEADER_FMT, 
+                                        UNRESOLVED_ADDRESS, 
+                                        editContainer.getNumberOfUnresolvedAddresses());
                         unresolvedPanel.add(unresolvedAddressesLabel , BorderLayout.NORTH);
                         unresolvedPanel.setMinimumSize(new Dimension(350, 200));
@@ -185 +191 @@
         }
 
-        private JLabel createHeaderLabel(String fmtString, int n) {
-                JLabel label = new JLabel(String.format(fmtString, n));
+        /**
+         * Creates a header label in the form "title (number)" with bold font. 
+         * @param fmtString The format string having a string and a numeric placeholder.
+         * @param title The title of the header.
+         * @param n The number to show in the header.
+         * @return
+         */
+        private JLabel createHeaderLabel(String fmtString, String title, int n) {
+                JLabel label = new JLabel(String.format(fmtString, title, n));
                 label.setFont(label.getFont().deriveFont(Font.BOLD));
                 return label;
         }
         
+        /**
+         * Updates the list headings.
+         */
         private void updateHeaders() {
                 if (editContainer != null) {
-                        streetLabel.setText(String.format(STREET_HEADER_FMT, editContainer.getNumberOfStreets()));
-                        unresolvedAddressesLabel.setText(String.format(UNRESOLVED_HEADER_FMT, editContainer.getNumberOfUnresolvedAddresses()));
+                        streetLabel.setText(String.format(
+                                        STREET_HEADER_FMT,
+                                        STREETS,
+                                        editContainer.getNumberOfStreets()));
+                        unresolvedAddressesLabel.setText(
+                                        String.format(UNRESOLVED_HEADER_FMT,
+                                                        UNRESOLVED_ADDRESS,
+                                                        editContainer.getNumberOfUnresolvedAddresses()));
                 } else {
                         streetLabel.setText(String.format(STREET_HEADER_FMT, 0));
@@ -244 +266 @@
         }
 
+        /**
+         * Removes all markers and rectangles from the map viewer.
+         */
         private void clearMapViewer() {
                 mapViewer.setVisible(false);
@@ -271 +296 @@
          *   
          * @author Oliver Wieland <oliver.wieland@online.de> 
-         */
-        
+         */     
         class IncompleteAddressListener implements ListSelectionListener {