Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/Preferences.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/Preferences.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/Preferences.java (revision 33029) @@ -135,39 +135,39 @@ }); - javax.swing.GroupLayout mainPanelLayout = new GroupLayout(mainPanel); + GroupLayout mainPanelLayout = new GroupLayout(mainPanel); mainPanel.setLayout(mainPanelLayout); mainPanelLayout.setHorizontalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() .addGap(12, 12, 12) - .addComponent(optimizeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(optimizeComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) .addComponent(jLabel2) - .addComponent(addNewTagCheckBox, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE) + .addComponent(addNewTagCheckBox, GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE) .addGroup(mainPanelLayout.createSequentialGroup() .addGap(12, 12, 12) - .addComponent(addNewTagKeyField, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(addNewTagKeyField, GroupLayout.PREFERRED_SIZE, 120, GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(addNewTagValueField, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 121, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(buildingCheckBox, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)) + .addComponent(addNewTagValueField, GroupLayout.PREFERRED_SIZE, 125, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 121, GroupLayout.PREFERRED_SIZE)) + .addComponent(buildingCheckBox, GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)) .addContainerGap()) ); mainPanelLayout.setVerticalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() .addComponent(jLabel2) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(optimizeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(optimizeComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addGap(18, 18, 18) .addComponent(addNewTagCheckBox) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(addNewTagKeyField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(addNewTagKeyField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(jLabel1) - .addComponent(addNewTagValueField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(addNewTagValueField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(buildingCheckBox) Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (revision 33029) @@ -13,4 +13,5 @@ public class PrimUtils { + // CHECKSTYLE.OFF: SingleSpaceSeparator public static final String KEY_HIGHWAY = "highway"; public static final String KEY_PLACE = "place"; @@ -24,5 +25,5 @@ public static final String KEY_IS_IN = "is_in"; public static final String KEY_NAME = "name"; - + // CHECKSTYLE.ON: SingleSpaceSeparator private static final String[] keysToCompare = new String[] @@ -57,3 +58,6 @@ }; + private PrimUtils() { + // Hide default constructor for utilities classes + } } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 33029) @@ -199,5 +199,5 @@ public static int matchField(String elemValue, String primValue) { - if (elemValue == null) return 0; + if (elemValue == null) return 0; if (primValue == null) return -1; @@ -273,5 +273,5 @@ switch (minVal * maxVal) { case -1 : return Reasoner.MATCH_CONFLICT; - case 0 : return Reasoner.MATCH_PARTIAL; + case 0 : return Reasoner.MATCH_PARTIAL; case +1 : return Reasoner.MATCH_ROCKSOLID; } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ElementWithHouses.java (revision 33029) @@ -33,6 +33,7 @@ */ public void addHouses(List housesToAdd) { - for (House houseToAdd : housesToAdd) + for (House houseToAdd : housesToAdd) { addHouse(houseToAdd); + } } @@ -42,6 +43,7 @@ public void setHouses(List houses) { this.houses = houses; - for (House house : this.houses) + for (House house : this.houses) { house.setParent(this); + } } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java (revision 33029) @@ -225,7 +225,8 @@ */ public static boolean isMatchable(OsmPrimitive prim) { - for (String key : prim.keySet()) + for (String key : prim.keySet()) { if (key.startsWith("addr:")) return true; + } return false; } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java (revision 33029) @@ -28,6 +28,7 @@ public void setViToCis(ArrayList municipalities) { this.vitocis = municipalities; - for (ViToCi obec : municipalities) + for (ViToCi obec : municipalities) { obec.setParent(this); + } } @@ -45,7 +46,8 @@ viToCiName = viToCiName.toUpperCase(); - for (ViToCi vitoci : vitocis) + for (ViToCi vitoci : vitocis) { if (vitoci.getName().toUpperCase().equals(name)) return vitoci; + } return null; Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java (revision 33029) @@ -16,5 +16,5 @@ * @author Radomír Černoch radomir.cernoch@gmail.com */ -public class Street extends ElementWithHouses { +public class Street extends ElementWithHouses { public Street(String name) { Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Suburb.java (revision 33029) @@ -17,7 +17,8 @@ public static boolean isMatchable(OsmPrimitive prim) { - for (String key : prim.keySet()) + for (String key : prim.keySet()) { if (key.equals(PrimUtils.KEY_PLACE)) return true; + } return false; } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/ViToCi.java (revision 33029) @@ -33,6 +33,7 @@ */ public void addSuburbs(List suburbsToAdd) { - for (Suburb suburbToAdd : suburbsToAdd) + for (Suburb suburbToAdd : suburbsToAdd) { addSuburb(suburbToAdd); + } } @@ -50,7 +51,8 @@ suburbName = suburbName.toUpperCase(); - for (Suburb suburb : suburbs) + for (Suburb suburb : suburbs) { if (suburb.getName().toUpperCase().equals(suburbName)) return suburb; + } return null; @@ -60,6 +62,7 @@ public List getAllStreets() { List result = super.getAllStreets(); - for (Suburb suburb : suburbs) + for (Suburb suburb : suburbs) { result.addAll(suburb.getAllStreets()); + } return result; } @@ -68,6 +71,7 @@ public List getAllHouses() { List result = super.getAllHouses(); - for (Suburb suburb : suburbs) + for (Suburb suburb : suburbs) { result.addAll(suburb.getAllHouses()); + } return result; } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java (revision 33029) @@ -357,6 +357,7 @@ ListDataEvent.INTERVAL_ADDED, -index-1, -index-1); - for (ListDataListener listener : listeners) + for (ListDataListener listener : listeners) { listener.intervalAdded(evt); + } if (mainField.getSelectedItem() == null) @@ -376,6 +377,7 @@ ListDataEvent.INTERVAL_ADDED, -index-1 + elements.size(), -index-1 + elements.size()); - for (ListDataListener listener : listeners) + for (ListDataListener listener : listeners) { listener.intervalAdded(evt); + } if (mainField.getSelectedItem() == null) @@ -399,6 +401,7 @@ ListDataEvent.INTERVAL_REMOVED, index, index); - for (ListDataListener listener : listeners) + for (ListDataListener listener : listeners) { listener.intervalRemoved(evt); + } } } @@ -419,6 +422,7 @@ ListDataEvent.INTERVAL_REMOVED, index + elements.size(), index + elements.size()); - for (ListDataListener listener : listeners) + for (ListDataListener listener : listeners) { listener.intervalRemoved(evt); + } } } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java (revision 33029) @@ -119,5 +119,5 @@ public void setSelectedHouse(House house) { - for (int i = 0; i < streetModel.getSize(); i++) + for (int i = 0; i < streetModel.getSize(); i++) { if (streetModel.getElementAt(i) == house.getParent()) { streetComboBox.setSelectedIndex(i); @@ -125,6 +125,7 @@ break; } - - for (int i = 0; i < houseModel.getSize(); i++) + } + + for (int i = 0; i < houseModel.getSize(); i++) { if (houseModel.getElementAt(i) == house) { houseList.setSelectedIndex(i); @@ -132,4 +133,5 @@ break; } + } } @@ -233,9 +235,10 @@ Street selectedStreet = null; - for (Street street : CzechAddressPlugin.getLocation().getStreets()) + for (Street street : CzechAddressPlugin.getLocation().getStreets()) { if (street.getName().toUpperCase().equals(streetName.toUpperCase())) { selectedStreet = street; break; } + } if (selectedStreet == null) return; Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/GroupManipulatorDialog.java (revision 33029) @@ -5,4 +5,5 @@ import java.awt.event.KeyEvent; +import javax.swing.GroupLayout; import javax.swing.tree.TreePath; @@ -135,29 +136,29 @@ jScrollPane1.setViewportView(proposalTree); - javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel); + GroupLayout mainPanelLayout = new GroupLayout(mainPanel); mainPanel.setLayout(mainPanelLayout); mainPanelLayout.setHorizontalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() .addComponent(locationLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(locationTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 379, Short.MAX_VALUE) + .addComponent(locationTextField, GroupLayout.DEFAULT_SIZE, 379, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(locationChangeButton)) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 482, Short.MAX_VALUE) + .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 482, Short.MAX_VALUE) .addGroup(mainPanelLayout.createSequentialGroup() .addContainerGap() - .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 458, Short.MAX_VALUE) + .addComponent(jLabel3, GroupLayout.DEFAULT_SIZE, 458, Short.MAX_VALUE) .addContainerGap()) ); mainPanelLayout.setVerticalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(locationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(locationTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(locationChangeButton) .addComponent(locationLabel)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 223, Short.MAX_VALUE) + .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 223, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel3)) Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java (revision 33029) @@ -81,5 +81,5 @@ private void initLocationHints() { boolean assertions = false; - assert assertions = true; + assert assertions = true; OsmPrimitive bestFit = null; @@ -151,7 +151,8 @@ hlRegions.add(oblast); hlViToCis.add(obec); - for (Suburb castObce : obec.getSuburbs()) + for (Suburb castObce : obec.getSuburbs()) { if (castObce.getName().equalsIgnoreCase(bestFit.get("name"))) hlSuburbs.add(castObce); + } } } else { @@ -176,5 +177,5 @@ int curHlIndex = 0; - for (int i = 0; i < list.getSize(); i++) + for (int i = 0; i < list.getSize(); i++) { for (int j = 0; j < hlList.size(); j++) { E t = list.getElementAt(i); @@ -185,4 +186,5 @@ } } + } return curHlIndex; @@ -315,6 +317,7 @@ if (obec.getSuburbs().size() > 0) { ElementWithStreets[] suburbs = new ElementWithStreets[obec.getSuburbs().size() + 1]; - for (int i = 0; i < obec.getSuburbs().size(); i++) + for (int i = 0; i < obec.getSuburbs().size(); i++) { suburbs[i] = obec.getSuburbs().get(i); + } suburbs[obec.getSuburbs().size()] = obec; DefaultComboBoxModel suburbsList = new DefaultComboBoxModel<>(suburbs); Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (revision 33029) @@ -9,4 +9,5 @@ import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.GroupLayout; import javax.swing.Timer; @@ -41,5 +42,5 @@ public class PointManipulatorDialog extends ExtendedDialog implements StatusListener { - private Timer updateMatchesTimer = null; + private Timer updateMatchesTimer = null; private Action updateMatchesAction; private ProposalContainer proposalContainer; @@ -277,18 +278,18 @@ mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(locationEdit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(locationEdit, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(jLabel5) .addComponent(changeLocationButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(alternateNumberEdit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(alternateNumberEdit, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(jLabel1)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) .addComponent(jLabel6) - .addComponent(matchesComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 153, Short.MAX_VALUE) + .addComponent(matchesComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 153, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(statusLabel)) @@ -313,6 +314,7 @@ private void proposalListKeyReleased(java.awt.event.KeyEvent evt) { //GEN-FIRST:event_proposalListKeyReleased if (evt.getKeyCode() == KeyEvent.VK_DELETE) { - for (Object o : proposalList.getSelectedValuesList()) + for (Object o : proposalList.getSelectedValuesList()) { proposalContainer.removeProposal((Proposal) o); + } } } //GEN-LAST:event_proposalListKeyReleased Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/EditorFactory.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/EditorFactory.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/EditorFactory.java (revision 33029) @@ -38,6 +38,7 @@ r.openTransaction(); street.setName(dialog.getStreetName()); - for (House house : street.getHouses()) + for (House house : street.getHouses()) { r.update(house); + } r.update(street); r.closeTransaction(); Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java (revision 33029) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors; +import javax.swing.GroupLayout; import javax.swing.JButton; import javax.swing.JLabel; @@ -115,16 +116,16 @@ ); mainPanelLayout.setVerticalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) .addComponent(jLabel1) - .addComponent(parentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(parentField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(parentEditButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) .addComponent(jLabel2) - .addComponent(cpField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(cpField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(jLabel3) - .addComponent(coField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(coField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java (revision 33029) @@ -3,4 +3,5 @@ import javax.swing.DefaultComboBoxModel; +import javax.swing.GroupLayout; import org.openstreetmap.josm.Main; @@ -113,22 +114,22 @@ }); - javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel); + GroupLayout mainPanelLayout = new GroupLayout(mainPanel); mainPanel.setLayout(mainPanelLayout); mainPanelLayout.setHorizontalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING) .addComponent(jLabel2) .addComponent(jLabel3) .addComponent(jLabel1)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(nameField, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup() - .addComponent(parentField, javax.swing.GroupLayout.DEFAULT_SIZE, 310, Short.MAX_VALUE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING) + .addComponent(nameField, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE) + .addGroup(GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup() + .addComponent(parentField, GroupLayout.DEFAULT_SIZE, 310, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(parentEditButton)) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup() - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 308, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(GroupLayout.Alignment.LEADING, mainPanelLayout.createSequentialGroup() + .addComponent(jScrollPane1, GroupLayout.PREFERRED_SIZE, 308, GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(houseEditButton) @@ -136,20 +137,20 @@ ); mainPanelLayout.setVerticalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) .addComponent(jLabel1) - .addComponent(parentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(parentField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(parentEditButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(nameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(nameField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(jLabel2)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(jLabel3) .addComponent(houseEditButton) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 77, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jScrollPane1, GroupLayout.PREFERRED_SIZE, 77, GroupLayout.PREFERRED_SIZE)) + .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java (revision 33029) @@ -3,4 +3,5 @@ import javax.swing.DefaultComboBoxModel; +import javax.swing.GroupLayout; import org.openstreetmap.josm.Main; @@ -144,10 +145,10 @@ jLabel4.setText("Ulice:"); - javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel); + GroupLayout mainPanelLayout = new GroupLayout(mainPanel); mainPanel.setLayout(mainPanelLayout); mainPanelLayout.setHorizontalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(jLabel4) .addComponent(jLabel3) @@ -155,45 +156,45 @@ .addComponent(jLabel1)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(mainPanelLayout.createSequentialGroup() - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addGroup(mainPanelLayout.createSequentialGroup() + .addComponent(jScrollPane2, GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(streetEditButton)) .addGroup(mainPanelLayout.createSequentialGroup() - .addComponent(parentField, javax.swing.GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE) + .addComponent(parentField, GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(parentEditButton)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup() - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE) + .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup() + .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(houseEditButton)) - .addComponent(nameField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 364, Short.MAX_VALUE))) + .addComponent(nameField, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 364, Short.MAX_VALUE))) ); mainPanelLayout.setVerticalGroup( - mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(mainPanelLayout.createSequentialGroup() - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(parentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addGroup(mainPanelLayout.createSequentialGroup() + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(parentField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(parentEditButton) .addComponent(jLabel1)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(nameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(nameField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(jLabel2)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(houseEditButton) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 77, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(jScrollPane1, GroupLayout.PREFERRED_SIZE, 77, GroupLayout.PREFERRED_SIZE))) .addGroup(mainPanelLayout.createSequentialGroup() .addGap(66, 66, 66) .addComponent(jLabel3))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(jLabel4) .addComponent(streetEditButton) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 77, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jScrollPane2, GroupLayout.PREFERRED_SIZE, 77, GroupLayout.PREFERRED_SIZE)) + .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedComboBoxModel.java (revision 33029) @@ -36,6 +36,7 @@ ListDataEvent.CONTENTS_CHANGED, 0, getSize()-1); - for (ListDataListener l : listeners) + for (ListDataListener l : listeners) { l.contentsChanged(evt); + } } } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedListModel.java (revision 33029) @@ -36,6 +36,7 @@ ListDataEvent.CONTENTS_CHANGED, 0, getSize()-1); - for (ListDataListener l : listeners) + for (ListDataListener l : listeners) { l.contentsChanged(evt); + } } } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/HalfCookedTreeModel.java (revision 33029) @@ -53,6 +53,7 @@ TreeModelEvent evt = new TreeModelEvent(this, new Object[] {root}); - for (TreeModelListener l : listeneres) + for (TreeModelListener l : listeneres) { l.treeNodesChanged(evt); + } } } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalRenderer.java (revision 33029) @@ -23,11 +23,11 @@ */ public abstract class UniversalRenderer { - private static final ImageIcon iconAdd = ImageProvider.get("actions", "add.png"); - private static final ImageIcon iconEdit = ImageProvider.get("actions", "edit.png"); + private static final ImageIcon iconAdd = ImageProvider.get("actions", "add.png"); + private static final ImageIcon iconEdit = ImageProvider.get("actions", "edit.png"); private static final ImageIcon iconRemove = ImageProvider.get("actions", "remove.png"); - private static final ImageIcon nodeIcon = ImageProvider.get("data/node.png"); - private static final ImageIcon wayIcon = ImageProvider.get("data/way.png"); - private static final ImageIcon relationIcon = ImageProvider.get("data/relation.png"); + private static final ImageIcon nodeIcon = ImageProvider.get("data/node.png"); + private static final ImageIcon wayIcon = ImageProvider.get("data/way.png"); + private static final ImageIcon relationIcon = ImageProvider.get("data/relation.png"); private static final ImageIcon envelopeNormIcon = ImageProvider.get("envelope-closed-small.png"); @@ -37,7 +37,7 @@ public static ImageIcon getIcon(Object value) { - if (value instanceof AddKeyValueProposal) return iconAdd; + if (value instanceof AddKeyValueProposal) return iconAdd; else if (value instanceof KeyValueChangeProposal) return iconEdit; - else if (value instanceof RemoveKeyProposal) return iconRemove; + else if (value instanceof RemoveKeyProposal) return iconRemove; if (value instanceof House) { Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java (revision 33029) @@ -85,6 +85,7 @@ transactionOpened = false; - for (ReasonerListener listener : listeners) + for (ReasonerListener listener : listeners) { listener.resonerReseted(); + } } @@ -129,5 +130,5 @@ Set elemChanges = new HashSet<>(); - Set primChanges = new HashSet<>(); + Set primChanges = new HashSet<>(); for (OsmPrimitive prim : primToUpdate) { @@ -172,11 +173,13 @@ for (ReasonerListener listener : listeners) { - for (AddressElement elem : elemToUpdate) + for (AddressElement elem : elemToUpdate) { if (elem != null) listener.elementChanged(elem); - - for (OsmPrimitive prim : primToUpdate) + } + + for (OsmPrimitive prim : primToUpdate) { if (prim != null) listener.primitiveChanged(prim); + } } @@ -210,6 +213,7 @@ } - for (AddressElement elem : elemMatchIndex.keySet()) + for (AddressElement elem : elemMatchIndex.keySet()) { reconsider(prim, elem); + } } @@ -238,6 +242,7 @@ } - for (OsmPrimitive prim : primMatchIndex.keySet()) + for (OsmPrimitive prim : primMatchIndex.keySet()) { reconsider(prim, elem); + } } @@ -629,7 +634,8 @@ public Set getUnassignedElements() { Set result = new HashSet<>(); - for (AddressElement elem : elemMatchIndex.keySet()) + for (AddressElement elem : elemMatchIndex.keySet()) { if (translate(elem) == null) result.add(elem); + } return result; } @@ -640,7 +646,8 @@ public Set getUnassignedPrimitives() { Set result = new HashSet<>(); - for (OsmPrimitive prim : primMatchIndex.keySet()) + for (OsmPrimitive prim : primMatchIndex.keySet()) { if (translate(prim) == null) result.add(prim); + } return result; } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/SelectionMonitor.java (revision 33029) @@ -43,16 +43,19 @@ synchronized (r) { r.openTransaction(); - for (OsmPrimitive selectedPrim :newSelection) + for (OsmPrimitive selectedPrim :newSelection) { if (House.isMatchable(selectedPrim) || Street.isMatchable(selectedPrim)) r.update(selectedPrim); - for (OsmPrimitive selectedPrim :lastSelection) + } + for (OsmPrimitive selectedPrim :lastSelection) { if (House.isMatchable(selectedPrim) || Street.isMatchable(selectedPrim)) r.update(selectedPrim); + } r.closeTransaction(); } lastSelection.clear(); - for (OsmPrimitive prim : newSelection) + for (OsmPrimitive prim : newSelection) { lastSelection.add(prim); + } } } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java (revision 33029) @@ -52,5 +52,5 @@ return; - ElementWithHouses topElem = curStreet; + ElementWithHouses topElem = curStreet; if (topElem == null) topElem = curSuburb; if (topElem == null) topElem = curViToCi; @@ -71,5 +71,5 @@ } - ElementWithStreets topElem = curSuburb; + ElementWithStreets topElem = curSuburb; if (topElem == null) topElem = curViToCi; if (topElem == null) topElem = curRegion; @@ -243,9 +243,10 @@ * non-systematic solution. */ - for (String oldUrl : OLD_URLS) + for (String oldUrl : OLD_URLS) { if (Main.pref.get(URL_PREFERENCES_KEY, URL_DEFAULT).equals(oldUrl)) { Main.pref.put(URL_PREFERENCES_KEY, URL_DEFAULT); break; } + } return Main.pref.get(URL_PREFERENCES_KEY, URL_DEFAULT); Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java (revision 33029) @@ -61,10 +61,12 @@ Node addrNode = new Node(visitor.getBounds().getCenter()); - for (String key : way.keySet()) + for (String key : way.keySet()) { if (key.startsWith("addr")) addrNode.put(key, way.get(key)); + } - for (String key : addrNode.keySet()) + for (String key : addrNode.keySet()) { way.remove(key); + } Main.getLayerManager().getEditDataSet().addPrimitive(addrNode); Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java (revision 33029) @@ -83,6 +83,7 @@ proposals.size()-1); - for (ListDataListener l : listeners) - l.contentsChanged(evt); + for (ListDataListener l : listeners) { + l.contentsChanged(evt); + } } @@ -102,6 +103,7 @@ index1, index2); - for (ListDataListener l : listeners) - l.contentsChanged(evt); + for (ListDataListener l : listeners) { + l.contentsChanged(evt); + } } @@ -124,6 +126,7 @@ index, index); - for (ListDataListener l : listeners) - l.contentsChanged(evt); + for (ListDataListener l : listeners) { + l.contentsChanged(evt); + } } @@ -139,6 +142,7 @@ 0, proposals.size()-1); - for (ListDataListener l : listeners) - l.contentsChanged(evt); + for (ListDataListener l : listeners) { + l.contentsChanged(evt); + } } @@ -161,6 +165,7 @@ proposals.clear(); - for (ListDataListener l : listeners) - l.contentsChanged(evt); + for (ListDataListener l : listeners) { + l.contentsChanged(evt); + } } @@ -169,6 +174,7 @@ */ public void applyAll() { - for (Proposal proposal : proposals) + for (Proposal proposal : proposals) { proposal.apply(target); + } } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalDatabase.java (revision 33029) @@ -124,6 +124,7 @@ */ public void applyAll() { - for (ProposalContainer a : changeSet) + for (ProposalContainer a : changeSet) { a.applyAll(); + } } @@ -213,6 +214,7 @@ TreeModelEvent event = new TreeModelEvent(this, path); - for (TreeModelListener l : listeners) + for (TreeModelListener l : listeners) { l.treeNodesRemoved(event); + } return; } @@ -225,6 +227,7 @@ TreeModelEvent event = new TreeModelEvent(this, path); - for (TreeModelListener l : listeners) + for (TreeModelListener l : listeners) { l.treeNodesRemoved(event); + } return; } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalFactory.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalFactory.java (revision 33028) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalFactory.java (revision 33029) @@ -74,8 +74,10 @@ return new AddKeyValueProposal(key, target); - for (String itemRaw : current.split(",")) - for (String itemSplitted : itemRaw.split(";")) + for (String itemRaw : current.split(",")) { + for (String itemSplitted : itemRaw.split(";")) { if (itemSplitted.trim().equals(target.trim())) return null; + } + } return new KeyValueChangeProposal(