Changeset 33029 in osm


Ignore:
Timestamp:
2016-10-09T04:25:04+02:00 (8 years ago)
Author:
donvip
Message:

checkstyle

Location:
applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/Preferences.java

    r32566 r33029  
    135135        });
    136136
    137         javax.swing.GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
     137        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
    138138        mainPanel.setLayout(mainPanelLayout);
    139139        mainPanelLayout.setHorizontalGroup(
    140             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     140            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    141141            .addGroup(mainPanelLayout.createSequentialGroup()
    142                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     142                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    143143                    .addGroup(mainPanelLayout.createSequentialGroup()
    144144                        .addGap(12, 12, 12)
    145                         .addComponent(optimizeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
     145                        .addComponent(optimizeComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
    146146                    .addComponent(jLabel2)
    147                     .addComponent(addNewTagCheckBox, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
     147                    .addComponent(addNewTagCheckBox, GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
    148148                    .addGroup(mainPanelLayout.createSequentialGroup()
    149149                        .addGap(12, 12, 12)
    150                         .addComponent(addNewTagKeyField, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)
     150                        .addComponent(addNewTagKeyField, GroupLayout.PREFERRED_SIZE, 120, GroupLayout.PREFERRED_SIZE)
    151151                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    152152                        .addComponent(jLabel1)
    153153                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    154                         .addComponent(addNewTagValueField, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
    155                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 121, javax.swing.GroupLayout.PREFERRED_SIZE))
    156                     .addComponent(buildingCheckBox, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE))
     154                        .addComponent(addNewTagValueField, GroupLayout.PREFERRED_SIZE, 125, GroupLayout.PREFERRED_SIZE)
     155                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 121, GroupLayout.PREFERRED_SIZE))
     156                    .addComponent(buildingCheckBox, GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE))
    157157                .addContainerGap())
    158158        );
    159159        mainPanelLayout.setVerticalGroup(
    160             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     160            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    161161            .addGroup(mainPanelLayout.createSequentialGroup()
    162162                .addComponent(jLabel2)
    163163                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    164                 .addComponent(optimizeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     164                .addComponent(optimizeComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    165165                .addGap(18, 18, 18)
    166166                .addComponent(addNewTagCheckBox)
    167167                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    168                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    169                     .addComponent(addNewTagKeyField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     168                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     169                    .addComponent(addNewTagKeyField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    170170                    .addComponent(jLabel1)
    171                     .addComponent(addNewTagValueField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
     171                    .addComponent(addNewTagValueField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
    172172                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
    173173                .addComponent(buildingCheckBox)

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java

    r32566 r33029  
    1313public class PrimUtils {
    1414
     15    // CHECKSTYLE.OFF: SingleSpaceSeparator
    1516    public static final String KEY_HIGHWAY      = "highway";
    1617    public static final String KEY_PLACE        = "place";
    … …  
    2425    public static final String KEY_IS_IN        = "is_in";
    2526    public static final String KEY_NAME         = "name";
    26 
     27    // CHECKSTYLE.ON: SingleSpaceSeparator
    2728
    2829    private static final String[] keysToCompare = new String[]
    … …  
    5758    };
    5859
     60    private PrimUtils() {
     61        // Hide default constructor for utilities classes
     62    }
    5963}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java

    r32566 r33029  
    199199    public static int matchField(String elemValue, String primValue) {
    200200
    201         if (elemValue == null) return  0;
     201        if (elemValue == null) return 0;
    202202        if (primValue == null) return -1;
    203203
    … …  
    273273        switch (minVal * maxVal) {
    274274            case -1 : return Reasoner.MATCH_CONFLICT;
    275             case  0 : return Reasoner.MATCH_PARTIAL;
     275            case 0 : return Reasoner.MATCH_PARTIAL;
    276276            case +1 : return Reasoner.MATCH_ROCKSOLID;
    277277        }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java

    r32566 r33029  
    3333     */
    3434    public void addHouses(List<House> housesToAdd) {
    35         for (House houseToAdd : housesToAdd)
     35        for (House houseToAdd : housesToAdd) {
    3636            addHouse(houseToAdd);
     37        }
    3738    }
    3839
    … …  
    4243    public void setHouses(List<House> houses) {
    4344        this.houses = houses;
    44         for (House house : this.houses)
     45        for (House house : this.houses) {
    4546            house.setParent(this);
     47        }
    4648    }
    4749

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java

    r32566 r33029  
    225225     */
    226226    public static boolean isMatchable(OsmPrimitive prim) {
    227         for (String key : prim.keySet())
     227        for (String key : prim.keySet()) {
    228228            if (key.startsWith("addr:"))
    229229                return true;
     230        }
    230231        return false;
    231232    }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java

    r32566 r33029  
    2828    public void setViToCis(ArrayList<ViToCi> municipalities) {
    2929        this.vitocis = municipalities;
    30         for (ViToCi obec : municipalities)
     30        for (ViToCi obec : municipalities) {
    3131            obec.setParent(this);
     32        }
    3233    }
    3334
    … …  
    4546        viToCiName = viToCiName.toUpperCase();
    4647
    47         for (ViToCi vitoci : vitocis)
     48        for (ViToCi vitoci : vitocis) {
    4849            if (vitoci.getName().toUpperCase().equals(name))
    4950                return vitoci;
     51        }
    5052
    5153        return null;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java

    r32566 r33029  
    1616 * @author Radomír Černoch radomir.cernoch@gmail.com
    1717 */
    18 public class Street extends ElementWithHouses  {
     18public class Street extends ElementWithHouses {
    1919
    2020    public Street(String name) {

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java

    r32566 r33029  
    1717
    1818    public static boolean isMatchable(OsmPrimitive prim) {
    19         for (String key : prim.keySet())
     19        for (String key : prim.keySet()) {
    2020            if (key.equals(PrimUtils.KEY_PLACE))
    2121                return true;
     22        }
    2223        return false;
    2324    }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java

    r32566 r33029  
    3333     */
    3434    public void addSuburbs(List<Suburb> suburbsToAdd) {
    35         for (Suburb suburbToAdd : suburbsToAdd)
     35        for (Suburb suburbToAdd : suburbsToAdd) {
    3636            addSuburb(suburbToAdd);
     37        }
    3738    }
    3839
    … …  
    5051        suburbName = suburbName.toUpperCase();
    5152
    52         for (Suburb suburb : suburbs)
     53        for (Suburb suburb : suburbs) {
    5354            if (suburb.getName().toUpperCase().equals(suburbName))
    5455                return suburb;
     56        }
    5557
    5658        return null;
    … …  
    6062    public List<Street> getAllStreets() {
    6163        List<Street> result = super.getAllStreets();
    62         for (Suburb suburb : suburbs)
     64        for (Suburb suburb : suburbs) {
    6365            result.addAll(suburb.getAllStreets());
     66        }
    6467        return result;
    6568    }
    … …  
    6871    public List<House> getAllHouses() {
    6972        List<House> result = super.getAllHouses();
    70         for (Suburb suburb : suburbs)
     73        for (Suburb suburb : suburbs) {
    7174            result.addAll(suburb.getAllHouses());
     75        }
    7276        return result;
    7377    }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java

    r32566 r33029  
    357357                        ListDataEvent.INTERVAL_ADDED,
    358358                        -index-1, -index-1);
    359                 for (ListDataListener listener : listeners)
     359                for (ListDataListener listener : listeners) {
    360360                    listener.intervalAdded(evt);
     361                }
    361362
    362363                if (mainField.getSelectedItem() == null)
    … …  
    376377                        ListDataEvent.INTERVAL_ADDED,
    377378                        -index-1 + elements.size(), -index-1 + elements.size());
    378                 for (ListDataListener listener : listeners)
     379                for (ListDataListener listener : listeners) {
    379380                    listener.intervalAdded(evt);
     381                }
    380382
    381383                if (mainField.getSelectedItem() == null)
    … …  
    399401                        ListDataEvent.INTERVAL_REMOVED,
    400402                        index, index);
    401                 for (ListDataListener listener : listeners)
     403                for (ListDataListener listener : listeners) {
    402404                    listener.intervalRemoved(evt);
     405                }
    403406            }
    404407        }
    … …  
    419422                        ListDataEvent.INTERVAL_REMOVED,
    420423                        index + elements.size(), index + elements.size());
    421                 for (ListDataListener listener : listeners)
     424                for (ListDataListener listener : listeners) {
    422425                    listener.intervalRemoved(evt);
     426                }
    423427            }
    424428        }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java

    r32566 r33029  
    119119    public void setSelectedHouse(House house) {
    120120
    121         for (int i = 0; i < streetModel.getSize(); i++)
     121        for (int i = 0; i < streetModel.getSize(); i++) {
    122122            if (streetModel.getElementAt(i) == house.getParent()) {
    123123                streetComboBox.setSelectedIndex(i);
    … …  
    125125                break;
    126126            }
    127 
    128         for (int i = 0; i < houseModel.getSize(); i++)
     127        }
     128
     129        for (int i = 0; i < houseModel.getSize(); i++) {
    129130            if (houseModel.getElementAt(i) == house) {
    130131                houseList.setSelectedIndex(i);
    … …  
    132133                break;
    133134            }
     135        }
    134136    }
    135137
    … …  
    233235
    234236        Street selectedStreet = null;
    235         for (Street street : CzechAddressPlugin.getLocation().getStreets())
     237        for (Street street : CzechAddressPlugin.getLocation().getStreets()) {
    236238            if (street.getName().toUpperCase().equals(streetName.toUpperCase())) {
    237239                selectedStreet = street;
    238240                break;
    239241            }
     242        }
    240243
    241244        if (selectedStreet == null) return;

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java

    r32566 r33029  
    55import java.awt.event.KeyEvent;
    66
     7import javax.swing.GroupLayout;
    78import javax.swing.tree.TreePath;
    89
    … …  
    135136        jScrollPane1.setViewportView(proposalTree);
    136137
    137         javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
     138        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
    138139        mainPanel.setLayout(mainPanelLayout);
    139140        mainPanelLayout.setHorizontalGroup(
    140             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     141            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    141142            .addGroup(mainPanelLayout.createSequentialGroup()
    142143                .addComponent(locationLabel)
    143144                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    144                 .addComponent(locationTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 379, Short.MAX_VALUE)
     145                .addComponent(locationTextField, GroupLayout.DEFAULT_SIZE, 379, Short.MAX_VALUE)
    145146                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    146147                .addComponent(locationChangeButton))
    147             .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 482, Short.MAX_VALUE)
     148            .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 482, Short.MAX_VALUE)
    148149            .addGroup(mainPanelLayout.createSequentialGroup()
    149150                .addContainerGap()
    150                 .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 458, Short.MAX_VALUE)
     151                .addComponent(jLabel3, GroupLayout.DEFAULT_SIZE, 458, Short.MAX_VALUE)
    151152                .addContainerGap())
    152153        );
    153154        mainPanelLayout.setVerticalGroup(
    154             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     155            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    155156            .addGroup(mainPanelLayout.createSequentialGroup()
    156                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    157                     .addComponent(locationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     157                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     158                    .addComponent(locationTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    158159                    .addComponent(locationChangeButton)
    159160                    .addComponent(locationLabel))
    160161                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    161                 .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 223, Short.MAX_VALUE)
     162                .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 223, Short.MAX_VALUE)
    162163                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    163164                .addComponent(jLabel3))

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java

    r32566 r33029  
    8181    private void initLocationHints() {
    8282        boolean assertions = false;
    83         assert  assertions = true;
     83        assert assertions = true;
    8484
    8585        OsmPrimitive bestFit = null;
    … …  
    151151                            hlRegions.add(oblast);
    152152                            hlViToCis.add(obec);
    153                             for (Suburb castObce : obec.getSuburbs())
     153                            for (Suburb castObce : obec.getSuburbs()) {
    154154                                if (castObce.getName().equalsIgnoreCase(bestFit.get("name")))
    155155                                    hlSuburbs.add(castObce);
     156                            }
    156157                        }
    157158                    } else {
    … …  
    176177        int curHlIndex = 0;
    177178
    178         for (int i = 0; i < list.getSize(); i++)
     179        for (int i = 0; i < list.getSize(); i++) {
    179180            for (int j = 0; j < hlList.size(); j++) {
    180181                E t = list.getElementAt(i);
    … …  
    185186                }
    186187            }
     188        }
    187189
    188190        return curHlIndex;
    … …  
    315317        if (obec.getSuburbs().size() > 0) {
    316318            ElementWithStreets[] suburbs = new ElementWithStreets[obec.getSuburbs().size() + 1];
    317             for (int i = 0; i < obec.getSuburbs().size(); i++)
     319            for (int i = 0; i < obec.getSuburbs().size(); i++) {
    318320                suburbs[i] = obec.getSuburbs().get(i);
     321            }
    319322            suburbs[obec.getSuburbs().size()] = obec;
    320323            DefaultComboBoxModel<ElementWithStreets> suburbsList = new DefaultComboBoxModel<>(suburbs);

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java

    r32566 r33029  
    99import javax.swing.AbstractAction;
    1010import javax.swing.Action;
     11import javax.swing.GroupLayout;
    1112import javax.swing.Timer;
    1213
    … …  
    4142public class PointManipulatorDialog extends ExtendedDialog implements StatusListener {
    4243
    43     private Timer  updateMatchesTimer = null;
     44    private Timer updateMatchesTimer = null;
    4445    private Action updateMatchesAction;
    4546    private ProposalContainer proposalContainer;
    … …  
    277278            mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    278279            .addGroup(mainPanelLayout.createSequentialGroup()
    279                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    280                     .addComponent(locationEdit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     280                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     281                    .addComponent(locationEdit, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    281282                    .addComponent(jLabel5)
    282283                    .addComponent(changeLocationButton))
    283284                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    284                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    285                     .addComponent(alternateNumberEdit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     285                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     286                    .addComponent(alternateNumberEdit, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    286287                    .addComponent(jLabel1))
    287288                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    288                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
     289                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
    289290                    .addComponent(jLabel6)
    290                     .addComponent(matchesComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
    291                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    292                 .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 153, Short.MAX_VALUE)
     291                    .addComponent(matchesComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
     292                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
     293                .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 153, Short.MAX_VALUE)
    293294                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    294295                .addComponent(statusLabel))
    … …  
    313314    private void proposalListKeyReleased(java.awt.event.KeyEvent evt) { //GEN-FIRST:event_proposalListKeyReleased
    314315        if (evt.getKeyCode() == KeyEvent.VK_DELETE) {
    315             for (Object o : proposalList.getSelectedValuesList())
     316            for (Object o : proposalList.getSelectedValuesList()) {
    316317                proposalContainer.removeProposal((Proposal) o);
     318            }
    317319        }
    318320    } //GEN-LAST:event_proposalListKeyReleased

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/EditorFactory.java

    r32566 r33029  
    3838                r.openTransaction();
    3939                street.setName(dialog.getStreetName());
    40                 for (House house : street.getHouses())
     40                for (House house : street.getHouses()) {
    4141                    r.update(house);
     42                }
    4243                r.update(street);
    4344                r.closeTransaction();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java

    r32566 r33029  
    22package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
    33
     4import javax.swing.GroupLayout;
    45import javax.swing.JButton;
    56import javax.swing.JLabel;
    … …  
    115116        );
    116117        mainPanelLayout.setVerticalGroup(
    117             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     118            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    118119            .addGroup(mainPanelLayout.createSequentialGroup()
    119                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
     120                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
    120121                    .addComponent(jLabel1)
    121                     .addComponent(parentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     122                    .addComponent(parentField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    122123                    .addComponent(parentEditButton))
    123124                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    124                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
     125                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
    125126                    .addComponent(jLabel2)
    126                     .addComponent(cpField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     127                    .addComponent(cpField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    127128                    .addComponent(jLabel3)
    128                     .addComponent(coField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
     129                    .addComponent(coField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
    129130                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
    130131        );

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java

    r32566 r33029  
    33
    44import javax.swing.DefaultComboBoxModel;
     5import javax.swing.GroupLayout;
    56
    67import org.openstreetmap.josm.Main;
    … …  
    113114        });
    114115
    115         javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
     116        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
    116117        mainPanel.setLayout(mainPanelLayout);
    117118        mainPanelLayout.setHorizontalGroup(
    118             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     119            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    119120            .addGroup(mainPanelLayout.createSequentialGroup()
    120                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
     121                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
    121122                    .addComponent(jLabel2)
    122123                    .addComponent(jLabel3)
    123124                    .addComponent(jLabel1))
    124125                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    125                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
    126                     .addComponent(nameField, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE)
    127                     .addGroup(javax.swing.GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup()
    128                         .addComponent(parentField, javax.swing.GroupLayout.DEFAULT_SIZE, 310, Short.MAX_VALUE)
     126                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
     127                    .addComponent(nameField, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE)
     128                    .addGroup(GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup()
     129                        .addComponent(parentField, GroupLayout.DEFAULT_SIZE, 310, Short.MAX_VALUE)
    129130                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    130131                        .addComponent(parentEditButton))
    131                     .addGroup(javax.swing.GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup()
    132                         .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 308, javax.swing.GroupLayout.PREFERRED_SIZE)
     132                    .addGroup(GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup()
     133                        .addComponent(jScrollPane1, GroupLayout.PREFERRED_SIZE, 308, GroupLayout.PREFERRED_SIZE)
    133134                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    134135                        .addComponent(houseEditButton)
    … …  
    136137        );
    137138        mainPanelLayout.setVerticalGroup(
    138             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     139            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    139140            .addGroup(mainPanelLayout.createSequentialGroup()
    140                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
     141                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
    141142                    .addComponent(jLabel1)
    142                     .addComponent(parentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     143                    .addComponent(parentField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    143144                    .addComponent(parentEditButton))
    144145                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    145                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    146                     .addComponent(nameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     146                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     147                    .addComponent(nameField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    147148                    .addComponent(jLabel2))
    148149                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    149                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     150                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    150151                    .addComponent(jLabel3)
    151152                    .addComponent(houseEditButton)
    152                     .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 77, javax.swing.GroupLayout.PREFERRED_SIZE))
    153                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
     153                    .addComponent(jScrollPane1, GroupLayout.PREFERRED_SIZE, 77, GroupLayout.PREFERRED_SIZE))
     154                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
    154155        );
    155156

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java

    r32566 r33029  
    33
    44import javax.swing.DefaultComboBoxModel;
     5import javax.swing.GroupLayout;
    56
    67import org.openstreetmap.josm.Main;
    … …  
    144145        jLabel4.setText("Ulice:");
    145146
    146         javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
     147        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
    147148        mainPanel.setLayout(mainPanelLayout);
    148149        mainPanelLayout.setHorizontalGroup(
    149             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     150            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    150151            .addGroup(mainPanelLayout.createSequentialGroup()
    151                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     152                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    152153                    .addComponent(jLabel4)
    153154                    .addComponent(jLabel3)
    … …  
    155156                    .addComponent(jLabel1))
    156157                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    157                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    158                     .addGroup(mainPanelLayout.createSequentialGroup()
    159                         .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE)
     158                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
     159                    .addGroup(mainPanelLayout.createSequentialGroup()
     160                        .addComponent(jScrollPane2, GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE)
    160161                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    161162                        .addComponent(streetEditButton))
    162163                    .addGroup(mainPanelLayout.createSequentialGroup()
    163                         .addComponent(parentField, javax.swing.GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE)
     164                        .addComponent(parentField, GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE)
    164165                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    165166                        .addComponent(parentEditButton))
    166                     .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
    167                         .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE)
     167                    .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
     168                        .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE)
    168169                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    169170                        .addComponent(houseEditButton))
    170                     .addComponent(nameField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 364, Short.MAX_VALUE)))
     171                    .addComponent(nameField, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 364, Short.MAX_VALUE)))
    171172        );
    172173        mainPanelLayout.setVerticalGroup(
    173             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     174            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    174175            .addGroup(mainPanelLayout.createSequentialGroup()
    175                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    176                     .addGroup(mainPanelLayout.createSequentialGroup()
    177                         .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    178                             .addComponent(parentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     176                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
     177                    .addGroup(mainPanelLayout.createSequentialGroup()
     178                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     179                            .addComponent(parentField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    179180                            .addComponent(parentEditButton)
    180181                            .addComponent(jLabel1))
    181182                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    182                         .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    183                             .addComponent(nameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
     183                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
     184                            .addComponent(nameField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
    184185                            .addComponent(jLabel2))
    185186                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    186                         .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     187                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    187188                            .addComponent(houseEditButton)
    188                             .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 77, javax.swing.GroupLayout.PREFERRED_SIZE)))
     189                            .addComponent(jScrollPane1, GroupLayout.PREFERRED_SIZE, 77, GroupLayout.PREFERRED_SIZE)))
    189190                    .addGroup(mainPanelLayout.createSequentialGroup()
    190191                        .addGap(66, 66, 66)
    191192                        .addComponent(jLabel3)))
    192193                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    193                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
     194                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
    194195                    .addComponent(jLabel4)
    195196                    .addComponent(streetEditButton)
    196                     .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 77, javax.swing.GroupLayout.PREFERRED_SIZE))
    197                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
     197                    .addComponent(jScrollPane2, GroupLayout.PREFERRED_SIZE, 77, GroupLayout.PREFERRED_SIZE))
     198                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
    198199        );
    199200

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java

    r32566 r33029  
    3636                ListDataEvent.CONTENTS_CHANGED, 0, getSize()-1);
    3737
    38         for (ListDataListener l : listeners)
     38        for (ListDataListener l : listeners) {
    3939            l.contentsChanged(evt);
     40        }
    4041    }
    4142}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java

    r32566 r33029  
    3636                ListDataEvent.CONTENTS_CHANGED, 0, getSize()-1);
    3737
    38         for (ListDataListener l : listeners)
     38        for (ListDataListener l : listeners) {
    3939            l.contentsChanged(evt);
     40        }
    4041    }
    4142}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java

    r32566 r33029  
    5353        TreeModelEvent evt = new TreeModelEvent(this, new Object[] {root});
    5454
    55         for (TreeModelListener l : listeneres)
     55        for (TreeModelListener l : listeneres) {
    5656            l.treeNodesChanged(evt);
     57        }
    5758    }
    5859}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java

    r32566 r33029  
    2323 */
    2424public abstract class UniversalRenderer {
    25     private static final ImageIcon iconAdd    = ImageProvider.get("actions", "add.png");
    26     private static final ImageIcon iconEdit   = ImageProvider.get("actions", "edit.png");
     25    private static final ImageIcon iconAdd = ImageProvider.get("actions", "add.png");
     26    private static final ImageIcon iconEdit = ImageProvider.get("actions", "edit.png");
    2727    private static final ImageIcon iconRemove = ImageProvider.get("actions", "remove.png");
    2828
    29     private static final ImageIcon nodeIcon      = ImageProvider.get("data/node.png");
    30     private static final ImageIcon wayIcon       = ImageProvider.get("data/way.png");
    31     private static final ImageIcon relationIcon  = ImageProvider.get("data/relation.png");
     29    private static final ImageIcon nodeIcon = ImageProvider.get("data/node.png");
     30    private static final ImageIcon wayIcon = ImageProvider.get("data/way.png");
     31    private static final ImageIcon relationIcon = ImageProvider.get("data/relation.png");
    3232
    3333    private static final ImageIcon envelopeNormIcon = ImageProvider.get("envelope-closed-small.png");
    … …  
    3737    public static ImageIcon getIcon(Object value) {
    3838
    39              if (value instanceof AddKeyValueProposal)    return iconAdd;
     39             if (value instanceof AddKeyValueProposal) return iconAdd;
    4040        else if (value instanceof KeyValueChangeProposal) return iconEdit;
    41         else if (value instanceof RemoveKeyProposal)      return iconRemove;
     41        else if (value instanceof RemoveKeyProposal) return iconRemove;
    4242
    4343        if (value instanceof House) {

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java

    r32566 r33029  
    8585        transactionOpened = false;
    8686
    87         for (ReasonerListener listener : listeners)
     87        for (ReasonerListener listener : listeners) {
    8888            listener.resonerReseted();
     89        }
    8990    }
    9091
    … …  
    129130
    130131        Set<AddressElement> elemChanges = new HashSet<>();
    131         Set<OsmPrimitive>   primChanges = new HashSet<>();
     132        Set<OsmPrimitive> primChanges = new HashSet<>();
    132133
    133134        for (OsmPrimitive prim : primToUpdate) {
    … …  
    172173
    173174        for (ReasonerListener listener : listeners) {
    174             for (AddressElement elem : elemToUpdate)
     175            for (AddressElement elem : elemToUpdate) {
    175176                if (elem != null)
    176177                    listener.elementChanged(elem);
    177 
    178             for (OsmPrimitive prim : primToUpdate)
     178            }
     179
     180            for (OsmPrimitive prim : primToUpdate) {
    179181                if (prim != null)
    180182                    listener.primitiveChanged(prim);
     183            }
    181184        }
    182185
    … …  
    210213        }
    211214
    212         for (AddressElement elem : elemMatchIndex.keySet())
     215        for (AddressElement elem : elemMatchIndex.keySet()) {
    213216            reconsider(prim, elem);
     217        }
    214218    }
    215219
    … …  
    238242        }
    239243
    240         for (OsmPrimitive prim : primMatchIndex.keySet())
     244        for (OsmPrimitive prim : primMatchIndex.keySet()) {
    241245            reconsider(prim, elem);
     246        }
    242247    }
    243248
    … …  
    629634    public Set<AddressElement> getUnassignedElements() {
    630635        Set<AddressElement> result = new HashSet<>();
    631         for (AddressElement elem : elemMatchIndex.keySet())
     636        for (AddressElement elem : elemMatchIndex.keySet()) {
    632637            if (translate(elem) == null)
    633638                result.add(elem);
     639        }
    634640        return result;
    635641    }
    … …  
    640646    public Set<OsmPrimitive> getUnassignedPrimitives() {
    641647        Set<OsmPrimitive> result = new HashSet<>();
    642         for (OsmPrimitive prim : primMatchIndex.keySet())
     648        for (OsmPrimitive prim : primMatchIndex.keySet()) {
    643649            if (translate(prim) == null)
    644650                result.add(prim);
     651        }
    645652        return result;
    646653    }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java

    r32566 r33029  
    4343        synchronized (r) {
    4444            r.openTransaction();
    45             for (OsmPrimitive selectedPrim :newSelection)
     45            for (OsmPrimitive selectedPrim :newSelection) {
    4646                if (House.isMatchable(selectedPrim) || Street.isMatchable(selectedPrim))
    4747                    r.update(selectedPrim);
    48             for (OsmPrimitive selectedPrim :lastSelection)
     48            }
     49            for (OsmPrimitive selectedPrim :lastSelection) {
    4950                if (House.isMatchable(selectedPrim) || Street.isMatchable(selectedPrim))
    5051                    r.update(selectedPrim);
     52            }
    5153            r.closeTransaction();
    5254        }
    5355
    5456        lastSelection.clear();
    55         for (OsmPrimitive prim : newSelection)
     57        for (OsmPrimitive prim : newSelection) {
    5658            lastSelection.add(prim);
     59        }
    5760    }
    5861}

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java

    r32566 r33029  
    5252                return;
    5353
    54             ElementWithHouses    topElem = curStreet;
     54            ElementWithHouses topElem = curStreet;
    5555            if (topElem == null) topElem = curSuburb;
    5656            if (topElem == null) topElem = curViToCi;
    … …  
    7171            }
    7272
    73             ElementWithStreets   topElem = curSuburb;
     73            ElementWithStreets topElem = curSuburb;
    7474            if (topElem == null) topElem = curViToCi;
    7575            if (topElem == null) topElem = curRegion;
    … …  
    243243         * non-systematic solution.
    244244         */
    245         for (String oldUrl : OLD_URLS)
     245        for (String oldUrl : OLD_URLS) {
    246246            if (Main.pref.get(URL_PREFERENCES_KEY, URL_DEFAULT).equals(oldUrl)) {
    247247                Main.pref.put(URL_PREFERENCES_KEY, URL_DEFAULT);
    248248                break;
    249249            }
     250        }
    250251
    251252        return Main.pref.get(URL_PREFERENCES_KEY, URL_DEFAULT);

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java

    r32566 r33029  
    6161        Node addrNode = new Node(visitor.getBounds().getCenter());
    6262
    63         for (String key : way.keySet())
     63        for (String key : way.keySet()) {
    6464            if (key.startsWith("addr"))
    6565                addrNode.put(key, way.get(key));
     66        }
    6667
    67         for (String key : addrNode.keySet())
     68        for (String key : addrNode.keySet()) {
    6869           way.remove(key);
     70        }
    6971
    7072        Main.getLayerManager().getEditDataSet().addPrimitive(addrNode);

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java

    r32566 r33029  
    8383                proposals.size()-1);
    8484
    85         for (ListDataListener l : listeners)
    86             l.contentsChanged(evt);
     85        for (ListDataListener l : listeners) {
     86            l.contentsChanged(evt);
     87        }
    8788    }
    8889
    … …  
    102103                index1, index2);
    103104
    104         for (ListDataListener l : listeners)
    105             l.contentsChanged(evt);
     105        for (ListDataListener l : listeners) {
     106            l.contentsChanged(evt);
     107        }
    106108    }
    107109
    … …  
    124126                index, index);
    125127
    126         for (ListDataListener l : listeners)
    127             l.contentsChanged(evt);
     128        for (ListDataListener l : listeners) {
     129            l.contentsChanged(evt);
     130        }
    128131    }
    129132
    … …  
    139142                0, proposals.size()-1);
    140143
    141         for (ListDataListener l : listeners)
    142             l.contentsChanged(evt);
     144        for (ListDataListener l : listeners) {
     145            l.contentsChanged(evt);
     146        }
    143147    }
    144148
    … …  
    161165        proposals.clear();
    162166
    163         for (ListDataListener l : listeners)
    164             l.contentsChanged(evt);
     167        for (ListDataListener l : listeners) {
     168            l.contentsChanged(evt);
     169        }
    165170    }
    166171
    … …  
    169174     */
    170175    public void applyAll() {
    171         for (Proposal proposal : proposals)
     176        for (Proposal proposal : proposals) {
    172177            proposal.apply(target);
     178        }
    173179    }
    174180

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java

    r32566 r33029  
    124124     */
    125125    public void applyAll() {
    126         for (ProposalContainer a : changeSet)
     126        for (ProposalContainer a : changeSet) {
    127127            a.applyAll();
     128        }
    128129    }
    129130
    … …  
    213214
    214215            TreeModelEvent event = new TreeModelEvent(this, path);
    215             for (TreeModelListener l : listeners)
     216            for (TreeModelListener l : listeners) {
    216217                l.treeNodesRemoved(event);
     218            }
    217219            return;
    218220        }
    … …  
    225227
    226228            TreeModelEvent event = new TreeModelEvent(this, path);
    227             for (TreeModelListener l : listeners)
     229            for (TreeModelListener l : listeners) {
    228230                l.treeNodesRemoved(event);
     231            }
    229232            return;
    230233        }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalFactory.java

    r32566 r33029  
    7474            return new AddKeyValueProposal(key, target);
    7575
    76         for (String itemRaw : current.split(","))
    77             for (String itemSplitted : itemRaw.split(";"))
     76        for (String itemRaw : current.split(",")) {
     77            for (String itemSplitted : itemRaw.split(";")) {
    7878                if (itemSplitted.trim().equals(target.trim()))
    7979                    return null;
     80            }
     81        }
    8082
    8183        return new KeyValueChangeProposal(
Note: See TracChangeset for help on using the changeset viewer.