Index: applications/editors/josm/plugins/tageditor/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- applications/editors/josm/plugins/tageditor/.settings/org.eclipse.jdt.ui.prefs (revision 32913)
+++ applications/editors/josm/plugins/tageditor/.settings/org.eclipse.jdt.ui.prefs (revision 32913)
@@ -0,0 +1,59 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java (revision 32913)
@@ -46,5 +46,5 @@
/**
* The dialog for editing name/value-pairs (aka tags) associated with {@link OsmPrimitive}s.
- *
+ *
*/
@SuppressWarnings("serial")
@@ -57,5 +57,5 @@
/**
* Access to the singleton instance
- *
+ *
* @return the singleton instance of the dialog
*/
@@ -91,5 +91,5 @@
protected JPanel buildButtonRow() {
JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
-
+
// the ok button
//
@@ -108,5 +108,5 @@
//
tagEditor = new TagEditor();
-
+
// create the auto completion list viewer and connect it
// to the tag editor
@@ -120,21 +120,21 @@
JPanel pnlTagGrid = new JPanel();
pnlTagGrid.setLayout(new BorderLayout());
-
-
+
+
pnlTagGrid.add(tagEditor, BorderLayout.CENTER);
pnlTagGrid.add(aclViewer, BorderLayout.EAST);
pnlTagGrid.setBorder(BorderFactory.createEmptyBorder(5, 0,0,0));
-
+
JSplitPane splitPane = new JSplitPane(
JSplitPane.HORIZONTAL_SPLIT,
- tagEditor,
+ tagEditor,
aclViewer
);
splitPane.setOneTouchExpandable(false);
- splitPane.setDividerLocation(600);
+ splitPane.setDividerLocation(600);
pnlTagGrid.add(splitPane, BorderLayout.CENTER);
return pnlTagGrid;
}
-
+
/**
* build the GUI
@@ -148,5 +148,5 @@
setSize(PREFERRED_SIZE);
setTitle(tr("JOSM Tag Editor Plugin"));
-
+
JPanel pnlTagGrid = buildTagGridPanel();
@@ -156,4 +156,5 @@
presetSelector.addPresetSelectorListener(
new IPresetSelectorListener() {
+ @Override
public void itemSelected(TaggingPreset item) {
tagEditor.stopEditing();
@@ -174,4 +175,5 @@
tagSelector.addTagSelectorListener(
new ITagSelectorListener() {
+ @Override
public void itemSelected(KeyValuePair pair) {
tagEditor.stopEditing();
@@ -192,10 +194,10 @@
tabbedPane.add(pnlTagSelector, tr("Tags"));
-
+
// create split pane
//
JSplitPane splitPane = new JSplitPane(
JSplitPane.VERTICAL_SPLIT,
- tabbedPane,
+ tabbedPane,
pnlTagGrid
);
@@ -216,4 +218,5 @@
@Override public void windowActivated(WindowEvent e) {
SwingUtilities.invokeLater(new Runnable(){
+ @Override
public void run()
{
@@ -291,4 +294,5 @@
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
setVisible(false);
@@ -305,4 +309,5 @@
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
@@ -318,4 +323,5 @@
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (! evt.getPropertyName().equals(TagEditorModel.PROP_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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java (revision 32913)
@@ -1,4 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins.tageditor.ac;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
@@ -12,11 +14,11 @@
import javax.swing.UIManager;
import javax.swing.table.TableCellRenderer;
+
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
-import static org.openstreetmap.josm.tools.I18n.tr;
/**
* This is the table cell renderer for the list of auto completion list items.
- *
+ *
*/
public class AutoCompletionListRenderer extends JLabel implements TableCellRenderer {
@@ -66,5 +68,5 @@
/**
* prepares the renderer for rendering a specific icon
- *
+ *
* @param item the item to be rendered
*/
@@ -101,4 +103,5 @@
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int row, int column) {
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java (revision 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java (revision 32913)
@@ -16,4 +16,5 @@
//private static final Logger logger = Logger.getLogger(PresetItemListCellRenderer.class.getName());
+ @Override
public Component getListCellRendererComponent(JList list, TaggingPreset item,
int index, boolean isSelected, boolean cellHasFocus) {
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java (revision 32913)
@@ -41,5 +41,6 @@
presets.addItemListener(
- new ItemListener(){
+ new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent e) {
syncWidgetStates();
@@ -53,5 +54,6 @@
btnHighlight = new JButton(tr("Highlight"));
btnHighlight.addActionListener(
- new ActionListener() {
+ new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent arg0) {
highlightCurrentPreset();
@@ -65,4 +67,5 @@
btnRemove.addActionListener(
new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent arg0) {
removeCurrentPreset();
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java (revision 32913)
@@ -28,5 +28,5 @@
* the main table with the tag names and tag values
*
- *
+ *
* This component depends on a couple of other components which have to be
* injected with the respective setter methods:
@@ -47,5 +47,5 @@
* AutoCompletionCache autoCompletionCache = ... // init the auto completion cache
* TagEditorModel model = ... // init the tag editor model
- *
+ *
* TagEditor tagEditor = new TagEditor();
* tagEditor.setTagEditorModel(model);
@@ -61,5 +61,5 @@
private TagTable tblTagEditor;
private PresetManager presetManager;
-
+
/**
* builds the panel with the button row
@@ -83,9 +83,9 @@
return pnl;
}
-
+
public void addComponentNotStoppingCellEditing(Component c) {
tblTagEditor.addComponentNotStoppingCellEditing(c);
}
-
+
/**
* builds the GUI
@@ -96,7 +96,7 @@
DefaultListSelectionModel rowSelectionModel = new DefaultListSelectionModel();
DefaultListSelectionModel colSelectionModel = new DefaultListSelectionModel();
-
+
tagEditorModel = new TagEditorModel(rowSelectionModel,colSelectionModel);
-
+
// build the scrollable table for editing tag names and tag values
//
@@ -129,15 +129,15 @@
gc.anchor = GridBagConstraints.CENTER;
pnl.add(pnlTagTable,gc);
-
+
return pnl;
}
-
+
/**
* builds the GUI
- *
+ *
*/
protected void build() {
setLayout(new BorderLayout());
-
+
add(buildTagEditorPanel(), BorderLayout.CENTER);
@@ -163,5 +163,5 @@
return tagEditorModel;
}
-
+
public void clearSelection() {
tblTagEditor.getSelectionModel().clearSelection();
@@ -174,5 +174,5 @@
}
}
-
+
public void setAutoCompletionList(AutoCompletionList autoCompletionList) {
tblTagEditor.setAutoCompletionList(autoCompletionList);
@@ -183,4 +183,5 @@
}
+ @Override
public void autoCompletionItemSelected(String item) {
logger.info("autocompletion item selected ...");
@@ -194,5 +195,5 @@
tblTagEditor.requestFocusInCell(0,0);
}
-
+
public TagEditorModel getModel() {
return tagEditorModel;
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java (revision 32913)
@@ -25,9 +25,9 @@
* values from the current JOSM data set. Keys already present in the
* current tag model are removed from the auto completion list.
- *
+ *
* @param model the tag editor model
* @param currentTag the current tag
*/
- protected void initAutoCompletionListForKeys(TagEditorModel model, TagModel currentTag) {
+ protected void initAutoCompletionListForKeys(TagEditorModel model, TagModel currentTag) {
if (getAutoCompletionList() == null) {
logger.warning("autoCompletionList is null. Make sure an instance of AutoCompletionList is injected into TableCellEditor.");
@@ -72,7 +72,8 @@
* set of standard values for a given key and the set of values present in the
* current data set for the given key.
- *
+ *
* @param forKey the key
*/
+ @Override
protected void initAutoCompletionListForValues(String forKey) {
@@ -83,5 +84,5 @@
autoCompletionList.clear();
autocomplete.populateWithTagValues(autoCompletionList, forKey);
-
+
AutoCompletionContext context = new AutoCompletionContext();
try {
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTableCellRenderer.java (revision 32913)
@@ -23,11 +23,11 @@
*/
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);
-
+
private Font fontStandard = null;
private Font fontItalic = null;
-
+
public TagTableCellRenderer() {
fontStandard = getFont();
@@ -36,20 +36,20 @@
setBorder(new EmptyBorder(5,5,5,5));
}
-
+
/**
* renders the name of a tag in the second column of
* the table
- *
- * @param tag the tag
+ *
+ * @param tag the tag
*/
protected void renderTagName(TagModel tag) {
setText(tag.getName());
}
-
+
/**
- * renders the value of a a tag in the third column of
+ * renders the value of a a tag in the third column of
* the table
- *
- * @param tag the tag
+ *
+ * @param tag the tag
*/
protected void renderTagValue(TagModel tag) {
@@ -63,7 +63,7 @@
}
}
-
+
/**
- * resets the renderer
+ * resets the renderer
*/
protected void resetRenderer() {
@@ -72,11 +72,11 @@
setFont(fontStandard);
}
-
+
protected TagEditorModel getModel(JTable table) {
return (TagEditorModel)table.getModel();
}
-
+
protected boolean belongsToSelectedPreset(TagModel tagModel, TagEditorModel model) {
-
+
// current tag is empty or consists of whitespace only => can't belong to
// a selected preset
@@ -85,6 +85,6 @@
return false;
}
-
- // no current preset selected?
+
+ // no current preset selected?
//
TaggingPreset item = (TaggingPreset)model.getAppliedPresetsModel().getSelectedItem();
@@ -92,28 +92,28 @@
return false;
}
-
+
for(AdvancedTag tag: AdvancedTag.forTaggingPreset(item)) {
if (tag.getValue() == null) {
if (tagModel.getName().equals(tag.getKey())) {
- return true;
+ return true;
}
} else {
if (tagModel.getName().equals(tag.getKey())
&& tagModel.getValue().equals(tag.getValue())) {
- return true;
+ return true;
}
}
- }
+ }
return false;
}
-
+
/**
* renders the background color. The default color is white. It is
* set to {@see TableCellRenderer#BG_COLOR_HIGHLIGHTED} if this cell
- * displays the tag which is suggested by the currently selected
+ * displays the tag which is suggested by the currently selected
* preset.
- *
- * @param tagModel the tag model
- * @param model the tag editor model
+ *
+ * @param tagModel the tag model
+ * @param model the tag editor model
*/
protected void renderColor(TagModel tagModel, TagEditorModel model, boolean isSelected) {
@@ -124,28 +124,29 @@
setBackground(UIManager.getColor("Table.background"));
setForeground(UIManager.getColor("Table.foreground"));
- }
+ }
if (belongsToSelectedPreset(tagModel, model)) {
setBackground(BG_COLOR_HIGHLIGHTED);
}
}
-
+
/**
- * replies the cell renderer component for a specific cell
- *
+ * replies the cell renderer component for a specific cell
+ *
* @param table the table
* @param value the value to be rendered
- * @param isSelected true, if the value is selected
- * @param hasFocus true, if the cell has focus
- * @param rowIndex the row index
- * @param vColIndex the column index
- *
- * @return the renderer component
+ * @param isSelected true, if the value is selected
+ * @param hasFocus true, if the cell has focus
+ * @param rowIndex the row index
+ * @param vColIndex the column index
+ *
+ * @return the renderer component
*/
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int rowIndex, int vColIndex) {
-
+
resetRenderer();
TagModel tagModel = (TagModel)value;
- switch(vColIndex) {
+ switch(vColIndex) {
case 0: renderTagName(tagModel); break;
case 1: renderTagValue(tagModel); break;
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/NameIconCellRenderer.java (revision 32913)
@@ -14,5 +14,4 @@
public class NameIconCellRenderer extends JLabel implements TableCellRenderer {
- //private static Logger logger = Logger.getLogger(NameIconCellRenderer.class.getName());
public static final Color BG_COLOR_SELECTED = new Color(143,170,255);
@@ -26,4 +25,5 @@
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int rowIndex, int colIndex) {
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableModel.java (revision 32913)
@@ -53,12 +53,15 @@
}
+ @Override
public int getColumnCount() {
return 2;
}
+ @Override
public int getRowCount() {
return visibleItems.size();
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
TaggingPreset item = visibleItems.get(rowIndex);
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java (revision 32913)
@@ -55,4 +55,5 @@
btn.addActionListener(
new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
tfFilter.setText("");
@@ -95,4 +96,5 @@
presetsTable.unregisterKeyboardAction(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0));
ActionListener enterAction = new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
int rowNum = presetsTable.getSelectedRow();
@@ -120,4 +122,5 @@
btnApply.addActionListener(
new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent arg0) {
int row = presetsTable.getSelectedRow();
@@ -141,12 +144,15 @@
tfFilter.getDocument().addDocumentListener(
new DocumentListener() {
+ @Override
public void changedUpdate(DocumentEvent arg0) {
onUpdate();
}
+ @Override
public void insertUpdate(DocumentEvent arg0) {
onUpdate();
}
+ @Override
public void removeUpdate(DocumentEvent arg0) {
onUpdate();
@@ -161,4 +167,5 @@
tfFilter.addActionListener(
new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
filter(tfFilter.getText());
@@ -171,4 +178,5 @@
presetsTable.getSelectionModel().addListSelectionListener(
new ListSelectionListener() {
+ @Override
public void valueChanged(ListSelectionEvent e) {
btnApply.setEnabled(presetsTable.getSelectedRowCount() != 0);
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java (revision 32913)
@@ -74,7 +74,7 @@
}
try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
- TagSpecifications spec = new TagSpecifications();
- spec.load(reader);
- instance = spec;
+ TagSpecifications spec = new TagSpecifications();
+ spec.load(reader);
+ instance = spec;
}
}
@@ -350,5 +350,5 @@
}
- class ResourceEntityResolver implements EntityResolver {
+ static class ResourceEntityResolver implements EntityResolver {
@Override
@@ -366,5 +366,5 @@
}
- static public 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/KeyValueCellRenderer.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/KeyValueCellRenderer.java (revision 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/KeyValueCellRenderer.java (revision 32913)
@@ -12,6 +12,4 @@
public class KeyValueCellRenderer extends JLabel implements TableCellRenderer {
- //private static final Logger logger = Logger.getLogger(KeyValueCellRenderer.class.getName());
-
protected void init() {
setFont(new Font("Courier",Font.PLAIN,getFont().getSize()));
@@ -23,4 +21,5 @@
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int rowIndex, int colIndex) {
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java (revision 32913)
@@ -51,4 +51,5 @@
btn.addActionListener(
new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
tfFilter.setText("");
@@ -92,4 +93,5 @@
tagsTable.unregisterKeyboardAction(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0));
ActionListener enterAction = new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
int rowNum = tagsTable.getSelectedRow();
@@ -118,4 +120,5 @@
btnApply.addActionListener(
new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent arg0) {
int row = tagsTable.getSelectedRow();
@@ -141,12 +144,15 @@
tfFilter.getDocument().addDocumentListener(
new DocumentListener() {
+ @Override
public void changedUpdate(DocumentEvent arg0) {
onUpdate();
}
+ @Override
public void insertUpdate(DocumentEvent arg0) {
onUpdate();
}
+ @Override
public void removeUpdate(DocumentEvent arg0) {
onUpdate();
@@ -161,4 +167,5 @@
tfFilter.addActionListener(
new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
filter(tfFilter.getText());
@@ -171,4 +178,5 @@
tagsTable.getSelectionModel().addListSelectionListener(
new ListSelectionListener() {
+ @Override
public void valueChanged(ListSelectionEvent e) {
btnApply.setEnabled(tagsTable.getSelectedRowCount() != 0);
@@ -177,10 +185,8 @@
);
-
// load the set of presets and bind them to the preset table
//
tagsTable.getSelectionModel().clearSelection();
btnApply.setEnabled(false);
-
}
@@ -188,5 +194,4 @@
build();
}
-
public void filter(String filter) {
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 32912)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java (revision 32913)
@@ -31,4 +31,5 @@
items,
new Comparator() {
+ @Override
public int compare(KeyValuePair self,
KeyValuePair other) {
@@ -67,12 +68,15 @@
}
+ @Override
public int getColumnCount() {
return 2;
}
+ @Override
public int getRowCount() {
return visibleItems.size();
}
+ @Override
public Object getValueAt(int row, int col) {
KeyValuePair pair = visibleItems.get(row);