Changeset 8540 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2015-06-27T21:43:35+02:00 (10 years ago)

Author:

Don-vip

Message:

fix remaining checkstyle issues

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• CombinePrimitiveResolverDialog.java (modified) (1 diff)
• MultiValueCellEditor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -608 +608 @@
             final Collection<? extends OsmPrimitive> primitives,
             final TagCollection normalizedTags) throws UserCancelException {
-        String conflicts = Utils.joinAsHtmlUnorderedList(Utils.transform(normalizedTags.getKeysWithMultipleValues(), new Function<String, String>() {
-
+        String conflicts = Utils.joinAsHtmlUnorderedList(Utils.transform(normalizedTags.getKeysWithMultipleValues(),
+                new Function<String, String>() {
             @Override
             public String apply(String key) {
-                return tr("{0} ({1})", key, Utils.join(tr(", "), Utils.transform(normalizedTags.getValues(key), new Function<String, String>() {
-
+                return tr("{0} ({1})", key, Utils.join(tr(", "), Utils.transform(normalizedTags.getValues(key),
+                        new Function<String, String>() {
                     @Override
                     public String apply(String x) {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

@@ -91 +91 @@
             @Override
             public void processKeyEvent(KeyEvent e) {
-                if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_ENTER) {
+                int keyCode = e.getKeyCode();
+                if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_ENTER) {
                     fireGotoNextDecision();
-                } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_TAB) {
+                } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_TAB) {
                     if (e.isShiftDown()) {
                         fireGotoPreviousDecision();
@@ -99 +100 @@
                         fireGotoNextDecision();
                     }
-                } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_DELETE || e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
+                } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_DELETE || keyCode == KeyEvent.VK_BACK_SPACE) {
                     if (editorModel.getIndexOf(MultiValueDecisionType.KEEP_NONE) > 0) {
                         editorModel.setSelectedItem(MultiValueDecisionType.KEEP_NONE);
                         fireGotoNextDecision();
                     }
-                } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+                } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_ESCAPE) {
                     cancelCellEditing();
                 }