Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java =================================================================== --- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java (revision 17637) +++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java (revision 17638) @@ -43,5 +43,4 @@ import org.openstreetmap.josm.plugins.tageditor.tagspec.ui.ITagSelectorListener; import org.openstreetmap.josm.plugins.tageditor.tagspec.ui.TabularTagSelector; -import static org.openstreetmap.josm.plugins.tageditor.josm.CompatibilityUtil.getCurrentDataSet; /** * The dialog for editing name/value-pairs (aka tags) associated with {@link OsmPrimitive}s. @@ -345,5 +344,5 @@ model.updateJOSMSelection(); - Collection sel = getCurrentDataSet().getSelected(); + Collection sel = Main.main.getCurrentDataSet().getSelected(); DataSet.fireSelectionChanged(sel); Main.parent.repaint(); // repaint all - drawing could have been changed Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionCache.java =================================================================== --- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionCache.java (revision 17637) +++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionCache.java (revision 17638) @@ -1,5 +1,3 @@ package org.openstreetmap.josm.plugins.tageditor.ac; - -import static org.openstreetmap.josm.plugins.tageditor.josm.CompatibilityUtil.getCurrentDataSet; import java.util.ArrayList; @@ -8,4 +6,5 @@ import java.util.List; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.OsmPrimitive; /** @@ -84,5 +83,5 @@ public void initFromJOSMDataset() { cache = new HashMap>(); - Collection ds = getCurrentDataSet().allNonDeletedPrimitives(); + Collection ds = Main.main.getCurrentDataSet().allNonDeletedPrimitives(); for (OsmPrimitive primitive : ds) { cachePrimitive(primitive); Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionContext.java =================================================================== --- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionContext.java (revision 17637) +++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionContext.java (revision 17638) @@ -1,5 +1,6 @@ package org.openstreetmap.josm.plugins.tageditor.ac; -import static org.openstreetmap.josm.plugins.tageditor.josm.CompatibilityUtil.getCurrentDataSet; +import org.openstreetmap.josm.Main; + public class AutoCompletionContext { @@ -14,8 +15,8 @@ public void initFromJOSMSelection() { - selectionIncludesNodes = ! getCurrentDataSet().getSelectedNodes().isEmpty(); - selectionIncludesWays = !getCurrentDataSet().getSelectedWays().isEmpty(); - selectionIncludesRelations = !getCurrentDataSet().getSelectedRelations().isEmpty(); - selectionEmpty = (getCurrentDataSet().getSelected().size() == 0); + selectionIncludesNodes = ! Main.main.getCurrentDataSet().getSelectedNodes().isEmpty(); + selectionIncludesWays = !Main.main.getCurrentDataSet().getSelectedWays().isEmpty(); + selectionIncludesRelations = !Main.main.getCurrentDataSet().getSelectedRelations().isEmpty(); + selectionEmpty = (Main.main.getCurrentDataSet().getSelected().size() == 0); } Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java =================================================================== --- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java (revision 17637) +++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java (revision 17638) @@ -39,5 +39,4 @@ private ArrayList listener = null; - /** * creates the GUI @@ -53,8 +52,8 @@ // if (autoCompletionList == null) { - logger.info("setting model to default model"); + //logger.info("setting model to default model"); table.setModel(new DefaultTableModel()); } else { - logger.info("setting model to " + autoCompletionList); + //logger.info("setting model to " + autoCompletionList); table.setModel(autoCompletionList); } @@ -90,8 +89,5 @@ } ); - - } - /** @@ -107,5 +103,4 @@ } - /** * constructor @@ -116,5 +111,4 @@ listener = new ArrayList(); } - /** @@ -160,6 +154,4 @@ } } - - /** @@ -189,5 +181,4 @@ } - /** * notifies listeners about a selected item in the auto completion list @@ -201,5 +192,4 @@ } - public void installKeyAction(Action a) { getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put((KeyStroke)a.getValue(AbstractAction.ACCELERATOR_KEY), a.getValue(AbstractAction.NAME)); Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java =================================================================== --- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java (revision 17637) +++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java (revision 17638) @@ -23,5 +23,4 @@ import org.openstreetmap.josm.plugins.tageditor.preset.Tag; import org.openstreetmap.josm.plugins.tageditor.tagspec.KeyValuePair; -import static org.openstreetmap.josm.plugins.tageditor.josm.CompatibilityUtil.getCurrentDataSet; /** @@ -273,5 +272,5 @@ */ public void initFromJOSMSelection() { - Collection selection = getCurrentDataSet().getSelected(); + Collection selection = Main.main.getCurrentDataSet().getSelected(); clear(); for (OsmPrimitive element : selection) { @@ -354,5 +353,5 @@ public void updateJOSMSelection() { ArrayList commands = new ArrayList(); - Collection selection = getCurrentDataSet().getSelected(); + Collection selection = Main.main.getCurrentDataSet().getSelected(); if (selection == null) return; Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java =================================================================== --- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java (revision 17637) +++ (revision ) @@ -1,91 +1,0 @@ -package org.openstreetmap.josm.plugins.tageditor.josm; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import static org.openstreetmap.josm.tools.I18n.tr; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.osm.DataSet; - -/** - * Static helper for the transition from JOSM with {@see Main#ds} to {@see Main#getCurrentDataSet()}. - * - * - */ -public class CompatibilityUtil { - - private static boolean useMainDs = false; - private static boolean useGetCurrentDataSet = false; - - private CompatibilityUtil(){} - - private static boolean hasMainDs() { - try { - Field f = Main.class.getField("ds"); - } catch(NoSuchFieldException e) { - return false; - } - return true; - } - - private static boolean hasGetCurrentDataSet() { - try { - Method m = Main.class.getMethod("getCurrentDataSet"); - } catch(NoSuchMethodException e) { - return false; - } - return true; - } - - private static void analyse() { - if (useMainDs || useGetCurrentDataSet) return; - if (hasMainDs()) { - useMainDs = true; - System.out.println(tr("INFO: entering compatibilty mode for JOSM with Main.ds")); - } else if (hasGetCurrentDataSet()) { - useGetCurrentDataSet = true; - System.out.println(tr("INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()")); - } else - throw new RuntimeException(tr("Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() found.")); - } - - private static DataSet getMainDs() throws RuntimeException{ - DataSet ds = null; - try { - Field f = Main.class.getField("ds"); - ds = (DataSet) f.get(null); - } catch(Exception e) { - throw new RuntimeException(e); - } - return ds; - } - - private static DataSet getGetCurrentDataSet() throws RuntimeException{ - DataSet ds = null; - try { - Method m = Main.class.getMethod("getCurrentDataSet"); - ds = (DataSet) m.invoke(Main.main); - } catch(Exception e) { - throw new RuntimeException(e); - } - return ds; - } - - /** - * Replies the current data set in JOSM. Depending on the JOSM version, either uses - * {@see Main#ds} or {@see Main#getCurrentDataSet()}. - * - * @return the current dataset. This may be null - * @throws RuntimeException thrown, if the current data set can't be read - */ - static public DataSet getCurrentDataSet() throws RuntimeException { - analyse(); - if (useMainDs) - return getMainDs(); - else if (useGetCurrentDataSet) - return getGetCurrentDataSet(); - - // should not happen - return null; - } -} Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java =================================================================== --- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java (revision 17637) +++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java (revision 17638) @@ -13,6 +13,4 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.plugins.tageditor.util.IndentWriter; - -import sun.java2d.loops.ScaledBlit;