Changeset 30950 in osm for applications/editors

Timestamp:

2015-02-09T00:11:30+01:00 (10 years ago)

Author:

polyglot

Message:

mapillary plugins still doesn't do anything, but I finally managed to setup the JDK environment and removed stuff until it oompiles without errors now.

Location:

applications/editors/josm/plugins/mapillary

Files:

• images/mapillary_icon_960.png (added)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAction.java

@@ -2 +2 @@
  * 
  */
-package org.openstreetmap.josm.plugins.sumoconvert;
+package org.openstreetmap.josm.plugins.mapillary;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -18 +18 @@
 
 /**
- * @author ignacio_palermo
+ * @author Polyglot
  *
  */
-public class SumoExportAction extends JosmAction {
+public class MapillaryAction extends JosmAction {
         
-        public SumoExportAction(){
-        super(tr("OSM Export"), "images/dialogs/logo-sumo.png",
-        tr("Export traffic data to SUMO network file."),
-        Shortcut.registerShortcut("menu:sumoexport", tr("Menu: {0}", tr("SUMO Export")),
-        KeyEvent.VK_G, Shortcut.ALT_CTRL), false);
+        public MapillaryAction(){
+        super(tr("Mapillary"), "images/icon24.png",
+        tr("Create Mapillary layer."),
+        Shortcut.registerShortcut("menu:Mapillary", tr("Menu: {0}", tr("Mapillary")),
+        KeyEvent.VK_M, Shortcut.ALT_CTRL), false);
     }
 
@@ -35 +35 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
-                SumoExportDialog dialog = new SumoExportDialog();
+                MapillaryDialog dialog = new MapillaryDialog();
         JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
         JDialog dlg = pane.createDialog(Main.parent, tr("Export"));
@@ -41 +41 @@
         dlg.setVisible(true);
         if(((Integer)pane.getValue()) == JOptionPane.OK_OPTION){
-            ExportTask task = new ExportTask();
-            Main.worker.execute(task);
+            // MapillaryTask task = new MapillaryTask();
+            // Main.worker.execute(task);
         }
         dlg.dispose();

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryDialog.java

@@ -2 +2 @@
  * 
  */
-package org.openstreetmap.josm.plugins.sumoconvert;
+package org.openstreetmap.josm.plugins.mapillary;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -28 +28 @@
 /**
  * Main export dialog
- * @author ignacio_palermo
+ * @author Polyglot
  *
  */
-public class SumoExportDialog extends JPanel {
+public class MapillaryDialog extends JPanel {
         // the JOptionPane that contains this dialog. required for the closeDialog() method.
     private JOptionPane optionPane;
@@ -38 +38 @@
     
 
-    public SumoExportDialog() {
+    public MapillaryDialog() {
         GridBagConstraints c = new GridBagConstraints();
         JButton refreshBtn, configBtn;
@@ -88 +88 @@
                         JOptionPane.showMessageDialog(Main.parent, tr("Connection Error.") + " " + ex.toString());
                     }
-                    System.out.println("configureing the device finised");
+                    System.out.println("configuring the device finished");
                 }
             });

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.sumoconvert;
+package org.openstreetmap.josm.plugins.mapillary;
 
 import java.util.ArrayList;
@@ -9 +9 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.turnrestrictions.list.TurnRestrictionsListDialog;
-import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceEditor;
-import org.openstreetmap.josm.plugins.turnrestrictions.*;
 
 /**
- * This is the main class for the sumoconvert plugin.
+ * This is the main class for the mapillary plugin.
  * 
  */
-public class SumoConvertPlugin extends Plugin{
-    
-        private final ArrayList<Relation> turnrestrictions = new ArrayList<Relation>();
-        private SumoExportAction exportAction;
+public class MapillaryPlugin extends Plugin{
         
-    public SumoConvertPlugin(PluginInformation info) {
+    public MapillaryPlugin(PluginInformation info) {
         super(info);
-        exportAction = new SumoExportAction();
-        Main.main.menu.toolsMenu.add(exportAction);
-        System.out.println(getPluginDir());
     }
     
@@ -36 +27 @@
         if (oldFrame == null && newFrame != null) { // map frame added
                 
-            //TurnRestrictionsListDialog dialog  = new TurnRestrictionsListDialog();
-            //add the dialog
-            //newFrame.addToggleDialog(dialog);
-            //CreateOrEditTurnRestrictionAction.getInstance();
         }
     }
-
-    @Override
-    public PreferenceSetting getPreferenceSetting() {
-        return new PreferenceEditor();
-    }
 }