update to latest JOSM, cleanup

.classpath

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="lib" path="D:/JOSM/josm-latest.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.gitignore

@@ -0,0 +1,2 @@
+/build/
+/bin/

.settings/org.eclipse.jdt.core.prefs

@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

build.xml

@@ -3,7 +3,7 @@
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Initial commit"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="1111"/>
+    <property name="plugin.main.version" value="10580"/>
 
     <!-- Configure these properties (replace "..." accordingly).
          See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

src/andrei/josm/plugin/color/ColorAction.java

@@ -9,7 +9,6 @@
 
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.tools.I18n;
@@ -24,31 +23,22 @@ public ColorAction() {
         super(tr("Color "), "dialogs/Color.png", tr("Choose or set a color for objects."),
                 Shortcut.registerShortcut("tools:Color", tr("Tool: {0}", tr("Color Plugin")), KeyEvent.VK_Y, Shortcut.CTRL_SHIFT),
                 true, "Color", true);
-
     }
 
     @Override
     public void actionPerformed(ActionEvent arg0) {
-        try
-        {
-            Collection<OsmPrimitive> selectedPrimitive = Main.main.getCurrentDataSet().getSelectedNodesAndWays();
-            if (selectedPrimitive.size() != 1)
-            {
-                JOptionPane.showMessageDialog(null, I18n.tr("Choose one node or way", new Object[0]), "Error", 0);
-
-                return;
-            }
-            else {
-                new ColorDialog().showDialog();
-            }
-        }catch(Exception e){
-            e.printStackTrace();
-        }
+        Collection<OsmPrimitive> selectedPrimitive = getLayerManager().getEditDataSet().getSelectedNodesAndWays();
+        if (selectedPrimitive.size() != 1) {
+            JOptionPane.showMessageDialog(null, I18n.tr("Choose one node or way", new Object[0]), "Error", 0);
 
+            return;
+        } else {
+            new ColorDialog().showDialog();
+        }
     }
-    protected void updateEnabledState()
-     {
-         setEnabled(getCurrentDataSet() != null);
-      }
 
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(getLayerManager().getEditDataSet() != null);
+    }
 }