Changeset 10070 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-03-28T14:45:45+02:00 (8 years ago)

Author:

Don-vip

Message:

refactor duplicated code

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/relation/MemberTable.java (modified) (3 diffs)
• tagging/TagTable.java (modified) (5 diffs)
• widgets/JosmTable.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.GraphicsEnvironment;
@@ -17 +16 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
-import javax.swing.JViewport;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
@@ -95 +93 @@
     @Override
     public Dimension getPreferredSize() {
-        Container c = getParent();
-        while (c != null && !(c instanceof JViewport)) {
-            c = c.getParent();
-        }
-        if (c != null) {
-            Dimension d = super.getPreferredSize();
-            d.width = c.getSize().width;
-            return d;
-        }
-        return super.getPreferredSize();
+        return getPreferredFullWidthSize();
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -6 +6 @@
 
 import java.awt.Component;
-import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.KeyboardFocusManager;
@@ -25 +24 @@
 import javax.swing.JComponent;
 import javax.swing.JTable;
-import javax.swing.JViewport;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
@@ -43 +41 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.gui.widgets.JosmTable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.TextTagParser;
@@ -51 +50 @@
  * @since 1762
  */
-public class TagTable extends JTable  {
+public class TagTable extends JosmTable  {
     /** the table cell editor used by this table */
     private TagCellEditor editor;
@@ -415 +414 @@
     @Override
     public Dimension getPreferredSize() {
-        Container c = getParent();
-        while (c != null && !(c instanceof JViewport)) {
-            c = c.getParent();
-        }
-        if (c != null) {
-            Dimension d = super.getPreferredSize();
-            d.width = c.getSize().width;
-            return d;
-        }
-        return super.getPreferredSize();
-    }
-
-    @Override protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
-            int condition, boolean pressed) {
+        return getPreferredFullWidthSize();
+    }
+
+    @Override
+    protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition, boolean pressed) {
 
         // handle delete key

trunk/src/org/openstreetmap/josm/gui/widgets/JosmTable.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.widgets;
 
+import java.awt.Container;
+import java.awt.Dimension;
 import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;
@@ -9 +11 @@
 import javax.swing.JComponent;
 import javax.swing.JTable;
+import javax.swing.JViewport;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
@@ -105 +108 @@
         }
     }
+
+    protected Dimension getPreferredFullWidthSize() {
+        Container c = getParent();
+        while (c != null && !(c instanceof JViewport)) {
+            c = c.getParent();
+        }
+        if (c != null) {
+            Dimension d = super.getPreferredSize();
+            d.width = c.getSize().width;
+            return d;
+        }
+        return super.getPreferredSize();
+    }
 }