Changeset 30737 in osm for applications/editors/josm/plugins/HouseNumberTaggingTool/src

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

File:

• applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java (modified) (18 diffs)

applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java

@@ -50 +50 @@
    private static final String APPLY_CHANGES = tr("Apply Changes");
    private static final String TAG_STREET_OR_PLACE = tr("Use tag ''addr:street'' or ''addr:place''");
-   
+
    public static final String TAG_BUILDING = "building";
    public static final String TAG_ADDR_COUNTRY = "addr:country";
@@ -61 +61 @@
 
    public static final String[] buildingStrings = {"yes", "apartments", "chapel", "church", "commercial", "dormitory", "hotel", "house", "residential", "terrace",  "industrial", "retail", "warehouse", "cathedral",  "civic", "hospital", "school", "train_station", "transportation", "university", "public", "bridge", "bunker", "cabin", "construction", "farm_auxiliary", "garage", "garages" , "greenhouse", "hangar", "hut", "roof", "shed", "stable" };
-   
+
    private static final int FPS_MIN = -2;
    private static final int FPS_MAX =  2;
-   
+
    private static final long serialVersionUID = 6414385452106276923L;
 
@@ -140 +140 @@
       Arrays.sort(buildingStrings);
       building = new JComboBox<>(buildingStrings);
-      building.setSelectedItem(dto.getBuilding()); 
+      building.setSelectedItem(dto.getBuilding());
       building.setMaximumRowCount(50);
       c.gridx = 3;
@@ -147 +147 @@
       c.gridwidth = 1;
       editPanel.add(building, c);
-      
+
       // country
       countryEnabled = new JCheckBox(TAG_ADDR_COUNTRY);
@@ -258 +258 @@
       editPanel.add(streetEnabled, c);
 
-      
+
       streetRadio = new JRadioButton(TAG_ADDR_STREET);
       streetRadio.setToolTipText(TAG_STREET_OR_PLACE);
@@ -269 +269 @@
       c.gridwidth = 1;
       editPanel.add(streetRadio, c);
-      
+
       placeRadio = new JRadioButton("addr:place");
       placeRadio.setToolTipText(TAG_STREET_OR_PLACE);
@@ -280 +280 @@
       c.gridwidth = 1;
       editPanel.add(placeRadio, c);
-      
+
       ButtonGroup g = new ButtonGroup();
-      g.add( streetRadio ); 
+      g.add( streetRadio );
       g.add( placeRadio );
-      
+
       street = new AutoCompletingComboBox();
       if (dto.isTagStreet())
@@ -318 +318 @@
       housnumber = new JTextField();
       housnumber.setPreferredSize(new Dimension(200, 24));
-      
+
       int number = 0;
       try {
@@ -327 +327 @@
          housnumber.setText(String.valueOf(number));
       }
-      
-      
+
+
       c.fill = GridBagConstraints.HORIZONTAL;
       c.gridx = 3;
@@ -335 +335 @@
       c.gridwidth = 1;
       editPanel.add(housnumber, c);
-      
+
       JLabel seqLabel = new JLabel(tr("House number increment:"));
       c.fill = GridBagConstraints.HORIZONTAL;
@@ -355 +355 @@
       c.gridwidth = 1;
       editPanel.add(housenumberChangeSequence, c);
-   
+
       return editPanel;
    }
@@ -372 +372 @@
          dto.setSaveStreet(streetEnabled.isSelected());
          dto.setTagStreet(streetRadio.isSelected());
-         
+
          dto.setBuilding((String) building.getSelectedItem());
          dto.setCity(getAutoCompletingComboBoxValue(city));
@@ -381 +381 @@
          dto.setState(getAutoCompletingComboBoxValue(state));
          dto.setHousenumberChangeValue(housenumberChangeSequence.getValue());
-         
+
          updateJOSMSelection(selection, dto);
          saveDto(dto);
@@ -424 +424 @@
    protected void updateJOSMSelection(OsmPrimitive selection, Dto dto)
    {
-      ArrayList<Command> commands = new ArrayList<Command>();
+      ArrayList<Command> commands = new ArrayList<>();
 
       if (dto.isSaveBuilding()) {
@@ -476 +476 @@
                     ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_STREET, dto.getStreet());
                     commands.add(command);
-                    
+
                     // remove old place-tag
                     if (selection.get(TagDialog.TAG_ADDR_PLACE) != null)
@@ -492 +492 @@
                     ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_PLACE, dto.getStreet());
                     commands.add(command);
-                    
+
                     // remove old place-tag
                     if (selection.get(TagDialog.TAG_ADDR_STREET) != null)
@@ -523 +523 @@
        * Generates a list of all visible names of highways in order to do autocompletion on the road name.
        */
-      TreeSet<String> names = new TreeSet<String>();
+      TreeSet<String> names = new TreeSet<>();
       for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedPrimitives())
       {
@@ -561 +561 @@
 
    }
-   
+
     class RadioChangeListener implements ItemListener
     {