Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/DefLitButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/DefLitButton.svg (revision 27112) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/DefLitButton.svg (revision 27112) @@ -0,0 +1,25036 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27112) @@ -23,7 +23,9 @@ SSWarning=Warning Signal Station SSTraffic=Traffic Signal Station +Topmark=Topmark Topmarks=Topmarks FogSignals=Fog signals Radar=Radar +Light=Light Lit=Lights Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 27112) @@ -23,7 +23,9 @@ SSWarning=Warning Signal Station SSTraffic=Traffic Signal Station +Topmark=Topmark Topmarks=Topmarks FogSignals=Fog signals Radar=Radar +Light=Light Lit=Lights Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27112) @@ -23,7 +23,9 @@ SSWarning=Warning Signal Station SSTraffic=Traffic Signal Station +Topmark=Topmark Topmarks=Topmarks FogSignals=Fog signals Radar=Radar +Light=Light Lit=Lights 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 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 27112) @@ -31,4 +31,5 @@ dlg.panelMain.saveButton.setEnabled(false); topmarkButton.setVisible(false); + lightButton.setVisible(false); Shp shp = dlg.mark.getShape(); if (portButton.isSelected()) { @@ -105,4 +106,6 @@ topmarkButton.setVisible(dlg.mark.testValid()); alTop.actionPerformed(null); + lightButton.setVisible(dlg.mark.testValid()); + alLit.actionPerformed(null); dlg.mark.paintSign(); } @@ -139,5 +142,5 @@ case LAM_STBD: case LAM_PSTBD: - dlg.panelMain.panelTop.coneTopButton.doClick(); + dlg.mark.setTopmark(Top.CONE); switch (dlg.mark.getRegion()) { case A: @@ -166,4 +169,49 @@ } dlg.panelMain.panelTop.syncPanel(); + dlg.mark.paintSign(); + } + }; + public JToggleButton lightButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/DefLitButton.png"))); + private ActionListener alLit = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (lightButton.isSelected()) { + if (SeaMark.GrpMAP.get(dlg.mark.getObject()) == Grp.SAW) { + dlg.mark.setLightAtt(Att.CHR, 0, "LFl"); + dlg.mark.setLightAtt(Att.COL, 0, Col.WHITE); + } else { + dlg.mark.setLightAtt(Att.CHR, 0, "Fl"); + switch (dlg.mark.getCategory()) { + case LAM_PORT: + case LAM_PPORT: + switch (dlg.mark.getRegion()) { + case A: + case C: + dlg.mark.setLightAtt(Att.COL, 0, Col.RED); + break; + case B: + dlg.mark.setLightAtt(Att.COL, 0, Col.GREEN); + break; + } + break; + case LAM_STBD: + case LAM_PSTBD: + switch (dlg.mark.getRegion()) { + case A: + case C: + dlg.mark.setLightAtt(Att.COL, 0, Col.GREEN); + break; + case B: + dlg.mark.setLightAtt(Att.COL, 0, Col.RED); + break; + } + break; + } + } + lightButton.setBorderPainted(true); + } else { + dlg.mark.clrLight(); + lightButton.setBorderPainted(false); + } + dlg.panelMain.panelLit.syncPanel(); dlg.mark.paintSign(); } @@ -192,8 +240,15 @@ topmarkButton.setBounds(new Rectangle(130, 0, 34, 32)); + topmarkButton.setToolTipText(Messages.getString("Topmark")); topmarkButton.setBorder(BorderFactory.createLoweredBevelBorder()); topmarkButton.addActionListener(alTop); topmarkButton.setVisible(false); this.add(topmarkButton); + lightButton.setBounds(new Rectangle(165, 0, 34, 32)); + lightButton.setToolTipText(Messages.getString("Light")); + lightButton.setBorder(BorderFactory.createLoweredBevelBorder()); + lightButton.addActionListener(alLit); + lightButton.setVisible(false); + this.add(lightButton); } @@ -235,4 +290,8 @@ topmarkButton.setSelected(dlg.mark.getTopmark() != Top.NONE); topmarkButton.setVisible(dlg.mark.testValid()); + Boolean lit = (dlg.mark.getLightAtt(Att.COL, 0) != Col.UNKNOWN) && !((String)dlg.mark.getLightAtt(Att.CHR, 0)).isEmpty(); + lightButton.setBorderPainted(lit); + lightButton.setSelected(lit); + lightButton.setVisible(dlg.mark.testValid()); panelPort.syncPanel(); panelStbd.syncPanel(); 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 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 27112) @@ -69,4 +69,5 @@ } alTop.actionPerformed(null); + alLit.actionPerformed(null); dlg.panelMain.panelMore.syncPanel(); dlg.mark.paintSign(); @@ -100,4 +101,5 @@ } topmarkButton.setVisible(dlg.mark.testValid()); + lightButton.setVisible(dlg.mark.testValid()); dlg.mark.paintSign(); } @@ -134,4 +136,40 @@ } dlg.panelMain.panelTop.syncPanel(); + dlg.mark.paintSign(); + } + }; + public JToggleButton lightButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/DefLitButton.png"))); + private ActionListener alLit = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (lightButton.isSelected()) { + dlg.mark.setLightAtt(Att.COL, 0, Col.WHITE); + switch (dlg.mark.getCategory()) { + case CAM_NORTH: + dlg.mark.setLightAtt(Att.CHR, 0, "Q"); + dlg.mark.setLightAtt(Att.GRP, 0, ""); + break; + case CAM_SOUTH: + dlg.mark.setLightAtt(Att.CHR, 0, "Q+LFl"); + dlg.mark.setLightAtt(Att.GRP, 0, "6"); + break; + case CAM_EAST: + dlg.mark.setLightAtt(Att.CHR, 0, "Q"); + dlg.mark.setLightAtt(Att.GRP, 0, "3"); + break; + case CAM_WEST: + dlg.mark.setLightAtt(Att.CHR, 0, "Q"); + dlg.mark.setLightAtt(Att.GRP, 0, "9"); + break; + default: + dlg.mark.setLightAtt(Att.CHR, 0, "Fl"); + dlg.mark.setLightAtt(Att.GRP, 0, "2"); + break; + } + lightButton.setBorderPainted(true); + } else { + dlg.mark.clrLight(); + lightButton.setBorderPainted(false); + } + dlg.panelMain.panelLit.syncPanel(); dlg.mark.paintSign(); } @@ -157,7 +195,15 @@ topmarkButton.setBounds(new Rectangle(130, 0, 34, 32)); + topmarkButton.setToolTipText(Messages.getString("Topmark")); topmarkButton.setBorder(BorderFactory.createLoweredBevelBorder()); topmarkButton.addActionListener(alTop); + topmarkButton.setVisible(false); this.add(topmarkButton); + lightButton.setBounds(new Rectangle(165, 0, 34, 32)); + lightButton.setToolTipText(Messages.getString("Light")); + lightButton.setBorder(BorderFactory.createLoweredBevelBorder()); + lightButton.addActionListener(alLit); + lightButton.setVisible(false); + this.add(lightButton); } @@ -175,4 +221,8 @@ topmarkButton.setSelected(dlg.mark.getTopmark() != Top.NONE); topmarkButton.setVisible(dlg.mark.testValid()); + Boolean lit = (dlg.mark.getLightAtt(Att.COL, 0) != Col.UNKNOWN) && !((String)dlg.mark.getLightAtt(Att.CHR, 0)).isEmpty(); + lightButton.setBorderPainted(lit); + lightButton.setSelected(lit); + lightButton.setVisible(dlg.mark.testValid()); } 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 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 27112) @@ -10,5 +10,4 @@ import oseam.Messages; import oseam.dialogs.OSeaMAction; -import oseam.seamarks.SeaMark; import oseam.seamarks.SeaMark.*; 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 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 27112) @@ -172,14 +172,14 @@ dlg = dia; panelChan = new PanelChan(dlg); - panelChan.setBounds(new Rectangle(65, 0, 180, 160)); + panelChan.setBounds(new Rectangle(65, 0, 200, 160)); panelChan.setVisible(false); panelHaz = new PanelHaz(dlg); - panelHaz.setBounds(new Rectangle(65, 0, 180, 160)); + panelHaz.setBounds(new Rectangle(65, 0, 200, 160)); panelHaz.setVisible(false); panelSpec = new PanelSpec(dlg); - panelSpec.setBounds(new Rectangle(65, 0, 180, 160)); + panelSpec.setBounds(new Rectangle(65, 0, 200, 160)); panelSpec.setVisible(false); panelLights = new PanelLights(dlg); - panelLights.setBounds(new Rectangle(65, 0, 180, 160)); + panelLights.setBounds(new Rectangle(65, 0, 200, 160)); panelLights.setVisible(false); panelMore = new PanelMore(dlg); 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 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 27112) @@ -39,4 +39,5 @@ if (dlg.mark.testValid()) { dlg.panelMain.panelChan.topmarkButton.setVisible(true); + dlg.panelMain.panelChan.lightButton.setVisible(true); if (dlg.mark.getCategory() == Cat.LAM_PORT) { switch (dlg.mark.getRegion()) { @@ -81,4 +82,5 @@ } else { dlg.panelMain.panelChan.topmarkButton.setVisible(false); + dlg.panelMain.panelChan.lightButton.setVisible(false); } dlg.mark.paintSign(); 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 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 27112) @@ -39,4 +39,5 @@ if (dlg.mark.testValid()) { dlg.panelMain.panelChan.topmarkButton.setVisible(true); + dlg.panelMain.panelChan.lightButton.setVisible(true); if (dlg.mark.getCategory() == Cat.LAM_STBD) { switch (dlg.mark.getRegion()) { @@ -81,4 +82,5 @@ } else { dlg.panelMain.panelChan.topmarkButton.setVisible(false); + dlg.panelMain.panelChan.lightButton.setVisible(false); } dlg.mark.paintSign(); 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 27111) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27112) @@ -452,15 +452,14 @@ ChrMAP.put(EnumSet.of(Chr.OCCULTING, Chr.FLASH), "OcFl"); ChrMAP.put(EnumSet.of(Chr.FIXED, Chr.LFLASH), "FLFl"); - ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.OCCULTING), "Al.Oc"); - ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.LFLASH), "Al.LFl"); - ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FLASH), "Al.Fl"); ChrMAP.put(EnumSet.of(Chr.QUICK, Chr.LFLASH), "Q+LFl"); ChrMAP.put(EnumSet.of(Chr.VQUICK, Chr.LFLASH), "VQ+LFl"); ChrMAP.put(EnumSet.of(Chr.UQUICK, Chr.LFLASH), "UQ+LFl"); ChrMAP.put(EnumSet.of(Chr.ALTERNATING), "Al"); + ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.OCCULTING), "Al.Oc"); + ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.LFLASH), "Al.LFl"); + ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FLASH), "Al.Fl"); ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FIXED), "Al.F"); ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FIXED, Chr.FLASH), "Al.FFl"); ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.ISOPHASED), "Al.Iso"); - ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.OCCULTING), "Al.Oc"); } @@ -576,4 +575,9 @@ if (sectors.size() > i) sectors.remove(i); + } + + public void clrLight() { + delLight(0); + addLight(); } @@ -1043,4 +1047,7 @@ setColour(Ent.TOPMARK, Col.UNKNOWN); setPattern(Ent.TOPMARK, Pat.NONE); + setFogSound(Fog.NONE); + setRadar(Rtb.NONE); + clrLight(); dlg.panelMain.moreButton.setVisible(false); dlg.panelMain.saveButton.setEnabled(false); @@ -1360,6 +1367,5 @@ } - sectors.clear(); - sectors.add(sector.clone()); + clrLight(); for (int i = 0; i < 30; i++) { String secStr = (i == 0) ? "" : (":" + Integer.toString(i)); @@ -1371,11 +1377,9 @@ } if (keys.containsKey("seamark:light" + secStr + ":character")) - setLightAtt(Att.CHR, i, - keys.get("seamark:light" + secStr + ":character")); + setLightAtt(Att.CHR, i, keys.get("seamark:light" + secStr + ":character")); if (keys.containsKey("seamark:light" + secStr + ":group")) setLightAtt(Att.GRP, i, keys.get("seamark:light" + secStr + ":group")); if (keys.containsKey("seamark:light" + secStr + ":sequence")) - setLightAtt(Att.SEQ, i, - keys.get("seamark:light" + secStr + ":sequence")); + setLightAtt(Att.SEQ, i, keys.get("seamark:light" + secStr + ":sequence")); if (keys.containsKey("seamark:light" + secStr + ":period")) setLightAtt(Att.PER, i, keys.get("seamark:light" + secStr + ":period")); @@ -1387,9 +1391,7 @@ } if (keys.containsKey("seamark:light" + secStr + ":sector_start")) - setLightAtt(Att.BEG, i, - keys.get("seamark:light" + secStr + ":sector_start")); + setLightAtt(Att.BEG, i, keys.get("seamark:light" + secStr + ":sector_start")); if (keys.containsKey("seamark:light" + secStr + ":sector_end")) - setLightAtt(Att.END, i, - keys.get("seamark:light" + secStr + ":sector_end")); + setLightAtt(Att.END, i, keys.get("seamark:light" + secStr + ":sector_end")); if (keys.containsKey("seamark:light" + secStr + ":radius")) setLightAtt(Att.RAD, i, keys.get("seamark:light" + secStr + ":radius")); @@ -1411,9 +1413,7 @@ } if (keys.containsKey("seamark:light" + secStr + ":orientation")) - setLightAtt(Att.ORT, i, - keys.get("seamark:light" + secStr + ":orientation")); + setLightAtt(Att.ORT, i, keys.get("seamark:light" + secStr + ":orientation")); if (keys.containsKey("seamark:light" + secStr + ":multiple")) - setLightAtt(Att.HGT, i, - keys.get("seamark:light" + secStr + ":multiple")); + setLightAtt(Att.HGT, i, keys.get("seamark:light" + secStr + ":multiple")); if (sectors.size() == i) break; @@ -1688,6 +1688,5 @@ } } else { - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource( - colStr))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(colStr))); } } else { @@ -1757,6 +1756,5 @@ System.out.println("Missing image: " + imgStr); } else { - dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource( - imgStr))); + dlg.panelMain.shapeIcon.setIcon(new ImageIcon(getClass().getResource(imgStr))); } } else { @@ -1867,10 +1865,8 @@ return; } else { - dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource( - imgStr))); + dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource(imgStr))); } } else { - dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource( - colStr))); + dlg.panelMain.topIcon.setIcon(new ImageIcon(getClass().getResource(colStr))); } } else { @@ -1879,6 +1875,5 @@ if (getFogSound() != Fog.NONE) { - dlg.panelMain.fogIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Fog_Signal.png"))); + dlg.panelMain.fogIcon.setIcon(new ImageIcon(getClass().getResource("/images/Fog_Signal.png"))); String str = ""; if (getFogSound() != Fog.UNKNOWN) @@ -1917,9 +1912,7 @@ if (RaType != Rtb.NONE) { if (getRadar() == Rtb.REFLECTOR) { - dlg.panelMain.radarIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Radar_Reflector_355.png"))); + dlg.panelMain.radarIcon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Reflector_355.png"))); } else { - dlg.panelMain.radarIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Radar_Station.png"))); + dlg.panelMain.radarIcon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png"))); String str = ""; if (getRadar() == Rtb.RAMARK) @@ -1941,22 +1934,18 @@ switch ((Col) getLightAtt(Att.COL, 0)) { case RED: - dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Light_Red_120.png"))); + dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Red_120.png"))); break; case GREEN: - dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Light_Green_120.png"))); + dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Green_120.png"))); break; case WHITE: case YELLOW: - dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Light_White_120.png"))); + dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_White_120.png"))); break; default: - dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource( - "/images/Light_Magenta_120.png"))); - } - } - String c = (String) getLightAtt(Att.CHR, 0); + dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Magenta_120.png"))); + } + } + String c = (String) dlg.mark.getLightAtt(Att.CHR, 0); String tmp = ""; if (c.contains("+")) { @@ -2004,6 +1993,5 @@ if (getObject() != Obj.UNKNOWN) { - Main.pref.put("smedplugin.IALA", getRegion() == Reg.C ? "C" - : (getRegion() == Reg.B ? "B" : "A")); + Main.pref.put("smedplugin.IALA", getRegion() == Reg.C ? "C" : (getRegion() == Reg.B ? "B" : "A")); for (String str : node.getKeys().keySet()) { @@ -2013,20 +2001,16 @@ if (!getName().isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:name", - getName())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:name", getName())); String objStr = ObjSTR.get(object); if (objStr != null) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:type", - objStr)); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:type", objStr)); if (getShape() != Shp.FLOAT) { String str = CatSTR.get(getCategory()); if (str != null) - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":category", str)); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":category", str)); if ((getShape() != Shp.BUOY) && (getShape() != Shp.BEACON)) - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":shape", ShpSTR.get(getShape()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":shape", ShpSTR.get(getShape()))); } @@ -2036,11 +2020,9 @@ str += (";" + ColSTR.get(getObjColour(i))); } - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":colour", str)); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":colour", str)); } if (getObjPattern() != Pat.NONE) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":colour_pattern", PatSTR.get(getObjPattern()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":colour_pattern", PatSTR.get(getObjPattern()))); } @@ -2049,32 +2031,25 @@ switch (region) { case A: - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":system", "iala-a")); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":system", "iala-a")); break; case B: - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":system", "iala-b")); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":system", "iala-b")); break; case C: - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":system", "other")); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":system", "other")); break; } } if (!getHeight().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":height", getHeight())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":height", getHeight())); } if (!getElevation().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" - + objStr + ":elevation", getElevation())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":elevation", getElevation())); } } if (getTopmark() != Top.NONE) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:topmark:shape", TopSTR.get(getTopmark()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:topmark:shape", TopSTR.get(getTopmark()))); if (getTopPattern() != Pat.NONE) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:topmark:colour_pattern", PatSTR.get(getTopPattern()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:topmark:colour_pattern", PatSTR.get(getTopPattern()))); if (getTopColour(0) != Col.UNKNOWN) { String str = ColSTR.get(getTopColour(0)); @@ -2082,6 +2057,5 @@ str += (";" + ColSTR.get(getTopColour(i))); } - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:topmark:colour", str)); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:topmark:colour", str)); } } @@ -2090,86 +2064,51 @@ String secStr = (i == 0) ? "" : (":" + Integer.toString(i)); if (sectors.get(i)[0] != Col.UNKNOWN) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":colour", - ColSTR.get(sectors.get(i)[0]))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":colour", ColSTR.get(sectors.get(i)[0]))); if (!((String) sectors.get(i)[1]).isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":character", - (String) sectors.get(i)[1])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":character", (String) sectors.get(i)[1])); if (!((String) sectors.get(i)[2]).isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":group", (String) sectors.get(i)[2])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":group", (String) sectors.get(i)[2])); if (!((String) sectors.get(i)[3]).isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":sequence", - (String) sectors.get(i)[3])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":sequence", (String) sectors.get(i)[3])); if (!((String) sectors.get(i)[4]).isEmpty()) - Main.main.undoRedo - .add(new ChangePropertyCommand(node, "seamark:light" + secStr - + ":period", (String) sectors.get(i)[4])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":period", (String) sectors.get(i)[4])); if (sectors.get(i)[5] != Lit.UNKNOWN) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":category", - LitSTR.get(sectors.get(i)[5]))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":category", LitSTR.get(sectors.get(i)[5]))); if (!((String) sectors.get(i)[6]).isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":sector_start", (String) sectors - .get(i)[6])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":sector_start", (String) sectors.get(i)[6])); if (!((String) sectors.get(i)[7]).isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":sector_end", - (String) sectors.get(i)[7])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":sector_end", (String) sectors.get(i)[7])); if (!((String) sectors.get(i)[8]).isEmpty()) - Main.main.undoRedo - .add(new ChangePropertyCommand(node, "seamark:light" + secStr - + ":radius", (String) sectors.get(i)[8])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":radius", (String) sectors.get(i)[8])); if (!((String) sectors.get(i)[9]).isEmpty()) - Main.main.undoRedo - .add(new ChangePropertyCommand(node, "seamark:light" + secStr - + ":height", (String) sectors.get(i)[9])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":height", (String) sectors.get(i)[9])); if (!((String) sectors.get(i)[10]).isEmpty()) - Main.main.undoRedo - .add(new ChangePropertyCommand(node, "seamark:light" + secStr - + ":range", (String) sectors.get(i)[10])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":range", (String) sectors.get(i)[10])); if (sectors.get(i)[11] != Vis.UNKNOWN) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":visibility", VisSTR.get(sectors - .get(i)[11]))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":visibility", VisSTR.get(sectors.get(i)[11]))); if (sectors.get(i)[12] != Exh.UNKNOWN) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":exhibition", ExhSTR.get(sectors - .get(i)[12]))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":exhibition", ExhSTR.get(sectors.get(i)[12]))); if (!((String) sectors.get(i)[13]).isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":orientation", (String) sectors - .get(i)[13])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":orientation", (String) sectors.get(i)[13])); if (!((String) sectors.get(i)[14]).isEmpty()) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light" + secStr + ":multiple", - (String) sectors.get(i)[14])); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":multiple", (String) sectors.get(i)[14])); } if (getFogSound() != Fog.NONE) { if (getFogSound() == Fog.UNKNOWN) - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:fog_signal", "yes")); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal", "yes")); else - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:fog_signal:category", FogSTR.get(getFogSound()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal:category", FogSTR.get(getFogSound()))); if (!getFogGroup().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:fog_signal:group", getFogGroup())); + 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())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal:period", getFogPeriod())); } if (!getFogSequence().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:fog_signal:sequence", getFogSequence())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal:sequence", getFogSequence())); } if (!getFogRange().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:fog_signal:range", getFogRange())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal:range", getFogRange())); } } @@ -2177,30 +2116,22 @@ if (RaType != Rtb.NONE) { if (getRadar() == Rtb.REFLECTOR) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:radar_reflector", "yes")); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_reflector", "yes")); } else { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:radar_transponder:category", RtbSTR.get(getRadar()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:category", RtbSTR.get(getRadar()))); if (!getRaconGroup().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:radar_transponder:group", getRaconGroup())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:group", getRaconGroup())); } if (!getRaconPeriod().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:radar_transponder:period", getRaconPeriod())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:period", getRaconPeriod())); } if (!getRaconSequence().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:radar_transponder:sequence", getRaconSequence())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:sequence", getRaconSequence())); } if (!getRaconRange().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:radar_transponder:range", getRaconRange())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:range", getRaconRange())); } if ((!getRaconSector1().isEmpty()) && (!getRaconSector2().isEmpty())) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:radar_transponder:sector_start", getRaconSector1())); - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:radar_transponder:sector_end", getRaconSector2())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:sector_start", getRaconSector1())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_transponder:sector_end", getRaconSector2())); } } @@ -2208,38 +2139,29 @@ if (!getInfo().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:information", getInfo())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:information", getInfo())); } if (!getSource().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:source", getSource())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:source", getSource())); } if (getStatus() != Sts.UNKNOWN) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:status", StsSTR.get(getStatus()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:status", StsSTR.get(getStatus()))); } if (getConstr() != Cns.UNKNOWN) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:construction", CnsSTR.get(getConstr()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:construction", CnsSTR.get(getConstr()))); } if (getConsp() != Con.UNKNOWN) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:conspicuity", ConSTR.get(getConsp()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:conspicuity", ConSTR.get(getConsp()))); } if (getRefl() != Con.UNKNOWN) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:reflectivity", ConSTR.get(getRefl()))); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:reflectivity", ConSTR.get(getRefl()))); } if (!getRef().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:reference", getRef())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:reference", getRef())); } if (!getLightRef().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, - "seamark:light:reference", getLightRef())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light:reference", getLightRef())); } if (!getFixme().isEmpty()) { - Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fixme", - getFixme())); + Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fixme", getFixme())); } }