Changeset 24995 in osm for applications/editors/josm/plugins/importvec/src

Timestamp:

2011-01-08T13:10:55+01:00 (14 years ago)

Author:

upliner

Message:

importvec: avoid to override "open" toolbar action

File:

• applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java (modified) (8 diffs)

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java

@@ -51 +51 @@
     public ImportVectorAction() {
         super(tr("Import..."), "open", tr("Import vector graphics."),
-                Shortcut.registerShortcut("system:import", tr("File: {0}", tr("Import...")), KeyEvent.VK_I, Shortcut.GROUP_MENU),true);
+                Shortcut.registerShortcut("system:import", tr("File: {0}", tr("Import...")), KeyEvent.VK_I, Shortcut.GROUP_MENU), false);
+        // Avoid to override "open" toolbar function
+        putValue("toolbar", "importvec");
+        Main.toolbar.register(this);
     }
     public static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title) {
@@ -122 +125 @@
 
         File[] files = fc.getSelectedFiles();
-        
+
         Main.worker.submit(new ImportTask(Arrays.asList(files)));
     }
-    
+
     static public class ImportTask extends PleaseWaitRunnable {
         LinkedList<Node> nodes = new LinkedList<Node>();
@@ -150 +153 @@
         EastNorth center;
         double scale;
-        
+
         Way currentway;
         double lastX;
         double lastY;
-        
+
         private void appendNode(double x, double y) throws IOException {
             if (currentway == null)
@@ -195 +198 @@
                     cube(1-t)*ay+3*sqr(1-t)*t*by+3*(1-t)*t*t*cy+t*t*t*dy);
         }
-        
+
         private void processElement(SVGElement el) throws IOException {
             if (el instanceof Group) {
@@ -224 +227 @@
                         double lasty = lastY;
                         for (int i = 1;i<Settings.getCurveSteps();i++) {
-                            appendNode(interpolate_quad(lastx,lasty,coords[0],coords[1],coords[2],coords[3],(double)i/Settings.getCurveSteps()));
+                            appendNode(interpolate_quad(lastx,lasty,coords[0],coords[1],coords[2],coords[3],i/Settings.getCurveSteps()));
                         }
                         appendNode(coords[2],coords[3]);
@@ -232 +235 @@
                         lasty = lastY;
                         for (int i = 1;i<Settings.getCurveSteps();i++) {
-                            appendNode(interpolate_cubic(lastx,lasty,coords[0],coords[1],coords[2],coords[3],coords[4],coords[5],(double)i/Settings.getCurveSteps()));
+                            appendNode(interpolate_cubic(lastx,lasty,coords[0],coords[1],coords[2],coords[3],coords[4],coords[5],i/Settings.getCurveSteps()));
                         }
                         appendNode(coords[4],coords[5]);
@@ -265 +268 @@
                         in.close();
                     }
-                
+
                     SVGDiagram diagram = loader.getLoadedDiagram();
                     ShapeElement root = diagram.getRoot();
@@ -271 +274 @@
                     Rectangle2D bbox = root.getBoundingBox();
                     this.center = this.center.add(-bbox.getCenterX()*scale, bbox.getCenterY()*scale);
-                    
+
                     processElement(root);
                 }