Changeset 30013 in osm for applications/editors/josm/plugins

Timestamp:

2013-10-07T16:48:51+02:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src

Files:

• panels/ShowFrame.java (modified) (2 diffs)
• smed2/Smed2Action.java (modified) (1 diff)

applications/editors/josm/plugins/smed2/src/panels/ShowFrame.java

@@ -8 +8 @@
 
 import javax.swing.JFrame;
+import javax.swing.JPanel;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -16 +17 @@
 import seamap.SeaMap.*;
 
-public class ShowFrame extends JFrame implements MapHelper {
+public class ShowFrame extends JFrame {
         
-        public SeaMap showMap;
+        class Picture extends JPanel implements MapHelper {
+                
+                public void drawPicture(OsmPrimitive osm, SeaMap map) {
+                        long id;
+                        Feature feature;
+                        
+                        id = osm.getUniqueId();
+                        feature = map.index.get(id);
+                        showMap = new SeaMap();
+                        showMap.nodes = map.nodes;
+                        showMap.edges = map.edges;
+                        showMap.areas = map.areas;
+                        showMap.index = map.index;
+                        if (feature != null) {
+                                showMap.features.put(feature.type, new ArrayList<Feature>());
+                                showMap.features.get(feature.type).add(feature);
+                        }
+                        repaint();
+                }
+                
+                public void paintComponent(Graphics g) {
+                        Graphics2D g2 = (Graphics2D)g;
+                        g2.setBackground(new Color(0xb5d0d0));
+                        g2.clearRect(0, 0, 300, 300);
+                        Renderer.reRender(g2, 16, 32, showMap, this);
+                }
+
+                @Override
+                public Point2D getPoint(Snode coord) {
+                        return new Point2D.Double(150, 150);
+                }
+        }
+        
+        SeaMap showMap;
+        Picture picture;
 
         public ShowFrame(String title) {
                 super(title);
+                picture = new Picture();
+    picture.setVisible(true);
+                add(picture);
+    pack();
         }
         
         public void showFeature(OsmPrimitive osm, SeaMap map) {
-                long id;
-                Feature feature;
-                
-                id = osm.getUniqueId();
-                feature = map.index.get(id);
-                showMap = new SeaMap();
-                showMap.nodes = map.nodes;
-                showMap.edges = map.edges;
-                showMap.areas = map.areas;
-                showMap.index = map.index;
-                if (feature != null) {
-                        showMap.features.put(feature.type, new ArrayList<Feature>());
-                        showMap.features.get(feature.type).add(feature);
-                }
-                repaint();
+                picture.drawPicture(osm, map);
         }
         
-        @Override
-        public Point2D getPoint(Snode coord) {
-                return new Point2D.Double(150, 150);
-        }
         
-        public void paint(Graphics g) {
-                super.paint(g);
-                Graphics2D g2 = (Graphics2D)g;
-                g2.setBackground(new Color(0xb5d0d0));
-                g2.clearRect(0, 0, 300, 300);
-                Renderer.reRender(g2, 16, 32, showMap, this);
-        }
-
 }

applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java

@@ -18 +18 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-import messages.Messages;
 
 import org.openstreetmap.josm.actions.JosmAction;