Index: /applications/editors/josm/plugins/tageditor/.checkstyle =================================================================== --- /applications/editors/josm/plugins/tageditor/.checkstyle (revision 32959) +++ /applications/editors/josm/plugins/tageditor/.checkstyle (revision 32959) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/tageditor/.project =================================================================== --- /applications/editors/josm/plugins/tageditor/.project (revision 32958) +++ /applications/editors/josm/plugins/tageditor/.project (revision 32959) @@ -16,7 +16,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java (revision 32959) @@ -16,12 +16,12 @@ public class LaunchAction extends JosmAction implements SelectionChangedListener { - public LaunchAction() { + public LaunchAction() { super( tr("Edit tags"), - (String)null, //TODO: set "tag-editor" and add /images/tag-editor.png to distrib + (String) null, //TODO: set "tag-editor" and add /images/tag-editor.png to distrib tr("Launches the tag editor dialog"), Shortcut.registerShortcut("edit:launchtageditor", tr("Launches the tag editor dialog"), - KeyEvent.VK_1,Shortcut.ALT_SHIFT) - , true, "tageditor/launch", true); + KeyEvent.VK_1, Shortcut.ALT_SHIFT), + true, "tageditor/launch", true); DataSet.addSelectionListener(this); @@ -47,5 +47,5 @@ @Override public void selectionChanged(Collection newSelection) { - setEnabled(newSelection != null && newSelection.size() >0); + setEnabled(newSelection != null && newSelection.size() > 0); } } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java (revision 32959) @@ -53,5 +53,5 @@ /** the unique instance */ - static private TagEditorDialog instance = null; + private static TagEditorDialog instance = null; /** @@ -60,5 +60,5 @@ * @return the singleton instance of the dialog */ - static public TagEditorDialog getInstance() { + public static TagEditorDialog getInstance() { if (instance == null) { instance = new TagEditorDialog(); @@ -68,5 +68,5 @@ /** default preferred size */ - static public final Dimension PREFERRED_SIZE = new Dimension(700, 500); + public static final Dimension PREFERRED_SIZE = new Dimension(700, 500); /** the properties table */ @@ -99,5 +99,5 @@ // the cancel button // - pnl.add(new JButton(cancelAction = new CancelAction())); + pnl.add(new JButton(cancelAction = new CancelAction())); return pnl; } @@ -124,5 +124,5 @@ pnlTagGrid.add(tagEditor, BorderLayout.CENTER); pnlTagGrid.add(aclViewer, BorderLayout.EAST); - pnlTagGrid.setBorder(BorderFactory.createEmptyBorder(5, 0,0,0)); + pnlTagGrid.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); JSplitPane splitPane = new JSplitPane( @@ -167,6 +167,6 @@ JPanel pnlPresetSelector = new JPanel(); pnlPresetSelector.setLayout(new BorderLayout()); - pnlPresetSelector.add(presetSelector,BorderLayout.CENTER); - pnlPresetSelector.setBorder(BorderFactory.createEmptyBorder(0,0,5,0 )); + pnlPresetSelector.add(presetSelector, BorderLayout.CENTER); + pnlPresetSelector.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0)); // create the tag selector @@ -185,6 +185,6 @@ JPanel pnlTagSelector = new JPanel(); pnlTagSelector.setLayout(new BorderLayout()); - pnlTagSelector.add(tagSelector,BorderLayout.CENTER); - pnlTagSelector.setBorder(BorderFactory.createEmptyBorder(0,0,5,0 )); + pnlTagSelector.add(tagSelector, BorderLayout.CENTER); + pnlTagSelector.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0)); // create the tabbed pane @@ -209,5 +209,5 @@ pnlTagGrid.setMinimumSize(minimumSize); - getContentPane().add(splitPane,BorderLayout.CENTER); + getContentPane().add(splitPane, BorderLayout.CENTER); getContentPane().add(buildButtonRow(), BorderLayout.SOUTH); @@ -217,8 +217,7 @@ new WindowAdapter() { @Override public void windowActivated(WindowEvent e) { - SwingUtilities.invokeLater(new Runnable(){ + SwingUtilities.invokeLater(new Runnable() { @Override - public void run() - { + public void run() { getModel().ensureOneTag(); tagEditor.clearSelection(); @@ -233,8 +232,10 @@ // and in the aclViewer is handled by okAction // - getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put((KeyStroke)cancelAction.getValue(Action.ACCELERATOR_KEY), okAction.getValue(AbstractAction.NAME)); + getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + (KeyStroke) cancelAction.getValue(Action.ACCELERATOR_KEY), okAction.getValue(AbstractAction.NAME)); getRootPane().getActionMap().put(cancelAction.getValue(Action.NAME), cancelAction); - getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put((KeyStroke)okAction.getValue(Action.ACCELERATOR_KEY), okAction.getValue(AbstractAction.NAME)); + getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + (KeyStroke) okAction.getValue(Action.ACCELERATOR_KEY), okAction.getValue(AbstractAction.NAME)); getRootPane().getActionMap().put(okAction.getValue(Action.NAME), okAction); @@ -287,8 +288,8 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); - putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0)); + putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0)); putValue(SHORT_DESCRIPTION, tr("Abort tag editing and close dialog")); } @@ -302,5 +303,5 @@ class OKAction extends AbstractAction implements PropertyChangeListener { - public OKAction() { + OKAction() { putValue(NAME, tr("OK")); putValue(SMALL_ICON, ImageProvider.get("ok")); @@ -325,9 +326,9 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (! evt.getPropertyName().equals(TagEditorModel.PROP_DIRTY)) + if (!evt.getPropertyName().equals(TagEditorModel.PROP_DIRTY)) return; - if (! evt.getNewValue().getClass().equals(Boolean.class)) + if (!evt.getNewValue().getClass().equals(Boolean.class)) return; - boolean dirty = (Boolean)evt.getNewValue(); + boolean dirty = (Boolean) evt.getNewValue(); setEnabled(dirty); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java (revision 32959) @@ -24,6 +24,6 @@ public class AutoCompletionListRenderer extends JLabel implements TableCellRenderer { - static public final String RES_OSM_ICON = "/resources/osm.png"; - static public final String RES_SELECTION_ICON = "/resources/selection.png"; + public static final String RES_OSM_ICON = "/resources/osm.png"; + public static final String RES_SELECTION_ICON = "/resources/selection.png"; /** the icon used to decorate items of priority @@ -111,5 +111,5 @@ // if (value instanceof AutoCompletionListItem) { - AutoCompletionListItem item = (AutoCompletionListItem)value; + AutoCompletionListItem item = (AutoCompletionListItem) value; prepareRendererIcon(item); setText(item.getValue()); Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java (revision 32959) @@ -22,25 +22,25 @@ public class AutoCompletionListViewer extends JPanel { - + //static private Logger logger = Logger.getLogger(AutoCompletionListViewer.class.getName()); /** the table showing the auto completion list entries */ private JTable table = null; - + /** the auto completion list to be displayed */ private AutoCompletionList autoCompletionList = null; - + /** the listeners */ private ArrayList listener = null; - + /** - * creates the GUI + * creates the GUI */ protected void createGUI() { setBackground(Color.WHITE); setLayout(new BorderLayout()); - + table = new JTable(); - + // the table model // @@ -52,21 +52,21 @@ table.setModel(autoCompletionList); } - - // no table header required + + // no table header required table.setTableHeader(null); - - // set cell renderer + + // set cell renderer // table.setDefaultRenderer(Object.class, new AutoCompletionListRenderer()); - - // embed in a scroll pane - JScrollPane p = new JScrollPane(table); + + // embed in a scroll pane + JScrollPane p = new JScrollPane(table); p.setBackground(Color.WHITE); add(p, BorderLayout.CENTER); - + // only single selection allowed // table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - + // fire item change event on double click // @@ -80,23 +80,23 @@ fireAutoCompletionListItemSelected(item); } - } + } } ); } - + /** - * constructor - * + * constructor + * * @param list the auto completion list to be rendered. If null, the list is empty. - * + * */ - public AutoCompletionListViewer(AutoCompletionList list) { + public AutoCompletionListViewer(AutoCompletionList list) { this.autoCompletionList = list; createGUI(); listener = new ArrayList<>(); } - + /** - * constructor + * constructor */ public AutoCompletionListViewer() { @@ -107,16 +107,16 @@ /** - * + * */ - @Override public Dimension getMaximumSize() { + @Override public Dimension getMaximumSize() { Dimension d = super.getMaximumSize(); d.width = 100; return d; } - + /** - * + * */ - @Override public Dimension getPreferredSize() { + @Override public Dimension getPreferredSize() { Dimension d = super.getMaximumSize(); d.width = 150; @@ -127,6 +127,6 @@ /** * replies the auto completion list this viewer renders - * - * @return the auto completion list; may be null + * + * @return the auto completion list; may be null */ public AutoCompletionList getAutoCompletionList() { @@ -136,6 +136,6 @@ /** - * sets the auto completion list this viewer renders - * + * sets the auto completion list this viewer renders + * * @param autoCompletionList the auto completion list; may be null */ @@ -148,44 +148,45 @@ } } - + /** * add an {@link IAutoCompletionListListener} - * - * @param listener the listener + * + * @param listener the listener */ public void addAutoCompletionListListener(IAutoCompletionListListener listener) { if (listener != null && !this.listener.contains(listener)) { - synchronized(this.listener) { + synchronized (this.listener) { this.listener.add(listener); } } } - + /** - * removes a {@link IAutoCompletionListListener} - * - * @param listener the listener + * removes a {@link IAutoCompletionListListener} + * + * @param listener the listener */ public void removeAutoCompletionListListener(IAutoCompletionListListener listener) { if (listener != null && this.listener.contains(listener)) { - synchronized(this.listener) { + synchronized (this.listener) { this.listener.remove(listener); } } } - + /** - * notifies listeners about a selected item in the auto completion list + * notifies listeners about a selected item in the auto completion list */ protected void fireAutoCompletionListItemSelected(String item) { - synchronized(this.listener) { + synchronized (this.listener) { for (IAutoCompletionListListener target: listener) { target.autoCompletionItemSelected(item); - } + } } - } - + } + public void installKeyAction(Action a) { - getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put((KeyStroke)a.getValue(AbstractAction.ACCELERATOR_KEY), a.getValue(AbstractAction.NAME)); + getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + (KeyStroke) a.getValue(AbstractAction.ACCELERATOR_KEY), a.getValue(AbstractAction.NAME)); getActionMap().put(a.getValue(AbstractAction.NAME), a); Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/IAutoCompletionListListener.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/IAutoCompletionListListener.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/IAutoCompletionListListener.java (revision 32959) @@ -3,4 +3,4 @@ public interface IAutoCompletionListListener { - public void autoCompletionItemSelected(String item); + void autoCompletionItemSelected(String item); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java (revision 32959) @@ -66,5 +66,5 @@ btnRemove = new JButton(tr("Remove")); btnRemove.addActionListener( - new ActionListener() { + new ActionListener() { @Override public void actionPerformed(ActionEvent arg0) { @@ -84,6 +84,6 @@ protected void removeCurrentPreset() { - TaggingPreset item= (TaggingPreset)presets.getSelectedItem(); - if (item != null && model !=null) { + TaggingPreset item = (TaggingPreset) presets.getSelectedItem(); + if (item != null && model != null) { model.removeAppliedPreset(item); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java (revision 32959) @@ -74,10 +74,10 @@ JButton btn; pnl.add(btn = new JButton(tblTagEditor.getAddAction())); - btn.setMargin(new Insets(0,0,0,0)); + btn.setMargin(new Insets(0, 0, 0, 0)); tblTagEditor.addComponentNotStoppingCellEditing(btn); // delete action pnl.add(btn = new JButton(tblTagEditor.getDeleteAction())); - btn.setMargin(new Insets(0,0,0,0)); + btn.setMargin(new Insets(0, 0, 0, 0)); tblTagEditor.addComponentNotStoppingCellEditing(btn); return pnl; @@ -97,5 +97,5 @@ DefaultListSelectionModel colSelectionModel = new DefaultListSelectionModel(); - tagEditorModel = new TagEditorModel(rowSelectionModel,colSelectionModel); + tagEditorModel = new TagEditorModel(rowSelectionModel, colSelectionModel); // build the scrollable table for editing tag names and tag values @@ -119,5 +119,5 @@ gc.weighty = 1.0; gc.anchor = GridBagConstraints.NORTHWEST; - pnl.add(buildButtonsPanel(),gc); + pnl.add(buildButtonsPanel(), gc); // -- the panel with the editor table @@ -128,5 +128,5 @@ gc.weighty = 1.0; gc.anchor = GridBagConstraints.CENTER; - pnl.add(pnlTagTable,gc); + pnl.add(pnlTagTable, gc); return pnl; @@ -186,5 +186,5 @@ public void autoCompletionItemSelected(String item) { logger.info("autocompletion item selected ..."); - TagSpecificationAwareTagCellEditor editor = (TagSpecificationAwareTagCellEditor)tblTagEditor.getCellEditor(); + TagSpecificationAwareTagCellEditor editor = (TagSpecificationAwareTagCellEditor) tblTagEditor.getCellEditor(); if (editor != null) { editor.autoCompletionItemSelected(item); @@ -193,5 +193,5 @@ public void requestFocusInTopLeftCell() { - tblTagEditor.requestFocusInCell(0,0); + tblTagEditor.requestFocusInCell(0, 0); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java (revision 32959) @@ -20,7 +20,7 @@ @SuppressWarnings("serial") -public class TagEditorModel extends org.openstreetmap.josm.gui.tagging.TagEditorModel { +public class TagEditorModel extends org.openstreetmap.josm.gui.tagging.TagEditorModel { //static private final Logger logger = Logger.getLogger(TagEditorModel.class.getName()); - + private DefaultComboBoxModel appliedPresets = null; @@ -28,5 +28,5 @@ * constructor */ - public TagEditorModel(DefaultListSelectionModel rowSelectionModel, DefaultListSelectionModel colSelectionModel){ + public TagEditorModel(DefaultListSelectionModel rowSelectionModel, DefaultListSelectionModel colSelectionModel) { super(rowSelectionModel, colSelectionModel); appliedPresets = new DefaultComboBoxModel<>(); @@ -35,12 +35,12 @@ /** * applies the tags defined for a preset item to the tag model. - * + * * Mandatory tags are added to the list of currently edited tags. * Optional tags are not added. * The model remembers the currently applied presets. - * + * * @param item the preset item. Must not be null. * @exception IllegalArgumentException thrown, if item is null - * + * */ public void applyPreset(TaggingPreset item) { @@ -49,5 +49,5 @@ // check whether item is already applied // - for(int i=0; i < appliedPresets.getSize(); i++) { + for (int i = 0; i < appliedPresets.getSize(); i++) { if (appliedPresets.getElementAt(i).equals(item)) // abort - preset already applied @@ -57,8 +57,8 @@ // apply the tags proposed by the preset // - for(AdvancedTag tag : AdvancedTag.forTaggingPreset(item)) { + for (AdvancedTag tag : AdvancedTag.forTaggingPreset(item)) { if (!tag.isOptional()) { if (!includesTag(tag.getKey())) { - TagModel tagModel = new TagModel(tag.getKey(),tag.getValue()); + TagModel tagModel = new TagModel(tag.getKey(), tag.getValue()); prepend(tagModel); } else { @@ -85,5 +85,5 @@ /** * applies a tag given by a {@see KeyValuePair} to the model - * + * * @param pair the key value pair */ @@ -98,5 +98,4 @@ fireTableDataChanged(); } - public DefaultComboBoxModel getAppliedPresetsModel() { @@ -140,9 +139,9 @@ fireTableDataChanged(); } - + /** * updates the tags of the primitives in the current selection with the * values in the current tag model - * + * */ public void updateJOSMSelection() { @@ -152,5 +151,5 @@ return; for (TagModel tag : tags) { - Command command = createUpdateTagCommand(selection,tag); + Command command = createUpdateTagCommand(selection, tag); if (command != null) { commands.add(command); @@ -170,5 +169,5 @@ Main.main.undoRedo.add(command); } - + /** * initializes the model with the tags in the current JOSM selection @@ -180,5 +179,5 @@ for (String key : element.keySet()) { String value = element.get(key); - add(key,value); + add(key, value); } } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java (revision 32959) @@ -2,5 +2,4 @@ package org.openstreetmap.josm.plugins.tageditor.editor; -import java.util.logging.Level; import java.util.logging.Logger; @@ -16,8 +15,8 @@ public TagSpecificationAwareTagCellEditor() { - super(0); - } + super(0); + } - /** + /** * initializes the auto completion list when the table cell editor starts * to edit the key of a tag. In this case the auto completion list is @@ -39,9 +38,9 @@ // add the list of standard keys // - try { - //autoCompletionList.add(TagSpecifications.getInstance().getKeysForAutoCompletion(context)); - } catch(Exception e) { + /*try { + autoCompletionList.add(TagSpecifications.getInstance().getKeysForAutoCompletion(context)); + } catch (Exception e) { logger.log(Level.WARNING, "failed to initialize auto completion list with standard keys.", e); - } + }*/ // add the list of keys in the current data set @@ -52,5 +51,5 @@ context.initFromJOSMSelection(); autoCompletionList.add(TagSpecifications.getInstance().getKeysForAutoCompletion(context)); - } catch(Exception e) { + } catch (Exception e) { System.out.println("Warning: failed to initialize auto completion list with tag specification keys. Exception was: " + e.toString()); e.printStackTrace(); @@ -60,5 +59,5 @@ // for (String key : model.getKeys()) { - if (! key.equals(currentTag.getName())) { + if (!key.equals(currentTag.getName())) { autoCompletionList.remove(key); } @@ -89,6 +88,7 @@ context.initFromJOSMSelection(); autoCompletionList.add(TagSpecifications.getInstance().getLabelsForAutoCompletion(forKey, context)); - } catch(Exception e) { - System.out.println("Warning: failed to initialize auto completion list with tag specification values. Exception was: " + e.toString()); + } catch (Exception e) { + System.out.println( + "Warning: failed to initialize auto completion list with tag specification values. Exception was: " + e.toString()); e.printStackTrace(); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTableCellRenderer.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTableCellRenderer.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTableCellRenderer.java (revision 32959) @@ -22,8 +22,8 @@ * in the tag editor dialog. */ -public class TagTableCellRenderer extends JLabel implements TableCellRenderer { +public class TagTableCellRenderer extends JLabel implements TableCellRenderer { //private static Logger logger = Logger.getLogger(TagTableCellRenderer.class.getName()); - public static final Color BG_COLOR_HIGHLIGHTED = new Color(255,255,204); + public static final Color BG_COLOR_HIGHLIGHTED = new Color(255, 255, 204); private Font fontStandard = null; @@ -34,5 +34,5 @@ fontItalic = fontStandard.deriveFont(Font.ITALIC); setOpaque(true); - setBorder(new EmptyBorder(5,5,5,5)); + setBorder(new EmptyBorder(5, 5, 5, 5)); } @@ -58,5 +58,5 @@ } else if (tag.getValueCount() == 1) { setText(tag.getValues().get(0)); - } else if (tag.getValueCount() > 1) { + } else if (tag.getValueCount() > 1) { setText(tr("multiple")); setFont(fontItalic); @@ -74,5 +74,5 @@ protected TagEditorModel getModel(JTable table) { - return (TagEditorModel)table.getModel(); + return (TagEditorModel) table.getModel(); } @@ -88,10 +88,10 @@ // no current preset selected? // - TaggingPreset item = (TaggingPreset)model.getAppliedPresetsModel().getSelectedItem(); + TaggingPreset item = (TaggingPreset) model.getAppliedPresetsModel().getSelectedItem(); if (item == null) { return false; } - for(AdvancedTag tag: AdvancedTag.forTaggingPreset(item)) { + for (AdvancedTag tag: AdvancedTag.forTaggingPreset(item)) { if (tag.getValue() == null) { if (tagModel.getName().equals(tag.getKey())) { @@ -118,5 +118,5 @@ */ protected void renderColor(TagModel tagModel, TagEditorModel model, boolean isSelected) { - if (isSelected){ + if (isSelected) { setBackground(UIManager.getColor("Table.selectionBackground")); setForeground(UIManager.getColor("Table.selectionForeground")); @@ -147,10 +147,10 @@ resetRenderer(); - TagModel tagModel = (TagModel)value; + TagModel tagModel = (TagModel) value; switch(vColIndex) { case 0: renderTagName(tagModel); break; case 1: renderTagValue(tagModel); break; } - renderColor(tagModel, (TagEditorModel)table.getModel(),isSelected); + renderColor(tagModel, (TagEditorModel) table.getModel(), isSelected); if (hasFocus && isSelected) { if (table.getSelectedColumnCount() == 1 && table.getSelectedRowCount() == 1) { Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AdvancedTag.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AdvancedTag.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AdvancedTag.java (revision 32959) @@ -48,5 +48,5 @@ this.optional = optional; } - + public static Collection forTaggingPreset(TaggingPreset preset) { Collection result = new ArrayList<>(); @@ -54,5 +54,5 @@ for (TaggingPresetItem item : preset.data) { if (item instanceof KeyedItem) { - KeyedItem ki = (KeyedItem)item; + KeyedItem ki = (KeyedItem) item; for (String value : ki.getValues()) { AdvancedTag tag = new AdvancedTag(ki.key, value); Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/IPresetSelectorListener.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/IPresetSelectorListener.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/IPresetSelectorListener.java (revision 32959) @@ -6,4 +6,4 @@ public interface IPresetSelectorListener { - public void itemSelected(TaggingPreset item); + void itemSelected(TaggingPreset item); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/NameIconCellRenderer.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/NameIconCellRenderer.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/NameIconCellRenderer.java (revision 32959) @@ -14,9 +14,9 @@ public class NameIconCellRenderer extends JLabel implements TableCellRenderer { - public static final Color BG_COLOR_SELECTED = new Color(143,170,255); + public static final Color BG_COLOR_SELECTED = new Color(143, 170, 255); protected void init() { setOpaque(true); - setFont(new Font("SansSerif",Font.PLAIN,10)); + setFont(new Font("SansSerif", Font.PLAIN, 10)); } @@ -31,5 +31,5 @@ if (isSelected) { setBackground(BG_COLOR_SELECTED); - } else { + } else { setBackground(Color.WHITE); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTable.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTable.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTable.java (revision 32959) @@ -10,24 +10,24 @@ /** - * initialize the table + * initialize the table */ - protected void init() { - setAutoResizeMode(JTable.AUTO_RESIZE_OFF); + protected void init() { + setAutoResizeMode(JTable.AUTO_RESIZE_OFF); setRowSelectionAllowed(true); setSelectionMode(ListSelectionModel.SINGLE_SELECTION); setRowHeight(18); // icon height (=16) + minimal border } - + public PresetsTable(TableModel model, TableColumnModel columnModel) { - super(model,columnModel); + super(model, columnModel); init(); } - + /** * adjusts the width of the columns for the tag name and the tag value * to the width of the scroll panes viewport. - * + * * Note: {@see #getPreferredScrollableViewportSize()} did not work as expected - * + * * @param scrollPaneWidth the width of the scroll panes viewport */ @@ -40,5 +40,5 @@ tcm.getColumn(0).setMaxWidth(width); tcm.getColumn(1).setMinWidth(width); - tcm.getColumn(1).setMaxWidth(width); + tcm.getColumn(1).setMaxWidth(width); } } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableModel.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableModel.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableModel.java (revision 32959) @@ -10,5 +10,5 @@ import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset; -public class PresetsTableModel extends AbstractTableModel { +public class PresetsTableModel extends AbstractTableModel { //private static final Logger logger = Logger.getLogger(PresetsTableModel.class.getName()); @@ -39,5 +39,5 @@ @Override public void addTableModelListener(TableModelListener l) { - synchronized(listeners) { + synchronized (listeners) { if (l == null) return; @@ -99,8 +99,8 @@ public void filter(String filter) { - synchronized(this) { + synchronized (this) { if (filter == null || filter.trim().equals("")) { visibleItems.clear(); - for(TaggingPreset item: items) { + for (TaggingPreset item: items) { visibleItems.add(item); } @@ -108,7 +108,7 @@ visibleItems.clear(); filter = filter.toLowerCase(); - for(TaggingPreset item: items) { + for (TaggingPreset item: items) { if ((item.getName() != null && item.getName().toLowerCase().trim().contains(filter)) - || (item.group != null && item.group.getName() != null && item.group.getName().toLowerCase().trim().contains(filter))) { + || (item.group != null && item.group.getName() != null && item.group.getName().toLowerCase().trim().contains(filter))) { visibleItems.add(item); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java (revision 32959) @@ -39,5 +39,5 @@ private PresetsTable presetsTable = null; - private JTextField tfFilter = null; + private JTextField tfFilter = null; private final ArrayList listeners = new ArrayList<>(); private JScrollPane scrollPane; @@ -50,5 +50,5 @@ tfFilter = new JTextField(20); pnl.add(lbl); - pnl.add(tfFilter,BorderLayout.CENTER); + pnl.add(tfFilter, BorderLayout.CENTER); JButton btn = new JButton(tr("Clear")); pnl.add(btn); @@ -67,5 +67,5 @@ protected JScrollPane buildPresetGrid() { - presetsTable = new PresetsTable(new PresetsTableModel(),new PresetsTableColumnModel()); + presetsTable = new PresetsTable(new PresetsTableModel(), new PresetsTableColumnModel()); scrollPane = new JScrollPane(presetsTable); @@ -94,5 +94,5 @@ // replace Enter action. apply the current preset on enter // - presetsTable.unregisterKeyboardAction(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0)); + presetsTable.unregisterKeyboardAction(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)); ActionListener enterAction = new ActionListener() { @Override @@ -108,5 +108,5 @@ enterAction, "Enter", - KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), + KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), JComponent.WHEN_FOCUSED ); @@ -125,5 +125,5 @@ public void actionPerformed(ActionEvent arg0) { int row = presetsTable.getSelectedRow(); - if (row >=0) { + if (row >= 0) { fireItemSelected(getModel().getVisibleItem(row)); } @@ -193,5 +193,5 @@ public void bindTo(Collection presets) { - PresetsTableModel model = (PresetsTableModel)presetsTable.getModel(); + PresetsTableModel model = (PresetsTableModel) presetsTable.getModel(); model.setPresets(presets); } @@ -202,6 +202,6 @@ public void addPresetSelectorListener(IPresetSelectorListener listener) { - synchronized(this.listeners) { - if (listener != null && ! listeners.contains(listener)) { + synchronized (this.listeners) { + if (listener != null && !listeners.contains(listener)) { listeners.add(listener); } @@ -210,5 +210,5 @@ public void removePresetSelectorListener(IPresetSelectorListener listener) { - synchronized(this.listeners) { + synchronized (this.listeners) { if (listener != null) { listeners.remove(listener); @@ -218,6 +218,6 @@ protected void fireItemSelected(TaggingPreset item) { - synchronized(this.listeners) { - for(IPresetSelectorListener listener: listeners) { + synchronized (this.listeners) { + for (IPresetSelectorListener listener: listeners) { listener.itemSelected(item); } @@ -249,5 +249,5 @@ // Component c = presetsTable; - while(c != null) { + while (c != null) { c.doLayout(); c.repaint(); @@ -257,9 +257,10 @@ protected PresetsTableModel getModel() { - return (PresetsTableModel)presetsTable.getModel(); + return (PresetsTableModel) presetsTable.getModel(); } public void installKeyAction(Action a) { - getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put((KeyStroke)a.getValue(AbstractAction.ACCELERATOR_KEY), a.getValue(AbstractAction.NAME)); + getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + (KeyStroke) a.getValue(AbstractAction.ACCELERATOR_KEY), a.getValue(AbstractAction.NAME)); getActionMap().put(a.getValue(AbstractAction.NAME), a); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/KeyValuePair.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/KeyValuePair.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/KeyValuePair.java (revision 32959) @@ -5,7 +5,7 @@ private String key = new String(""); private String value = new String(""); - + public KeyValuePair() {} - + public KeyValuePair(String key, String value) { setKey(key); @@ -13,5 +13,4 @@ } - public String getKey() { return key; @@ -19,5 +18,5 @@ public void setKey(String key) { - this.key = key == null? "" :key; + this.key = key == null ? "" : key; } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecification.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecification.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecification.java (revision 32959) @@ -65,5 +65,5 @@ /** * sets the list of lables for this tag specification - * + * * @param lables the list of lables; must not be null * @exception IllegalArgumentException thrown, if lables is null @@ -81,9 +81,9 @@ * Adds a label to the list of label for this tag specification. The label * is only added if i - * + * * @param lable the lalbe to add; must not be null * @exception IllegalArgumentException thrown, if lable is null */ - public void addLable(LabelSpecification lable) throws IllegalArgumentException { + public void addLable(LabelSpecification lable) throws IllegalArgumentException { if (lable == null) throw new IllegalArgumentException("argument 'lable' must not be null"); @@ -111,28 +111,37 @@ return key; } + public void setKey(String key) { this.key = key; } + public String getType() { return type; } + public void setType(String type) { this.type = type; } + public boolean isApplicableToNode() { return applicableToNode; } + public void setApplicableToNode(boolean applicableToNode) { this.applicableToNode = applicableToNode; } + public boolean isApplicableToWay() { return applicableToWay; } + public void setApplicableToWay(boolean applicableToWay) { this.applicableToWay = applicableToWay; } + public boolean isApplicableToRelation() { return applicableToRelation; } + public void setApplicableToRelation(boolean applicableToRelation) { this.applicableToRelation = applicableToRelation; Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java (revision 32959) @@ -35,20 +35,20 @@ public class TagSpecifications { - final static public String ATTR_KEY = "key"; - final static public String ATTR_TYPE = "type"; - final static public String ATTR_FOR_NODE = "for-node"; - final static public String ATTR_FOR_WAY = "for-way"; - final static public String ATTR_FOR_RELATION = "for-relation"; - final static public String ATTR_VALUE = "value"; - - final static public String ELEM_ROOT = "osm-tag-definitions"; - final static public String ELEM_TAG = "tag"; - final static public String ELEM_LABEL = "label"; - - final static public String DTD = "osm-tag-definitions.dtd"; + public static final String ATTR_KEY = "key"; + public static final String ATTR_TYPE = "type"; + public static final String ATTR_FOR_NODE = "for-node"; + public static final String ATTR_FOR_WAY = "for-way"; + public static final String ATTR_FOR_RELATION = "for-relation"; + public static final String ATTR_VALUE = "value"; + + public static final String ELEM_ROOT = "osm-tag-definitions"; + public static final String ELEM_TAG = "tag"; + public static final String ELEM_LABEL = "label"; + + public static final String DTD = "osm-tag-definitions.dtd"; /** the default name of the resource file with the tag specifications */ - static public final String RES_NAME_TAG_SPECIFICATIONS = "/resources/osm-tag-definitions.xml"; + public static final String RES_NAME_TAG_SPECIFICATIONS = "/resources/osm-tag-definitions.xml"; /** the logger object */ @@ -67,5 +67,5 @@ * @throws Exception thrown, if an exception occurs */ - static public void loadFromResources() throws Exception { + public static void loadFromResources() throws Exception { InputStream in = TagSpecifications.class.getResourceAsStream(RES_NAME_TAG_SPECIFICATIONS); if (in == null) { @@ -80,5 +80,5 @@ } - static public TagSpecifications getInstance() throws Exception { + public static TagSpecifications getInstance() throws Exception { if (instance == null) { loadFromResources(); @@ -187,9 +187,9 @@ * between <tag> ... </tag> */ - private TagSpecification currentTagSpecification = null; + private TagSpecification currentTagSpecification = null; @Override public void endDocument() throws SAXException { - logger.log(Level.FINE,"END"); + logger.log(Level.FINE, "END"); } @@ -206,5 +206,5 @@ @Override public void startDocument() throws SAXException { - logger.log(Level.FINE,"START"); + logger.log(Level.FINE, "START"); } @@ -230,5 +230,5 @@ * * @param atts the XML attributes - * @throws SAXException + * @throws SAXException if any SAX error occurs */ protected void startElementOsmTagDefinitions(Attributes atts) throws SAXException { @@ -239,5 +239,5 @@ * handles an end element with name osm-tag-specifications * - * @throws SAXException + * @throws SAXException if any SAX error occurs */ protected void endElementOsmTagDefinitions() throws SAXException { @@ -249,9 +249,9 @@ * * @param atts the XML attributes of the element - * @throws SAXException + * @throws SAXException if any SAX error occurs */ protected void startElementTag(Attributes atts) throws SAXException { currentTagSpecification = new TagSpecification(); - for (int i=0; i< atts.getLength(); i++) { + for (int i = 0; i < atts.getLength(); i++) { String name = atts.getQName(i); String value = atts.getValue(i); @@ -272,13 +272,11 @@ } - /** * handles an end element with name tag - * @throws SAXException + * @throws SAXException if any SAX error occurs */ protected void endElementTag() throws SAXException { tagSpecifications.add(currentTagSpecification); currentTagSpecification = null; - } @@ -287,9 +285,9 @@ * * @param atts the XML attributes - * @throws SAXException + * @throws SAXException if any SAX error occurs */ protected void startElementLabel(Attributes atts) throws SAXException { LabelSpecification ls = new LabelSpecification(); - for (int i=0; i< atts.getLength(); i++) { + for (int i = 0; i < atts.getLength(); i++) { String name = atts.getQName(i); String value = atts.getValue(i); @@ -312,5 +310,5 @@ * handles an end element with name label * - * @throws SAXException + * @throws SAXException if any SAX error occurs */ protected void endElementLabel() throws SAXException { @@ -353,5 +351,5 @@ @Override - public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { + public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { if (systemId != null && systemId.endsWith(DTD)) { InputStream stream = TagSpecifications.class.getResourceAsStream("/resources/"+DTD); @@ -366,5 +364,5 @@ } - public static void main(String args[]) throws Exception{ + public static void main(String[] args) throws Exception { TagSpecifications.loadFromResources(); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/ITagSelectorListener.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/ITagSelectorListener.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/ITagSelectorListener.java (revision 32959) @@ -5,4 +5,4 @@ public interface ITagSelectorListener { - public void itemSelected(KeyValuePair pair); + void itemSelected(KeyValuePair pair); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/KeyValueCellRenderer.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/KeyValueCellRenderer.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/KeyValueCellRenderer.java (revision 32959) @@ -10,8 +10,8 @@ import javax.swing.table.TableCellRenderer; -public class KeyValueCellRenderer extends JLabel implements TableCellRenderer { +public class KeyValueCellRenderer extends JLabel implements TableCellRenderer { protected void init() { - setFont(new Font("Courier",Font.PLAIN,getFont().getSize())); + setFont(new Font("Courier", Font.PLAIN, getFont().getSize())); setOpaque(true); } @@ -28,9 +28,9 @@ setBackground(UIManager.getColor("Table.selectionBackground")); setForeground(UIManager.getColor("Table.selectionForeground")); - } else { + } else { setBackground(UIManager.getColor("Table.background")); setForeground(UIManager.getColor("Table.foreground")); } - setText((String)value); + setText((String) value); setIcon(null); return this; Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java (revision 32959) @@ -46,5 +46,5 @@ tfFilter = new JTextField(20); pnl.add(lbl); - pnl.add(tfFilter,BorderLayout.CENTER); + pnl.add(tfFilter, BorderLayout.CENTER); JButton btn = new JButton(tr("Clear")); pnl.add(btn); @@ -63,5 +63,5 @@ protected JScrollPane buildPresetGrid() { - tagsTable = new TagsTable(new TagsTableModel(),new TagsTableColumnModel()); + tagsTable = new TagsTable(new TagsTableModel(), new TagsTableColumnModel()); getModel().initFromTagSpecifications(); @@ -91,5 +91,5 @@ // replace Enter action. apply the current preset on enter // - tagsTable.unregisterKeyboardAction(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0)); + tagsTable.unregisterKeyboardAction(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)); ActionListener enterAction = new ActionListener() { @Override @@ -106,5 +106,5 @@ enterAction, "Enter", - KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), + KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), JComponent.WHEN_FOCUSED ); @@ -123,5 +123,5 @@ public void actionPerformed(ActionEvent arg0) { int row = tagsTable.getSelectedRow(); - if (row >=0) { + if (row >= 0) { KeyValuePair item = getModel().getVisibleItem(row); fireItemSelected(item); @@ -209,5 +209,5 @@ // Component c = tagsTable; - while(c != null) { + while (c != null) { c.doLayout(); c.repaint(); @@ -217,11 +217,10 @@ protected TagsTableModel getModel() { - return (TagsTableModel)tagsTable.getModel(); - } - + return (TagsTableModel) tagsTable.getModel(); + } public void addTagSelectorListener(ITagSelectorListener listener) { - synchronized(this.listeners) { - if (listener != null && ! listeners.contains(listener)) { + synchronized (this.listeners) { + if (listener != null && !listeners.contains(listener)) { listeners.add(listener); } @@ -230,5 +229,5 @@ public void removeTagSelectorListener(ITagSelectorListener listener) { - synchronized(this.listeners) { + synchronized (this.listeners) { if (listener != null) { listeners.remove(listener); @@ -238,6 +237,6 @@ protected void fireItemSelected(KeyValuePair pair) { - synchronized(this.listeners) { - for(ITagSelectorListener listener: listeners) { + synchronized (this.listeners) { + for (ITagSelectorListener listener: listeners) { listener.itemSelected(pair); } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTable.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTable.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTable.java (revision 32959) @@ -9,23 +9,23 @@ public class TagsTable extends JTable { /** - * initialize the table + * initialize the table */ - protected void init() { - setAutoResizeMode(JTable.AUTO_RESIZE_OFF); + protected void init() { + setAutoResizeMode(JTable.AUTO_RESIZE_OFF); setRowSelectionAllowed(true); setSelectionMode(ListSelectionModel.SINGLE_SELECTION); } - + public TagsTable(TableModel model, TableColumnModel columnModel) { - super(model,columnModel); + super(model, columnModel); init(); } - + /** * adjusts the width of the columns for the tag name and the tag value * to the width of the scroll panes viewport. - * + * * Note: {@see #getPreferredScrollableViewportSize()} did not work as expected - * + * * @param scrollPaneWidth the width of the scroll panes viewport */ @@ -38,5 +38,5 @@ tcm.getColumn(0).setMaxWidth(width); tcm.getColumn(1).setMinWidth(width); - tcm.getColumn(1).setMaxWidth(width); + tcm.getColumn(1).setMaxWidth(width); } } Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java =================================================================== --- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java (revision 32958) +++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java (revision 32959) @@ -17,5 +17,5 @@ public class TagsTableModel extends AbstractTableModel { - static private Logger logger = Logger.getLogger(TagsTableModel.class.getName()); + private static Logger logger = Logger.getLogger(TagsTableModel.class.getName()); private ArrayList items = null; @@ -34,5 +34,5 @@ public int compare(KeyValuePair self, KeyValuePair other) { - int ret =self.getKey().compareToIgnoreCase(other.getKey()); + int ret = self.getKey().compareToIgnoreCase(other.getKey()); if (ret == 0) @@ -56,5 +56,5 @@ try { spec = TagSpecifications.getInstance(); - } catch(Exception e) { + } catch (Exception e) { logger.log(Level.SEVERE, "failed to init TagTableModel. Exception:" + e); return; @@ -63,5 +63,5 @@ items = spec.asList(); sort(); - for(KeyValuePair item : items) { + for (KeyValuePair item : items) { visibleItems.add(item); } @@ -86,13 +86,13 @@ default: /* should not happen */ - throw new IllegalArgumentException(tr("unexpected column number {0}",col)); + throw new IllegalArgumentException(tr("unexpected column number {0}", col)); } } public void filter(String filter) { - synchronized(this) { + synchronized (this) { if (filter == null || filter.trim().equals("")) { visibleItems.clear(); - for(KeyValuePair pair: items) { + for (KeyValuePair pair: items) { visibleItems.add(pair); } @@ -100,7 +100,7 @@ visibleItems.clear(); filter = filter.toLowerCase(); - for(KeyValuePair pair: items) { + for (KeyValuePair pair: items) { if (pair.getKey().toLowerCase().trim().startsWith(filter) - || pair.getValue().toLowerCase().trim().startsWith(filter)) { + || pair.getValue().toLowerCase().trim().startsWith(filter)) { visibleItems.add(pair); }