Changeset 13675 in josm for trunk/src/org

Timestamp:

2018-04-24T22:32:26+02:00 (6 years ago)

Author:

Don-vip

Message:

rework constructors of MemberRoleCellEditor / MemberTableColumnModel

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• MemberRoleCellEditor.java (modified) (4 diffs)
• MemberTable.java (modified) (5 diffs)
• MemberTableColumnModel.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import javax.swing.table.TableCellEditor;
 
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
@@ -21 +20 @@
 public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
     private final AutoCompletingTextField editor;
-    private final transient DataSet ds;
+    private final AutoCompletionManager autoCompletionManager;
     private final transient Relation relation;
 
@@ -29 +28 @@
     /**
      * Constructs a new {@code MemberRoleCellEditor}.
-     * @param ds the data set. Must not be null
+     * @param autoCompletionManager the auto completion manager. Must not be null
      * @param relation the relation. Can be null
+     * @since 13675
      */
-    public MemberRoleCellEditor(DataSet ds, Relation relation) {
-        this.ds = ds;
+    public MemberRoleCellEditor(AutoCompletionManager autoCompletionManager, Relation relation) {
+        this.autoCompletionManager = autoCompletionManager;
         this.relation = relation;
         editor = new AutoCompletingTextField(0, false);
@@ -48 +48 @@
         editor.setText(role);
         autoCompletionList.clear();
-        AutoCompletionManager.of(ds).populateWithMemberRoles(autoCompletionList, relation);
+        autoCompletionManager.populateWithMemberRoles(autoCompletionList, relation);
         return editor;
     }

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

@@ -38 +38 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
@@ -60 +61 @@
      */
     public MemberTable(OsmDataLayer layer, Relation relation, MemberTableModel model) {
-        super(model, new MemberTableColumnModel(layer.data, relation), model.getSelectionModel());
+        super(model, new MemberTableColumnModel(AutoCompletionManager.of(layer.data), relation), model.getSelectionModel());
         setLayer(layer);
         model.addMemberModelListener(this);
@@ -133 +134 @@
         if (!highlightEnabled) return;
         getMemberTableModel().getSelectionModel().addListSelectionListener(highlighterListener);
-        if (MainApplication.isDisplayingMapView()) {
-            HighlightHelper.clearAllHighlighted();
-            MainApplication.getMap().mapView.repaint();
-        }
+        clearAllHighlighted();
     }
 
@@ -153 +151 @@
     }
 
+    /**
+     * Stops highlighting of selected objects.
+     */
     public void stopHighlighting() {
         if (highlighterListener == null) return;
@@ -158 +159 @@
         getMemberTableModel().getSelectionModel().removeListSelectionListener(highlighterListener);
         highlighterListener = null;
+        clearAllHighlighted();
+    }
+
+    private static void clearAllHighlighted() {
         if (MainApplication.isDisplayingMapView()) {
             HighlightHelper.clearAllHighlighted();

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

@@ -7 +7 @@
 import javax.swing.table.TableColumn;
 
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 
 /**
@@ -17 +17 @@
     /**
      * Constructs a new {@code MemberTableColumnModel}.
-     * @param ds the data set. Must not be null
+     * @param autoCompletionManager the auto completion manager. Must not be null
      * @param relation the relation. Can be null
+     * @since 13675
      */
-    public MemberTableColumnModel(DataSet ds, Relation relation) {
+    public MemberTableColumnModel(AutoCompletionManager autoCompletionManager, Relation relation) {
         TableColumn col = null;
 
@@ -29 +30 @@
         col.setPreferredWidth(100);
         col.setCellRenderer(new MemberTableRoleCellRenderer());
-        col.setCellEditor(new MemberRoleCellEditor(ds, relation));
+        col.setCellEditor(new MemberRoleCellEditor(autoCompletionManager, relation));
         addColumn(col);