Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardEButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardEButton.svg (revision 24613)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardEButton.svg (revision 24613)
@@ -0,0 +1,354 @@
+
+
+
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardNButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardNButton.svg (revision 24613)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardNButton.svg (revision 24613)
@@ -0,0 +1,354 @@
+
+
+
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardSButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardSButton.svg (revision 24613)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardSButton.svg (revision 24613)
@@ -0,0 +1,354 @@
+
+
+
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardWButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardWButton.svg (revision 24613)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardWButton.svg (revision 24613)
@@ -0,0 +1,354 @@
+
+
+
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsolButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsolButton.svg (revision 24613)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsolButton.svg (revision 24613)
@@ -0,0 +1,364 @@
+
+
+
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 24612)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 24613)
@@ -56,4 +56,7 @@
private JLabel raconIcon = null;
private JLabel fogIcon = null;
+ private JLabel nameLabel = null;
+ private JTextField nameBox = null;
+ private JButton saveButton = null;
private ButtonGroup typeButtons = null;
private JRadioButton chanButton = null;
@@ -62,4 +65,6 @@
private JRadioButton lightButton = null;
private PanelChan panelChan = null;
+ private PanelHaz panelHaz = null;
+ private PanelSpec panelSpec = null;
public OSeaMAction() {
@@ -79,4 +84,10 @@
panelChan.setBounds(new Rectangle(105, 0, 295, 160));
panelChan.setVisible(false);
+ panelHaz= new PanelHaz();
+ panelHaz.setBounds(new Rectangle(105, 0, 295, 160));
+ panelHaz.setVisible(false);
+ panelSpec= new PanelSpec();
+ panelSpec.setBounds(new Rectangle(105, 0, 295, 160));
+ panelSpec.setVisible(false);
}
@@ -112,4 +123,6 @@
oseamPanel.add(getLightButton(), null);
oseamPanel.add(panelChan, null);
+ oseamPanel.add(panelHaz, null);
+ oseamPanel.add(panelSpec, null);
typeButtons = new ButtonGroup();
typeButtons.add(chanButton);
@@ -126,6 +139,18 @@
panelChan.setVisible(false);
}
- hazButton.setEnabled(!hazButton.isSelected());
- specButton.setEnabled(!specButton.isSelected());
+ if (hazButton.isSelected()) {
+ hazButton.setEnabled(false);
+ panelHaz.setVisible(true);
+ } else {
+ hazButton.setEnabled(true);
+ panelHaz.setVisible(false);
+ }
+ if (specButton.isSelected()) {
+ specButton.setEnabled(false);
+ panelSpec.setVisible(true);
+ } else {
+ specButton.setEnabled(true);
+ panelSpec.setVisible(false);
+ }
lightButton.setEnabled(!lightButton.isSelected());
//System.out.println("pressed: " + chanButton.isSelected() + " " + hazButton.isSelected() + " " + specButton.isSelected() + " " + lightButton.isSelected());
@@ -136,4 +161,16 @@
specButton.addActionListener(alType);
lightButton.addActionListener(alType);
+
+ nameLabel = new JLabel();
+ nameLabel.setBounds(new Rectangle(5, 325, 60, 20));
+ nameLabel.setText(tr("Name:"));
+ oseamPanel.add(nameLabel, null);
+ nameBox = new JTextField();
+ nameBox.setBounds(new Rectangle(60, 320, 200, 30));
+ oseamPanel.add(nameBox, null);
+ saveButton = new JButton();
+ saveButton.setBounds(new Rectangle(285, 320, 100, 30));
+ saveButton.setText(tr("Save"));
+ oseamPanel.add(saveButton, null);
}
return oseamPanel;
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 24612)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 24613)
@@ -19,4 +19,14 @@
SafeWaterButton=/images/SafeWaterButton.png
SafeWaterTip=Safe Water marks
+NorthButton=/images/CardNButton.png
+PortTip=North cardinal marks
+SouthButton=/images/CardSButton.png
+SouthTip=South cardinal marks
+EastButton=/images/CardEButton.png
+EastTip=East cardinal marks
+WestButton=/images/CardWButton.png
+WestTip=West cardinal marks
+IsolButton=/images/IsolButton.png
+IsolTip=Isolated danger marks
PillarButton=/images/PillarButton.png
SparButton=/images/SparButton.png
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 24612)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 24613)
@@ -19,4 +19,14 @@
SafeWaterButton=/images/SafeWaterButton_de.png
SafeWaterTip=Safe Water marks
+NorthButton=/images/CardNButton_de.png
+PortTip=North cardinal marks
+SouthButton=/images/CardSButton_de.png
+SouthTip=South cardinal marks
+EastButton=/images/CardEButton_de.png
+EastTip=East cardinal marks
+WestButton=/images/CardWButton_de.png
+WestTip=West cardinal marks
+IsolButton=/images/IsolButton_de.png
+IsolTip=Isolated danger marks
PillarButton=/images/PillarButton_de.png
SparButton=/images/SparButton_de.png
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 24612)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 24613)
@@ -19,4 +19,14 @@
SafeWaterButton=/images/SafeWaterButton.png
SafeWaterTip=Safe Water marks
+NorthButton=/images/CardNButton.png
+PortTip=North cardinal marks
+SouthButton=/images/CardSButton.png
+SouthTip=South cardinal marks
+EastButton=/images/CardEButton.png
+EastTip=East cardinal marks
+WestButton=/images/CardWButton.png
+WestTip=West cardinal marks
+IsolButton=/images/IsolButton.png
+IsolTip=Isolated danger marks
PillarButton=/images/PillarButton.png
SparButton=/images/SparButton.png
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 24613)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 24613)
@@ -0,0 +1,195 @@
+package oseam.panels;
+
+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 oseam.Messages;
+
+import java.awt.Cursor;
+import java.awt.event.ActionListener;
+
+public class PanelHaz extends JPanel {
+
+ private ButtonGroup catButtons = null;
+ private JRadioButton northButton = null;
+ private JRadioButton southButton = null;
+ private JRadioButton eastButton = null;
+ private JRadioButton westButton = null;
+ private JRadioButton isolButton = null;
+
+ private ButtonGroup shapeButtons = null;
+ private JRadioButton pillarButton = null;
+ private JRadioButton sparButton = null;
+ private JRadioButton floatButton = null;
+ private JRadioButton beaconButton = null;
+ private JRadioButton towerButton = null;
+
+ public PanelHaz() {
+ super();
+ initialize();
+ }
+
+ private void initialize() {
+ this.setLayout(null);
+ this.add(getNothButton(), null);
+ this.add(getSouthButton(), null);
+ this.add(getEastButton(), null);
+ this.add(getWestButton(), null);
+ this.add(getIsolButton(), null);
+ catButtons = new ButtonGroup();
+ catButtons.add(northButton);
+ catButtons.add(southButton);
+ catButtons.add(eastButton);
+ catButtons.add(westButton);
+ catButtons.add(isolButton);
+ ActionListener alCat = new ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ northButton.setEnabled(!northButton.isSelected());
+ southButton.setEnabled(!southButton.isSelected());
+ eastButton.setEnabled(!eastButton.isSelected());
+ westButton.setEnabled(!westButton.isSelected());
+ isolButton.setEnabled(!isolButton.isSelected());
+ }
+ };
+ northButton.addActionListener(alCat);
+ southButton.addActionListener(alCat);
+ eastButton.addActionListener(alCat);
+ westButton.addActionListener(alCat);
+ isolButton.addActionListener(alCat);
+
+ this.add(getPillarButton(), null);
+ this.add(getSparButton(), null);
+ this.add(getFloatButton(), null);
+ this.add(getBeaconButton(), null);
+ this.add(getTowerButton(), null);
+ shapeButtons = new ButtonGroup();
+ shapeButtons.add(pillarButton);
+ shapeButtons.add(sparButton);
+ shapeButtons.add(floatButton);
+ shapeButtons.add(beaconButton);
+ shapeButtons.add(towerButton);
+ ActionListener alShape = new ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ pillarButton.setEnabled(!pillarButton.isSelected());
+ sparButton.setEnabled(!sparButton.isSelected());
+ floatButton.setEnabled(!floatButton.isSelected());
+ beaconButton.setEnabled(!beaconButton.isSelected());
+ towerButton.setEnabled(!towerButton.isSelected());
+ }
+ };
+ pillarButton.addActionListener(alShape);
+ sparButton.addActionListener(alShape);
+ floatButton.addActionListener(alShape);
+ beaconButton.addActionListener(alShape);
+ towerButton.addActionListener(alShape);
+ }
+
+ private JRadioButton getNothButton() {
+ if (northButton == null) {
+ northButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("NorthButton"))));
+ northButton.setBounds(new Rectangle(0, 0, 105, 32));
+ northButton.setToolTipText(Messages.getString("NorthTip"));
+ }
+ return northButton;
+ }
+
+ private JRadioButton getSouthButton() {
+ if (southButton == null) {
+ southButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("SouthButton"))));
+ southButton.setBounds(new Rectangle(0, 32, 105, 32));
+ southButton.setToolTipText(Messages.getString("SouthTip"));
+ }
+ return southButton;
+ }
+
+ private JRadioButton getEastButton() {
+ if (eastButton == null) {
+ eastButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("EastButton"))));
+ eastButton.setBounds(new Rectangle(0, 64, 105, 32));
+ eastButton.setToolTipText(Messages.getString("EastTip"));
+ }
+ return eastButton;
+ }
+
+ private JRadioButton getWestButton() {
+ if (westButton == null) {
+ westButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("WestButton"))));
+ westButton.setBounds(new Rectangle(0, 96, 105, 32));
+ westButton.setToolTipText(Messages.getString("WestTip"));
+ }
+ return westButton;
+ }
+
+ private JRadioButton getIsolButton() {
+ if (isolButton == null) {
+ isolButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("IsolButton"))));
+ isolButton.setBounds(new Rectangle(0, 128, 105, 32));
+ isolButton.setToolTipText(Messages.getString("IsolTip"));
+ }
+ return isolButton;
+ }
+
+ private JRadioButton getPillarButton() {
+ if (pillarButton == null) {
+ pillarButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("PillarButton"))));
+ pillarButton.setBounds(new Rectangle(105, 0, 90, 32));
+ }
+ return pillarButton;
+ }
+
+ private JRadioButton getSparButton() {
+ if (sparButton == null) {
+ sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("SparButton"))));
+ sparButton.setBounds(new Rectangle(105, 32, 90, 32));
+ }
+ return sparButton;
+ }
+
+ private JRadioButton getFloatButton() {
+ if (floatButton == null) {
+ floatButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("FloatButton"))));
+ floatButton.setBounds(new Rectangle(105, 64, 90, 32));
+ }
+ return floatButton;
+ }
+
+ private JRadioButton getBeaconButton() {
+ if (beaconButton == null) {
+ beaconButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("BeaconButton"))));
+ beaconButton.setBounds(new Rectangle(105, 96, 90, 32));
+ }
+ return beaconButton;
+ }
+
+ private JRadioButton getTowerButton() {
+ if (towerButton == null) {
+ towerButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("TowerButton"))));
+ towerButton.setBounds(new Rectangle(105, 128, 90, 32));
+ }
+ return towerButton;
+ }
+
+}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 24613)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 24613)
@@ -0,0 +1,183 @@
+package oseam.panels;
+
+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 oseam.Messages;
+
+import java.awt.Cursor;
+import java.awt.event.ActionListener;
+
+public class PanelSpec extends JPanel {
+
+ private ButtonGroup shapeButtons = null;
+ private JRadioButton pillarButton = null;
+ private JRadioButton sparButton = null;
+ private JRadioButton canButton = null;
+ private JRadioButton coneButton = null;
+ private JRadioButton sphereButton = null;
+ private JRadioButton barrelButton = null;
+ private JRadioButton superButton = null;
+ private JRadioButton floatButton = null;
+ private JRadioButton beaconButton = null;
+ private JRadioButton towerButton = null;
+
+ public PanelSpec() {
+ super();
+ initialize();
+ }
+
+ private void initialize() {
+ this.setLayout(null);
+
+ this.add(getPillarButton(), null);
+ this.add(getSparButton(), null);
+ this.add(getCanButton(), null);
+ this.add(getConeButton(), null);
+ this.add(getSphereButton(), null);
+ this.add(getBarrelButton(), null);
+ this.add(getSuperButton(), null);
+ this.add(getFloatButton(), null);
+ this.add(getBeaconButton(), null);
+ this.add(getTowerButton(), null);
+ shapeButtons = new ButtonGroup();
+ shapeButtons.add(pillarButton);
+ shapeButtons.add(sparButton);
+ shapeButtons.add(canButton);
+ shapeButtons.add(coneButton);
+ shapeButtons.add(sphereButton);
+ shapeButtons.add(barrelButton);
+ shapeButtons.add(superButton);
+ shapeButtons.add(floatButton);
+ shapeButtons.add(beaconButton);
+ shapeButtons.add(towerButton);
+ ActionListener alShape = new ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ pillarButton.setEnabled(!pillarButton.isSelected());
+ sparButton.setEnabled(!sparButton.isSelected());
+ canButton.setEnabled(!canButton.isSelected());
+ coneButton.setEnabled(!coneButton.isSelected());
+ sphereButton.setEnabled(!sphereButton.isSelected());
+ barrelButton.setEnabled(!barrelButton.isSelected());
+ superButton.setEnabled(!superButton.isSelected());
+ floatButton.setEnabled(!floatButton.isSelected());
+ beaconButton.setEnabled(!beaconButton.isSelected());
+ towerButton.setEnabled(!towerButton.isSelected());
+ }
+ };
+ pillarButton.addActionListener(alShape);
+ sparButton.addActionListener(alShape);
+ canButton.addActionListener(alShape);
+ coneButton.addActionListener(alShape);
+ sphereButton.addActionListener(alShape);
+ barrelButton.addActionListener(alShape);
+ superButton.addActionListener(alShape);
+ floatButton.addActionListener(alShape);
+ beaconButton.addActionListener(alShape);
+ towerButton.addActionListener(alShape);
+ }
+
+ private JRadioButton getPillarButton() {
+ if (pillarButton == null) {
+ pillarButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("PillarButton"))));
+ pillarButton.setBounds(new Rectangle(105, 0, 90, 32));
+ }
+ return pillarButton;
+ }
+
+ private JRadioButton getSparButton() {
+ if (sparButton == null) {
+ sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("SparButton"))));
+ sparButton.setBounds(new Rectangle(105, 32, 90, 32));
+ }
+ return sparButton;
+ }
+
+ private JRadioButton getCanButton() {
+ if (canButton == null) {
+ canButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("CanButton"))));
+ canButton.setBounds(new Rectangle(105, 64, 90, 32));
+ }
+ return canButton;
+ }
+
+ private JRadioButton getConeButton() {
+ if (coneButton == null) {
+ coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("ConeButton"))));
+ coneButton.setBounds(new Rectangle(105, 96, 90, 32));
+ }
+ return coneButton;
+ }
+
+ private JRadioButton getSphereButton() {
+ if (sphereButton == null) {
+ sphereButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("SphereButton"))));
+ sphereButton.setBounds(new Rectangle(105, 128, 90, 32));
+ }
+ return sphereButton;
+ }
+
+ private JRadioButton getBarrelButton() {
+ if (barrelButton == null) {
+ barrelButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("BarrelButton"))));
+ barrelButton.setBounds(new Rectangle(195, 0, 90, 32));
+ }
+ return barrelButton;
+ }
+
+ private JRadioButton getSuperButton() {
+ if (superButton == null) {
+ superButton = new JRadioButton(new ImageIcon(getClass().getResource(
+ Messages.getString("SuperButton"))));
+ superButton.setBounds(new Rectangle(195, 32, 90, 32));
+ }
+ return superButton;
+ }
+
+ private JRadioButton getFloatButton() {
+ if (floatButton == null) {
+ floatButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("FloatButton"))));
+ floatButton.setBounds(new Rectangle(195, 64, 90, 32));
+ }
+ return floatButton;
+ }
+
+ private JRadioButton getBeaconButton() {
+ if (beaconButton == null) {
+ beaconButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("BeaconButton"))));
+ beaconButton.setBounds(new Rectangle(195, 96, 90, 32));
+ }
+ return beaconButton;
+ }
+
+ private JRadioButton getTowerButton() {
+ if (towerButton == null) {
+ towerButton = new JRadioButton(new ImageIcon(getClass()
+ .getResource(Messages.getString("TowerButton"))));
+ towerButton.setBounds(new Rectangle(195, 128, 90, 32));
+ }
+ return towerButton;
+ }
+
+}