Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/Messages.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/Messages.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/Messages.java (revision 24839) @@ -5,18 +5,17 @@ public class Messages { - private static final String BUNDLE_NAME = "oseam.msg.messages"; + private static final String BUNDLE_NAME = "oseam.msg.messages"; - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - private Messages() { - } + private Messages() { + } - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } + public static String getString(String key) { + try { + return RESOURCE_BUNDLE.getString(key); + } catch (MissingResourceException e) { + return '!' + key + '!'; + } + } } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java (revision 24839) @@ -29,5 +29,5 @@ @Override public boolean stop() { -// DataSet.removeSelectionListener(oseam.SmpListener); + // DataSet.removeSelectionListener(oseam.SmpListener); return true; } @@ -35,5 +35,5 @@ @Override public boolean hasFocus() { -// DataSet.addSelectionListener(oseam.SmpListener); + // DataSet.addSelectionListener(oseam.SmpListener); return true; } @@ -41,5 +41,5 @@ @Override public boolean lostFocus() { -// DataSet.removeSelectionListener(oseam.SmpListener); + // DataSet.removeSelectionListener(oseam.SmpListener); return true; } 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 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 24839) @@ -24,5 +24,4 @@ import oseam.seamarks.MarkLight; import oseam.seamarks.MarkSpec; -import oseam.seamarks.MarkUkn; import oseam.seamarks.MarkSaw; import smed.plug.ifc.SmedPluginManager; @@ -36,9 +35,7 @@ public Node node = null; private Collection Selection = null; - private OsmPrimitive lastNode = null; public SelectionChangedListener SmpListener = new SelectionChangedListener() { - public void selectionChanged( - Collection newSelection) { + public void selectionChanged(Collection newSelection) { Node nextNode = null; Selection = newSelection; @@ -49,7 +46,7 @@ nextNode = (Node) osm; if (Selection.size() == 1) { - if (nextNode.compareTo(lastNode) != 0) { - lastNode = nextNode; - parseNode(nextNode); + if (nextNode.compareTo(node) != 0) { + node = nextNode; + parseNode(); } } else @@ -58,6 +55,7 @@ } if (nextNode == null) { + node = null; + mark = null; panelMain.clearSelections(); - lastNode = null; manager.showVisualMessage(Messages.getString("SelectNode")); } @@ -73,6 +71,5 @@ if (!str.isEmpty()) str += new String(new char[] { 0x1e }); - Main.pref.put("mappaint.style.sources", str - + "http://dev.openseamap.org/josm/seamark_styles.xml"); + Main.pref.put("mappaint.style.sources", str + "http://dev.openseamap.org/josm/seamark_styles.xml"); } str = Main.pref.get("color.background"); @@ -90,10 +87,9 @@ } - private void parseNode(Node newNode) { + private void parseNode() { Map keys; manager.showVisualMessage(""); - node = newNode; mark = null; String type = ""; @@ -106,29 +102,20 @@ if (type.equals("buoy_lateral") || type.equals("beacon_lateral")) { mark = new MarkLat(this); - } else if (type.equals("buoy_cardinal") - || type.equals("beacon_cardinal")) { + } else if (type.equals("buoy_cardinal") || type.equals("beacon_cardinal")) { mark = new MarkCard(this); - } else if (type.equals("buoy_safe_water") - || type.equals("beacon_safe_water")) { + } else if (type.equals("buoy_safe_water") || type.equals("beacon_safe_water")) { mark = new MarkSaw(this); - } else if (type.equals("buoy_special_purpose") - || type.equals("beacon_special_purpose")) { + } else if (type.equals("buoy_special_purpose") || type.equals("beacon_special_purpose")) { mark = new MarkSpec(this); - } else if (type.equals("buoy_isolated_danger") - || type.equals("beacon_isolated_danger")) { + } else if (type.equals("buoy_isolated_danger") || type.equals("beacon_isolated_danger")) { mark = new MarkIsol(this); - } else if (type.equals("landmark") || type.equals("light_vessel") - || type.equals("light_major") || type.equals("light_minor")) { + } else if (type.equals("landmark") || type.equals("light_vessel") || type.equals("light_major") || type.equals("light_minor")) { mark = new MarkLight(this); } else if (type.equals("light_float")) { if (keys.containsKey("seamark:light_float:colour")) { str = keys.get("seamark:light_float:colour"); - if (str.equals("red") || str.equals("green") - || str.equals("red;green;red") - || str.equals("green;red;green")) { + if (str.equals("red") || str.equals("green") || str.equals("red;green;red") || str.equals("green;red;green")) { mark = new MarkLat(this); - } else if (str.equals("black;yellow") - || str.equals("black;yellow;black") - || str.equals("yellow;black") + } else if (str.equals("black;yellow") || str.equals("black;yellow;black") || str.equals("yellow;black") || str.equals("yellow;black;yellow")) { mark = new MarkCard(this); @@ -151,48 +138,33 @@ } } - } else if (keys.containsKey("buoy_lateral:category") - || keys.containsKey("beacon_lateral:category")) { + } else if (keys.containsKey("buoy_lateral:category") || keys.containsKey("beacon_lateral:category")) { mark = new MarkLat(this); - } else if (keys.containsKey("buoy_cardinal:category") - || keys.containsKey("beacon_cardinal:category")) { + } else if (keys.containsKey("buoy_cardinal:category") || keys.containsKey("beacon_cardinal:category")) { mark = new MarkCard(this); - } else if (keys.containsKey("buoy_isolated_danger:category") - || keys.containsKey("beacon_isolated_danger:category")) { + } else if (keys.containsKey("buoy_isolated_danger:category") || keys.containsKey("beacon_isolated_danger:category")) { mark = new MarkIsol(this); - } else if (keys.containsKey("buoy_safe_water:category") - || keys.containsKey("beacon_safe_water:category")) { + } else if (keys.containsKey("buoy_safe_water:category") || keys.containsKey("beacon_safe_water:category")) { mark = new MarkSaw(this); - } else if (keys.containsKey("buoy_special_purpose:category") - || keys.containsKey("beacon_special_purpose:category")) { + } else if (keys.containsKey("buoy_special_purpose:category") || keys.containsKey("beacon_special_purpose:category")) { mark = new MarkSpec(this); - } else if (keys.containsKey("buoy_lateral:shape") - || keys.containsKey("beacon_lateral:shape")) { + } else if (keys.containsKey("buoy_lateral:shape") || keys.containsKey("beacon_lateral:shape")) { mark = new MarkLat(this); - } else if (keys.containsKey("buoy_cardinal:shape") - || keys.containsKey("beacon_cardinal:shape")) { + } else if (keys.containsKey("buoy_cardinal:shape") || keys.containsKey("beacon_cardinal:shape")) { mark = new MarkCard(this); - } else if (keys.containsKey("buoy_isolated_danger:shape") - || keys.containsKey("beacon_isolated_danger:shape")) { + } else if (keys.containsKey("buoy_isolated_danger:shape") || keys.containsKey("beacon_isolated_danger:shape")) { mark = new MarkIsol(this); - } else if (keys.containsKey("buoy_safe_water:shape") - || keys.containsKey("beacon_safe_water:shape")) { + } else if (keys.containsKey("buoy_safe_water:shape") || keys.containsKey("beacon_safe_water:shape")) { mark = new MarkSaw(this); - } else if (keys.containsKey("buoy_special_purpose:shape") - || keys.containsKey("beacon_special_purpose:shape")) { + } else if (keys.containsKey("buoy_special_purpose:shape") || keys.containsKey("beacon_special_purpose:shape")) { mark = new MarkSpec(this); - } else if (keys.containsKey("buoy_lateral:colour") - || keys.containsKey("beacon_lateral:colour")) { + } else if (keys.containsKey("buoy_lateral:colour") || keys.containsKey("beacon_lateral:colour")) { mark = new MarkLat(this); - } else if (keys.containsKey("buoy_cardinal:colour") - || keys.containsKey("beacon_cardinal:colour")) { + } else if (keys.containsKey("buoy_cardinal:colour") || keys.containsKey("beacon_cardinal:colour")) { mark = new MarkCard(this); - } else if (keys.containsKey("buoy_isolated_danger:colour") - || keys.containsKey("beacon_isolated_danger:colour")) { + } else if (keys.containsKey("buoy_isolated_danger:colour") || keys.containsKey("beacon_isolated_danger:colour")) { mark = new MarkIsol(this); - } else if (keys.containsKey("buoy_safe_water:colour") - || keys.containsKey("beacon_safe_water:colour")) { + } else if (keys.containsKey("buoy_safe_water:colour") || keys.containsKey("beacon_safe_water:colour")) { mark = new MarkSaw(this); - } else if (keys.containsKey("buoy_special_purpose:colour") - || keys.containsKey("beacon_special_purpose:colour")) { + } else if (keys.containsKey("buoy_special_purpose:colour") || keys.containsKey("beacon_special_purpose:colour")) { mark = new MarkSpec(this); } @@ -200,5 +172,5 @@ if (mark == null) { manager.showVisualMessage(Messages.getString("NoMark")); - mark = new MarkUkn(this); + panelMain.clearSelections(); } else { mark.parseMark(); Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 24839) @@ -79,6 +79,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { if (portButton.isSelected()) { - if (!(dlg.mark instanceof MarkLat) - || (dlg.mark.getCategory() != Cat.LAT_PORT)) + if (!(dlg.mark instanceof MarkLat) || (dlg.mark.getCategory() != Cat.LAT_PORT)) dlg.mark = new MarkLat(dlg); dlg.mark.setCategory(Cat.LAT_PORT); @@ -98,6 +97,5 @@ } if (stbdButton.isSelected()) { - if (!(dlg.mark instanceof MarkLat) - || (dlg.mark.getCategory() != Cat.LAT_STBD)) + if (!(dlg.mark instanceof MarkLat) || (dlg.mark.getCategory() != Cat.LAT_STBD)) dlg.mark = new MarkLat(dlg); dlg.mark.setCategory(Cat.LAT_STBD); @@ -117,6 +115,5 @@ } if (prefPortButton.isSelected()) { - if (!(dlg.mark instanceof MarkLat) - || (dlg.mark.getCategory() != Cat.LAT_PREF_PORT)) + if (!(dlg.mark instanceof MarkLat) || (dlg.mark.getCategory() != Cat.LAT_PREF_PORT)) dlg.mark = new MarkLat(dlg); dlg.mark.setCategory(Cat.LAT_PREF_PORT); @@ -136,6 +133,5 @@ } if (prefStbdButton.isSelected()) { - if (!(dlg.mark instanceof MarkLat) - || (dlg.mark.getCategory() != Cat.LAT_PREF_STBD)) + if (!(dlg.mark instanceof MarkLat) || (dlg.mark.getCategory() != Cat.LAT_PREF_STBD)) dlg.mark = new MarkLat(dlg); dlg.mark.setCategory(Cat.LAT_PREF_STBD); @@ -188,9 +184,7 @@ private JRadioButton getPortButton() { if (portButton == null) { - portButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/PortButton.png"))); + portButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PortButton.png"))); portButton.setBounds(new Rectangle(0, 0, 52, 32)); - portButton.setBorder(BorderFactory.createLineBorder(Color.magenta, - 2)); + portButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); portButton.setToolTipText(Messages.getString("PortTip")); } @@ -200,9 +194,7 @@ private JRadioButton getStbdButton() { if (stbdButton == null) { - stbdButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/StbdButton.png"))); + stbdButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StbdButton.png"))); stbdButton.setBounds(new Rectangle(0, 32, 52, 32)); - stbdButton.setBorder(BorderFactory.createLineBorder(Color.magenta, - 2)); + stbdButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); stbdButton.setToolTipText(Messages.getString("StbdTip")); } @@ -212,9 +204,7 @@ private JRadioButton getPrefPortButton() { if (prefPortButton == null) { - prefPortButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PrefPortButton.png"))); + prefPortButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PrefPortButton.png"))); prefPortButton.setBounds(new Rectangle(0, 64, 52, 32)); - prefPortButton.setBorder(BorderFactory.createLineBorder( - Color.magenta, 2)); + prefPortButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); prefPortButton.setToolTipText(Messages.getString("PrefPortTip")); } @@ -224,9 +214,7 @@ private JRadioButton getPrefStbdButton() { if (prefStbdButton == null) { - prefStbdButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PrefStbdButton.png"))); + prefStbdButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PrefStbdButton.png"))); prefStbdButton.setBounds(new Rectangle(0, 96, 52, 32)); - prefStbdButton.setBorder(BorderFactory.createLineBorder( - Color.magenta, 2)); + prefStbdButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); prefStbdButton.setToolTipText(Messages.getString("PrefStbdTip")); } @@ -236,9 +224,7 @@ private JRadioButton getSafeWaterButton() { if (safeWaterButton == null) { - safeWaterButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/SafeWaterButton.png"))); + safeWaterButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SafeWaterButton.png"))); safeWaterButton.setBounds(new Rectangle(0, 128, 52, 32)); - safeWaterButton.setBorder(BorderFactory.createLineBorder( - Color.magenta, 2)); + safeWaterButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); safeWaterButton.setToolTipText(Messages.getString("SafeWaterTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java (revision 24839) @@ -91,8 +91,7 @@ private JRadioButton getOffButton() { if (offButton == null) { - offButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/OffButton.png"))); + offButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); offButton.setBounds(new Rectangle(0, 0, 34, 16)); - offButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + offButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); offButton.setToolTipText(tr("No colour")); } @@ -102,8 +101,7 @@ private JRadioButton getWhiteButton() { if (whiteButton == null) { - whiteButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/WhiteButton.png"))); + whiteButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WhiteButton.png"))); whiteButton.setBounds(new Rectangle(0, 16, 34, 16)); - whiteButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + whiteButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); whiteButton.setToolTipText(tr("White")); } @@ -113,8 +111,7 @@ private JRadioButton getRedButton() { if (redButton == null) { - redButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/RedButton.png"))); + redButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RedButton.png"))); redButton.setBounds(new Rectangle(0, 32, 34, 16)); - redButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + redButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); redButton.setToolTipText(tr("Red")); } @@ -124,8 +121,7 @@ private JRadioButton getOrangeButton() { if (orangeButton == null) { - orangeButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/OrangeButton.png"))); + orangeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OrangeButton.png"))); orangeButton.setBounds(new Rectangle(0, 48, 34, 16)); - orangeButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + orangeButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); orangeButton.setToolTipText(tr("Orange")); } @@ -135,8 +131,7 @@ private JRadioButton getAmberButton() { if (amberButton == null) { - amberButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/AmberButton.png"))); + amberButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/AmberButton.png"))); amberButton.setBounds(new Rectangle(0, 64, 34, 16)); - amberButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + amberButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); amberButton.setToolTipText(tr("Amber")); } @@ -146,8 +141,7 @@ private JRadioButton getYellowButton() { if (yellowButton == null) { - yellowButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/YellowButton.png"))); + yellowButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/YellowButton.png"))); yellowButton.setBounds(new Rectangle(0, 80, 34, 16)); - yellowButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + yellowButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); yellowButton.setToolTipText(tr("Yellow")); } @@ -157,8 +151,7 @@ private JRadioButton getGreenButton() { if (greenButton == null) { - greenButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/GreenButton.png"))); + greenButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/GreenButton.png"))); greenButton.setBounds(new Rectangle(0, 96, 34, 16)); - greenButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + greenButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); greenButton.setToolTipText(tr("Green")); } @@ -168,8 +161,7 @@ private JRadioButton getBlueButton() { if (blueButton == null) { - blueButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/BlueButton.png"))); + blueButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BlueButton.png"))); blueButton.setBounds(new Rectangle(0, 112, 34, 16)); - blueButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + blueButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); blueButton.setToolTipText(tr("Blue")); } @@ -179,8 +171,7 @@ private JRadioButton getVioletButton() { if (violetButton == null) { - violetButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/VioletButton.png"))); + violetButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/VioletButton.png"))); violetButton.setBounds(new Rectangle(0, 128, 34, 16)); - violetButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + violetButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); violetButton.setToolTipText(tr("Violet")); } @@ -190,8 +181,7 @@ private JRadioButton getBlackButton() { if (blackButton == null) { - blackButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BlackButton.png"))); + blackButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BlackButton.png"))); blackButton.setBounds(new Rectangle(0, 144, 34, 16)); - blackButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + blackButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); blackButton.setToolTipText(tr("Black")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java (revision 24839) @@ -32,5 +32,5 @@ public void clearSelections() { - + } 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 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 24839) @@ -110,5 +110,6 @@ isolButton.setBorderPainted(false); } - if (dlg.mark != null) dlg.mark.paintSign(); + if (dlg.mark != null) + dlg.mark.paintSign(); } }; @@ -133,30 +134,30 @@ public void actionPerformed(java.awt.event.ActionEvent e) { if (pillarButton.isSelected()) { - pillarButton.setBorderPainted(true); - dlg.mark.setShape(Shp.PILLAR); + pillarButton.setBorderPainted(true); + dlg.mark.setShape(Shp.PILLAR); } else { pillarButton.setBorderPainted(false); } if (sparButton.isSelected()) { - sparButton.setBorderPainted(true); - dlg.mark.setShape(Shp.SPAR); + sparButton.setBorderPainted(true); + dlg.mark.setShape(Shp.SPAR); } else { sparButton.setBorderPainted(false); } if (floatButton.isSelected()) { - floatButton.setBorderPainted(true); - dlg.mark.setShape(Shp.FLOAT); + floatButton.setBorderPainted(true); + dlg.mark.setShape(Shp.FLOAT); } else { floatButton.setBorderPainted(false); } if (beaconButton.isSelected()) { - beaconButton.setBorderPainted(true); - dlg.mark.setShape(Shp.BEACON); + beaconButton.setBorderPainted(true); + dlg.mark.setShape(Shp.BEACON); } else { beaconButton.setBorderPainted(false); } if (towerButton.isSelected()) { - towerButton.setBorderPainted(true); - dlg.mark.setShape(Shp.TOWER); + towerButton.setBorderPainted(true); + dlg.mark.setShape(Shp.TOWER); } else { towerButton.setBorderPainted(false); @@ -180,8 +181,7 @@ private JRadioButton getNothButton() { if (northButton == null) { - northButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/CardNButton.png"))); + northButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CardNButton.png"))); northButton.setBounds(new Rectangle(0, 0, 52, 32)); - northButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + northButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); northButton.setToolTipText(Messages.getString("NorthTip")); } @@ -191,8 +191,7 @@ private JRadioButton getSouthButton() { if (southButton == null) { - southButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/CardSButton.png"))); + southButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CardSButton.png"))); southButton.setBounds(new Rectangle(0, 32, 52, 32)); - southButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + southButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); southButton.setToolTipText(Messages.getString("SouthTip")); } @@ -202,8 +201,7 @@ private JRadioButton getEastButton() { if (eastButton == null) { - eastButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/CardEButton.png"))); + eastButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CardEButton.png"))); eastButton.setBounds(new Rectangle(0, 64, 52, 32)); - eastButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + eastButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); eastButton.setToolTipText(Messages.getString("EastTip")); } @@ -213,8 +211,7 @@ private JRadioButton getWestButton() { if (westButton == null) { - westButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/CardWButton.png"))); + westButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CardWButton.png"))); westButton.setBounds(new Rectangle(0, 96, 52, 32)); - westButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + westButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); westButton.setToolTipText(Messages.getString("WestTip")); } @@ -224,8 +221,7 @@ private JRadioButton getIsolButton() { if (isolButton == null) { - isolButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/IsolButton.png"))); + isolButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/IsolButton.png"))); isolButton.setBounds(new Rectangle(0, 128, 52, 32)); - isolButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + isolButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); isolButton.setToolTipText(Messages.getString("IsolTip")); } @@ -235,8 +231,7 @@ private JRadioButton getPillarButton() { if (pillarButton == null) { - pillarButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PillarButton.png"))); + pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); pillarButton.setBounds(new Rectangle(55, 0, 34, 32)); - pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); pillarButton.setToolTipText(Messages.getString("PillarTip")); } @@ -246,8 +241,7 @@ private JRadioButton getSparButton() { if (sparButton == null) { - sparButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/SparButton.png"))); + sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); sparButton.setBounds(new Rectangle(55, 32, 34, 32)); - sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sparButton.setToolTipText(Messages.getString("SparTip")); } @@ -257,8 +251,7 @@ private JRadioButton getFloatButton() { if (floatButton == null) { - floatButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/FloatButton.png"))); + floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); floatButton.setBounds(new Rectangle(55, 64, 34, 32)); - floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); floatButton.setToolTipText(Messages.getString("FloatTip")); } @@ -268,8 +261,7 @@ private JRadioButton getBeaconButton() { if (beaconButton == null) { - beaconButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BeaconButton.png"))); + beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); beaconButton.setBounds(new Rectangle(55, 96, 34, 32)); - beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); beaconButton.setToolTipText(Messages.getString("BeaconTip")); } @@ -279,8 +271,7 @@ private JRadioButton getTowerButton() { if (towerButton == null) { - towerButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/TowerButton.png"))); + towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); towerButton.setBounds(new Rectangle(55, 128, 34, 32)); - towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); towerButton.setToolTipText(Messages.getString("TowerTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 24839) @@ -54,5 +54,6 @@ vesselButton.setBorderPainted(vesselButton.isSelected()); floatButton.setBorderPainted(floatButton.isSelected()); - if (dlg.mark != null) dlg.mark.paintSign(); + if (dlg.mark != null) + dlg.mark.paintSign(); } }; @@ -65,13 +66,12 @@ public void clearSelections() { - + } private JRadioButton getHouseButton() { if (houseButton == null) { - houseButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/LighthouseButton.png"))); + houseButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LighthouseButton.png"))); houseButton.setBounds(new Rectangle(0, 0, 34, 32)); - houseButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + houseButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); houseButton.setToolTipText(Messages.getString("LighthouseTip")); } @@ -81,8 +81,7 @@ private JRadioButton getMajorButton() { if (majorButton == null) { - majorButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/LightMajorButton.png"))); + majorButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightMajorButton.png"))); majorButton.setBounds(new Rectangle(0, 32, 34, 32)); - majorButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + majorButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); majorButton.setToolTipText(Messages.getString("MajorLightTip")); } @@ -92,8 +91,7 @@ private JRadioButton getMinorButton() { if (minorButton == null) { - minorButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/LightMinorButton.png"))); + minorButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightMinorButton.png"))); minorButton.setBounds(new Rectangle(0, 64, 34, 32)); - minorButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + minorButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); minorButton.setToolTipText(Messages.getString("MinorLightTip")); } @@ -103,8 +101,7 @@ private JRadioButton getVesselButton() { if (vesselButton == null) { - vesselButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/LightVesselButton.png"))); + vesselButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightVesselButton.png"))); vesselButton.setBounds(new Rectangle(0, 96, 34, 32)); - vesselButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + vesselButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); vesselButton.setToolTipText(Messages.getString("LightVesselTip")); } @@ -114,8 +111,7 @@ private JRadioButton getFloatButton() { if (floatButton == null) { - floatButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/LightFloatButton.png"))); + floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightFloatButton.png"))); floatButton.setBounds(new Rectangle(0, 128, 34, 32)); - floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); floatButton.setToolTipText(Messages.getString("LightFloatTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 24839) @@ -37,5 +37,5 @@ public void clearSelections() { - + } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 24839) @@ -18,6 +18,11 @@ import oseam.Messages; import oseam.dialogs.OSeaMAction; +import oseam.seamarks.MarkLat; +import oseam.seamarks.MarkSaw; +import oseam.seamarks.MarkCard; +import oseam.seamarks.MarkIsol; import oseam.seamarks.MarkSpec; import oseam.seamarks.MarkLight; +import oseam.seamarks.SeaMark.Cat; public class PanelMain extends JPanel { @@ -120,9 +125,12 @@ alType = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (dlg.mark == null) { + if (dlg.node == null) { typeButtons.clearSelection(); - return; } if (chanButton.isSelected()) { + if (!((dlg.mark instanceof MarkLat) || (dlg.mark instanceof MarkSaw))) { + dlg.mark = null; + clearIcons(); + } chanButton.setBorderPainted(true); panelChan.setVisible(true); @@ -133,4 +141,8 @@ } if (hazButton.isSelected()) { + if (!((dlg.mark instanceof MarkCard) || (dlg.mark instanceof MarkIsol))) { + dlg.mark = null; + clearIcons(); + } hazButton.setBorderPainted(true); panelHaz.setVisible(true); @@ -141,6 +153,8 @@ } if (specButton.isSelected()) { - if (!(dlg.mark instanceof MarkSpec)) + if (!(dlg.mark instanceof MarkSpec)) { dlg.mark = new MarkSpec(dlg); + clearIcons(); + } specButton.setBorderPainted(true); panelSpec.setVisible(true); @@ -151,6 +165,8 @@ } if (lightsButton.isSelected()) { - if (!(dlg.mark instanceof MarkLight)) + if (!(dlg.mark instanceof MarkLight)) { dlg.mark = new MarkLight(dlg); + clearIcons(); + } lightsButton.setBorderPainted(true); panelLights.setVisible(true); @@ -235,10 +251,4 @@ miscButtons.clearSelection(); alMisc.actionPerformed(null); - shapeIcon.setIcon(null); - lightIcon.setIcon(null); - topIcon.setIcon(null); - reflIcon.setIcon(null); - radarIcon.setIcon(null); - fogIcon.setIcon(null); panelChan.clearSelections(); panelHaz.clearSelections(); @@ -249,13 +259,21 @@ panelRadar.clearSelections(); panelLit.clearSelections(); + clearIcons(); + } + + public void clearIcons() { + shapeIcon.setIcon(null); + lightIcon.setIcon(null); + topIcon.setIcon(null); + reflIcon.setIcon(null); + radarIcon.setIcon(null); + fogIcon.setIcon(null); } private JRadioButton getChanButton() { if (chanButton == null) { - chanButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/ChanButton.png"))); + chanButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ChanButton.png"))); chanButton.setBounds(new Rectangle(0, 0, 62, 40)); - chanButton.setBorder(BorderFactory.createLineBorder(Color.magenta, - 2)); + chanButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); chanButton.setToolTipText(Messages.getString("ChanTip")); } @@ -265,9 +283,7 @@ private JRadioButton getHazButton() { if (hazButton == null) { - hazButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/HazButton.png"))); + hazButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/HazButton.png"))); hazButton.setBounds(new Rectangle(0, 40, 62, 40)); - hazButton.setBorder(BorderFactory - .createLineBorder(Color.magenta, 2)); + hazButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); hazButton.setToolTipText(Messages.getString("HazTip")); } @@ -277,9 +293,7 @@ private JRadioButton getSpecButton() { if (specButton == null) { - specButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/SpecButton.png"))); + specButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SpecButton.png"))); specButton.setBounds(new Rectangle(0, 80, 62, 40)); - specButton.setBorder(BorderFactory.createLineBorder(Color.magenta, - 2)); + specButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); specButton.setToolTipText(Messages.getString("SpecTip")); } @@ -289,9 +303,7 @@ private JRadioButton getLightsButton() { if (lightsButton == null) { - lightsButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/LightsButton.png"))); + lightsButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightsButton.png"))); lightsButton.setBounds(new Rectangle(0, 120, 62, 40)); - lightsButton.setBorder(BorderFactory.createLineBorder( - Color.magenta, 2)); + lightsButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); lightsButton.setToolTipText(Messages.getString("LightsTip")); } @@ -301,9 +313,7 @@ private JRadioButton getTopButton() { if (topButton == null) { - topButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/TopButton.png"))); + topButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TopButton.png"))); topButton.setBounds(new Rectangle(0, 165, 34, 32)); - topButton.setBorder(BorderFactory - .createLineBorder(Color.magenta, 2)); + topButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); topButton.setToolTipText(Messages.getString("TopmarksTip")); } @@ -313,9 +323,7 @@ private JRadioButton getFogButton() { if (fogButton == null) { - fogButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/FogButton.png"))); + fogButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogButton.png"))); fogButton.setBounds(new Rectangle(0, 205, 34, 32)); - fogButton.setBorder(BorderFactory - .createLineBorder(Color.magenta, 2)); + fogButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); fogButton.setToolTipText(Messages.getString("FogSignalsTip")); } @@ -325,9 +333,7 @@ private JRadioButton getRadarButton() { if (radarButton == null) { - radarButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RadarButton.png"))); + radarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RadarButton.png"))); radarButton.setBounds(new Rectangle(0, 245, 34, 32)); - radarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, - 2)); + radarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); radarButton.setToolTipText(Messages.getString("RadarTip")); } @@ -337,9 +343,7 @@ private JRadioButton getLitButton() { if (litButton == null) { - litButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/LitButton.png"))); + litButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LitButton.png"))); litButton.setBounds(new Rectangle(0, 285, 34, 32)); - litButton.setBorder(BorderFactory - .createLineBorder(Color.magenta, 2)); + litButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); litButton.setToolTipText(Messages.getString("LitTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 24839) @@ -139,8 +139,7 @@ private JRadioButton getRegionAButton() { if (regionAButton == null) { - regionAButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RegionAButton.png"))); + regionAButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionAButton.png"))); regionAButton.setBounds(new Rectangle(0, 2, 34, 30)); - regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); regionAButton.setToolTipText(Messages.getString("RegionATip")); } @@ -150,8 +149,7 @@ private JRadioButton getRegionBButton() { if (regionBButton == null) { - regionBButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RegionBButton.png"))); + regionBButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionBButton.png"))); regionBButton.setBounds(new Rectangle(0, 32, 34, 30)); - regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); regionBButton.setToolTipText(Messages.getString("RegionBTip")); } @@ -161,8 +159,7 @@ private JRadioButton getPillarButton() { if (pillarButton == null) { - pillarButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PillarButton.png"))); + pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); pillarButton.setBounds(new Rectangle(0, 64, 34, 32)); - pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); pillarButton.setToolTipText(Messages.getString("PillarTip")); } @@ -172,8 +169,7 @@ private JRadioButton getSparButton() { if (sparButton == null) { - sparButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/SparButton.png"))); + sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); sparButton.setBounds(new Rectangle(0, 96, 34, 32)); - sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sparButton.setToolTipText(Messages.getString("SparTip")); } @@ -183,8 +179,7 @@ private JRadioButton getCanButton() { if (canButton == null) { - canButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/CanButton.png"))); + canButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CanButton.png"))); canButton.setBounds(new Rectangle(0, 128, 34, 32)); - canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); canButton.setToolTipText(Messages.getString("CanTip")); } @@ -194,8 +189,7 @@ private JRadioButton getFloatButton() { if (floatButton == null) { - floatButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/FloatButton.png"))); + floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); floatButton.setBounds(new Rectangle(35, 0, 34, 32)); - floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); floatButton.setToolTipText(Messages.getString("FloatTip")); } @@ -205,8 +199,7 @@ private JRadioButton getBeaconButton() { if (beaconButton == null) { - beaconButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BeaconButton.png"))); + beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); beaconButton.setBounds(new Rectangle(35, 32, 34, 32)); - beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); beaconButton.setToolTipText(Messages.getString("BeaconTip")); } @@ -216,8 +209,7 @@ private JRadioButton getTowerButton() { if (towerButton == null) { - towerButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/TowerButton.png"))); + towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); towerButton.setBounds(new Rectangle(35, 64, 34, 32)); - towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); towerButton.setToolTipText(Messages.getString("TowerTip")); } @@ -227,8 +219,7 @@ private JRadioButton getPerchButton() { if (perchButton == null) { - perchButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PerchPButton.png"))); + perchButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PerchPButton.png"))); perchButton.setBounds(new Rectangle(35, 96, 34, 32)); - perchButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + perchButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); perchButton.setToolTipText(Messages.getString("PerchTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java (revision 24839) @@ -128,8 +128,7 @@ private JRadioButton getRegionAButton() { if (regionAButton == null) { - regionAButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RegionAButton.png"))); + regionAButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionAButton.png"))); regionAButton.setBounds(new Rectangle(0, 2, 34, 30)); - regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); regionAButton.setToolTipText(Messages.getString("RegionATip")); } @@ -139,8 +138,7 @@ private JRadioButton getRegionBButton() { if (regionBButton == null) { - regionBButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RegionBButton.png"))); + regionBButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionBButton.png"))); regionBButton.setBounds(new Rectangle(0, 32, 34, 30)); - regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); regionBButton.setToolTipText(Messages.getString("RegionBTip")); } @@ -150,8 +148,7 @@ private JRadioButton getPillarButton() { if (pillarButton == null) { - pillarButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PillarButton.png"))); + pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); pillarButton.setBounds(new Rectangle(0, 64, 34, 32)); - pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); pillarButton.setToolTipText(Messages.getString("PillarTip")); } @@ -161,8 +158,7 @@ private JRadioButton getSparButton() { if (sparButton == null) { - sparButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/SparButton.png"))); + sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); sparButton.setBounds(new Rectangle(0, 96, 34, 32)); - sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sparButton.setToolTipText(Messages.getString("SparTip")); } @@ -172,8 +168,7 @@ private JRadioButton getCanButton() { if (canButton == null) { - canButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/CanButton.png"))); + canButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CanButton.png"))); canButton.setBounds(new Rectangle(0, 128, 34, 32)); - canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); canButton.setToolTipText(Messages.getString("CanTip")); } @@ -183,8 +178,7 @@ private JRadioButton getFloatButton() { if (floatButton == null) { - floatButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/FloatButton.png"))); + floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); floatButton.setBounds(new Rectangle(35, 0, 34, 32)); - floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); floatButton.setToolTipText(Messages.getString("FloatTip")); } @@ -194,8 +188,7 @@ private JRadioButton getBeaconButton() { if (beaconButton == null) { - beaconButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BeaconButton.png"))); + beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); beaconButton.setBounds(new Rectangle(35, 32, 34, 32)); - beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); beaconButton.setToolTipText(Messages.getString("BeaconTip")); } @@ -205,8 +198,7 @@ private JRadioButton getTowerButton() { if (towerButton == null) { - towerButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/TowerButton.png"))); + towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); towerButton.setBounds(new Rectangle(35, 64, 34, 32)); - towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); towerButton.setToolTipText(Messages.getString("TowerTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java (revision 24839) @@ -128,8 +128,7 @@ private JRadioButton getRegionAButton() { if (regionAButton == null) { - regionAButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RegionAButton.png"))); + regionAButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionAButton.png"))); regionAButton.setBounds(new Rectangle(0, 2, 34, 30)); - regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); regionAButton.setToolTipText(Messages.getString("RegionATip")); } @@ -139,8 +138,7 @@ private JRadioButton getRegionBButton() { if (regionBButton == null) { - regionBButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RegionBButton.png"))); + regionBButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionBButton.png"))); regionBButton.setBounds(new Rectangle(0, 32, 34, 30)); - regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); regionBButton.setToolTipText(Messages.getString("RegionBTip")); } @@ -150,8 +148,7 @@ private JRadioButton getPillarButton() { if (pillarButton == null) { - pillarButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PillarButton.png"))); + pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); pillarButton.setBounds(new Rectangle(0, 64, 34, 32)); - pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); pillarButton.setToolTipText(Messages.getString("PillarTip")); } @@ -161,8 +158,7 @@ private JRadioButton getSparButton() { if (sparButton == null) { - sparButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/SparButton.png"))); + sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); sparButton.setBounds(new Rectangle(0, 96, 34, 32)); - sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sparButton.setToolTipText(Messages.getString("SparTip")); } @@ -172,8 +168,7 @@ private JRadioButton getConeButton() { if (coneButton == null) { - coneButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/ConeButton.png"))); + coneButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ConeButton.png"))); coneButton.setBounds(new Rectangle(0, 128, 34, 32)); - coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); coneButton.setToolTipText(Messages.getString("ConeTip")); } @@ -183,8 +178,7 @@ private JRadioButton getFloatButton() { if (floatButton == null) { - floatButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/FloatButton.png"))); + floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); floatButton.setBounds(new Rectangle(35, 0, 34, 32)); - floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); floatButton.setToolTipText(Messages.getString("FloatTip")); } @@ -194,8 +188,7 @@ private JRadioButton getBeaconButton() { if (beaconButton == null) { - beaconButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BeaconButton.png"))); + beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); beaconButton.setBounds(new Rectangle(35, 32, 34, 32)); - beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); beaconButton.setToolTipText(Messages.getString("BeaconTip")); } @@ -205,8 +198,7 @@ private JRadioButton getTowerButton() { if (towerButton == null) { - towerButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/TowerButton.png"))); + towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); towerButton.setBounds(new Rectangle(35, 64, 34, 32)); - towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); towerButton.setToolTipText(Messages.getString("TowerTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java (revision 24839) @@ -32,5 +32,5 @@ public void clearSelections() { - + } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java (revision 24839) @@ -100,8 +100,7 @@ private JRadioButton getPillarButton() { if (pillarButton == null) { - pillarButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PillarButton.png"))); + pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); pillarButton.setBounds(new Rectangle(0, 0, 34, 32)); - pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); pillarButton.setToolTipText(Messages.getString("PillarTip")); } @@ -111,8 +110,7 @@ private JRadioButton getSparButton() { if (sparButton == null) { - sparButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/SparButton.png"))); + sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); sparButton.setBounds(new Rectangle(0, 32, 34, 32)); - sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sparButton.setToolTipText(Messages.getString("SparTip")); } @@ -122,8 +120,7 @@ private JRadioButton getSphereButton() { if (sphereButton == null) { - sphereButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/SphereButton.png"))); + sphereButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SphereButton.png"))); sphereButton.setBounds(new Rectangle(0, 64, 34, 32)); - sphereButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sphereButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sphereButton.setToolTipText(Messages.getString("SphereTip")); } @@ -133,8 +130,7 @@ private JRadioButton getBarrelButton() { if (barrelButton == null) { - barrelButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BarrelButton.png"))); + barrelButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BarrelButton.png"))); barrelButton.setBounds(new Rectangle(0, 96, 34, 32)); - barrelButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + barrelButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); barrelButton.setToolTipText(Messages.getString("BarrelTip")); } @@ -144,8 +140,7 @@ private JRadioButton getFloatButton() { if (floatButton == null) { - floatButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/FloatButton.png"))); + floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); floatButton.setBounds(new Rectangle(0, 128, 34, 32)); - floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); floatButton.setToolTipText(Messages.getString("FloatTip")); } 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 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 24839) @@ -81,5 +81,6 @@ beaconButton.setBorderPainted(beaconButton.isSelected()); towerButton.setBorderPainted(towerButton.isSelected()); - if (dlg.mark != null) dlg.mark.paintSign(); + if (dlg.mark != null) + dlg.mark.paintSign(); } }; @@ -98,13 +99,12 @@ public void clearSelections() { - + } private JRadioButton getPillarButton() { if (pillarButton == null) { - pillarButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PillarButton.png"))); + pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); pillarButton.setBounds(new Rectangle(55, 0, 34, 32)); - pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); pillarButton.setToolTipText(Messages.getString("PillarTip")); } @@ -114,8 +114,7 @@ private JRadioButton getSparButton() { if (sparButton == null) { - sparButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/SparButton.png"))); + sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); sparButton.setBounds(new Rectangle(55, 32, 34, 32)); - sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sparButton.setToolTipText(Messages.getString("SparTip")); } @@ -125,8 +124,7 @@ private JRadioButton getCanButton() { if (canButton == null) { - canButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/CanButton.png"))); + canButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CanButton.png"))); canButton.setBounds(new Rectangle(55, 64, 34, 32)); - canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); canButton.setToolTipText(Messages.getString("CanTip")); } @@ -136,8 +134,7 @@ private JRadioButton getConeButton() { if (coneButton == null) { - coneButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/ConeButton.png"))); + coneButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ConeButton.png"))); coneButton.setBounds(new Rectangle(55, 96, 34, 32)); - coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); coneButton.setToolTipText(Messages.getString("ConeTip")); } @@ -147,8 +144,7 @@ private JRadioButton getSphereButton() { if (sphereButton == null) { - sphereButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/SphereButton.png"))); + sphereButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SphereButton.png"))); sphereButton.setBounds(new Rectangle(55, 128, 34, 32)); - sphereButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sphereButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sphereButton.setToolTipText(Messages.getString("SphereTip")); } @@ -158,8 +154,7 @@ private JRadioButton getBarrelButton() { if (barrelButton == null) { - barrelButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BarrelButton.png"))); + barrelButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BarrelButton.png"))); barrelButton.setBounds(new Rectangle(90, 0, 34, 32)); - barrelButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + barrelButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); barrelButton.setToolTipText(Messages.getString("BarrelTip")); } @@ -169,8 +164,7 @@ private JRadioButton getSuperButton() { if (superButton == null) { - superButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/SuperButton.png"))); + superButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SuperButton.png"))); superButton.setBounds(new Rectangle(90, 32, 34, 32)); - superButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + superButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); superButton.setToolTipText(Messages.getString("SuperTip")); } @@ -180,8 +174,7 @@ private JRadioButton getFloatButton() { if (floatButton == null) { - floatButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/FloatButton.png"))); + floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); floatButton.setBounds(new Rectangle(90, 64, 34, 32)); - floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); floatButton.setToolTipText(Messages.getString("FloatTip")); } @@ -191,8 +184,7 @@ private JRadioButton getBeaconButton() { if (beaconButton == null) { - beaconButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BeaconButton.png"))); + beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); beaconButton.setBounds(new Rectangle(90, 96, 34, 32)); - beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); beaconButton.setToolTipText(Messages.getString("BeaconTip")); } @@ -202,8 +194,7 @@ private JRadioButton getTowerButton() { if (towerButton == null) { - towerButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/TowerButton.png"))); + towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); towerButton.setBounds(new Rectangle(90, 128, 34, 32)); - towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); towerButton.setToolTipText(Messages.getString("TowerTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 24839) @@ -138,8 +138,7 @@ private JRadioButton getRegionAButton() { if (regionAButton == null) { - regionAButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RegionAButton.png"))); + regionAButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionAButton.png"))); regionAButton.setBounds(new Rectangle(0, 2, 34, 30)); - regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); regionAButton.setToolTipText(Messages.getString("RegionATip")); } @@ -149,8 +148,7 @@ private JRadioButton getRegionBButton() { if (regionBButton == null) { - regionBButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/RegionBButton.png"))); + regionBButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionBButton.png"))); regionBButton.setBounds(new Rectangle(0, 32, 34, 30)); - regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); regionBButton.setToolTipText(Messages.getString("RegionBTip")); } @@ -160,8 +158,7 @@ private JRadioButton getPillarButton() { if (pillarButton == null) { - pillarButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PillarButton.png"))); + pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); pillarButton.setBounds(new Rectangle(0, 64, 34, 32)); - pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); pillarButton.setToolTipText(Messages.getString("PillarTip")); } @@ -171,8 +168,7 @@ private JRadioButton getSparButton() { if (sparButton == null) { - sparButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/SparButton.png"))); + sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); sparButton.setBounds(new Rectangle(0, 96, 34, 32)); - sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); sparButton.setToolTipText(Messages.getString("SparTip")); } @@ -182,8 +178,7 @@ private JRadioButton getConeButton() { if (coneButton == null) { - coneButton = new JRadioButton(new ImageIcon(getClass().getResource( - "/images/ConeButton.png"))); + coneButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ConeButton.png"))); coneButton.setBounds(new Rectangle(0, 128, 34, 32)); - coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); coneButton.setToolTipText(Messages.getString("ConeTip")); } @@ -193,8 +188,7 @@ private JRadioButton getFloatButton() { if (floatButton == null) { - floatButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/FloatButton.png"))); + floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); floatButton.setBounds(new Rectangle(35, 0, 34, 32)); - floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); floatButton.setToolTipText(Messages.getString("FloatTip")); } @@ -204,8 +198,7 @@ private JRadioButton getBeaconButton() { if (beaconButton == null) { - beaconButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BeaconButton.png"))); + beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); beaconButton.setBounds(new Rectangle(35, 32, 34, 32)); - beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); beaconButton.setToolTipText(Messages.getString("BeaconTip")); } @@ -215,8 +208,7 @@ private JRadioButton getTowerButton() { if (towerButton == null) { - towerButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/TowerButton.png"))); + towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); towerButton.setBounds(new Rectangle(35, 64, 34, 32)); - towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); towerButton.setToolTipText(Messages.getString("TowerTip")); } @@ -226,8 +218,7 @@ private JRadioButton getPerchButton() { if (perchButton == null) { - perchButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/PerchSButton.png"))); + perchButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PerchSButton.png"))); perchButton.setBounds(new Rectangle(35, 96, 34, 32)); - perchButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + perchButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); perchButton.setToolTipText(Messages.getString("PerchTip")); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 24839) @@ -132,8 +132,7 @@ private JRadioButton getNoTopButton() { if (noTopButton == null) { - noTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/NoTopButton.png"))); + noTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/NoTopButton.png"))); noTopButton.setBounds(new Rectangle(40, 5, 27, 27)); - noTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + noTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); noTopButton.setToolTipText(Messages.getString("NoTopTip")); } @@ -143,8 +142,7 @@ private JRadioButton getCanTopButton() { if (canTopButton == null) { - canTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/CanTopButton.png"))); + canTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CanTopButton.png"))); canTopButton.setBounds(new Rectangle(70, 5, 27, 27)); - canTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + canTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); canTopButton.setToolTipText(Messages.getString("CanTopTip")); } @@ -154,6 +152,5 @@ private JRadioButton getConeTopButton() { if (coneTopButton == null) { - coneTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/ConeTopButton.png"))); + coneTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ConeTopButton.png"))); coneTopButton.setBounds(new Rectangle(100, 5, 27, 27)); coneTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -165,6 +162,5 @@ private JRadioButton getSphereTopButton() { if (sphereTopButton == null) { - sphereTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/SphereTopButton.png"))); + sphereTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SphereTopButton.png"))); sphereTopButton.setBounds(new Rectangle(130, 5, 27, 27)); sphereTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -176,6 +172,5 @@ private JRadioButton getXTopButton() { if (XTopButton == null) { - XTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/XTopButton.png"))); + XTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/XTopButton.png"))); XTopButton.setBounds(new Rectangle(160, 5, 27, 27)); XTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -187,8 +182,7 @@ private JRadioButton getNorthTopButton() { if (northTopButton == null) { - northTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/NorthTopButton.png"))); + northTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/NorthTopButton.png"))); northTopButton.setBounds(new Rectangle(40, 35, 27, 27)); - northTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + northTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); northTopButton.setToolTipText(Messages.getString("NorthTopTip")); } @@ -198,8 +192,7 @@ private JRadioButton getSouthTopButton() { if (southTopButton == null) { - southTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/SouthTopButton.png"))); + southTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SouthTopButton.png"))); southTopButton.setBounds(new Rectangle(70, 35, 27, 27)); - southTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + southTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); southTopButton.setToolTipText(Messages.getString("SouthTopTip")); } @@ -209,6 +202,5 @@ private JRadioButton getEastTopButton() { if (eastTopButton == null) { - eastTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/EastTopButton.png"))); + eastTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/EastTopButton.png"))); eastTopButton.setBounds(new Rectangle(100, 35, 27, 27)); eastTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -220,6 +212,5 @@ private JRadioButton getWestTopButton() { if (westTopButton == null) { - westTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/WestTopButton.png"))); + westTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WestTopButton.png"))); westTopButton.setBounds(new Rectangle(130, 35, 27, 27)); westTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -231,6 +222,5 @@ private JRadioButton getSpheres2TopButton() { if (spheres2TopButton == null) { - spheres2TopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/Spheres2TopButton.png"))); + spheres2TopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/Spheres2TopButton.png"))); spheres2TopButton.setBounds(new Rectangle(160, 35, 27, 27)); spheres2TopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -242,6 +232,5 @@ private JRadioButton getBoardDayButton() { if (boardDayButton == null) { - boardDayButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/BoardDayButton.png"))); + boardDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BoardDayButton.png"))); boardDayButton.setBounds(new Rectangle(40, 65, 27, 27)); boardDayButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -253,6 +242,5 @@ private JRadioButton getDiamondDayButton() { if (diamondDayButton == null) { - diamondDayButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/DiamondDayButton.png"))); + diamondDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/DiamondDayButton.png"))); diamondDayButton.setBounds(new Rectangle(70, 65, 27, 27)); diamondDayButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -264,6 +252,5 @@ private JRadioButton getTriangleDayButton() { if (triangleDayButton == null) { - triangleDayButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/TriangleDayButton.png"))); + triangleDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TriangleDayButton.png"))); triangleDayButton.setBounds(new Rectangle(100, 65, 27, 27)); triangleDayButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -275,6 +262,5 @@ private JRadioButton getTriangleInvDayButton() { if (triangleInvDayButton == null) { - triangleInvDayButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/TriangleInvDayButton.png"))); + triangleInvDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TriangleInvDayButton.png"))); triangleInvDayButton.setBounds(new Rectangle(130, 65, 27, 27)); triangleInvDayButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -286,6 +272,5 @@ private JRadioButton getSquareDayButton() { if (squareDayButton == null) { - squareDayButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/SquareDayButton.png"))); + squareDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SquareDayButton.png"))); squareDayButton.setBounds(new Rectangle(160, 65, 27, 27)); squareDayButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); @@ -297,6 +282,5 @@ private JRadioButton getMooringTopButton() { if (mooringTopButton == null) { - mooringTopButton = new JRadioButton(new ImageIcon(getClass() - .getResource("/images/MooringTopButton.png"))); + mooringTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/MooringTopButton.png"))); mooringTopButton.setBounds(new Rectangle(40, 95, 27, 27)); mooringTopButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkCard.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkCard.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkCard.java (revision 24839) @@ -15,5 +15,5 @@ super(dia); } - + public void parseMark() { String str; @@ -81,12 +81,11 @@ } } else if (keys.containsKey("seamark:beacon_cardinal:shape")) { - str = keys.get("seamark:beacon_cardinal:shape"); - if (str.equals("tower")) { - dlg.panelMain.panelHaz.towerButton.doClick(); - } else { - dlg.panelMain.panelHaz.beaconButton.doClick(); - } - } else if (keys.containsKey("seamark:type") - && (keys.get("seamark:type").equals("light_float"))) { + str = keys.get("seamark:beacon_cardinal:shape"); + if (str.equals("tower")) { + dlg.panelMain.panelHaz.towerButton.doClick(); + } else { + dlg.panelMain.panelHaz.beaconButton.doClick(); + } + } else if (keys.containsKey("seamark:type") && (keys.get("seamark:type").equals("light_float"))) { dlg.panelMain.panelHaz.floatButton.doClick(); } @@ -106,53 +105,47 @@ public void paintSign() { - /* - if (dlg.paintlock) return; super.paintSign(); - */ - if ((getCategory() != Cat.UNKNOWN) && (getShape() != Shp.UNKNOWN)) { - String image = "/images/Cardinal"; - switch (getShape()) { - case PILLAR: - image += "_Pillar"; - break; - case SPAR: - image += "_Spar"; - break; - case BEACON: - image += "_Beacon"; - break; - case TOWER: - image += "_Tower"; - break; - case FLOAT: - image += "_Float"; - break; - default: - return; - } - - switch (getCategory()) { - case CARD_NORTH: - image += "_North"; - break; - case CARD_EAST: - image += "_East"; - break; - case CARD_SOUTH: - image += "_South"; - break; - case CARD_WEST: - image += "_West"; - break; - default: - return; - } - - if (!image.equals("/images/Cardinal")) { - image += ".png"; - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass() - .getResource(image))); - } else - dlg.panelMain.shapeIcon.setIcon(null); - } + String image = "/images/Cardinal"; + switch (getShape()) { + case PILLAR: + image += "_Pillar"; + break; + case SPAR: + image += "_Spar"; + break; + case BEACON: + image += "_Beacon"; + break; + case TOWER: + image += "_Tower"; + break; + case FLOAT: + image += "_Float"; + break; + default: + dlg.panelMain.shapeIcon.setIcon(null); + return; + } + + switch (getCategory()) { + case CARD_NORTH: + image += "_North"; + break; + case CARD_EAST: + image += "_East"; + break; + case CARD_SOUTH: + image += "_South"; + break; + case CARD_WEST: + image += "_West"; + break; + default: + dlg.panelMain.shapeIcon.setIcon(null); + return; + } + + image += ".png"; + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(image))); + super.paintSign(); } @@ -166,11 +159,9 @@ case PILLAR: super.saveSign("buoy_cardinal"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:shape", "pillar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:shape", "pillar")); break; case SPAR: super.saveSign("buoy_cardinal"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:shape", "spar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:shape", "spar")); break; case BEACON: @@ -179,6 +170,5 @@ case TOWER: super.saveSign("beacon_cardinal"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:shape", "tower")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:shape", "tower")); break; case FLOAT: @@ -193,114 +183,83 @@ switch (getCategory()) { case CARD_NORTH: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:category", "north")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:colour", "black;yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:category", "north")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:colour", "black;yellow")); shape = "2 cones up"; break; case CARD_EAST: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:category", "east")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:colour", "black;yellow;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:category", "east")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:colour", "black;yellow;black")); shape = "2 cones base together"; break; case CARD_SOUTH: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:category", "south")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:colour", "yellow;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:category", "south")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:colour", "yellow;black")); shape = "2 cones down"; break; case CARD_WEST: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:category", "west")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:colour", "yellow;black;yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:category", "west")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:colour", "yellow;black;yellow")); shape = "2 cones point together"; break; } - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_cardinal:colour_pattern", - "horizontal stripes")); - break; - + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_cardinal:colour_pattern", "horizontal stripes")); + break; + case BEACON: case TOWER: switch (getCategory()) { case CARD_NORTH: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:category", "north")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:colour", "black;yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:category", "north")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:colour", "black;yellow")); shape = "2 cones up"; break; case CARD_EAST: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:category", "east")); - Main.main.undoRedo - .add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:colour", - "black;yellow;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:category", "east")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:colour", "black;yellow;black")); shape = "2 cones base together"; break; case CARD_SOUTH: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:category", "south")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:colour", "yellow;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:category", "south")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:colour", "yellow;black")); shape = "2 cones down"; break; case CARD_WEST: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:category", "west")); - Main.main.undoRedo - .add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:colour", - "yellow;black;yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:category", "west")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:colour", "yellow;black;yellow")); shape = "2 cones point together"; break; } - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_cardinal:colour_pattern", - "horizontal stripes")); - break; - + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_cardinal:colour_pattern", "horizontal stripes")); + break; + case FLOAT: switch (getCategory()) { case CARD_NORTH: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "black;yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "black;yellow")); shape = "2 cones up"; break; case CARD_EAST: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "black;yellow;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "black;yellow;black")); shape = "2 cones base together"; break; case CARD_SOUTH: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "yellow;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "yellow;black")); shape = "2 cones down"; break; case CARD_WEST: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "yellow;black;yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "yellow;black;yellow")); shape = "2 cones point together"; break; } - Main.main.undoRedo - .add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour_pattern", - "horizontal stripes")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour_pattern", "horizontal stripes")); break; } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkIsol.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkIsol.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkIsol.java (revision 24839) @@ -15,5 +15,5 @@ super(dia); } - + public void parseMark() { @@ -50,12 +50,11 @@ } } else if (keys.containsKey("seamark:beacon_isolated_danger:shape")) { - str = keys.get("seamark:beacon_isolated_danger:shape"); - if (str.equals("tower")) { - dlg.panelMain.panelHaz.towerButton.doClick(); - } else { - dlg.panelMain.panelHaz.beaconButton.doClick(); - } - } else if (keys.containsKey("seamark:type") - && (keys.get("seamark:type").equals("light_float"))) { + str = keys.get("seamark:beacon_isolated_danger:shape"); + if (str.equals("tower")) { + dlg.panelMain.panelHaz.towerButton.doClick(); + } else { + dlg.panelMain.panelHaz.beaconButton.doClick(); + } + } else if (keys.containsKey("seamark:type") && (keys.get("seamark:type").equals("light_float"))) { dlg.panelMain.panelHaz.floatButton.doClick(); } @@ -64,7 +63,7 @@ parseFogRadar(keys); -// dlg.cbM01StyleOfMark.setSelectedIndex(getStyleIndex()); -// dlg.tfM01Name.setText(getName()); -// dlg.cM01TopMark.setSelected(hasTopMark()); + // dlg.cbM01StyleOfMark.setSelectedIndex(getStyleIndex()); + // dlg.tfM01Name.setText(getName()); + // dlg.cM01TopMark.setSelected(hasTopMark()); } @@ -74,9 +73,9 @@ public void paintSign() { -/* if (dlg.paintlock) - return; - - super.paintSign(); -*/ + /* + * if (dlg.paintlock) return; + * + * super.paintSign(); + */ if ((getCategory() != Cat.UNKNOWN) && (getShape() != Shp.UNKNOWN)) { @@ -104,6 +103,5 @@ if (!image.equals("/images/Cardinal")) { image += ".png"; - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass() - .getResource(image))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(image))); } else dlg.panelMain.shapeIcon.setIcon(null); @@ -120,11 +118,9 @@ case PILLAR: super.saveSign("buoy_isolated_danger"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_isolated_danger:shape", "pillar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_isolated_danger:shape", "pillar")); break; case SPAR: super.saveSign("buoy_isolated_danger"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_isolated_danger:shape", "spar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_isolated_danger:shape", "spar")); break; case BEACON: @@ -133,6 +129,5 @@ case TOWER: super.saveSign("beacon_isolated_danger"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_isolated_danger:shape", "tower")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_isolated_danger:shape", "tower")); break; case FLOAT: @@ -145,22 +140,17 @@ case PILLAR: case SPAR: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_isolated_danger:colour_pattern", "horizontal stripes")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_isolated_danger:colour", "black;red;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_isolated_danger:colour_pattern", + "horizontal stripes")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_isolated_danger:colour", "black;red;black")); break; case BEACON: case TOWER: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_isolated_danger:colour_pattern", + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_isolated_danger:colour_pattern", "horizontal stripes")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_isolated_danger:colour", "black;red;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_isolated_danger:colour", "black;red;black")); break; case FLOAT: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour_pattern", "horizontal stripes")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "black;red;black")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour_pattern", "horizontal stripes")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "black;red;black")); break; } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkLat.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkLat.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkLat.java (revision 24839) @@ -14,5 +14,5 @@ super(dia); } - + public void parseMark() { @@ -56,12 +56,13 @@ if (keys.containsKey("seamark:topmark:shape")) { top = keys.get("seamark:topmark:shape"); -// setTopMark(true); + // setTopMark(true); } if (keys.containsKey("seamark:topmark:colour")) { - if (col.isEmpty()) col = keys.get("seamark:topmark:colour"); -// setTopMark(true); + if (col.isEmpty()) + col = keys.get("seamark:topmark:colour"); + // setTopMark(true); } } - + if (col.isEmpty()) { if (keys.containsKey("seamark:light:colour")) @@ -70,190 +71,86 @@ /* - if (cat.isEmpty()) { - if (col.equals("red")) { - setColour(RED); - if (top.equals("cylinder")) { - setBuoyIndex(PORT_HAND); - setRegion(IALA_A); - } else if (top.equals("cone, point up")) { - setBuoyIndex(STARBOARD_HAND); - setRegion(IALA_B); - } else { - if (getRegion() == IALA_A) - setBuoyIndex(PORT_HAND); - else - setBuoyIndex(STARBOARD_HAND); - } - } else if (col.equals("green")) { - setColour(GREEN); - if (top.equals("cone, point up")) { - setBuoyIndex(STARBOARD_HAND); - setRegion(IALA_A); - } else if (top.equals("cylinder")) { - setBuoyIndex(PORT_HAND); - setRegion(IALA_B); - } else { - if (getRegion() == IALA_A) - setBuoyIndex(STARBOARD_HAND); - else - setBuoyIndex(PORT_HAND); - } - } else if (col.equals("red;green;red")) { - setColour(RED_GREEN_RED); - if (top.equals("cylinder")) { - setBuoyIndex(PREF_PORT_HAND); - setRegion(IALA_A); - } else if (top.equals("cone, point up")) { - setBuoyIndex(PREF_STARBOARD_HAND); - setRegion(IALA_B); - } else { - if (getRegion() == IALA_A) - setBuoyIndex(PREF_PORT_HAND); - else - setBuoyIndex(PREF_STARBOARD_HAND); - } - } else if (col.equals("green;red;green")) { - setColour(GREEN_RED_GREEN); - if (top.equals("cone, point up")) { - setBuoyIndex(PREF_STARBOARD_HAND); - setRegion(IALA_A); - } else if (top.equals("cylinder")) { - setBuoyIndex(PREF_PORT_HAND); - setRegion(IALA_B); - } else { - if (getRegion() == IALA_A) - setBuoyIndex(PREF_STARBOARD_HAND); - else - setBuoyIndex(PREF_PORT_HAND); - } - } - } else if (cat.equals("port")) { - - setBuoyIndex(PORT_HAND); - - if (col.equals("red")) { - setRegion(IALA_A); - setColour(RED); - } else if (col.equals("green")) { - setRegion(IALA_B); - setColour(GREEN); - } else { - if (getRegion() == IALA_A) - setColour(RED); - else - setColour(GREEN); - } - } else if (cat.equals("starboard")) { - - setBuoyIndex(STARBOARD_HAND); - - if (col.equals("green")) { - setRegion(IALA_A); - setColour(GREEN); - } else if (col.equals("red")) { - setRegion(IALA_B); - setColour(RED); - } else { - if (getRegion() == IALA_A) - setColour(GREEN); - else - setColour(RED); - } - } else if (cat.equals("preferred_channel_port")) { - - setBuoyIndex(PREF_PORT_HAND); - - if (col.equals("red;green;red")) { - setRegion(IALA_A); - setColour(RED_GREEN_RED); - } else if (col.equals("green;red;green")) { - setRegion(IALA_B); - setColour(GREEN_RED_GREEN); - } else { - if (getRegion() == IALA_A) - setColour(RED_GREEN_RED); - else - setColour(GREEN_RED_GREEN); - } - - } else if (cat.equals("preferred_channel_starboard")) { - - setBuoyIndex(PREF_STARBOARD_HAND); - - if (col.equals("green;red;green")) { - setRegion(IALA_A); - setColour(GREEN_RED_GREEN); - } else if (col.equals("red;green;red")) { - setRegion(IALA_B); - setColour(RED_GREEN_RED); - } else { - if (getRegion() == IALA_A) - setColour(GREEN_RED_GREEN); - else - setColour(RED_GREEN_RED); - } - } - - if (keys.containsKey("seamark:buoy_lateral:shape")) { - str = keys.get("seamark:buoy_lateral:shape"); - - switch (getBuoyIndex()) { - case PORT_HAND: - if (str.equals("can")) - setStyleIndex(CAN); - else if (str.equals("pillar")) - setStyleIndex(PILLAR); - else if (str.equals("spar")) - setStyleIndex(SPAR); - break; - - case PREF_PORT_HAND: - if (str.equals("can")) - setStyleIndex(CAN); - else if (str.equals("pillar")) - setStyleIndex(PILLAR); - else if (str.equals("spar")) - setStyleIndex(SPAR); - break; - - case STARBOARD_HAND: - if (str.equals("conical")) - setStyleIndex(CONE); - else if (str.equals("pillar")) - setStyleIndex(PILLAR); - else if (str.equals("spar")) - setStyleIndex(SPAR); - break; - - case PREF_STARBOARD_HAND: - if (str.equals("conical")) - setStyleIndex(CONE); - else if (str.equals("pillar")) - setStyleIndex(PILLAR); - else if (str.equals("spar")) - setStyleIndex(SPAR); - break; - } - } else if (keys.containsKey("seamark:beacon_lateral:shape")) { - str = keys.get("seamark:beacon_lateral:shape"); - if (str.equals("tower")) - setStyleIndex(TOWER); - else if (str.equals("perch")) - setStyleIndex(PERCH); - else - setStyleIndex(BEACON); - } else if (keys.containsKey("seamark:type") - && (keys.get("seamark:type").equals("beacon_lateral"))) { - setStyleIndex(BEACON); - } else if (keys.containsKey("seamark:type") - && (keys.get("seamark:type").equals("light_float"))) { - setStyleIndex(FLOAT); - } - - parseLights(keys); - parseFogRadar(keys); - setLightColour(); - -*/ } + * if (cat.isEmpty()) { if (col.equals("red")) { setColour(RED); if + * (top.equals("cylinder")) { setBuoyIndex(PORT_HAND); setRegion(IALA_A); } + * else if (top.equals("cone, point up")) { setBuoyIndex(STARBOARD_HAND); + * setRegion(IALA_B); } else { if (getRegion() == IALA_A) + * setBuoyIndex(PORT_HAND); else setBuoyIndex(STARBOARD_HAND); } } else if + * (col.equals("green")) { setColour(GREEN); if + * (top.equals("cone, point up")) { setBuoyIndex(STARBOARD_HAND); + * setRegion(IALA_A); } else if (top.equals("cylinder")) { + * setBuoyIndex(PORT_HAND); setRegion(IALA_B); } else { if (getRegion() == + * IALA_A) setBuoyIndex(STARBOARD_HAND); else setBuoyIndex(PORT_HAND); } } + * else if (col.equals("red;green;red")) { setColour(RED_GREEN_RED); if + * (top.equals("cylinder")) { setBuoyIndex(PREF_PORT_HAND); + * setRegion(IALA_A); } else if (top.equals("cone, point up")) { + * setBuoyIndex(PREF_STARBOARD_HAND); setRegion(IALA_B); } else { if + * (getRegion() == IALA_A) setBuoyIndex(PREF_PORT_HAND); else + * setBuoyIndex(PREF_STARBOARD_HAND); } } else if + * (col.equals("green;red;green")) { setColour(GREEN_RED_GREEN); if + * (top.equals("cone, point up")) { setBuoyIndex(PREF_STARBOARD_HAND); + * setRegion(IALA_A); } else if (top.equals("cylinder")) { + * setBuoyIndex(PREF_PORT_HAND); setRegion(IALA_B); } else { if (getRegion() + * == IALA_A) setBuoyIndex(PREF_STARBOARD_HAND); else + * setBuoyIndex(PREF_PORT_HAND); } } } else if (cat.equals("port")) { + * + * setBuoyIndex(PORT_HAND); + * + * if (col.equals("red")) { setRegion(IALA_A); setColour(RED); } else if + * (col.equals("green")) { setRegion(IALA_B); setColour(GREEN); } else { if + * (getRegion() == IALA_A) setColour(RED); else setColour(GREEN); } } else + * if (cat.equals("starboard")) { + * + * setBuoyIndex(STARBOARD_HAND); + * + * if (col.equals("green")) { setRegion(IALA_A); setColour(GREEN); } else if + * (col.equals("red")) { setRegion(IALA_B); setColour(RED); } else { if + * (getRegion() == IALA_A) setColour(GREEN); else setColour(RED); } } else + * if (cat.equals("preferred_channel_port")) { + * + * setBuoyIndex(PREF_PORT_HAND); + * + * if (col.equals("red;green;red")) { setRegion(IALA_A); + * setColour(RED_GREEN_RED); } else if (col.equals("green;red;green")) { + * setRegion(IALA_B); setColour(GREEN_RED_GREEN); } else { if (getRegion() + * == IALA_A) setColour(RED_GREEN_RED); else setColour(GREEN_RED_GREEN); } + * + * } else if (cat.equals("preferred_channel_starboard")) { + * + * setBuoyIndex(PREF_STARBOARD_HAND); + * + * if (col.equals("green;red;green")) { setRegion(IALA_A); + * setColour(GREEN_RED_GREEN); } else if (col.equals("red;green;red")) { + * setRegion(IALA_B); setColour(RED_GREEN_RED); } else { if (getRegion() == + * IALA_A) setColour(GREEN_RED_GREEN); else setColour(RED_GREEN_RED); } } + * + * if (keys.containsKey("seamark:buoy_lateral:shape")) { str = + * keys.get("seamark:buoy_lateral:shape"); + * + * switch (getBuoyIndex()) { case PORT_HAND: if (str.equals("can")) + * setStyleIndex(CAN); else if (str.equals("pillar")) setStyleIndex(PILLAR); + * else if (str.equals("spar")) setStyleIndex(SPAR); break; + * + * case PREF_PORT_HAND: if (str.equals("can")) setStyleIndex(CAN); else if + * (str.equals("pillar")) setStyleIndex(PILLAR); else if + * (str.equals("spar")) setStyleIndex(SPAR); break; + * + * case STARBOARD_HAND: if (str.equals("conical")) setStyleIndex(CONE); else + * if (str.equals("pillar")) setStyleIndex(PILLAR); else if + * (str.equals("spar")) setStyleIndex(SPAR); break; + * + * case PREF_STARBOARD_HAND: if (str.equals("conical")) setStyleIndex(CONE); + * else if (str.equals("pillar")) setStyleIndex(PILLAR); else if + * (str.equals("spar")) setStyleIndex(SPAR); break; } } else if + * (keys.containsKey("seamark:beacon_lateral:shape")) { str = + * keys.get("seamark:beacon_lateral:shape"); if (str.equals("tower")) + * setStyleIndex(TOWER); else if (str.equals("perch")) setStyleIndex(PERCH); + * else setStyleIndex(BEACON); } else if (keys.containsKey("seamark:type") + * && (keys.get("seamark:type").equals("beacon_lateral"))) { + * setStyleIndex(BEACON); } else if (keys.containsKey("seamark:type") && + * (keys.get("seamark:type").equals("light_float"))) { setStyleIndex(FLOAT); + * } + * + * parseLights(keys); parseFogRadar(keys); setLightColour(); + */} public void setLightColour() { @@ -272,8 +169,7 @@ public void paintSign() { -/* if (dlg.paintlock) - return; - super.paintSign(); -*/ + /* + * if (dlg.paintlock) return; super.paintSign(); + */ boolean region = getRegion(); Shp style = getShape(); @@ -488,6 +384,5 @@ image += ".png"; - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass() - .getResource(image))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(image))); if (hasTopMark()) { @@ -571,6 +466,5 @@ } if (!image.isEmpty()) - dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass() - .getResource(image))); + dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource(image))); } } else @@ -594,16 +488,13 @@ case CAN: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "can")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "can")); break; case PILLAR: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "pillar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "pillar")); break; case SPAR: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "spar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "spar")); break; case BEACON: @@ -612,6 +503,5 @@ case TOWER: super.saveSign("beacon_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:shape", "tower")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:shape", "tower")); break; case FLOAT: @@ -620,6 +510,5 @@ case PERCH: super.saveSign("beacon_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:shape", "perch")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:shape", "perch")); break; default: @@ -629,31 +518,24 @@ case PILLAR: case SPAR: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:category", "port")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour", "red")); - colour = "red"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour", "green")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:category", "port")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour", "red")); + colour = "red"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour", "green")); colour = "green"; } break; case PERCH: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:category", "port")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:category", "port")); break; case BEACON: case TOWER: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:category", "port")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour", "red")); - colour = "red"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour", "green")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:category", "port")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour", "red")); + colour = "red"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour", "green")); colour = "green"; } @@ -661,10 +543,8 @@ case FLOAT: if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "red")); - colour = "red"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "green")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "red")); + colour = "red"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "green")); colour = "green"; } @@ -678,16 +558,13 @@ case CAN: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "can")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "can")); break; case PILLAR: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "pillar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "pillar")); break; case SPAR: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "spar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "spar")); break; case BEACON: @@ -696,6 +573,5 @@ case TOWER: super.saveSign("beacon_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:shape", "tower")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:shape", "tower")); break; case FLOAT: @@ -708,15 +584,11 @@ case PILLAR: case SPAR: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:category", "preferred_channel_port")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour_pattern", "horizontal stripes")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour", "red;green;red")); - colour = "red"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour", "green;red;green")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:category", "preferred_channel_port")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour_pattern", "horizontal stripes")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour", "red;green;red")); + colour = "red"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour", "green;red;green")); colour = "green"; } @@ -724,28 +596,21 @@ case BEACON: case TOWER: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:category", "preferred_channel_port")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour_pattern", "horizontal stripes")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour", "red;green;red")); - colour = "red"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour", "green;red;green")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:category", "preferred_channel_port")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour_pattern", "horizontal stripes")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour", "red;green;red")); + colour = "red"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour", "green;red;green")); colour = "green"; } break; case FLOAT: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour_pattern", "horizontal stripes")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "red;green;red")); - colour = "red"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "green;red;green")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour_pattern", "horizontal stripes")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "red;green;red")); + colour = "red"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "green;red;green")); colour = "green"; } @@ -759,26 +624,21 @@ case CONE: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "conical")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "conical")); break; case PILLAR: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "pillar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "pillar")); break; case SPAR: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "spar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "spar")); break; case BEACON: super.saveSign("beacon_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:shape", "stake")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:shape", "stake")); break; case TOWER: super.saveSign("beacon_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:shape", "tower")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:shape", "tower")); break; case FLOAT: @@ -787,6 +647,5 @@ case PERCH: super.saveSign("beacon_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:shape", "perch")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:shape", "perch")); break; default: @@ -796,13 +655,10 @@ case PILLAR: case SPAR: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:category", "starboard")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour", "green")); - colour = "green"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour", "red")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:category", "starboard")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour", "green")); + colour = "green"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour", "red")); colour = "red"; } @@ -810,13 +666,10 @@ case BEACON: case TOWER: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:category", "starboard")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour", "green")); - colour = "green"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour", "red")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:category", "starboard")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour", "green")); + colour = "green"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour", "red")); colour = "red"; } @@ -824,16 +677,13 @@ case FLOAT: if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "green")); - colour = "green"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "red")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "green")); + colour = "green"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "red")); colour = "red"; } break; case PERCH: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:category", "starboard")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:category", "starboard")); break; } @@ -845,26 +695,21 @@ case CONE: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "conical")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "conical")); break; case PILLAR: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "pillar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "pillar")); break; case SPAR: super.saveSign("buoy_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:shape", "spar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:shape", "spar")); break; case BEACON: super.saveSign("beacon_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:shape", "stake")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:shape", "stake")); break; case TOWER: super.saveSign("beacon_lateral"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:shape", "tower")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:shape", "tower")); break; case FLOAT: @@ -877,15 +722,11 @@ case PILLAR: case SPAR: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:category", "preferred_channel_starboard")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour_pattern", "horizontal stripes")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour", "green;red;green")); - colour = "green"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_lateral:colour", "red;green;red")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:category", "preferred_channel_starboard")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour_pattern", "horizontal stripes")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour", "green;red;green")); + colour = "green"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_lateral:colour", "red;green;red")); colour = "red"; } @@ -893,28 +734,22 @@ case BEACON: case TOWER: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:category", "preferred_channel_starboard")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour_pattern", "horizontal stripes")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour", "green;red;green")); - colour = "green"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_lateral:colour", "red;green;red")); + Main.main.undoRedo + .add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:category", "preferred_channel_starboard")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour_pattern", "horizontal stripes")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour", "green;red;green")); + colour = "green"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_lateral:colour", "red;green;red")); colour = "red"; } break; case FLOAT: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour_pattern", "horizontal stripes")); - if (getRegion() == IALA_A) { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "green;red;green")); - colour = "green"; - } else { - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "red;green;red")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour_pattern", "horizontal stripes")); + if (getRegion() == IALA_A) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "green;red;green")); + colour = "green"; + } else { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "red;green;red")); colour = "red"; } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkLight.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkLight.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkLight.java (revision 24839) @@ -12,5 +12,5 @@ super(dia); } - + public void parseMark() { @@ -39,53 +39,40 @@ /* - if (keys.containsKey("seamark:type")) { - String type = keys.get("seamark:type"); - if (type.equals("landmark")) - setBuoyIndex(LIGHT_HOUSE); - else if (type.equals("light_major")) - setBuoyIndex(LIGHT_MAJOR); - else if (type.equals("light_minor")) - setBuoyIndex(LIGHT_MINOR); - else if (type.equals("light_vessel")) - setBuoyIndex(LIGHT_VESSEL); - } - - parseLights(keys); - parseFogRadar(keys); - setTopMark(false); - setFired(true); - - dlg.cbM01CatOfMark.setSelectedIndex(getBuoyIndex()); - dlg.tfM01Name.setText(getName()); - dlg.cM01Fired.setEnabled(false); - dlg.cM01Fired.setSelected(true); -*/ } + * if (keys.containsKey("seamark:type")) { String type = + * keys.get("seamark:type"); if (type.equals("landmark")) + * setBuoyIndex(LIGHT_HOUSE); else if (type.equals("light_major")) + * setBuoyIndex(LIGHT_MAJOR); else if (type.equals("light_minor")) + * setBuoyIndex(LIGHT_MINOR); else if (type.equals("light_vessel")) + * setBuoyIndex(LIGHT_VESSEL); } + * + * parseLights(keys); parseFogRadar(keys); setTopMark(false); + * setFired(true); + * + * dlg.cbM01CatOfMark.setSelectedIndex(getBuoyIndex()); + * dlg.tfM01Name.setText(getName()); dlg.cM01Fired.setEnabled(false); + * dlg.cM01Fired.setSelected(true); + */} public void paintSign() { -/* if (dlg.paintlock) - return; - super.paintSign(); -*/ + /* + * if (dlg.paintlock) return; super.paintSign(); + */ if (getCategory() != Cat.UNKNOWN) { switch (getCategory()) { case LIGHT_HOUSE: - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Light_House.png"))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_House.png"))); break; case LIGHT_MAJOR: - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Light_Major.png"))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Major.png"))); break; case LIGHT_MINOR: - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Light_Minor.png"))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Minor.png"))); break; case LIGHT_VESSEL: - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Major_Float.png"))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource("/images/Major_Float.png"))); break; Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkSaw.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkSaw.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkSaw.java (revision 24839) @@ -42,21 +42,18 @@ /* * - * setBuoyIndex(SAFE_WATER); - * setColour(SeaMark.RED_WHITE); + * setBuoyIndex(SAFE_WATER); setColour(SeaMark.RED_WHITE); * setLightColour("W"); * setRegion(Main.pref.get("tomsplugin.IALA").equals("B")); * - * if (keys.containsKey("seamark:buoy_safe_water:shape")) { - * str = keys.get("seamark:buoy_safe_water:shape"); + * if (keys.containsKey("seamark:buoy_safe_water:shape")) { str = + * keys.get("seamark:buoy_safe_water:shape"); * - * if (str.equals("pillar")) setStyleIndex(SAFE_PILLAR); - * else if - * (str.equals("spar")) setStyleIndex(SAFE_SPAR); - * else if (str.equals("sphere")) setStyleIndex(SAFE_SPHERE); - * } else if ((keys.containsKey("seamark:type")) && + * if (str.equals("pillar")) setStyleIndex(SAFE_PILLAR); else if + * (str.equals("spar")) setStyleIndex(SAFE_SPAR); else if + * (str.equals("sphere")) setStyleIndex(SAFE_SPHERE); } else if + * ((keys.containsKey("seamark:type")) && * (keys.get("seamark:type").equals("light_float"))) { - * setStyleIndex(SAFE_FLOAT); - * } else if ((keys.containsKey("seamark:type")) && - * (keys.get("seamark:type").equals("beacon_safe_water"))) { + * setStyleIndex(SAFE_FLOAT); } else if ((keys.containsKey("seamark:type")) + * && (keys.get("seamark:type").equals("beacon_safe_water"))) { * setStyleIndex(SAFE_BEACON); } * @@ -67,7 +64,5 @@ * keys.containsKey("seamark:topmark:colour")) { setTopMark(true); } * - * refreshLights(); - * parseLights(keys); - * parseFogRadar(keys); + * refreshLights(); parseLights(keys); parseFogRadar(keys); * * dlg.cbM01StyleOfMark.setSelectedIndex(getStyleIndex()); @@ -112,6 +107,5 @@ if (!image.equals("/images/Safe_Water")) { image += ".png"; - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass() - .getResource(image))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(image))); if (hasTopMark()) { image = ""; @@ -132,6 +126,5 @@ } if (!image.isEmpty()) - dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass() - .getResource(image))); + dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource(image))); } else dlg.panelMain.topIcon.setIcon(null); @@ -150,16 +143,13 @@ case PILLAR: super.saveSign("buoy_safe_water"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_safe_water:shape", "pillar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_safe_water:shape", "pillar")); break; case SPAR: super.saveSign("buoy_safe_water"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_safe_water:shape", "spar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_safe_water:shape", "spar")); break; case SPHERE: super.saveSign("buoy_safe_water"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_safe_water:shape", "sphere")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_safe_water:shape", "sphere")); break; case BEACON: @@ -176,22 +166,14 @@ case SPAR: case SPHERE: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_safe_water:colour_pattern", - "vertical stripes")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_safe_water:colour", "red;white")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_safe_water:colour_pattern", "vertical stripes")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_safe_water:colour", "red;white")); break; case BEACON: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_safe_water:colour_pattern", - "vertical stripes")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_safe_water:colour", "red;white")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_safe_water:colour_pattern", "vertical stripes")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_safe_water:colour", "red;white")); break; case FLOAT: - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour_pattern", "vertical stripes")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "red;white")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour_pattern", "vertical stripes")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "red;white")); break; default: Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkSpec.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkSpec.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkSpec.java (revision 24839) @@ -15,5 +15,5 @@ super(dia); } - + public void parseMark() { @@ -38,82 +38,55 @@ setName(keys.get("seamark:light_float:name")); -/* - dlg.cM01TopMark.setEnabled(true); - - setBuoyIndex(SPECIAL_PURPOSE); - setColour(SeaMark.YELLOW); - setLightColour("W"); - setRegion(Main.pref.get("tomsplugin.IALA").equals("B")); - - if (keys.containsKey("seamark:buoy_special_purpose:shape")) { - str = keys.get("seamark:buoy_special_purpose:shape"); - - if (str.equals("pillar")) - setStyleIndex(PILLAR); - else if (str.equals("can")) - setStyleIndex(CAN); - else if (str.equals("conical")) - setStyleIndex(CONE); - else if (str.equals("spar")) - setStyleIndex(SPAR); - else if (str.equals("sphere")) - setStyleIndex(SPHERE); - else if (str.equals("barrel")) - setStyleIndex(BARREL); - } - - if (keys.containsKey("seamark:beacon_special_purpose:shape")) { - str = keys.get("seamark:beacon_special_purpose:shape"); - if (str.equals("tower")) - setStyleIndex(TOWER); - else - setStyleIndex(BEACON); - } - - if (keys.containsKey("seamark:light_float:colour")) { - setStyleIndex(FLOAT); - } - - if ((keys.containsKey("seamark:type") && keys.get("seamark:type").equals( - "beacon_special_purpose")) - || keys.containsKey("seamark:beacon_special_purpose:colour") - || keys.containsKey("seamark:beacon_special_purpose:shape")) { - if (keys.containsKey("seamark:beacon_special_purpose:shape") - && keys.get("seamark:beacon_special_purpose:shape").equals("tower")) - setStyleIndex(TOWER); - else - setStyleIndex(BEACON); - } else if (keys.containsKey("seamark:light_float:colour") - && keys.get("seamark:light_float:colour").equals("yellow")) - setStyleIndex(FLOAT); - - if (getStyleIndex() >= dlg.cbM01StyleOfMark.getItemCount()) - setStyleIndex(0); - - keys = node.getKeys(); - if (keys.containsKey("seamark:topmark:shape")) { - str = keys.get("seamark:topmark:shape"); - setTopMark(true); - if (str.equals("x-shape")) { - if (keys.containsKey("seamark:topmark:colour")) { - if (keys.get("seamark:topmark:colour").equals("red")) - setTopMarkIndex(TOP_RED_X); - else - setTopMarkIndex(TOP_YELLOW_X); - } - } else if (str.equals("cone, point up")) { - setTopMarkIndex(TOP_YELLOW_CONE); - } else if (str.equals("cylinder")) { - setTopMarkIndex(TOP_YELLOW_CAN); - } - } - - parseLights(keys); - parseFogRadar(keys); - - dlg.cbM01StyleOfMark.setSelectedIndex(getStyleIndex()); - dlg.tfM01Name.setText(getName()); - dlg.cM01TopMark.setSelected(hasTopMark()); -*/ } + /* + * dlg.cM01TopMark.setEnabled(true); + * + * setBuoyIndex(SPECIAL_PURPOSE); setColour(SeaMark.YELLOW); + * setLightColour("W"); + * setRegion(Main.pref.get("tomsplugin.IALA").equals("B")); + * + * if (keys.containsKey("seamark:buoy_special_purpose:shape")) { str = + * keys.get("seamark:buoy_special_purpose:shape"); + * + * if (str.equals("pillar")) setStyleIndex(PILLAR); else if + * (str.equals("can")) setStyleIndex(CAN); else if (str.equals("conical")) + * setStyleIndex(CONE); else if (str.equals("spar")) setStyleIndex(SPAR); + * else if (str.equals("sphere")) setStyleIndex(SPHERE); else if + * (str.equals("barrel")) setStyleIndex(BARREL); } + * + * if (keys.containsKey("seamark:beacon_special_purpose:shape")) { str = + * keys.get("seamark:beacon_special_purpose:shape"); if + * (str.equals("tower")) setStyleIndex(TOWER); else setStyleIndex(BEACON); } + * + * if (keys.containsKey("seamark:light_float:colour")) { + * setStyleIndex(FLOAT); } + * + * if ((keys.containsKey("seamark:type") && keys.get("seamark:type").equals( + * "beacon_special_purpose")) || + * keys.containsKey("seamark:beacon_special_purpose:colour") || + * keys.containsKey("seamark:beacon_special_purpose:shape")) { if + * (keys.containsKey("seamark:beacon_special_purpose:shape") && + * keys.get("seamark:beacon_special_purpose:shape").equals("tower")) + * setStyleIndex(TOWER); else setStyleIndex(BEACON); } else if + * (keys.containsKey("seamark:light_float:colour") && + * keys.get("seamark:light_float:colour").equals("yellow")) + * setStyleIndex(FLOAT); + * + * if (getStyleIndex() >= dlg.cbM01StyleOfMark.getItemCount()) + * setStyleIndex(0); + * + * keys = node.getKeys(); if (keys.containsKey("seamark:topmark:shape")) { + * str = keys.get("seamark:topmark:shape"); setTopMark(true); if + * (str.equals("x-shape")) { if (keys.containsKey("seamark:topmark:colour")) + * { if (keys.get("seamark:topmark:colour").equals("red")) + * setTopMarkIndex(TOP_RED_X); else setTopMarkIndex(TOP_YELLOW_X); } } else + * if (str.equals("cone, point up")) { setTopMarkIndex(TOP_YELLOW_CONE); } + * else if (str.equals("cylinder")) { setTopMarkIndex(TOP_YELLOW_CAN); } } + * + * parseLights(keys); parseFogRadar(keys); + * + * dlg.cbM01StyleOfMark.setSelectedIndex(getStyleIndex()); + * dlg.tfM01Name.setText(getName()); + * dlg.cM01TopMark.setSelected(hasTopMark()); + */} public void setLightColour() { @@ -122,8 +95,7 @@ public void paintSign() { -/* if (dlg.paintlock) - return; - super.paintSign(); -*/ + /* + * if (dlg.paintlock) return; super.paintSign(); + */ if ((getCategory() != Cat.UNKNOWN) && (getShape() != Shp.UNKNOWN)) { @@ -163,83 +135,31 @@ if (!image.equals("/images/Special_Purpose")) { image += ".png"; - dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass() - .getResource(image))); -/* if (hasTopMark()) { - image = ""; - switch (getShape()) { - case PILLAR: - case SPAR: - switch (getTopMarkIndex()) { - case TOP_YELLOW_X: - image = "/images/Top_X_Yellow_Buoy.png"; - break; - case TOP_RED_X: - image = "/images/Top_X_Red_Buoy.png"; - break; - case TOP_YELLOW_CAN: - image = "/images/Top_Can_Yellow_Buoy.png"; - break; - case TOP_YELLOW_CONE: - image = "/images/Top_Cone_Yellow_Buoy.png"; - break; - } - break; - case CAN: - case CONE: - case SPHERE: - case BARREL: - switch (getTopMarkIndex()) { - case TOP_YELLOW_X: - image = "/images/Top_X_Yellow_Buoy_Small.png"; - break; - case TOP_RED_X: - image = "/images/Top_X_Red_Buoy_Small.png"; - break; - case TOP_YELLOW_CAN: - image = "/images/Top_Can_Yellow_Buoy_Small.png"; - break; - case TOP_YELLOW_CONE: - image = "/images/Top_Cone_Yellow_Buoy_Small.png"; - break; - } - break; - case BEACON: - case TOWER: - switch (getTopMarkIndex()) { - case TOP_YELLOW_X: - image = "/images/Top_X_Yellow_Beacon.png"; - break; - case TOP_RED_X: - image = "/images/Top_X_Red_Beacon.png"; - break; - case TOP_YELLOW_CAN: - image = "/images/Top_Can_Yellow_Beacon.png"; - break; - case TOP_YELLOW_CONE: - image = "/images/Top_Cone_Yellow_Beacon.png"; - break; - } - break; - case FLOAT: - switch (getTopMarkIndex()) { - case TOP_YELLOW_X: - image = "/images/Top_X_Yellow_Float.png"; - break; - case TOP_RED_X: - image = "/images/Top_X_Red_Float.png"; - break; - case TOP_YELLOW_CAN: - image = "/images/Top_Can_Yellow_Float.png"; - break; - case TOP_YELLOW_CONE: - image = "/images/Top_Cone_Yellow_Float.png"; - break; - } - break; - } - if (!image.isEmpty()) - dlg.lM06Icon.setIcon(new ImageIcon(getClass().getResource(image))); - } -*/ } else + dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource(image))); + /* + * if (hasTopMark()) { image = ""; switch (getShape()) { case PILLAR: + * case SPAR: switch (getTopMarkIndex()) { case TOP_YELLOW_X: image = + * "/images/Top_X_Yellow_Buoy.png"; break; case TOP_RED_X: image = + * "/images/Top_X_Red_Buoy.png"; break; case TOP_YELLOW_CAN: image = + * "/images/Top_Can_Yellow_Buoy.png"; break; case TOP_YELLOW_CONE: image + * = "/images/Top_Cone_Yellow_Buoy.png"; break; } break; case CAN: case + * CONE: case SPHERE: case BARREL: switch (getTopMarkIndex()) { case + * TOP_YELLOW_X: image = "/images/Top_X_Yellow_Buoy_Small.png"; break; + * case TOP_RED_X: image = "/images/Top_X_Red_Buoy_Small.png"; break; + * case TOP_YELLOW_CAN: image = "/images/Top_Can_Yellow_Buoy_Small.png"; + * break; case TOP_YELLOW_CONE: image = + * "/images/Top_Cone_Yellow_Buoy_Small.png"; break; } break; case + * BEACON: case TOWER: switch (getTopMarkIndex()) { case TOP_YELLOW_X: + * image = "/images/Top_X_Yellow_Beacon.png"; break; case TOP_RED_X: + * image = "/images/Top_X_Red_Beacon.png"; break; case TOP_YELLOW_CAN: + * image = "/images/Top_Can_Yellow_Beacon.png"; break; case + * TOP_YELLOW_CONE: image = "/images/Top_Cone_Yellow_Beacon.png"; break; + * } break; case FLOAT: switch (getTopMarkIndex()) { case TOP_YELLOW_X: + * image = "/images/Top_X_Yellow_Float.png"; break; case TOP_RED_X: + * image = "/images/Top_X_Red_Float.png"; break; case TOP_YELLOW_CAN: + * image = "/images/Top_Can_Yellow_Float.png"; break; case + * TOP_YELLOW_CONE: image = "/images/Top_Cone_Yellow_Float.png"; break; + * } break; } if (!image.isEmpty()) dlg.lM06Icon.setIcon(new + * ImageIcon(getClass().getResource(image))); } + */} else dlg.panelMain.shapeIcon.setIcon(null); } @@ -254,78 +174,54 @@ case PILLAR: super.saveSign("buoy_special_purpose"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:shape", "pillar")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:shape", "pillar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:colour", "yellow")); break; case SPAR: super.saveSign("buoy_special_purpose"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:shape", "spar")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:shape", "spar")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:colour", "yellow")); break; case CAN: super.saveSign("buoy_special_purpose"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:shape", "can")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:shape", "can")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:colour", "yellow")); break; case CONE: super.saveSign("buoy_special_purpose"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:shape", "conical")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:shape", "conical")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:colour", "yellow")); break; case SPHERE: super.saveSign("buoy_special_purpose"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:shape", "sphere")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:shape", "sphere")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:colour", "yellow")); break; case BARREL: super.saveSign("buoy_special_purpose"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:shape", "barrel")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:buoy_special_purpose:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:shape", "barrel")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:buoy_special_purpose:colour", "yellow")); break; case FLOAT: super.saveSign("light_float"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:light_float:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:light_float:colour", "yellow")); break; case BEACON: super.saveSign("beacon_special_purpose"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_special_purpose:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_special_purpose:colour", "yellow")); break; case TOWER: super.saveSign("beacon_special_purpose"); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_special_purpose:shape", "tower")); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:beacon_special_purpose:colour", "yellow")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_special_purpose:shape", "tower")); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:beacon_special_purpose:colour", "yellow")); break; default: } -/* switch (getTopMarkIndex()) { - case TOP_YELLOW_X: - saveTopMarkData("x-shape", "yellow"); - break; - case TOP_RED_X: - saveTopMarkData("x-shape", "red"); - break; - case TOP_YELLOW_CAN: - saveTopMarkData("cylinder", "yellow"); - break; - case TOP_YELLOW_CONE: - saveTopMarkData("cone, point up", "yellow"); - break; - } -*/ saveLightData(); + /* + * switch (getTopMarkIndex()) { case TOP_YELLOW_X: + * saveTopMarkData("x-shape", "yellow"); break; case TOP_RED_X: + * saveTopMarkData("x-shape", "red"); break; case TOP_YELLOW_CAN: + * saveTopMarkData("cylinder", "yellow"); break; case TOP_YELLOW_CONE: + * saveTopMarkData("cone, point up", "yellow"); break; } + */saveLightData(); saveRadarFogData(); } Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkUkn.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkUkn.java (revision 24835) +++ (revision ) @@ -1,30 +1,0 @@ -package oseam.seamarks; - -import oseam.dialogs.OSeaMAction; - -public class MarkUkn extends SeaMark { - public MarkUkn(OSeaMAction dia) { - super(dia); - dlg.panelMain.clearSelections(); - } - - public void parseMark() {} - - public void paintSign() { -/* if (dlg.paintlock) - return; - super.paintSign(); - - if (getErrMsg() != null) - dlg.sM01StatusBar.setText(getErrMsg()); - - setErrMsg(null); -*/ } - - public void setLightColour() { - super.setLightColour(""); - } - - public void saveSign() { - } -} Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 24835) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 24839) @@ -6,4 +6,6 @@ import java.util.regex.Pattern; +import javax.swing.ImageIcon; + import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.ChangePropertyCommand; @@ -18,7 +20,5 @@ public enum Cat { - UNKNOWN, LAT_PORT, LAT_STBD, LAT_PREF_PORT, LAT_PREF_STBD, - CARD_NORTH, CARD_EAST, CARD_SOUTH, CARD_WEST, - LIGHT_HOUSE, LIGHT_MAJOR, LIGHT_MINOR, LIGHT_VESSEL, LIGHT_FLOAT + UNKNOWN, LAT_PORT, LAT_STBD, LAT_PREF_PORT, LAT_PREF_STBD, CARD_NORTH, CARD_EAST, CARD_SOUTH, CARD_WEST, LIGHT_HOUSE, LIGHT_MAJOR, LIGHT_MINOR, LIGHT_VESSEL, LIGHT_FLOAT } @@ -28,6 +28,5 @@ public enum Col { - UNKNOWN, WHITE, RED, ORANGE, AMBER, YELLOW, GREEN, BLUE, VIOLET, BLACK, - RED_GREEN_RED, GREEN_RED_GREEN, RED_WHITE, BLACK_YELLOW, BLACK_YELLOW_BLACK, YELLOW_BLACK, YELLOW_BLACK_YELLOW, BLACK_RED_BLACK + UNKNOWN, WHITE, RED, ORANGE, AMBER, YELLOW, GREEN, BLUE, VIOLET, BLACK, RED_GREEN_RED, GREEN_RED_GREEN, RED_WHITE, BLACK_YELLOW, BLACK_YELLOW_BLACK, YELLOW_BLACK, YELLOW_BLACK_YELLOW, BLACK_RED_BLACK } @@ -379,9 +378,9 @@ if (matcher.find()) { -// setErrMsg(null); + // setErrMsg(null); } else { -// setErrMsg("Must be a number"); + // setErrMsg("Must be a number"); lightPeriod = ""; -// dlg.tfM01RepeatTime.requestFocus(); + // dlg.tfM01RepeatTime.requestFocus(); } } @@ -448,15 +447,4 @@ } } - setSectorIndex(0); -// dlg.cbM01Sector.setSelectedIndex(0); -// dlg.cM01Fired.setSelected(isFired()); -// dlg.rbM01Fired1.setSelected(!isSectored()); -// dlg.rbM01FiredN.setSelected(isSectored()); -// dlg.cbM01Kennung.setSelectedItem(getLightChar()); -// dlg.tfM01Height.setText(getHeight()); -// dlg.tfM01Range.setText(getRange()); -// dlg.tfM01Group.setText(getLightGroup()); -// dlg.tfM01RepeatTime.setText(getLightPeriod()); -// dlg.cbM01Colour.setSelectedItem(getLightColour()); } @@ -466,8 +454,6 @@ setRadar(false); setRacon(false); - if (k.containsKey("seamark:fog_signal") - || k.containsKey("seamark:fog_signal:category") - || k.containsKey("seamark:fog_signal:group") - || k.containsKey("seamark:fog_signal:period")) { + if (k.containsKey("seamark:fog_signal") || k.containsKey("seamark:fog_signal:category") + || k.containsKey("seamark:fog_signal:group") || k.containsKey("seamark:fog_signal:period")) { setFog(true); if (k.containsKey("seamark:fog_signal:category")) { @@ -495,11 +481,6 @@ setFogPeriod(k.get("seamark:fog_signal:period")); } -// dlg.cM01Fog.setSelected(hasFog()); -// dlg.cbM01Fog.setSelectedIndex(getFogSound()); -// dlg.tfM01FogGroup.setText(getFogGroup()); -// dlg.tfM01FogPeriod.setText(getFogPeriod()); - - if (k.containsKey("seamark:radar_transponder") - || k.containsKey("seamark:radar_transponder:category") + + if (k.containsKey("seamark:radar_transponder") || k.containsKey("seamark:radar_transponder:category") || k.containsKey("seamark:radar_transponder:group")) { setRacon(true); @@ -519,212 +500,236 @@ } else if (k.containsKey("seamark:radar_reflector")) setRadar(true); -// dlg.cM01Radar.setSelected(hasRadar()); -// dlg.cM01Racon.setSelected(hasRacon()); -// dlg.cbM01Racon.setSelectedIndex(getRaType()); -// dlg.tfM01Racon.setText(getRaconGroup()); - } - - public abstract void paintSign(); + } + + public void paintSign() { + /* + * dlg.lM01NameMark.setText(getName()); + * + * dlg.bM01Save.setEnabled(true); + * + * dlg.cM01TopMark.setSelected(hasTopMark()); + * dlg.cM01Fired.setSelected(isFired()); + * + * dlg.tfM01RepeatTime.setText(getLightPeriod()); + * + * dlg.tfM01Name.setText(getName()); dlg.tfM01Name.setEnabled(true); + * + * if (hasRadar()) { dlg.lM03Icon.setIcon(new + * ImageIcon(getClass().getResource( "/images/Radar_Reflector_355.png"))); } + * + * else if (hasRacon()) { dlg.lM04Icon.setIcon(new + * ImageIcon(getClass().getResource( "/images/Radar_Station.png"))); if + * (getRaType() != 0) { String c = (String) + * dlg.cbM01Racon.getSelectedItem(); if ((getRaType() == RATYPE_RACON) && + * !getRaconGroup().isEmpty()) c += ("(" + getRaconGroup() + ")"); + * dlg.lM01RadarMark.setText(c); } dlg.cbM01Racon.setVisible(true); if + * (getRaType() == RATYPE_RACON) { dlg.lM01Racon.setVisible(true); + * dlg.tfM01Racon.setVisible(true); dlg.tfM01Racon.setEnabled(true); } else + * { dlg.lM01Racon.setVisible(false); dlg.tfM01Racon.setVisible(false); } } + * else { dlg.cbM01Racon.setVisible(false); dlg.lM01Racon.setVisible(false); + * dlg.tfM01Racon.setVisible(false); } + * + * if (hasFog()) { dlg.lM05Icon.setIcon(new + * ImageIcon(getClass().getResource( "/images/Fog_Signal.png"))); if + * (getFogSound() != 0) { String c = (String) + * dlg.cbM01Fog.getSelectedItem(); if (!getFogGroup().isEmpty()) c += ("(" + + * getFogGroup() + ")"); if (!getFogPeriod().isEmpty()) c += (" " + + * getFogPeriod() + "s"); dlg.lM01FogMark.setText(c); } + * dlg.cbM01Fog.setVisible(true); if (getFogSound() == 0) { + * dlg.lM01FogGroup.setVisible(false); dlg.tfM01FogGroup.setVisible(false); + * dlg.lM01FogPeriod.setVisible(false); + * dlg.tfM01FogPeriod.setVisible(false); } else { + * dlg.lM01FogGroup.setVisible(true); dlg.tfM01FogGroup.setVisible(true); + * dlg.lM01FogPeriod.setVisible(true); dlg.tfM01FogPeriod.setVisible(true); + * } } else { dlg.cbM01Fog.setVisible(false); + * dlg.lM01FogGroup.setVisible(false); dlg.tfM01FogGroup.setVisible(false); + * dlg.lM01FogPeriod.setVisible(false); + * dlg.tfM01FogPeriod.setVisible(false); } + * + * if (isFired()) { String lp, c; String tmp = null; int i1; + * + * String col = getLightColour(); if (col.equals("W")) { + * dlg.lM02Icon.setIcon(new ImageIcon(getClass().getResource( + * "/images/Light_White_120.png"))); + * dlg.cbM01Colour.setSelectedIndex(WHITE_LIGHT); } else if + * (col.equals("R")) { dlg.lM02Icon.setIcon(new + * ImageIcon(getClass().getResource( "/images/Light_Red_120.png"))); + * dlg.cbM01Colour.setSelectedIndex(RED_LIGHT); } else if (col.equals("G")) + * { dlg.lM02Icon.setIcon(new ImageIcon(getClass().getResource( + * "/images/Light_Green_120.png"))); + * dlg.cbM01Colour.setSelectedIndex(GREEN_LIGHT); } else { + * dlg.lM02Icon.setIcon(new ImageIcon(getClass().getResource( + * "/images/Light_Magenta_120.png"))); + * dlg.cbM01Colour.setSelectedIndex(UNKNOWN_COLOUR); } + * + * c = getLightChar(); dlg.cbM01Kennung.setSelectedItem(c); if + * (c.contains("+")) { i1 = c.indexOf("+"); tmp = c.substring(i1, + * c.length()); c = c.substring(0, i1); if (!getLightGroup().isEmpty()) { c + * = c + "(" + getLightGroup() + ")"; } if (tmp != null) c = c + tmp; + * dlg.cbM01Kennung.setSelectedItem(c); } else if + * (!getLightGroup().isEmpty()) c = c + "(" + getLightGroup() + ")"; if + * (dlg.cbM01Kennung.getSelectedIndex() == 0) + * dlg.cbM01Kennung.setSelectedItem(c); c = c + " " + getLightColour(); lp = + * getLightPeriod(); if (!lp.isEmpty()) c = c + " " + lp + "s"; + * dlg.lM01FireMark.setText(c); dlg.cM01Fired.setVisible(true); + * dlg.lM01Kennung.setVisible(true); dlg.cbM01Kennung.setVisible(true); if + * (((String) dlg.cbM01Kennung.getSelectedItem()).contains("(")) { + * dlg.tfM01Group.setVisible(false); dlg.lM01Group.setVisible(false); } else + * { dlg.lM01Group.setVisible(true); dlg.tfM01Group.setVisible(true); } + * dlg.tfM01Group.setText(getLightGroup()); + * dlg.lM01RepeatTime.setVisible(true); + * dlg.tfM01RepeatTime.setVisible(true); if (isSectored()) { + * dlg.rbM01Fired1.setSelected(false); dlg.rbM01FiredN.setSelected(true); if + * ((getSectorIndex() != 0) && (!LightChar[0].isEmpty())) + * dlg.cbM01Kennung.setEnabled(false); else + * dlg.cbM01Kennung.setEnabled(true); + * dlg.cbM01Kennung.setSelectedItem(getLightChar()); if ((getSectorIndex() + * != 0) && (!LightGroup[0].isEmpty())) dlg.tfM01Group.setEnabled(false); + * else dlg.tfM01Group.setEnabled(true); + * dlg.tfM01Group.setText(getLightGroup()); if ((getSectorIndex() != 0) && + * (!LightPeriod[0].isEmpty())) dlg.tfM01RepeatTime.setEnabled(false); else + * dlg.tfM01RepeatTime.setEnabled(true); + * dlg.tfM01RepeatTime.setText(getLightPeriod()); if ((getSectorIndex() != + * 0) && (!Height[0].isEmpty())) dlg.tfM01Height.setEnabled(false); else + * dlg.tfM01Height.setEnabled(true); dlg.tfM01Height.setText(getHeight()); + * if ((getSectorIndex() != 0) && (!Range[0].isEmpty())) + * dlg.tfM01Range.setEnabled(false); else dlg.tfM01Range.setEnabled(true); + * dlg.tfM01Range.setText(getRange()); dlg.lM01Sector.setVisible(true); + * dlg.cbM01Sector.setVisible(true); } else { } } else { } } else { + */} public void saveSign(String type) { - delSeaMarkKeys(dlg.node); - - String str = dlg.panelMain.nameBox.getText(); - if (!str.isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, - "seamark:name", str)); - Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:type", - type)); - } - - protected void saveLightData() { -/* String colour; - if (dlg.cM01Fired.isSelected()) { - if (!(colour = LightColour[0]).isEmpty()) - if (colour.equals("R")) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:colour", "red")); - } else if (colour.equals("G")) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:colour", "green")); - } else if (colour.equals("W")) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:colour", "white")); - } - - if (!LightPeriod[0].isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:period", LightPeriod[0])); - - if (!LightChar[0].isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:character", LightChar[0])); - - if (!LightGroup[0].isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:group", LightGroup[0])); - - if (!Height[0].isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:height", Height[0])); - - if (!Range[0].isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:range", Range[0])); - - for (int i = 1; i < 10; i++) { - if ((colour = LightColour[i]) != null) - if (colour.equals("R")) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":colour", "red")); - if ((Bearing1[i] != null) && (Bearing2[i] != null) - && (Radius[i] != null)) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i, "red:" + Bearing1[i] + ":" - + Bearing2[i] + ":" + Radius[i])); - } else if (colour.equals("G")) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":colour", "green")); - if ((Bearing1[i] != null) && (Bearing2[i] != null) - && (Radius[i] != null)) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i, "green:" + Bearing1[i] + ":" - + Bearing2[i] + ":" + Radius[i])); - } else if (colour.equals("W")) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":colour", "white")); - if ((Bearing1[i] != null) && (Bearing2[i] != null) - && (Radius[i] != null)) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i, "white:" + Bearing1[i] + ":" - + Bearing2[i] + ":" + Radius[i])); - } - - if (LightPeriod[i] != null) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":period", LightPeriod[i])); - - if (LightChar[i] != null) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":character", LightChar[i])); - - if (LightGroup[i] != null) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":group", LightGroup[i])); - - if (Height[i] != null) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":height", Height[i])); - - if (Range[i] != null) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":range", Range[i])); - - if (Bearing1[i] != null) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":sector_start", Bearing1[i])); - - if (Bearing2[i] != null) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:light:" + i + ":sector_end", Bearing2[i])); - } - } -*/ } - - protected void saveTopMarkData(String shape, String colour) { -/* if (hasTopMark()) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:topmark:shape", shape)); - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:topmark:colour", colour)); - } -*/ } - - protected void saveRadarFogData() { -/* if (hasRadar()) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:radar_reflector", "yes")); - } - if (hasRacon()) { - switch (RaType) { - case RATYPE_RACON: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:radar_transponder:category", "racon")); - if (!getRaconGroup().isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:radar_transponder:group", getRaconGroup())); - break; - case RATYPE_RAMARK: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:radar_transponder:category", "ramark")); - break; - case RATYPE_LEADING: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:radar_transponder:category", "leading")); - break; - default: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:radar_transponder", "yes")); - } - } - if (hasFog()) { - if (getFogSound() == 0) { - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal", "yes")); - } else { - switch (getFogSound()) { - case FOG_HORN: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:category", "horn")); - break; - case FOG_SIREN: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:category", "siren")); - break; - case FOG_DIA: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:category", "diaphone")); - break; - case FOG_BELL: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:category", "bell")); - break; - case FOG_WHIS: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:category", "whistle")); - break; - case FOG_GONG: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:category", "gong")); - break; - case FOG_EXPLOS: - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:category", "explosive")); - break; - } - if (!getFogGroup().isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:group", getFogGroup())); - if (!getFogPeriod().isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(Node, - "seamark:fog_signal:period", getFogPeriod())); - } - } -*/ } - - protected void delSeaMarkKeys(Node node) { - Iterator it = node.getKeys().keySet().iterator(); + Iterator it = dlg.node.getKeys().keySet().iterator(); String str; while (it.hasNext()) { str = it.next(); - - if (str.contains("seamark") == true) - if (str.compareTo("seamark") != 0) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, str, - null)); + if (str.contains("seamark")) + if (!str.equals("seamark")) { + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, str, null)); } } - } + str = dlg.panelMain.nameBox.getText(); + if (!str.isEmpty()) + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:name", str)); + Main.main.undoRedo.add(new ChangePropertyCommand(dlg.node, "seamark:type", type)); + } + + protected void saveLightData() { + /* + * String colour; if (dlg.cM01Fired.isSelected()) { if (!(colour = + * LightColour[0]).isEmpty()) if (colour.equals("R")) { + * Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:light:colour", "red")); } else if (colour.equals("G")) { + * Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:light:colour", "green")); } else if (colour.equals("W")) { + * Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:light:colour", "white")); } + * + * if (!LightPeriod[0].isEmpty()) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:period", LightPeriod[0])); + * + * if (!LightChar[0].isEmpty()) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:character", LightChar[0])); + * + * if (!LightGroup[0].isEmpty()) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:group", LightGroup[0])); + * + * if (!Height[0].isEmpty()) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:height", Height[0])); + * + * if (!Range[0].isEmpty()) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:range", Range[0])); + * + * for (int i = 1; i < 10; i++) { if ((colour = LightColour[i]) != null) if + * (colour.equals("R")) { Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":colour", "red")); if + * ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != null)) + * Main.main.undoRedo.add(new ChangePropertyCommand(Node, "seamark:light:" + + * i, "red:" + Bearing1[i] + ":" + Bearing2[i] + ":" + Radius[i])); } else + * if (colour.equals("G")) { Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":colour", "green")); + * if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != + * null)) Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:light:" + i, "green:" + Bearing1[i] + ":" + Bearing2[i] + ":" + + * Radius[i])); } else if (colour.equals("W")) { Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":colour", "white")); + * if ((Bearing1[i] != null) && (Bearing2[i] != null) && (Radius[i] != + * null)) Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:light:" + i, "white:" + Bearing1[i] + ":" + Bearing2[i] + ":" + + * Radius[i])); } + * + * if (LightPeriod[i] != null) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":period", + * LightPeriod[i])); + * + * if (LightChar[i] != null) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":character", + * LightChar[i])); + * + * if (LightGroup[i] != null) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":group", + * LightGroup[i])); + * + * if (Height[i] != null) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":height", + * Height[i])); + * + * if (Range[i] != null) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":range", Range[i])); + * + * if (Bearing1[i] != null) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":sector_start", + * Bearing1[i])); + * + * if (Bearing2[i] != null) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:light:" + i + ":sector_end", + * Bearing2[i])); } } + */} + + protected void saveTopMarkData(String shape, String colour) { + /* + * if (hasTopMark()) { Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:topmark:shape", shape)); + * Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:topmark:colour", colour)); } + */} + + protected void saveRadarFogData() { + /* + * if (hasRadar()) { Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:radar_reflector", "yes")); } if (hasRacon()) { switch (RaType) { + * case RATYPE_RACON: Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:radar_transponder:category", "racon")); if + * (!getRaconGroup().isEmpty()) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:radar_transponder:group", + * getRaconGroup())); break; case RATYPE_RAMARK: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:radar_transponder:category", + * "ramark")); break; case RATYPE_LEADING: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:radar_transponder:category", + * "leading")); break; default: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:radar_transponder", "yes")); } } if + * (hasFog()) { if (getFogSound() == 0) { Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal", "yes")); } else { + * switch (getFogSound()) { case FOG_HORN: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:category", "horn")); + * break; case FOG_SIREN: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:category", "siren")); + * break; case FOG_DIA: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:category", "diaphone")); + * break; case FOG_BELL: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:category", "bell")); + * break; case FOG_WHIS: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:category", "whistle")); + * break; case FOG_GONG: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:category", "gong")); + * break; case FOG_EXPLOS: Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:category", "explosive")); + * break; } if (!getFogGroup().isEmpty()) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:group", getFogGroup())); + * if (!getFogPeriod().isEmpty()) Main.main.undoRedo.add(new + * ChangePropertyCommand(Node, "seamark:fog_signal:period", + * getFogPeriod())); } } + */} }