Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/Dto.java =================================================================== --- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/Dto.java (revision 36059) +++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/Dto.java (revision 36060) @@ -5,4 +5,5 @@ /** + * An object for the current dialog settings * @author Oliver Raupach 18.01.2012 */ Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberHelper.java =================================================================== --- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberHelper.java (revision 36059) +++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberHelper.java (revision 36060) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.housenumbertool; @@ -4,7 +5,21 @@ import java.util.regex.Pattern; -public class HouseNumberHelper { +import org.openstreetmap.josm.tools.Logging; - static public String incrementHouseNumber(String number, int increment) { +/** + * A helper class for incrementing addr:housenumber + */ +public final class HouseNumberHelper { + private HouseNumberHelper() { + // Hide constructor + } + + /** + * Increment a house number + * @param number The number to increment + * @param increment The amount to increment the number by + * @return The incremented number + */ + public static String incrementHouseNumber(String number, int increment) { if (number != null) { try { @@ -16,6 +31,6 @@ return prefix + n + suffix; } - } catch (NumberFormatException e) { - // Do nothing + } catch (NumberFormatException e) { + Logging.trace(e); } } Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java =================================================================== --- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java (revision 36059) +++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java (revision 36060) Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java =================================================================== --- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java (revision 36059) +++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java (revision 36060) @@ -15,9 +15,13 @@ import org.openstreetmap.josm.tools.Shortcut; +/** + * An action for opening the {@link TagDialog} editor + */ public class LaunchAction extends JosmAction implements DataSelectionListener { - private OsmPrimitive selection = null; + private static final long serialVersionUID = -2017126466206457986L; + private OsmPrimitive selection; - private File pluginDir; + private final File pluginDir; /** @@ -26,7 +30,7 @@ */ public LaunchAction(File pluginDir) { - super("HouseNumberTaggingTool", + super(tr("HouseNumberTaggingTool"), "home-icon32", - "Launches the HouseNumberTaggingTool dialog", + tr("Launches the HouseNumberTaggingTool dialog"), Shortcut.registerShortcut("edit:housenumbertaggingtool", tr("Data: {0}", "HouseNumberTaggingTool"), KeyEvent.VK_K, Shortcut.DIRECT), @@ -60,5 +64,5 @@ if (newSelection != null && newSelection.size() == 1) { setEnabled(true); - selection = newSelection.iterator().next(); + selection = newSelection.iterator().next(); } else { setEnabled(false); Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java =================================================================== --- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java (revision 36059) +++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java (revision 36060) @@ -9,6 +9,6 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; -import java.awt.Insets; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -16,4 +16,5 @@ import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -24,6 +25,4 @@ import java.util.Set; import java.util.TreeSet; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.ButtonGroup; @@ -48,10 +47,17 @@ import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager; +import org.openstreetmap.josm.gui.widgets.JosmComboBox; +import org.openstreetmap.josm.gui.widgets.JosmTextField; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Logging; /** + * The dialog to show users the tags that will be applied to an object + * * @author Oliver Raupach 09.01.2012 * @author Victor Kropp 10.03.2012 */ public class TagDialog extends ExtendedDialog { + private static final long serialVersionUID = -4781477945608720136L; private static final String APPLY_CHANGES = tr("Apply Changes"); private static final String TAG_STREET_OR_PLACE = tr("Use tag ''addr:street'' or ''addr:place''"); @@ -70,16 +76,14 @@ private static final String[] BUILDING_STRINGS = { "yes", "apartments", "chapel", "church", "commercial", "dormitory", "hotel", "house", "residential", "terrace", - "industrial", "retail", "warehouse", "cathedral", "civic", "hospital", "school", "train_station", "transportation", + "industrial", "retail", "warehouse", "cathedral", "civic", "hospital", "school", "train_station", "transportation", "university", "public", "bridge", "bunker", "cabin", "construction", "farm_auxiliary", "garage", "garages", "greenhouse", "hangar", "hut", "roof", "shed", "stable"}; private static final int FPS_MIN = -10; - private static final int FPS_MAX = 10; - - private static final Logger LOGGER = Logger.getLogger(TagDialog.class.getName()); - - private File pluginDir; + private static final int FPS_MAX = 10; + + private final File pluginDir; private AutoCompletionManager acm; - private OsmPrimitive selection; + private final OsmPrimitive selection; private static final String TEMPLATE_DATA = "/template.data"; @@ -87,10 +91,10 @@ private AutoCompComboBox source; private AutoCompComboBox country; - private AutoCompComboBox state; + private AutoCompComboBox stateTag; private AutoCompComboBox suburb; private AutoCompComboBox city; private AutoCompComboBox postcode; private AutoCompComboBox street; - private JTextField housnumber; + private JTextField housenumber; private JCheckBox buildingEnabled; private JCheckBox sourceEnabled; @@ -113,5 +117,5 @@ */ public TagDialog(File pluginDir, OsmPrimitive selection) { - super(MainApplication.getMainFrame(), tr("House Number Editor"), new String[] { tr("OK"), tr("Cancel") }, true); + super(MainApplication.getMainFrame(), tr("House Number Editor"), new String[] {tr("OK"), tr("Cancel")}, true); this.pluginDir = pluginDir; this.selection = selection; @@ -132,6 +136,6 @@ SwingUtilities.invokeLater(() -> { - housnumber.requestFocus(); - housnumber.selectAll(); + housenumber.requestFocus(); + housenumber.selectAll(); }); } @@ -143,5 +147,4 @@ JPanel editPanel = new JPanel(new GridBagLayout()); - GridBagConstraints c = new GridBagConstraints(); JLabel labelNewValues = new JLabel(); @@ -149,22 +152,10 @@ labelNewValues.setFont(newLabelFont); labelNewValues.setText(tr("New values:")); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 3; - c.gridy = 0; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(0, 5, 10, 5); - editPanel.add(labelNewValues, c); + editPanel.add(labelNewValues, GBC.std().grid(3, 0).insets(0, 5, 10, 5)); JLabel labelExistingValues = new JLabel(); labelExistingValues.setFont(newLabelFont); labelExistingValues.setText(tr("Existing values:")); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 0; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(0, 5, 10, 5); - editPanel.add(labelExistingValues, c); + editPanel.add(labelExistingValues, GBC.std().span(3).weight(0, 0).grid(5, 0).insets(0, 5, 10, 5)); JButton getAllButton = new JButton("<<"); @@ -172,374 +163,87 @@ getAllButton.setToolTipText(tr("Accept all existing values")); getAllButton.addActionListener(actionEvent -> acceptAllExistingValues()); - GridBagConstraints buttonContstraints = new GridBagConstraints(); - buttonContstraints.fill = GridBagConstraints.NONE; - buttonContstraints.gridx = 6; - buttonContstraints.gridy = 0; - buttonContstraints.weightx = 0; - buttonContstraints.gridwidth = 1; - buttonContstraints.anchor = GridBagConstraints.EAST; - buttonContstraints.insets = new Insets(0, 5, 10, 5); - editPanel.add(getAllButton, buttonContstraints); + editPanel.add(getAllButton, GBC.eol().grid(7, 0).anchor(GridBagConstraints.EAST).insets(0, 5, 10, 5)); + + GBC columnOne = GBC.std().span(3).insets(5, 5, 0, 5); + GBC columnTwo = GBC.std().span(1).weight(1, 0).fill(GBC.HORIZONTAL).insets(5, 5, 0, 5); + GBC columnThree = GBC.std().insets(5, 5, 0, 5); + GBC columnFour = GBC.eol().weight(1, 0).fill(GBC.HORIZONTAL).insets(5, 5, 0, 5); // building - buildingEnabled = new JCheckBox(TAG_BUILDING); - buildingEnabled.setFocusable(false); - buildingEnabled.setSelected(dto.isSaveBuilding()); - buildingEnabled.setToolTipText(APPLY_CHANGES); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 1; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(buildingEnabled, c); + buildingEnabled = generateCheckbox(TAG_BUILDING, dto.isSaveBuilding()); + editPanel.add(buildingEnabled, columnOne); Arrays.sort(BUILDING_STRINGS); - building = new JComboBox<>(BUILDING_STRINGS); + building = new JosmComboBox<>(BUILDING_STRINGS); building.setSelectedItem(dto.getBuilding()); building.setMaximumRowCount(50); - c.gridx = 3; - c.gridy = 1; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(building, c); - - JButton getBuildingButton = new JButton("<"); - getBuildingButton.setPreferredSize(new Dimension(45, 24)); - getBuildingButton.setToolTipText(tr("Accept existing value")); - getBuildingButton.addActionListener(actionEvent -> building.setSelectedItem(selection.get(TAG_BUILDING))); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 1; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getBuildingButton, c); - - JTextField existingBuilding = new JTextField(); - existingBuilding.setText(selection.get(TAG_BUILDING)); - existingBuilding.setPreferredSize(new Dimension(200, 24)); - existingBuilding.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 1; - c.weightx = 1; - c.gridwidth = 2; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingBuilding, c); + editPanel.add(building, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> building.setSelectedItem(selection.get(TAG_BUILDING))), columnThree); + editPanel.add(generateTextField(selection.get(TAG_BUILDING)), columnFour); // source - sourceEnabled = new JCheckBox(TAG_SOURCE); - sourceEnabled.setFocusable(false); - sourceEnabled.setSelected(dto.isSaveBuilding()); - sourceEnabled.setToolTipText(APPLY_CHANGES); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 2; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(sourceEnabled, c); - - source = new AutoCompComboBox<>(); - source.getModel().addAllElements(acm.getTagValues(TAG_SOURCE)); - source.setPreferredSize(new Dimension(200, 24)); - source.setEditable(true); - source.setSelectedItem(dto.getSource()); - c.gridx = 3; - c.gridy = 2; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(source, c); - - JButton getSourceButton = new JButton("<"); - getSourceButton.setPreferredSize(new Dimension(45, 24)); - getSourceButton.setToolTipText(tr("Accept existing value")); - getSourceButton.addActionListener(actionEvent -> source.setSelectedItem(selection.get(TAG_SOURCE))); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 2; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getSourceButton, c); - - JTextField existingSource = new JTextField(); - existingSource.setText(selection.get(TAG_SOURCE)); - existingSource.setPreferredSize(new Dimension(200, 24)); - existingSource.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 2; - c.weightx = 1; - c.gridwidth = 2; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingSource, c); + sourceEnabled = generateCheckbox(TAG_SOURCE, dto.isSaveSource()); + editPanel.add(sourceEnabled, columnOne); + + source = generateAutoCompTextField(acm.getTagValues(TAG_SOURCE), dto.getSource()); + editPanel.add(source, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> source.setSelectedItem(selection.get(TAG_SOURCE))), columnThree); + editPanel.add(generateTextField(selection.get(TAG_SOURCE)), columnFour); // country - countryEnabled = new JCheckBox(TAG_ADDR_COUNTRY); - countryEnabled.setFocusable(false); - countryEnabled.setSelected(dto.isSaveCountry()); - countryEnabled.setToolTipText(APPLY_CHANGES); - c = new GridBagConstraints(); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 3; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(countryEnabled, c); - - country = new AutoCompComboBox<>(); - country.getModel().addAllElements(acm.getTagValues(TAG_ADDR_COUNTRY)); - country.setPreferredSize(new Dimension(200, 24)); - country.setEditable(true); - country.setSelectedItem(dto.getCountry()); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 3; - c.gridy = 3; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(country, c); - - JButton getCountryButton = new JButton("<"); - getCountryButton.setPreferredSize(new Dimension(45, 24)); - getCountryButton.setToolTipText(tr("Accept existing value")); - getCountryButton.addActionListener(actionEvent -> country.setSelectedItem(selection.get(TAG_ADDR_COUNTRY))); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 3; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getCountryButton, c); - - JTextField existingCountry = new JTextField(); - existingCountry.setText(selection.get(TAG_ADDR_COUNTRY)); - existingCountry.setPreferredSize(new Dimension(200, 24)); - existingCountry.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 3; - c.weightx = 1; - c.gridwidth = 2; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingCountry, c); + countryEnabled = generateCheckbox(TAG_ADDR_COUNTRY, dto.isSaveCountry()); + editPanel.add(countryEnabled, columnOne); + + country = generateAutoCompTextField(acm.getTagValues(TAG_ADDR_COUNTRY), dto.getCountry()); + editPanel.add(country, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> country.setSelectedItem(selection.get(TAG_ADDR_COUNTRY))), columnThree); + editPanel.add(generateTextField(selection.get(TAG_ADDR_COUNTRY)), columnFour); // state - stateEnabled = new JCheckBox(TAG_ADDR_STATE); - stateEnabled.setFocusable(false); - stateEnabled.setSelected(dto.isSaveState()); - stateEnabled.setToolTipText(APPLY_CHANGES); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 4; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(stateEnabled, c); - - state = new AutoCompComboBox<>(); - state.getModel().addAllElements(acm.getTagValues(TAG_ADDR_STATE)); - state.setPreferredSize(new Dimension(200, 24)); - state.setEditable(true); - state.setSelectedItem(dto.getState()); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 3; - c.gridy = 4; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(state, c); - - JButton getStateButton = new JButton("<"); - getStateButton.setPreferredSize(new Dimension(45, 24)); - getStateButton.setToolTipText(tr("Accept existing value")); - getStateButton.addActionListener(actionEvent -> state.setSelectedItem(selection.get(TAG_ADDR_STATE))); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 4; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getStateButton, c); - - JTextField existingState= new JTextField(); - existingState.setText(selection.get(TAG_ADDR_STATE)); - existingState.setPreferredSize(new Dimension(200, 24)); - existingState.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 4; - c.weightx = 1; - c.gridwidth = 2; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingState, c); + stateEnabled = generateCheckbox(TAG_ADDR_STATE, dto.isSaveState()); + editPanel.add(stateEnabled, columnOne); + + stateTag = generateAutoCompTextField(acm.getTagValues(TAG_ADDR_STATE), dto.getState()); + editPanel.add(stateTag, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> stateTag.setSelectedItem(selection.get(TAG_ADDR_STATE))), columnThree); + editPanel.add(generateTextField(selection.get(TAG_ADDR_STATE)), columnFour); // suburb - suburbEnabled = new JCheckBox(TAG_ADDR_SUBURB); - suburbEnabled.setFocusable(false); - suburbEnabled.setSelected(dto.isSaveSuburb()); - suburbEnabled.setToolTipText(APPLY_CHANGES); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 5; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(suburbEnabled, c); - - suburb = new AutoCompComboBox<>(); - suburb.getModel().addAllElements(acm.getTagValues(TAG_ADDR_SUBURB)); - suburb.setPreferredSize(new Dimension(200, 24)); - suburb.setEditable(true); - suburb.setSelectedItem(dto.getSuburb()); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 3; - c.gridy = 5; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(suburb, c); - - JButton getSuburbButton = new JButton("<"); - getSuburbButton.setPreferredSize(new Dimension(45, 24)); - getSuburbButton.setToolTipText(tr("Accept existing value")); - getSuburbButton.addActionListener(actionEvent -> suburb.setSelectedItem(selection.get(TAG_ADDR_SUBURB))); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 5; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getSuburbButton, c); - - JTextField existingSuburb = new JTextField(); - existingSuburb.setText(selection.get(TAG_ADDR_SUBURB)); - existingSuburb.setPreferredSize(new Dimension(200, 24)); - existingSuburb.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 5; - c.weightx = 1; - c.gridwidth = 2; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingSuburb, c); + suburbEnabled = generateCheckbox(TAG_ADDR_SUBURB, dto.isSaveSuburb()); + editPanel.add(suburbEnabled, columnOne); + + suburb = generateAutoCompTextField(acm.getTagValues(TAG_ADDR_SUBURB), dto.getSuburb()); + editPanel.add(suburb, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> suburb.setSelectedItem(selection.get(TAG_ADDR_SUBURB))), columnThree); + editPanel.add(generateTextField(selection.get(TAG_ADDR_SUBURB)), columnFour); // city - cityEnabled = new JCheckBox(TAG_ADDR_CITY); - cityEnabled.setFocusable(false); - cityEnabled.setSelected(dto.isSaveCity()); - cityEnabled.setToolTipText(APPLY_CHANGES); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 6; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(cityEnabled, c); - - city = new AutoCompComboBox<>(); - city.getModel().addAllElements(acm.getTagValues(TAG_ADDR_CITY)); - city.setPreferredSize(new Dimension(200, 24)); - city.setEditable(true); - city.setSelectedItem(dto.getCity()); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 3; - c.gridy = 6; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(city, c); - - JButton getCityButton = new JButton("<"); - getCityButton.setPreferredSize(new Dimension(45, 24)); - getCityButton.setToolTipText(tr("Accept existing value")); - getCityButton.addActionListener(actionEvent -> city.setSelectedItem(selection.get(TAG_ADDR_CITY))); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 6; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getCityButton, c); - - JTextField existingCity = new JTextField(); - existingCity.setText(selection.get(TAG_ADDR_CITY)); - existingCity.setPreferredSize(new Dimension(200, 24)); - existingCity.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 6; - c.weightx = 1; - c.gridwidth = 2; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingCity, c); + cityEnabled = generateCheckbox(TAG_ADDR_CITY, dto.isSaveCity()); + editPanel.add(cityEnabled, columnOne); + + city = generateAutoCompTextField(acm.getTagValues(TAG_ADDR_CITY), dto.getCity()); + editPanel.add(city, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> city.setSelectedItem(selection.get(TAG_ADDR_CITY))), columnThree); + editPanel.add(generateTextField(selection.get(TAG_ADDR_CITY)), columnFour); // postcode - zipEnabled = new JCheckBox(TAG_ADDR_POSTCODE); - zipEnabled.setFocusable(false); - zipEnabled.setSelected(dto.isSavePostcode()); - zipEnabled.setToolTipText(APPLY_CHANGES); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 7; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(zipEnabled, c); - - postcode = new AutoCompComboBox<>(); - postcode.getModel().addAllElements(acm.getTagValues(TAG_ADDR_POSTCODE)); - postcode.setPreferredSize(new Dimension(200, 24)); - postcode.setEditable(true); - postcode.setSelectedItem(dto.getPostcode()); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 3; - c.gridy = 7; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(postcode, c); - - JButton getPostcodeButton = new JButton("<"); - getPostcodeButton.setPreferredSize(new Dimension(45, 24)); - getPostcodeButton.setToolTipText(tr("Accept existing value")); - getPostcodeButton.addActionListener(actionEvent -> postcode.setSelectedItem(selection.get(TAG_ADDR_POSTCODE))); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 7; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getPostcodeButton, c); - - JTextField existingPostcode = new JTextField(); - existingPostcode.setText(selection.get(TAG_ADDR_POSTCODE)); - existingPostcode.setPreferredSize(new Dimension(200, 24)); - existingPostcode.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 7; - c.weightx = 1; - c.gridwidth = 2; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingPostcode, c); + zipEnabled = generateCheckbox(TAG_ADDR_POSTCODE, dto.isSavePostcode()); + editPanel.add(zipEnabled, columnOne); + + postcode = generateAutoCompTextField(acm.getTagValues(TAG_ADDR_POSTCODE), dto.getPostcode()); + editPanel.add(postcode, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> postcode.setSelectedItem(selection.get(TAG_ADDR_POSTCODE))), columnThree); + editPanel.add(generateTextField(selection.get(TAG_ADDR_POSTCODE)), columnFour); // street - streetEnabled = new JCheckBox(); - streetEnabled.setFocusable(false); - streetEnabled.setSelected(dto.isSaveStreet()); - streetEnabled.setToolTipText(APPLY_CHANGES); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 8; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(streetEnabled, c); + streetEnabled = generateCheckbox(null, dto.isSaveStreet()); + editPanel.add(streetEnabled, GBC.std().insets(5, 5, 0, 5)); streetRadio = new JRadioButton(TAG_ADDR_STREET); @@ -547,11 +251,5 @@ streetRadio.setSelected(dto.isTagStreet()); streetRadio.addItemListener(new RadioChangeListener()); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 1; - c.gridy = 8; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(streetRadio, c); + editPanel.add(streetRadio, GBC.std().weight(0, 0).insets(5, 5, 0, 5)); placeRadio = new JRadioButton("addr:place"); @@ -559,11 +257,5 @@ placeRadio.setSelected(!dto.isTagStreet()); placeRadio.addItemListener(new RadioChangeListener()); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 2; - c.gridy = 8; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(placeRadio, c); + editPanel.add(placeRadio, GBC.std().insets(5, 5, 0, 5)); ButtonGroup g = new ButtonGroup(); @@ -571,120 +263,35 @@ g.add(placeRadio); - street = new AutoCompComboBox<>(); if (dto.isTagStreet()) { - street.getModel().addAllElements(getPossibleStreets()); + street = generateAutoCompTextField(getPossibleStreets(), dto.getStreet()); } else { - street.getModel().addAllElements(acm.getTagValues(TAG_ADDR_PLACE)); - } - street.setPreferredSize(new Dimension(200, 24)); - street.setEditable(true); - street.setSelectedItem(dto.getStreet()); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 3; - c.gridy = 8; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(street, c); - - JButton getStreetButton = new JButton("<"); - getStreetButton.setPreferredSize(new Dimension(45, 24)); - getStreetButton.setToolTipText(tr("Accept existing value")); - getStreetButton.addActionListener(actionEvent -> updateStreetOrPlaceValues()); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 8; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getStreetButton, c); - - JTextField streetOrPlace = new JTextField(); - streetOrPlace.setText(getStreetOrPlaceTag()); + street = generateAutoCompTextField(acm.getTagValues(TAG_ADDR_PLACE), dto.getStreet()); + } + editPanel.add(street, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> updateStreetOrPlaceValues()), columnThree); + + JTextField streetOrPlace = generateTextField(getStreetOrPlaceTag()); streetOrPlace.setPreferredSize(new Dimension(50, 24)); - streetOrPlace.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 8; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(streetOrPlace, c); - - JTextField existingStreet = new JTextField(); - existingStreet.setText(getStreetOrPlaceValue()); + editPanel.add(streetOrPlace, GBC.std().weight(0, 0).fill(GridBagConstraints.HORIZONTAL).insets(5, 5, 0, 5)); + + JTextField existingStreet = generateTextField(getStreetOrPlaceValue()); existingStreet.setPreferredSize(new Dimension(100, 24)); - existingStreet.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 6; - c.gridy = 8; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingStreet, c); - - + editPanel.add(existingStreet, GBC.eol().weight(1, 0).insets(5, 5, 0, 5).fill(GridBagConstraints.HORIZONTAL)); // housenumber - housenumberEnabled = new JCheckBox(TAG_ADDR_HOUSENUMBER); - housenumberEnabled.setFocusable(false); - housenumberEnabled.setSelected(dto.isSaveHousenumber()); - housenumberEnabled.setToolTipText(APPLY_CHANGES); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 9; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(housenumberEnabled, c); - - housnumber = new JTextField(); - housnumber.setPreferredSize(new Dimension(200, 24)); - - String number = HouseNumberHelper.incrementHouseNumber(dto.getHousenumber(), dto.getHousenumberChangeValue()); - if (number != null) { - housnumber.setText(number); - } - - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 3; - c.gridy = 9; - c.weightx = 1; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(housnumber, c); - - JButton getHousenumberButton = new JButton("<"); - getHousenumberButton.setPreferredSize(new Dimension(45, 24)); - getHousenumberButton.setToolTipText(tr("Accept existing value")); - getHousenumberButton.addActionListener(actionEvent -> housnumber.setText(selection.get(TAG_ADDR_HOUSENUMBER))); - c.fill = GridBagConstraints.NONE; - c.gridx = 4; - c.gridy = 9; - c.weightx = 0; - c.gridwidth = 1; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(getHousenumberButton, c); - - JTextField existingHousenumber = new JTextField(); - existingHousenumber.setText(selection.get(TAG_ADDR_HOUSENUMBER)); - existingHousenumber.setPreferredSize(new Dimension(200, 24)); - existingHousenumber.setEditable(false); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 5; - c.gridy = 9; - c.weightx = 1; - c.gridwidth = 2; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(existingHousenumber, c); + housenumberEnabled = generateCheckbox(TAG_ADDR_HOUSENUMBER, dto.isSaveHousenumber()); + editPanel.add(housenumberEnabled, columnOne); + + housenumber = generateTextField(HouseNumberHelper.incrementHouseNumber(dto.getHousenumber(), dto.getHousenumberChangeValue())); + housenumber.setEditable(true); + + editPanel.add(housenumber, columnTwo); + + editPanel.add(generateAcceptButton(actionEvent -> housenumber.setText(selection.get(TAG_ADDR_HOUSENUMBER))), columnThree); + editPanel.add(generateTextField(selection.get(TAG_ADDR_HOUSENUMBER)), columnFour); // increment JLabel seqLabel = new JLabel(tr("House number increment:")); - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 10; - c.weightx = 0; - c.gridwidth = 3; - c.insets = new Insets(5, 5, 0, 5); - editPanel.add(seqLabel, c); + editPanel.add(seqLabel, columnOne); housenumberChangeSequence = new JSlider(JSlider.HORIZONTAL, FPS_MIN, FPS_MAX, dto.getHousenumberChangeValue()); @@ -694,12 +301,55 @@ housenumberChangeSequence.setPaintLabels(true); housenumberChangeSequence.setSnapToTicks(true); - c.gridx = 3; - c.gridy = 10; - c.weightx = 1; - c.gridwidth = 4; - c.insets = new Insets(20, 5, 10, 5); - editPanel.add(housenumberChangeSequence, c); + editPanel.add(housenumberChangeSequence, GBC.eol().weight(1, 0).insets(20, 5, 10, 5).fill(GridBagConstraints.HORIZONTAL)); return editPanel; + } + + /** + * Generate a checkbox for applying changes + * @param text The text to show + * @param enabled Whether or not the checkbox is enabled + * @return The checkbox to add + */ + private static JCheckBox generateCheckbox(String text, boolean enabled) { + JCheckBox checkBox = new JCheckBox(text, enabled); + checkBox.setFocusable(false); + checkBox.setToolTipText(APPLY_CHANGES); + return checkBox; + } + + /** + * Generate an accept button + * @param listener The listener to call when the user "accepts" a value + * @return The button to add + */ + private static JButton generateAcceptButton(ActionListener listener) { + JButton button = new JButton("<"); + button.setPreferredSize(new Dimension(45, 24)); + button.setToolTipText(tr("Accept existing value")); + button.addActionListener(listener); + return button; + } + + private static AutoCompComboBox generateAutoCompTextField(Collection tagValues, String selected) { + AutoCompComboBox comboBox = new AutoCompComboBox<>(); + comboBox.getModel().addAllElements(tagValues); + comboBox.setPreferredSize(new Dimension(200, 24)); + comboBox.setEditable(true); + comboBox.setSelectedItem(selected); + return comboBox; + } + + /** + * Generate a non-editable text field + * @param startingText The text to show + * @return The text field (200x24) + */ + private static JosmTextField generateTextField(String startingText) { + JosmTextField textField = new JosmTextField(); + textField.setText(startingText); + textField.setPreferredSize(new Dimension(200, 24)); + textField.setEditable(false); + return textField; } @@ -709,9 +359,9 @@ source.setSelectedItem(selection.get(TAG_SOURCE)); country.setSelectedItem(selection.get(TAG_ADDR_COUNTRY)); - state.setSelectedItem(selection.get(TAG_ADDR_STATE)); + stateTag.setSelectedItem(selection.get(TAG_ADDR_STATE)); suburb.setSelectedItem(selection.get(TAG_ADDR_SUBURB)); city.setSelectedItem(selection.get(TAG_ADDR_CITY)); postcode.setSelectedItem(selection.get(TAG_ADDR_POSTCODE)); - housnumber.setText(selection.get(TAG_ADDR_HOUSENUMBER)); + housenumber.setText(selection.get(TAG_ADDR_HOUSENUMBER)); } @@ -720,5 +370,5 @@ placeRadio.setSelected(true); street.setSelectedItem(selection.get(TAG_ADDR_PLACE)); - }else { + } else { streetRadio.setSelected(true); street.setSelectedItem(selection.get(TAG_ADDR_STREET)); @@ -765,8 +415,8 @@ dto.setCity(getAutoCompletingComboBoxValue(city)); dto.setCountry(getAutoCompletingComboBoxValue(country)); - dto.setHousenumber(housnumber.getText()); + dto.setHousenumber(housenumber.getText()); dto.setPostcode(getAutoCompletingComboBoxValue(postcode)); dto.setStreet(getAutoCompletingComboBoxValue(street)); - dto.setState(getAutoCompletingComboBoxValue(state)); + dto.setState(getAutoCompletingComboBoxValue(stateTag)); dto.setSuburb(getAutoCompletingComboBoxValue(suburb)); dto.setHousenumberChangeValue(housenumberChangeSequence.getValue()); @@ -778,5 +428,5 @@ } - private String getAutoCompletingComboBoxValue(AutoCompComboBox box) { + private static String getAutoCompletingComboBoxValue(AutoCompComboBox box) { Object item = box.getSelectedItem(); if (item != null) { @@ -794,18 +444,20 @@ protected void saveDto(Dto dto) { - File path = pluginDir; File fileName = new File(pluginDir + TagDialog.TEMPLATE_DATA); try { - path.mkdirs(); - try ( - FileOutputStream file = new FileOutputStream(fileName); - ObjectOutputStream o = new ObjectOutputStream(file) - ) { - o.writeObject(dto); - } - } catch (Exception ex) { - LOGGER.log(Level.SEVERE, ex.getMessage()); - fileName.delete(); + if (pluginDir.mkdirs()) { + try ( + FileOutputStream file = new FileOutputStream(fileName); + ObjectOutputStream o = new ObjectOutputStream(file) + ) { + o.writeObject(dto); + } + } + } catch (IOException ex) { + Logging.error(ex); + if (!fileName.delete()) { + Logging.trace("TagDialog: {0} not deleted", fileName); + } } } @@ -816,5 +468,5 @@ if (dto.isSaveBuilding()) { String value = selection.get(TagDialog.TAG_BUILDING); - if (value == null || (value != null && !value.equals(dto.getBuilding()))) { + if (value == null || !value.equals(dto.getBuilding())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_BUILDING, dto.getBuilding()); commands.add(command); @@ -824,5 +476,5 @@ if (dto.isSaveSource()) { String value = selection.get(TagDialog.TAG_SOURCE); - if (value == null || (value != null && !value.equals(dto.getSource()))) { + if (value == null || !value.equals(dto.getSource())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_SOURCE, dto.getSource()); commands.add(command); @@ -832,5 +484,5 @@ if (dto.isSaveCity()) { String value = selection.get(TagDialog.TAG_ADDR_CITY); - if (value == null || (value != null && !value.equals(dto.getCity()))) { + if (value == null || !value.equals(dto.getCity())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_CITY, dto.getCity()); commands.add(command); @@ -838,7 +490,7 @@ } - if (dto.isSaveCountry()) { + if (dto.isSaveCountry()) { String value = selection.get(TagDialog.TAG_ADDR_COUNTRY); - if (value == null || (value != null && !value.equals(dto.getCountry()))) { + if (value == null || !value.equals(dto.getCountry())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_COUNTRY, dto.getCountry()); commands.add(command); @@ -846,7 +498,7 @@ } - if (dto.isSaveSuburb()) { + if (dto.isSaveSuburb()) { String value = selection.get(TagDialog.TAG_ADDR_SUBURB); - if (value == null || (value != null && !value.equals(dto.getSuburb()))) { + if (value == null || !value.equals(dto.getSuburb())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_SUBURB, dto.getSuburb()); commands.add(command); @@ -854,7 +506,7 @@ } - if (dto.isSaveHousenumber()) { + if (dto.isSaveHousenumber()) { String value = selection.get(TagDialog.TAG_ADDR_HOUSENUMBER); - if (value == null || (value != null && !value.equals(dto.getHousenumber()))) { + if (value == null || !value.equals(dto.getHousenumber())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_HOUSENUMBER, dto.getHousenumber()); commands.add(command); @@ -864,5 +516,5 @@ if (dto.isSavePostcode()) { String value = selection.get(TagDialog.TAG_ADDR_POSTCODE); - if (value == null || (value != null && !value.equals(dto.getPostcode()))) { + if (value == null || !value.equals(dto.getPostcode())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_POSTCODE, dto.getPostcode()); commands.add(command); @@ -873,5 +525,5 @@ if (dto.isTagStreet()) { String value = selection.get(TagDialog.TAG_ADDR_STREET); - if (value == null || (value != null && !value.equals(dto.getStreet()))) { + if (value == null || !value.equals(dto.getStreet())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_STREET, dto.getStreet()); commands.add(command); @@ -885,5 +537,5 @@ } else { String value = selection.get(TagDialog.TAG_ADDR_PLACE); - if (value == null || (value != null && !value.equals(dto.getStreet()))) { + if (value == null || !value.equals(dto.getStreet())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_PLACE, dto.getStreet()); commands.add(command); @@ -900,5 +552,5 @@ if (dto.isSaveState()) { String value = selection.get(TagDialog.TAG_ADDR_STATE); - if (value == null || (value != null && !value.equals(dto.getState()))) { + if (value == null || !value.equals(dto.getState())) { ChangePropertyCommand command = new ChangePropertyCommand(selection, TagDialog.TAG_ADDR_STATE, dto.getState()); commands.add(command); @@ -918,6 +570,7 @@ /** * Generates a list of all visible names of highways in order to do autocompletion on the road name. + * @return The possible streets for the current edit dataset */ - private Collection getPossibleStreets() { + private static Collection getPossibleStreets() { Set names = new TreeSet<>(); for (OsmPrimitive osm : MainApplication.getLayerManager().getEditDataSet().allNonDeletedPrimitives()) { @@ -937,5 +590,5 @@ try ( FileInputStream file = new FileInputStream(fileName); - ObjectInputStream o = new ObjectInputStream(file); + ObjectInputStream o = new ObjectInputStream(file) ) { dto = (Dto) o.readObject(); @@ -944,7 +597,9 @@ loadExistingValuesToDto(dto); } - } catch (Exception ex) { - LOGGER.log(Level.SEVERE, ex.getMessage()); - fileName.delete(); + } catch (ClassNotFoundException | IOException ex) { + Logging.error(ex); + if (!fileName.delete()) { + Logging.trace("TagDialog: {0} not deleted", fileName); + } loadExistingValuesToDto(dto); } Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/test/unit/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberHelperTest.java =================================================================== --- /applications/editors/josm/plugins/HouseNumberTaggingTool/test/unit/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberHelperTest.java (revision 36059) +++ /applications/editors/josm/plugins/HouseNumberTaggingTool/test/unit/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberHelperTest.java (revision 36060) @@ -2,13 +2,14 @@ package org.openstreetmap.josm.plugins.housenumbertool; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.Test; /** * Unit tests of {@link TagDialog}. */ -public class HouseNumberHelperTest { +class HouseNumberHelperTest { /** @@ -16,5 +17,5 @@ */ @Test - public void testIncrementHouseNumber() { + void testIncrementHouseNumber() { assertEquals("2", HouseNumberHelper.incrementHouseNumber("1", 1)); assertEquals("12", HouseNumberHelper.incrementHouseNumber("10", 2));