Changeset 24885 in osm for applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java

Timestamp:

2010-12-27T11:37:15+01:00 (14 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java (modified) (6 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java

@@ -1 +1 @@
 package oseam.panels;
 
+import java.awt.event.ActionListener;
+import java.awt.Color;
+import java.awt.Rectangle;
+
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JRadioButton;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.Font;
-
-import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.JComboBox;
-import javax.swing.JCheckBox;
-import javax.swing.JRadioButton;
+import java.util.EnumMap;
+import java.util.Iterator;
 
 import oseam.Messages;
 import oseam.dialogs.OSeaMAction;
 import oseam.seamarks.SeaMark.Shp;
-
-import java.awt.Cursor;
-import java.awt.event.ActionListener;
-import java.util.EnumMap;
-import java.util.Iterator;
+import oseam.seamarks.SeaMark.Obj;
 
 public class PanelSaw extends JPanel {
@@ -36 +29 @@
         private JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png")));
         private EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
+        private EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
         private ActionListener alShape = new ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -44 +38 @@
                                 if (button.isSelected()) {
                                         dlg.mark.setShape(shp);
+                                        dlg.mark.setObject(objects.get(shp));
                                         button.setBorderPainted(true);
                                 } else
@@ -56 +51 @@
                 dlg = dia;
                 this.setLayout(null);
-                this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "PillarTip", Shp.PILLAR), null);
-                this.add(getShapeButton(sparButton, 0, 32, 34, 32, "SparTip", Shp.SPAR), null);
-                this.add(getShapeButton(sphereButton, 0, 64, 34, 32, "SphereTip", Shp.SPHERE), null);
-                this.add(getShapeButton(barrelButton, 0, 96, 34, 32, "BarrelTip", Shp.BARREL), null);
-                this.add(getShapeButton(floatButton, 0, 128, 34, 32, "FloatTip", Shp.FLOAT), null);
+                this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "PillarTip", Shp.PILLAR, Obj.BOYSAW), null);
+                this.add(getShapeButton(sparButton, 0, 32, 34, 32, "SparTip", Shp.SPAR, Obj.BOYSAW), null);
+                this.add(getShapeButton(sphereButton, 0, 64, 34, 32, "SphereTip", Shp.SPHERE, Obj.BOYSAW), null);
+                this.add(getShapeButton(barrelButton, 0, 96, 34, 32, "BarrelTip", Shp.BARREL, Obj.BOYSAW), null);
+                this.add(getShapeButton(floatButton, 0, 128, 34, 32, "FloatTip", Shp.FLOAT, Obj.LITFLT), null);
         }
 
@@ -68 +63 @@
         }
 
-        private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp) {
+        private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) {
                 button.setBounds(new Rectangle(x, y, w, h));
                 button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
@@ -75 +70 @@
                 shapeButtons.add(button);
                 shapes.put(shp, button);
+                objects.put(shp, obj);
                 return button;
         }