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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 24875) @@ -20,4 +20,5 @@ import oseam.seamarks.SeaMark.Cat; import oseam.seamarks.SeaMark.Col; +import oseam.seamarks.SeaMark.Obj; import oseam.seamarks.MarkLat; import oseam.seamarks.MarkSaw; @@ -41,8 +42,8 @@ dlg.mark.setCategory(Cat.LAT_PORT); if (dlg.mark.getRegion() == SeaMark.IALA_A) { - dlg.mark.setColour(Col.RED); + dlg.mark.setColour(Obj.BODY, Col.RED); panelPort.regionAButton.doClick(); } else { - dlg.mark.setColour(Col.GREEN); + dlg.mark.setColour(Obj.BODY, Col.GREEN); panelPort.regionBButton.doClick(); } @@ -59,8 +60,8 @@ dlg.mark.setCategory(Cat.LAT_STBD); if (dlg.mark.getRegion() == SeaMark.IALA_A) { - dlg.mark.setColour(Col.GREEN); + dlg.mark.setColour(Obj.BODY, Col.GREEN); panelStbd.regionAButton.doClick(); } else { - dlg.mark.setColour(Col.RED); + dlg.mark.setColour(Obj.BODY, Col.RED); panelStbd.regionBButton.doClick(); } @@ -77,8 +78,8 @@ dlg.mark.setCategory(Cat.LAT_PREF_PORT); if (dlg.mark.getRegion() == SeaMark.IALA_A) { - dlg.mark.setColour(Col.RED_GREEN_RED); + dlg.mark.setColour(Obj.BODY, Col.RED_GREEN_RED); panelPrefPort.regionAButton.doClick(); } else { - dlg.mark.setColour(Col.GREEN_RED_GREEN); + dlg.mark.setColour(Obj.BODY, Col.GREEN_RED_GREEN); panelPrefPort.regionBButton.doClick(); } @@ -95,8 +96,8 @@ dlg.mark.setCategory(Cat.LAT_PREF_STBD); if (dlg.mark.getRegion() == SeaMark.IALA_A) { - dlg.mark.setColour(Col.GREEN_RED_GREEN); + dlg.mark.setColour(Obj.BODY, Col.GREEN_RED_GREEN); panelPrefStbd.regionAButton.doClick(); } else { - dlg.mark.setColour(Col.RED_GREEN_RED); + dlg.mark.setColour(Obj.BODY, Col.RED_GREEN_RED); panelPrefStbd.regionBButton.doClick(); } @@ -111,5 +112,5 @@ if (!(dlg.mark instanceof MarkSaw)) dlg.mark = new MarkSaw(dlg); - dlg.mark.setColour(Col.RED_WHITE); + dlg.mark.setColour(Obj.BODY, Col.RED_WHITE); safeWaterButton.setBorderPainted(true); panelSafeWater.setVisible(true); 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java (revision 24875) @@ -18,8 +18,10 @@ import oseam.dialogs.OSeaMAction; import oseam.seamarks.SeaMark.Col; +import oseam.seamarks.SeaMark.Obj; public class PanelCol extends JPanel { private OSeaMAction dlg; + private Obj obj; private ButtonGroup colourButtons = new ButtonGroup(); public JRadioButton offButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); @@ -41,4 +43,5 @@ JRadioButton button = colours.get(col); if (button.isSelected()) { + if (dlg.mark != null) dlg.mark.setColour(obj, col); button.setBorderPainted(true); } else @@ -48,6 +51,7 @@ }; - public PanelCol(OSeaMAction dia) { + public PanelCol(OSeaMAction dia, Obj object) { dlg = dia; + obj = object; this.setLayout(null); this.add(getColButton(offButton, 0, 0, 34, 16, "No colour", Col.UNKNOWN), null); 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 24875) @@ -17,4 +17,5 @@ import oseam.seamarks.SeaMark.Cat; import oseam.seamarks.SeaMark.Col; +import oseam.seamarks.SeaMark.Obj; import oseam.seamarks.SeaMark.Shp; @@ -40,5 +41,5 @@ } dlg.mark.setCategory(Cat.CARD_NORTH); - dlg.mark.setColour(Col.BLACK_YELLOW); + dlg.mark.setColour(Obj.BODY, Col.BLACK_YELLOW); dlg.panelMain.panelTop.northTopButton.doClick(); dlg.panelMain.panelTop.panelCol.blackButton.doClick(); @@ -53,5 +54,5 @@ } dlg.mark.setCategory(Cat.CARD_SOUTH); - dlg.mark.setColour(Col.YELLOW_BLACK); + dlg.mark.setColour(Obj.BODY, Col.YELLOW_BLACK); dlg.panelMain.panelTop.southTopButton.doClick(); dlg.panelMain.panelTop.panelCol.blackButton.doClick(); @@ -66,5 +67,5 @@ } dlg.mark.setCategory(Cat.CARD_EAST); - dlg.mark.setColour(Col.BLACK_YELLOW_BLACK); + dlg.mark.setColour(Obj.BODY, Col.BLACK_YELLOW_BLACK); dlg.panelMain.panelTop.eastTopButton.doClick(); dlg.panelMain.panelTop.panelCol.blackButton.doClick(); @@ -79,5 +80,5 @@ } dlg.mark.setCategory(Cat.CARD_WEST); - dlg.mark.setColour(Col.YELLOW_BLACK_YELLOW); + dlg.mark.setColour(Obj.BODY, Col.YELLOW_BLACK_YELLOW); dlg.panelMain.panelTop.westTopButton.doClick(); dlg.panelMain.panelTop.panelCol.blackButton.doClick(); @@ -91,5 +92,5 @@ alShape.actionPerformed(null); } - dlg.mark.setColour(Col.BLACK_RED_BLACK); + dlg.mark.setColour(Obj.BODY, Col.BLACK_RED_BLACK); dlg.panelMain.panelTop.spheres2TopButton.doClick(); dlg.panelMain.panelTop.panelCol.blackButton.doClick(); 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 24875) @@ -3,22 +3,9 @@ import javax.swing.JPanel; -import java.awt.Color; -import java.awt.Dimension; import java.awt.Rectangle; -import java.awt.Font; - -import javax.swing.ButtonGroup; -import javax.swing.ImageIcon; -import javax.swing.JLabel; -import javax.swing.JTextField; -import javax.swing.JComboBox; -import javax.swing.JCheckBox; -import javax.swing.JRadioButton; import oseam.Messages; import oseam.dialogs.OSeaMAction; - -import java.awt.Cursor; -import java.awt.event.ActionListener; +import oseam.seamarks.SeaMark.Obj; public class PanelLit extends JPanel { @@ -29,5 +16,5 @@ public PanelLit(OSeaMAction dia) { dlg = dia; - panelCol = new PanelCol(dlg); + panelCol = new PanelCol(dlg, Obj.LIGHT); panelCol.setBounds(new Rectangle(0, 0, 34, 160)); this.setLayout(null); 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 24875) @@ -20,4 +20,5 @@ import oseam.dialogs.OSeaMAction; import oseam.seamarks.SeaMark.Shp; +import oseam.seamarks.SeaMark.Obj; public class PanelSpec extends JPanel { @@ -56,5 +57,5 @@ public PanelSpec(OSeaMAction dia) { dlg = dia; - panelCol = new PanelCol(dlg); + panelCol = new PanelCol(dlg, Obj.BODY); panelCol.setBounds(new Rectangle(9, 0, 34, 160)); 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 24875) @@ -16,4 +16,5 @@ import oseam.dialogs.OSeaMAction; import oseam.seamarks.SeaMark.Top; +import oseam.seamarks.SeaMark.Obj; public class PanelTop extends JPanel { @@ -46,4 +47,5 @@ JRadioButton button = tops.get(top); if (button.isSelected()) { + dlg.mark.setTopMark(top); button.setBorderPainted(true); } else @@ -55,5 +57,5 @@ public PanelTop(OSeaMAction dia) { dlg = dia; - panelCol = new PanelCol(dlg); + panelCol = new PanelCol(dlg, Obj.TOPMARK); panelCol.setBounds(new Rectangle(0, 0, 34, 160)); this.setLayout(null); 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkCard.java (revision 24875) @@ -101,5 +101,5 @@ public void setLightColour() { - super.setLightColour("W"); + super.setLightColour(Col.WHITE); } 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkIsol.java (revision 24875) @@ -10,4 +10,5 @@ import oseam.dialogs.OSeaMAction; import oseam.seamarks.SeaMark; +import oseam.seamarks.SeaMark.Col; public class MarkIsol extends SeaMark { @@ -69,5 +70,5 @@ public void setLightColour() { - super.setLightColour("W"); + super.setLightColour(Col.WHITE); } 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkLat.java (revision 24875) @@ -9,4 +9,5 @@ import oseam.dialogs.OSeaMAction; +import oseam.seamarks.SeaMark.Col; public class MarkLat extends SeaMark { @@ -157,12 +158,12 @@ if (getRegion() == IALA_A) { if (getCategory() == Cat.LAT_PORT || getCategory() == Cat.LAT_PREF_PORT) - super.setLightColour("R"); + super.setLightColour(Col.RED); else - super.setLightColour("G"); + super.setLightColour(Col.GREEN); } else { if (getCategory() == Cat.LAT_PORT || getCategory() == Cat.LAT_PREF_PORT) - super.setLightColour("G"); + super.setLightColour(Col.GREEN); else - super.setLightColour("R"); + super.setLightColour(Col.RED); } } 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/MarkSpec.java (revision 24875) @@ -10,4 +10,5 @@ import oseam.dialogs.OSeaMAction; import oseam.seamarks.SeaMark; +import oseam.seamarks.SeaMark.Col; public class MarkSpec extends SeaMark { @@ -91,5 +92,5 @@ public void setLightColour() { - super.setLightColour("W"); + super.setLightColour(Col.WHITE); } 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 24874) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 24875) @@ -45,17 +45,39 @@ public enum Col { - UNKNOWN, WHITE, RED, ORANGE, AMBER, YELLOW, GREEN, BLUE, VIOLET, - BLACK, RED_GREEN_RED, GREEN_RED_GREEN, RED_WHITE, + 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 } - private Col colour = Col.UNKNOWN; - - public Col getColour() { - return colour; - } - - public void setColour(Col col) { - colour = col; + public enum Obj { + BODY, TOPMARK, LIGHT + } + + private Col bodyColour = Col.UNKNOWN; + + public Col getColour(Obj obj) { + switch (obj) { + case BODY: + return bodyColour; + case TOPMARK: + return topColour; + case LIGHT: + return lightColour[sectorIndex]; + } + return Col.UNKNOWN; + } + + public void setColour(Obj obj, Col col) { + switch (obj) { + case BODY: + bodyColour = col; + break; + case TOPMARK: + topColour = col; + break; + case LIGHT: + lightColour[sectorIndex] = col; + break; + } } @@ -87,5 +109,6 @@ public enum Shp { - UNKNOWN, PILLAR, SPAR, CAN, CONE, SPHERE, BARREL, FLOAT, SUPER, BEACON, TOWER, STAKE, PERCH + UNKNOWN, PILLAR, SPAR, CAN, CONE, SPHERE, BARREL, FLOAT, SUPER, + BEACON, TOWER, STAKE, PERCH } @@ -101,15 +124,17 @@ public enum Top { - NONE, CAN, CONE, SPHERE, X_SHAPE, NORTH, SOUTH, EAST, WEST, SPHERES2, BOARD, DIAMOND, TRIANGLE, TRIANGLE_INV, SQUARE, MOORING - } - - private Top TopMark = Top.NONE; + NONE, CAN, CONE, SPHERE, X_SHAPE, NORTH, SOUTH, EAST, WEST, SPHERES2, + BOARD, DIAMOND, TRIANGLE, TRIANGLE_INV, SQUARE, MOORING + } + + private Top topMark = Top.NONE; + private Col topColour = Col.UNKNOWN; public boolean hasTopMark() { - return (TopMark != Top.NONE); + return (topMark != Top.NONE); } public void setTopMark(Top top) { - TopMark = top; + topMark = top; } @@ -221,9 +246,9 @@ Sectored = sectored; if (sectored) { - LightColour[0] = ""; + lightColour[0] = Col.UNKNOWN; } else { - setSectorIndex(0); + setsectorIndex(0); setLightChar(""); - setLightColour(""); + setLightColour(Col.UNKNOWN); setLightGroup(""); setHeight(""); @@ -235,12 +260,12 @@ } - private int SectorIndex = 0; - - public int getSectorIndex() { - return SectorIndex; - } - - public void setSectorIndex(int sector) { - SectorIndex = sector; + private int sectorIndex = 0; + + public int getsectorIndex() { + return sectorIndex; + } + + public void setsectorIndex(int sector) { + sectorIndex = sector; } @@ -248,27 +273,27 @@ public String getLightChar() { - if (LightChar[SectorIndex] == null) + if (LightChar[sectorIndex] == null) return (LightChar[0]); - return LightChar[SectorIndex]; + return LightChar[sectorIndex]; } public void setLightChar(String lightChar) { - if (SectorIndex == 0) { + if (sectorIndex == 0) { LightChar = new String[10]; LightChar[0] = lightChar; } else if (LightChar[0].isEmpty()) - LightChar[SectorIndex] = lightChar; - } - - private String[] LightColour = new String[10]; - - public String getLightColour() { - if (LightColour[SectorIndex] == null) - return (LightColour[0]); - return LightColour[SectorIndex]; - } - - public void setLightColour(String lightColour) { - LightColour[SectorIndex] = lightColour; + LightChar[sectorIndex] = lightChar; + } + + private Col[] lightColour = new Col[10]; + + public Col getLightColour() { + if (lightColour[sectorIndex] == null) + return (lightColour[0]); + return lightColour[sectorIndex]; + } + + public void setLightColour(Col col) { + lightColour[sectorIndex] = col; } @@ -276,13 +301,13 @@ public String getLightGroup() { - if (LightGroup[SectorIndex] == null) + if (LightGroup[sectorIndex] == null) return (LightGroup[0]); - return LightGroup[SectorIndex]; + return LightGroup[sectorIndex]; } public void setLightGroup(String lightGroup) { - if (SectorIndex == 0) + if (sectorIndex == 0) LightGroup = new String[10]; - LightGroup[SectorIndex] = lightGroup; + LightGroup[sectorIndex] = lightGroup; } @@ -298,13 +323,13 @@ public String getHeight() { - if (Height[SectorIndex] == null) + if (Height[sectorIndex] == null) return (Height[0]); - return Height[SectorIndex]; + return Height[sectorIndex]; } public void setHeight(String height) { - if (SectorIndex == 0) + if (sectorIndex == 0) Height = new String[10]; - Height[SectorIndex] = height; + Height[sectorIndex] = height; } @@ -312,13 +337,13 @@ public String getRange() { - if (Range[SectorIndex] == null) + if (Range[sectorIndex] == null) return (Range[0]); - return Range[SectorIndex]; + return Range[sectorIndex]; } public void setRange(String range) { - if (SectorIndex == 0) + if (sectorIndex == 0) Range = new String[10]; - Range[SectorIndex] = range; + Range[sectorIndex] = range; } @@ -326,13 +351,13 @@ public String getBearing1() { - if (Bearing1[SectorIndex] == null) + if (Bearing1[sectorIndex] == null) return (Bearing1[0]); - return Bearing1[SectorIndex]; + return Bearing1[sectorIndex]; } public void setBearing1(String bearing) { - if (SectorIndex == 0) + if (sectorIndex == 0) Bearing1 = new String[10]; - Bearing1[SectorIndex] = bearing; + Bearing1[sectorIndex] = bearing; } @@ -340,13 +365,13 @@ public String getBearing2() { - if (Bearing2[SectorIndex] == null) + if (Bearing2[sectorIndex] == null) return (Bearing2[0]); - return Bearing2[SectorIndex]; + return Bearing2[sectorIndex]; } public void setBearing2(String bearing) { - if (SectorIndex == 0) + if (sectorIndex == 0) Bearing2 = new String[10]; - Bearing2[SectorIndex] = bearing; + Bearing2[sectorIndex] = bearing; } @@ -354,13 +379,13 @@ public String getRadius() { - if (Radius[SectorIndex] == null) + if (Radius[sectorIndex] == null) return (Radius[0]); - return Radius[SectorIndex]; + return Radius[sectorIndex]; } public void setRadius(String radius) { - if (SectorIndex == 0) + if (sectorIndex == 0) Radius = new String[10]; - Radius[SectorIndex] = radius; + Radius[sectorIndex] = radius; } @@ -368,7 +393,7 @@ public String getLightPeriod() { - if (LightPeriod[SectorIndex] == null) + if (LightPeriod[sectorIndex] == null) return (LightPeriod[0]); - return LightPeriod[SectorIndex]; + return LightPeriod[sectorIndex]; } @@ -389,7 +414,7 @@ } } - if (SectorIndex == 0) + if (sectorIndex == 0) LightPeriod = new String[10]; - LightPeriod[SectorIndex] = lightPeriod; + LightPeriod[sectorIndex] = lightPeriod; } @@ -415,9 +440,9 @@ String values[] = value.split(":"); if (values[0].equals("red")) - LightColour[index] = "R"; + lightColour[index] = Col.RED; else if (values[0].equals("green")) - LightColour[index] = "G"; + lightColour[index] = Col.GREEN; else if (values[0].equals("white")) - LightColour[index] = "W"; + lightColour[index] = Col.WHITE; if (values.length > 1) Bearing1[index] = values[1]; @@ -433,9 +458,9 @@ if (key.equals("colour")) { if (value.equals("red")) - LightColour[index] = "R"; + lightColour[index] = Col.RED; else if (value.equals("green")) - LightColour[index] = "G"; + lightColour[index] = Col.GREEN; else if (value.equals("white")) - LightColour[index] = "W"; + lightColour[index] = Col.WHITE; } else if (key.equals("character")) { LightChar[index] = value; @@ -585,17 +610,17 @@ * dlg.tfM01RepeatTime.setVisible(true); if (isSectored()) { * dlg.rbM01Fired1.setSelected(false); dlg.rbM01FiredN.setSelected(true); if - * ((getSectorIndex() != 0) && (!LightChar[0].isEmpty())) + * ((getsectorIndex() != 0) && (!LightChar[0].isEmpty())) * dlg.cbM01Kennung.setEnabled(false); else * dlg.cbM01Kennung.setEnabled(true); - * dlg.cbM01Kennung.setSelectedItem(getLightChar()); if ((getSectorIndex() + * 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) && + * 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() != + * 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())) + * if ((getsectorIndex() != 0) && (!Range[0].isEmpty())) * dlg.tfM01Range.setEnabled(false); else dlg.tfM01Range.setEnabled(true); * dlg.tfM01Range.setText(getRange()); dlg.lM01Sector.setVisible(true); @@ -685,10 +710,9 @@ * if (Bearing2[i] != null) Main.main.undoRedo.add(new * ChangePropertyCommand(Node, "seamark:light:" + i + ":sector_end", - * Bearing2[i])); } } - * if (hasTopMark()) { Main.main.undoRedo.add(new + * Bearing2[i])); } } if (hasTopMark()) { Main.main.undoRedo.add(new * ChangePropertyCommand(Node, "seamark:topmark:shape", shape)); * Main.main.undoRedo.add(new ChangePropertyCommand(Node, - * "seamark:topmark:colour", colour)); } - * if (hasRadar()) { Main.main.undoRedo.add(new ChangePropertyCommand(Node, + * "seamark:topmark:colour", colour)); } 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,