Changeset 9847 in josm for trunk

Timestamp:

2016-02-21T14:03:08+01:00 (8 years ago)

Author:

Don-vip

Message:

code refactoring

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/pair/tags/TagMergeColumnModel.java (deleted)
• conflict/pair/tags/TagMerger.java (modified) (6 diffs)
• conflict/tags/PasteTagsConflictResolverDialog.java (modified) (3 diffs)
• conflict/tags/TagConflictResolverColumnModel.java (deleted)
• conflict/tags/TagConflictResolverTable.java (modified) (2 diffs)
• tagging/TagTable.java (modified) (5 diffs)
• tagging/TagTableColumnModelBuilder.java (added)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
+import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -43 +44 @@
     private JTable theirTable;
     private final TagMergeModel model;
+    private final String[] keyvalue;
     private transient AdjustmentSynchronizer adjustmentSynchronizer;
 
@@ -50 +52 @@
     public TagMerger() {
         model = new TagMergeModel();
+        keyvalue = new String[]{tr("Key"), tr("Value")};
         build();
     }
@@ -71 +74 @@
      */
     protected JScrollPane buildMineTagTable() {
-        mineTable = new JTable(
-                model,
-                new TagMergeColumnModel(
-                        new MineTableCellRenderer()
-                )
-        );
+        mineTable = new JTable(model, new TagTableColumnModelBuilder(new MineTableCellRenderer(), keyvalue).build());
         mineTable.setName("table.my");
         return embeddInScrollPane(mineTable);
@@ -87 +85 @@
      */
     protected JScrollPane buildTheirTable() {
-        theirTable = new JTable(
-                model,
-                new TagMergeColumnModel(
-                        new TheirTableCellRenderer()
-                )
-        );
+        theirTable = new JTable(model, new TagTableColumnModelBuilder(new TheirTableCellRenderer(), keyvalue).build());
         theirTable.setName("table.their");
         return embeddInScrollPane(theirTable);
@@ -104 +97 @@
 
     protected JScrollPane buildMergedTable() {
-        mergedTable = new JTable(
-                model,
-                new TagMergeColumnModel(
-                        new MergedTableCellRenderer()
-                )
-        );
+        mergedTable = new JTable(model, new TagTableColumnModelBuilder(new MergedTableCellRenderer(), keyvalue).build());
         mergedTable.setName("table.merged");
         return embeddInScrollPane(mergedTable);

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

@@ -33 +33 @@
 import javax.swing.JTable;
 import javax.swing.UIManager;
-import javax.swing.table.DefaultTableColumnModel;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -368 +367 @@
     }
 
-    private static final class StatisticsTableColumnModel extends DefaultTableColumnModel {
-        private StatisticsTableColumnModel() {
-            TableCellRenderer renderer = new StatisticsInfoRenderer();
-            TableColumn col = null;
-
-            // column 0 - Paste
-            col = new TableColumn(0);
-            col.setHeaderValue(tr("Paste ..."));
-            col.setResizable(true);
-            col.setCellRenderer(renderer);
-            addColumn(col);
-
-            // column 1 - From
-            col = new TableColumn(1);
-            col.setHeaderValue(tr("From ..."));
-            col.setResizable(true);
-            col.setCellRenderer(renderer);
-            addColumn(col);
-
-            // column 2 - To
-            col = new TableColumn(2);
-            col.setHeaderValue(tr("To ..."));
-            col.setResizable(true);
-            col.setCellRenderer(renderer);
-            addColumn(col);
-        }
-    }
-
     private static final class StatisticsTableModel extends DefaultTableModel {
         private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") };
@@ -510 +481 @@
 
         private StatisticsInfoTable(StatisticsTableModel model) {
-            JTable infoTable = new JTable(model, new StatisticsTableColumnModel());
+            JTable infoTable = new JTable(model,
+                    new TagTableColumnModelBuilder(new StatisticsInfoRenderer(), tr("Paste ..."), tr("From ..."), tr("To ...")).build());
             infoTable.setShowHorizontalLines(true);
             infoTable.setShowVerticalLines(false);

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.tags;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 
+import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmTable;
@@ -15 +18 @@
      */
     public TagConflictResolverTable(TagConflictResolverModel model) {
-        super(model, new TagConflictResolverColumnModel());
+        super(model, new TagTableColumnModelBuilder(new MultiValueCellRenderer(), "", tr("Key"), tr("Value"))
+                .setWidth(20, 0).setPreferredWidth(20, 0).setMaxWidth(30, 0)
+                .setCellEditor(new MultiValueCellEditor(), 2).build());
 
         setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);

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

@@ -24 +24 @@
 import javax.swing.AbstractAction;
 import javax.swing.CellEditor;
-import javax.swing.DefaultListSelectionModel;
 import javax.swing.JComponent;
 import javax.swing.JTable;
@@ -33 +32 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableColumnModel;
-import javax.swing.table.TableColumn;
 import javax.swing.text.JTextComponent;
 
@@ -53 +50 @@
 /**
  * This is the tabular editor component for OSM tags.
- *
+ * @since 1762
  */
 public class TagTable extends JTable  {
@@ -66 +63 @@
     private final CopyOnWriteArrayList<Component> doNotStopCellEditingWhenFocused = new CopyOnWriteArrayList<>();
     private transient CellEditorRemover editorRemover;
-
-    /**
-     * The table has two columns. The first column is used for editing rendering and
-     * editing tag keys, the second for rendering and editing tag values.
-     *
-     */
-    static class TagTableColumnModel extends DefaultTableColumnModel {
-        TagTableColumnModel(DefaultListSelectionModel selectionModel) {
-            setSelectionModel(selectionModel);
-            TableColumn col = null;
-            TagCellRenderer renderer = new TagCellRenderer();
-
-            // column 0 - tag key
-            col = new TableColumn(0);
-            col.setHeaderValue(tr("Key"));
-            col.setResizable(true);
-            col.setCellRenderer(renderer);
-            addColumn(col);
-
-            // column 1 - tag value
-            col = new TableColumn(1);
-            col.setHeaderValue(tr("Value"));
-            col.setResizable(true);
-            col.setCellRenderer(renderer);
-            addColumn(col);
-        }
-    }
 
     /**
@@ -437 +407 @@
      */
     public TagTable(TagEditorModel model, final int maxCharacters) {
-        super(model, new TagTableColumnModel(model.getColumnSelectionModel()), model.getRowSelectionModel());
+        super(model, new TagTableColumnModelBuilder(new TagCellRenderer(), tr("Key"), tr("Value"))
+                  .setSelectionModel(model.getColumnSelectionModel()).build(),
+              model.getRowSelectionModel());
         this.model = model;
         init(maxCharacters);