Changeset 6072 in josm for trunk/src/org

Timestamp:

2013-07-18T20:42:36+02:00 (12 years ago)

Author:

akks

Message:

see #8853: minor fixes in tagging preset selector (working without Main.main ,listening for selection)

Location:

trunk/src/org/openstreetmap/josm/gui/tagging

Files:

• TaggingPresetItem.java (modified) (1 diff)
• TaggingPresetSelector.java (modified) (5 diffs)

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

@@ -20 +20 @@
 
     protected void initAutoCompletionField(AutoCompletingTextField field, String key) {
+        if (Main.main == null) return;
         OsmDataLayer layer = Main.main.getEditLayer();
         if (layer == null) {

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

@@ -33 +33 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -50 +52 @@
 /**
  * GUI component to select tagging preset: the list with filter and two checkboxes
- * @since 6067
+ * @since 6068
  */
 public class TaggingPresetSelector extends JPanel implements SelectionChangedListener {
@@ -200 +202 @@
     public TaggingPresetSelector() {
         super(new BorderLayout());
-        
-        loadPresets(TaggingPresetPreference.taggingPresets);
+        if (TaggingPresetPreference.taggingPresets!=null) {
+            loadPresets(TaggingPresetPreference.taggingPresets);
+        }
         
         edSearchText = new JosmTextField();
@@ -374 +377 @@
                 typesInSelectionDirty = false;
                 typesInSelection.clear();
-                if (Main.main.getCurrentDataSet() == null) return typesInSelection;
+                if (Main.main==null || Main.main.getCurrentDataSet() == null) return typesInSelection;
                 for (OsmPrimitive primitive : Main.main.getCurrentDataSet().getSelected()) {
                     if (primitive instanceof Node) {
@@ -470 +473 @@
     }
     
+    public void addSelectionListener(final ActionListener selectListener) {
+        lsResult.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                if (!e.getValueIsAdjusting())
+                    selectListener.actionPerformed(null);
+            }
+        });
+    }
 }