Changeset 33579 in osm for applications/editors/josm/plugins/tageditor

Timestamp:

2017-08-27T22:22:31+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12678

Location:

applications/editors/josm/plugins/tageditor

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/tageditor/TagEditorPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionContext.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java (modified) (4 diffs)

applications/editors/josm/plugins/tageditor/build.xml

@@ -2 +2 @@
 <project name="tageditor" default="dist" basedir=".">
     <property name="commit.message" value="Tageditor:  help shortcut parser, rebuild"/>
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12678"/>
     
         <property name="plugin.author" value="Karl Guggisberg"/>

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionListViewer;
 import org.openstreetmap.josm.plugins.tageditor.editor.TagEditor;
@@ -42 +44 @@
 import org.openstreetmap.josm.plugins.tageditor.tagspec.ui.TabularTagSelector;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -282 +283 @@
         tagEditor.getModel().clearAppliedPresets();
         tagEditor.getModel().initFromJOSMSelection();
-        autocomplete = Main.getLayerManager().getEditLayer().data.getAutoCompletionManager();
+        autocomplete = MainApplication.getLayerManager().getEditLayer().data.getAutoCompletionManager();
         tagEditor.setAutoCompletionManager(autocomplete);
         getModel().ensureOneTag();
@@ -319 +320 @@
             setVisible(false);
             tagEditor.getModel().updateJOSMSelection();
-            DataSet ds = Main.getLayerManager().getEditDataSet();
+            DataSet ds = MainApplication.getLayerManager().getEditDataSet();
             ds.fireSelectionChanged();
             Main.parent.repaint(); // repaint all - drawing could have been changed

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorPlugin.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.tageditor;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -9 +9 @@
 public class TagEditorPlugin extends Plugin {
     LaunchAction action;
-    
+
     /**
-     * constructor 
+     * constructor
      */
     public TagEditorPlugin(PluginInformation info) {
         super(info);
         action = new LaunchAction();
-        MainMenu.add(Main.main.menu.editMenu, action);
+        MainMenu.add(MainApplication.getMenu().editMenu, action);
     }
 }

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionContext.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.tageditor.ac;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 
 public class AutoCompletionContext {
@@ -16 +16 @@
 
     public void initFromJOSMSelection() {
-        DataSet ds = Main.getLayerManager().getEditDataSet();
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         selectionIncludesNodes = !ds.getSelectedNodes().isEmpty();
         selectionIncludesWays = !ds.getSelectedWays().isEmpty();

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java

@@ -10 +10 @@
 import javax.swing.DefaultListSelectionModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.TagModel;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
@@ -147 +147 @@
     public void updateJOSMSelection() {
         ArrayList<Command> commands = new ArrayList<>();
-        Collection<OsmPrimitive> selection = Main.getLayerManager().getEditDataSet().getSelected();
+        Collection<OsmPrimitive> selection = MainApplication.getLayerManager().getEditDataSet().getSelected();
         if (selection == null)
             return;
@@ -167 +167 @@
 
         // executes the commands and adds them to the undo/redo chains
-        Main.main.undoRedo.add(command);
+        MainApplication.undoRedo.add(command);
     }
 
@@ -174 +174 @@
      */
     public void initFromJOSMSelection() {
-        Collection<OsmPrimitive> selection = Main.getLayerManager().getEditDataSet().getSelected();
+        Collection<OsmPrimitive> selection = MainApplication.getLayerManager().getEditDataSet().getSelected();
         clear();
         for (OsmPrimitive element : selection) {