Changeset 30150 in osm for applications/editors/josm/plugins/smed2/src/panels

Timestamp:

2013-12-25T11:40:00+01:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/panels

Files:

• PanelMain.java (modified) (4 diffs)
• ShowFrame.java (modified) (3 diffs)

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

@@ -22 +22 @@
 import s57.S57att.Att;
 import s57.S57obj.Obj;
-import seamap.Renderer;
-import seamap.SeaMap.*;
+import s57.S57map.*;
+import render.Renderer;
 import smed2.Smed2Action;
 
@@ -48 +48 @@
         int returnVal = ifc.showOpenDialog(Main.parent);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
-          Smed2Action.panelS57.startImport(ifc.getSelectedFile());
+//          xxx.startImport(ifc.getSelectedFile());
          } else {
            messageBar.setText("");
@@ -64 +64 @@
         int returnVal = efc.showOpenDialog(Main.parent);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
-          Smed2Action.panelS57.startExport(efc.getSelectedFile());
+//          xxx.startExport(efc.getSelectedFile());
          } else {
            messageBar.setText("");
@@ -113 +113 @@
                 decode.setBounds(0, 0, 480, 420);
                 decode.setTabSize(1);
-//              add(decode);
+                add(decode);
         }
         

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
-import seamap.MapContext;
-import seamap.Renderer;
-import seamap.SeaMap;
-import seamap.SeaMap.*;
+import render.MapContext;
+import render.Renderer;
+import s57.S57map;
+import s57.S57map.*;
 
 public class ShowFrame extends JFrame {
         
-        SeaMap showMap;
+        S57map showMap;
         Picture picture;
 
         class Picture extends JPanel implements MapContext {
 
-                public void drawPicture(OsmPrimitive osm, SeaMap map) {
+                public void drawPicture(OsmPrimitive osm, S57map map) {
                         long id;
                         Feature feature;
@@ -30 +30 @@
                         id = osm.getUniqueId();
                         feature = map.index.get(id);
-                        showMap = new SeaMap();
+                        showMap = new S57map();
                         showMap.nodes = map.nodes;
                         showMap.edges = map.edges;
@@ -66 +66 @@
         }
         
-        public void showFeature(OsmPrimitive osm, SeaMap map) {
+        public void showFeature(OsmPrimitive osm, S57map map) {
                 picture.drawPicture(osm, map);
         }