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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 26881) @@ -106,5 +106,6 @@ Fog=Fog -NoColour=No colour +RemColour=Remove colour +AddColour=Add colour White=White Red=Red @@ -170,2 +171,8 @@ Military=Military Practice +Status=Status +Information=Information +Source=Source +Elevation=Elevation +StructureHeight=Structure Height + 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 26881) @@ -34,11 +34,4 @@ dlg.mark.setShape(Shp.UNKNOWN); } - if (dlg.mark.getRegion() == Reg.C) { - panelPort.regionCButton.doClick(); - } else if (dlg.mark.getRegion() == Reg.B) { - panelPort.regionBButton.doClick(); - } else { - panelPort.regionAButton.doClick(); - } portButton.setBorderPainted(true); panelPort.setVisible(true); @@ -57,11 +50,4 @@ dlg.mark.setShape(Shp.UNKNOWN); } - if (dlg.mark.getRegion() == Reg.C) { - panelPort.regionCButton.doClick(); - } else if (dlg.mark.getRegion() == Reg.B) { - panelPort.regionBButton.doClick(); - } else { - panelPort.regionAButton.doClick(); - } prefPortButton.setBorderPainted(true); panelPort.setVisible(true); @@ -78,11 +64,4 @@ panelStbd.clearSelections(); dlg.mark.setShape(Shp.UNKNOWN); - } - if (dlg.mark.getRegion() == Reg.C) { - panelStbd.regionCButton.doClick(); - } else if (dlg.mark.getRegion() == Reg.B) { - panelStbd.regionBButton.doClick(); - } else { - panelStbd.regionAButton.doClick(); } stbdButton.setBorderPainted(true); @@ -101,11 +80,4 @@ panelStbd.clearSelections(); dlg.mark.setShape(Shp.UNKNOWN); - } - if (dlg.mark.getRegion() == Reg.C) { - panelStbd.regionCButton.doClick(); - } else if (dlg.mark.getRegion() == Reg.B) { - panelStbd.regionBButton.doClick(); - } else { - panelStbd.regionAButton.doClick(); } prefStbdButton.setBorderPainted(true); @@ -168,5 +140,5 @@ private JRadioButton getCatButton(JRadioButton button, int x, int y, int w, int h, String tip) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alCat); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java (revision 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java (revision 26881) @@ -142,5 +142,5 @@ private JToggleButton getChrButton(JToggleButton button, int x, int y, int w, int h, String tip, Chr chr) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setBorderPainted(false); button.setToolTipText(tr(tip)); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java (revision 26881) @@ -60,5 +60,5 @@ stackCol.add(stackIdx, new JRadioButton(new ImageIcon(getClass().getResource("/images/ColourButton.png")))); JRadioButton btnI = stackCol.get(stackIdx); - btnI.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + btnI.setBorder(BorderFactory.createLoweredBevelBorder()); stack.add(btnI); stackColours.add(btnI); @@ -111,5 +111,5 @@ ent = entity; this.setLayout(null); - this.add(getColButton(offButton, 0, 0, 34, 16, Messages.getString("NoColour"), Col.UNKNOWN), null); + this.add(getColButton(offButton, 0, 0, 34, 16, Messages.getString("RemColour"), Col.UNKNOWN), null); this.add(getColButton(whiteButton, 0, 16, 34, 16, Messages.getString("White"), Col.WHITE), null); this.add(getColButton(redButton, 0, 32, 34, 16, Messages.getString("Red"), Col.RED), null); @@ -129,5 +129,5 @@ stack = new JPanel(); - stack.setBorder(BorderFactory.createLineBorder(Color.black)); + stack.setBorder(BorderFactory.createLoweredBevelBorder()); stack.setBounds(38, 87, 34, 64); stack.setLayout(null); @@ -154,5 +154,5 @@ private JRadioButton getColButton(JRadioButton button, int x, int y, int w, int h, String tip, Col col) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(tr(tip)); button.addActionListener(alColour); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 26881) @@ -149,5 +149,5 @@ private JRadioButton getCatButton(JRadioButton button, int x, int y, int w, int h, String tip) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alCat); @@ -158,5 +158,5 @@ private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj car, Obj isd) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alShape); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 26881) @@ -190,5 +190,5 @@ private JRadioButton getObjButton(JRadioButton button, int x, int y, int w, int h, String tip, Obj obj) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alObj); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 26881) @@ -218,5 +218,5 @@ private JRadioButton getTypeButton(JRadioButton button, int x, int y, int w, int h, String tip) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alType); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 26881) @@ -316,5 +316,5 @@ private JRadioButton getButton(JRadioButton button, int x, int y, int w, int h, String tip) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); return button; Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java (revision 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java (revision 26881) @@ -1,3 +1,5 @@ package oseam.panels; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.*; @@ -15,5 +17,162 @@ private OSeaMAction dlg; + public JLabel infoLabel; + public JTextField infoBox; + private ActionListener alInfo = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (dlg.mark == null) + return; + } + }; + public JLabel sourceLabel; + public JTextField sourceBox; + private ActionListener alSource = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (dlg.mark == null) + return; + } + }; + public JLabel elevLabel; + public JTextField elevBox; + private ActionListener alElev = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (dlg.mark == null) + return; + } + }; + public JLabel heightLabel; + public JTextField heightBox; + private ActionListener alHeight = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (dlg.mark == null) + return; + } + }; + public JLabel statusLabel; + public JComboBox statusBox; + private ActionListener alStatus = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (dlg.mark == null) + return; + } + }; + public JLabel constrLabel; + public JComboBox constrBox; + private ActionListener alConstr = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (dlg.mark == null) + return; + } + }; + public JLabel visLabel; + public JComboBox visBox; + private ActionListener alVis = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (dlg.mark == null) + return; + } + }; + public JLabel conspLabel; + public JComboBox conspBox; + private ActionListener alConsp = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (dlg.mark == null) + return; + } + }; public PanelPat panelPat; + private ButtonGroup regionButtons = new ButtonGroup(); + public JRadioButton regionAButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionAButton.png"))); + public JRadioButton regionBButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionBButton.png"))); + public JRadioButton regionCButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionCButton.png"))); + private ActionListener alRegion = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + if (regionAButton.isSelected()) { + dlg.mark.setRegion(Reg.A); + switch (dlg.mark.getCategory()) { + case LAM_PORT: + dlg.mark.setColour(Ent.BODY, Col.RED); + dlg.mark.setPattern(Ent.BODY, Pat.NONE); + break; + case LAM_PPORT: + dlg.mark.setColour(Ent.BODY, Col.RED); + dlg.mark.addColour(Ent.BODY, Col.GREEN); + dlg.mark.addColour(Ent.BODY, Col.RED); + dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); + break; + case LAM_STBD: + dlg.mark.setColour(Ent.BODY, Col.GREEN); + dlg.mark.setPattern(Ent.BODY, Pat.NONE); + break; + case LAM_PSTBD: + dlg.mark.setColour(Ent.BODY, Col.GREEN); + dlg.mark.addColour(Ent.BODY, Col.RED); + dlg.mark.addColour(Ent.BODY, Col.GREEN); + dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); + break; + } + regionAButton.setBorderPainted(true); + } else { + regionAButton.setBorderPainted(false); + } + if (regionBButton.isSelected()) { + dlg.mark.setRegion(Reg.B); + switch (dlg.mark.getCategory()) { + case LAM_PORT: + dlg.mark.setColour(Ent.BODY, Col.GREEN); + dlg.mark.setPattern(Ent.BODY, Pat.NONE); + break; + case LAM_PPORT: + dlg.mark.setColour(Ent.BODY, Col.GREEN); + dlg.mark.addColour(Ent.BODY, Col.RED); + dlg.mark.addColour(Ent.BODY, Col.GREEN); + dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); + break; + case LAM_STBD: + dlg.mark.setColour(Ent.BODY, Col.RED); + dlg.mark.setPattern(Ent.BODY, Pat.NONE); + break; + case LAM_PSTBD: + dlg.mark.setColour(Ent.BODY, Col.RED); + dlg.mark.addColour(Ent.BODY, Col.GREEN); + dlg.mark.addColour(Ent.BODY, Col.RED); + dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); + break; + } + regionBButton.setBorderPainted(true); + } else { + regionBButton.setBorderPainted(false); + } + if (regionCButton.isSelected()) { + dlg.mark.setRegion(Reg.C); + dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); + switch (dlg.mark.getCategory()) { + case LAM_PORT: + dlg.mark.setColour(Ent.BODY, Col.RED); + dlg.mark.addColour(Ent.BODY, Col.WHITE); + dlg.mark.addColour(Ent.BODY, Col.RED); + dlg.mark.addColour(Ent.BODY, Col.WHITE); + break; + case LAM_PPORT: + case LAM_PSTBD: + dlg.mark.setColour(Ent.BODY, Col.RED); + dlg.mark.addColour(Ent.BODY, Col.GREEN); + dlg.mark.addColour(Ent.BODY, Col.RED); + dlg.mark.addColour(Ent.BODY, Col.GREEN); + break; + case LAM_STBD: + dlg.mark.setColour(Ent.BODY, Col.GREEN); + dlg.mark.addColour(Ent.BODY, Col.WHITE); + dlg.mark.addColour(Ent.BODY, Col.GREEN); + dlg.mark.addColour(Ent.BODY, Col.WHITE); + break; + } + regionCButton.setBorderPainted(true); + } else { + regionCButton.setBorderPainted(false); + } + dlg.mark.paintSign(); + } + }; public PanelMore(OSeaMAction dia) { @@ -23,6 +182,49 @@ panelPat.setBounds(new Rectangle(0, 0, 110, 160)); this.add(panelPat, null); - - } + this.add(getRegionButton(regionAButton, 110, 0, 34, 30, "RegionA"), null); + this.add(getRegionButton(regionBButton, 110, 32, 34, 30, "RegionB"), null); + this.add(getRegionButton(regionCButton, 110, 64, 34, 30, "RegionC"), null); + + elevLabel = new JLabel(Messages.getString("Elevation"), SwingConstants.CENTER); + elevLabel.setBounds(new Rectangle(140, 0, 90, 20)); + this.add(elevLabel, null); + elevBox = new JTextField(); + elevBox.setBounds(new Rectangle(160, 20, 50, 20)); + this.add(elevBox, null); + elevBox.addActionListener(alElev); + + heightLabel = new JLabel(Messages.getString("StructureHeight"), SwingConstants.CENTER); + heightLabel.setBounds(new Rectangle(230, 0, 100, 20)); + this.add(heightLabel, null); + heightBox = new JTextField(); + heightBox.setBounds(new Rectangle(250, 20, 50, 20)); + this.add(heightBox, null); + heightBox.addActionListener(alHeight); + + sourceLabel = new JLabel(Messages.getString("Source"), SwingConstants.CENTER); + sourceLabel.setBounds(new Rectangle(110, 120, 140, 20)); + this.add(sourceLabel, null); + sourceBox = new JTextField(); + sourceBox.setBounds(new Rectangle(110, 100, 140, 20)); + this.add(sourceBox, null); + sourceBox.addActionListener(alSource); + + infoLabel = new JLabel(Messages.getString("Information"), SwingConstants.CENTER); + infoLabel.setBounds(new Rectangle(110, 120, 140, 20)); + this.add(infoLabel, null); + infoBox = new JTextField(); + infoBox.setBounds(new Rectangle(110, 140, 140, 20)); + this.add(infoBox, null); + infoBox.addActionListener(alInfo); + +/* statusLabel = new JLabel(Messages.getString("Status"), SwingConstants.CENTER); + statusLabel.setBounds(new Rectangle(150, 0, 100, 20)); + this.add(statusLabel, null); + statusBox = new JComboBox(); + statusBox.setBounds(new Rectangle(150, 20, 100, 20)); + this.add(statusBox, null); + statusBox.addActionListener(alStatus); +*/ + } public void clearSelections() { @@ -30,3 +232,12 @@ } + private JRadioButton getRegionButton(JRadioButton button, int x, int y, int w, int h, String tip) { + button.setBounds(new Rectangle(x, y, w, h)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); + button.setToolTipText(Messages.getString(tip)); + button.addActionListener(alRegion); + regionButtons.add(button); + return button; + } + } Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPat.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPat.java (revision 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPat.java (revision 26881) @@ -63,5 +63,5 @@ private JRadioButton getPatButton(JRadioButton button, int x, int y, int w, int h, String tip, Pat pat) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alPat); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 26881) @@ -13,57 +13,4 @@ private OSeaMAction dlg; - private ButtonGroup regionButtons = new ButtonGroup(); - public JRadioButton regionAButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionAButton.png"))); - public JRadioButton regionBButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionBButton.png"))); - public JRadioButton regionCButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionCButton.png"))); - private ActionListener alRegion = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { - if (regionAButton.isSelected()) { - dlg.mark.setRegion(Reg.A); - dlg.mark.setColour(Ent.BODY, Col.RED); - dlg.mark.setPattern(Ent.BODY, Pat.NONE); - if (dlg.mark.getCategory() == Cat.LAM_PPORT) { - dlg.mark.addColour(Ent.BODY, Col.GREEN); - dlg.mark.addColour(Ent.BODY, Col.RED); - dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - } - regionAButton.setBorderPainted(true); - } else { - regionAButton.setBorderPainted(false); - } - if (regionBButton.isSelected()) { - dlg.mark.setRegion(Reg.B); - dlg.mark.setColour(Ent.BODY, Col.GREEN); - dlg.mark.setPattern(Ent.BODY, Pat.NONE); - if (dlg.mark.getCategory() == Cat.LAM_PPORT) { - dlg.mark.addColour(Ent.BODY, Col.RED); - dlg.mark.addColour(Ent.BODY, Col.GREEN); - dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - } - regionBButton.setBorderPainted(true); - } else { - regionBButton.setBorderPainted(false); - } - if (regionCButton.isSelected()) { - dlg.mark.setRegion(Reg.C); - if (dlg.mark.getCategory() == Cat.LAM_PPORT) { - dlg.mark.setColour(Ent.BODY, Col.RED); - dlg.mark.addColour(Ent.BODY, Col.GREEN); - dlg.mark.addColour(Ent.BODY, Col.RED); - dlg.mark.addColour(Ent.BODY, Col.GREEN); - } else { - dlg.mark.setColour(Ent.BODY, Col.RED); - dlg.mark.addColour(Ent.BODY, Col.WHITE); - dlg.mark.addColour(Ent.BODY, Col.RED); - dlg.mark.addColour(Ent.BODY, Col.WHITE); - } - dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - regionCButton.setBorderPainted(true); - } else { - regionCButton.setBorderPainted(false); - } - dlg.mark.paintSign(); - } - }; private ButtonGroup shapeButtons = new ButtonGroup(); public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); @@ -102,7 +49,4 @@ dlg = dia; this.setLayout(null); - this.add(getRegionButton(regionAButton, 70, 0, 34, 30, "RegionA"), null); - this.add(getRegionButton(regionBButton, 70, 32, 34, 30, "RegionB"), null); - this.add(getRegionButton(regionCButton, 70, 64, 34, 30, "RegionC"), null); this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT), null); this.add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), null); @@ -121,16 +65,7 @@ } - private JRadioButton getRegionButton(JRadioButton button, int x, int y, int w, int h, String tip) { - button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); - button.setToolTipText(Messages.getString(tip)); - button.addActionListener(alRegion); - regionButtons.add(button); - return button; - } - private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alShape); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java (revision 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java (revision 26881) @@ -59,5 +59,5 @@ private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alShape); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 26881) @@ -153,5 +153,5 @@ private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alShape); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 26881) @@ -13,57 +13,4 @@ private OSeaMAction dlg; - private ButtonGroup regionButtons = new ButtonGroup(); - public JRadioButton regionAButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionAButton.png"))); - public JRadioButton regionBButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionBButton.png"))); - public JRadioButton regionCButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionCButton.png"))); - private ActionListener alRegion = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { - if (regionAButton.isSelected()) { - dlg.mark.setRegion(Reg.A); - dlg.mark.setColour(Ent.BODY, Col.GREEN); - dlg.mark.setPattern(Ent.BODY, Pat.NONE); - if (dlg.mark.getCategory() == Cat.LAM_PSTBD) { - dlg.mark.addColour(Ent.BODY, Col.RED); - dlg.mark.addColour(Ent.BODY, Col.GREEN); - dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - } - regionAButton.setBorderPainted(true); - } else { - regionAButton.setBorderPainted(false); - } - if (regionBButton.isSelected()) { - dlg.mark.setRegion(Reg.B); - dlg.mark.setColour(Ent.BODY, Col.RED); - dlg.mark.setPattern(Ent.BODY, Pat.NONE); - if (dlg.mark.getCategory() == Cat.LAM_PSTBD) { - dlg.mark.addColour(Ent.BODY, Col.GREEN); - dlg.mark.addColour(Ent.BODY, Col.RED); - dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - } - regionBButton.setBorderPainted(true); - } else { - regionBButton.setBorderPainted(false); - } - if (regionCButton.isSelected()) { - dlg.mark.setRegion(Reg.C); - if (dlg.mark.getCategory() == Cat.LAM_PSTBD) { - dlg.mark.setColour(Ent.BODY, Col.RED); - dlg.mark.addColour(Ent.BODY, Col.GREEN); - dlg.mark.addColour(Ent.BODY, Col.RED); - dlg.mark.addColour(Ent.BODY, Col.GREEN); - } else { - dlg.mark.setColour(Ent.BODY, Col.GREEN); - dlg.mark.addColour(Ent.BODY, Col.WHITE); - dlg.mark.addColour(Ent.BODY, Col.GREEN); - dlg.mark.addColour(Ent.BODY, Col.WHITE); - } - dlg.mark.setPattern(Ent.BODY, Pat.HORIZ); - regionCButton.setBorderPainted(true); - } else { - regionCButton.setBorderPainted(false); - } - dlg.mark.paintSign(); - } - }; private ButtonGroup shapeButtons = new ButtonGroup(); public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); @@ -102,7 +49,4 @@ dlg = dia; this.setLayout(null); - this.add(getRegionButton(regionAButton, 70, 0, 34, 30, "RegionA"), null); - this.add(getRegionButton(regionBButton, 70, 32, 34, 30, "RegionB"), null); - this.add(getRegionButton(regionCButton, 70, 64, 34, 30, "RegionC"), null); this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT), null); this.add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), null); @@ -121,16 +65,7 @@ } - private JRadioButton getRegionButton(JRadioButton button, int x, int y, int w, int h, String tip) { - button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); - button.setToolTipText(Messages.getString(tip)); - button.addActionListener(alRegion); - regionButtons.add(button); - return button; - } - private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alShape); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 26881) @@ -101,5 +101,5 @@ private JRadioButton getTopButton(JRadioButton button, int x, int y, int w, int h, String tip, Top top) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alTop); @@ -111,5 +111,5 @@ private JRadioButton getDayButton(JRadioButton button, int x, int y, int w, int h, String tip, Day day) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alTop); @@ -121,5 +121,5 @@ private JRadioButton getMoorButton(JRadioButton button, int x, int y, int w, int h, String tip) { button.setBounds(new Rectangle(x, y, w, h)); - button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); + button.setBorder(BorderFactory.createLoweredBevelBorder()); button.setToolTipText(Messages.getString(tip)); button.addActionListener(alTop); 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 26880) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 26881) @@ -629,11 +629,17 @@ public void parseMark(Node node) { - region = Main.pref.get("smedplugin.IALA").equals("C") ? Reg.C : (Main.pref.get("smedplugin.IALA").equals("B") ? Reg.B : Reg.A); dlg.panelMain.clearSelections(); dlg.manager.showVisualMessage(""); - String str = ""; + String str = Main.pref.get("smedplugin.IALA"); + if (str.equals("C")) + dlg.panelMain.panelMore.regionCButton.doClick(); + else if (str.equals("B")) + dlg.panelMain.panelMore.regionBButton.doClick(); + else + dlg.panelMain.panelMore.regionAButton.doClick(); Map keys = node.getKeys(); + str = ""; if (keys.containsKey("seamark:type")) str = keys.get("seamark:type");