Index: plications/editors/josm/plugins/smed/plugs/oseam/src/images/MooringTopButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/MooringTopButton.svg (revision 27422) +++ (revision ) @@ -1,14125 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27423) @@ -64,5 +64,4 @@ SquareDay=Square daymark CircleDay=Circular daymark -MooringTop=Mooring SelectNode=Please select a node 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 27423) @@ -64,5 +64,4 @@ SquareDay=Quadratisch Tagzeichen CircleDay=Kreis Tagzeichen -MooringTop=Mooring SelectNode=Bitte einen Knoten auswählen 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27423) @@ -64,5 +64,4 @@ SquareDay=Square daymark CircleDay=Circular daymark -MooringTop=Mooring SelectNode=Please select a node 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java (revision 27423) @@ -76,6 +76,7 @@ } }; - private ActionListener alCharBox = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flCharBox = new FocusListener() { + public void focusGained(java.awt.event.FocusEvent e) {} + public void focusLost(java.awt.event.FocusEvent e) { String str = charBox.getText(); dlg.panelMain.mark.setLightAtt(Att.CHR, 0, str); @@ -136,5 +137,5 @@ charBox.setHorizontalAlignment(SwingConstants.CENTER); add(charBox); - charBox.addActionListener(alCharBox); + charBox.addFocusListener(flCharBox); } 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java (revision 27423) @@ -39,6 +39,6 @@ public JLabel groupLabel; public JTextField groupBox; - private ActionListener alGroup = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flGroup = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setFogGroup(groupBox.getText()); } @@ -46,6 +46,6 @@ public JLabel periodLabel; public JTextField periodBox; - private ActionListener alPeriod = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flPeriod = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setFogPeriod(periodBox.getText()); } @@ -53,6 +53,6 @@ public JLabel seqLabel; public JTextField seqBox; - private ActionListener alSeq = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flSeq = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setFogSequence(seqBox.getText()); } @@ -60,6 +60,6 @@ public JLabel rangeLabel; public JTextField rangeBox; - private ActionListener alRange = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flRange = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setFogRange(rangeBox.getText()); } @@ -86,5 +86,5 @@ groupBox.setHorizontalAlignment(SwingConstants.CENTER); add(groupBox); - groupBox.addActionListener(alGroup); + groupBox.addFocusListener(flGroup); periodLabel = new JLabel(Messages.getString("Period"), SwingConstants.CENTER); @@ -95,5 +95,5 @@ periodBox.setHorizontalAlignment(SwingConstants.CENTER); add(periodBox); - periodBox.addActionListener(alPeriod); + periodBox.addFocusListener(flPeriod); seqLabel = new JLabel(Messages.getString("Sequence"), SwingConstants.CENTER); @@ -104,5 +104,5 @@ seqBox.setHorizontalAlignment(SwingConstants.CENTER); add(seqBox); - seqBox.addActionListener(alSeq); + seqBox.addFocusListener(flSeq); rangeLabel = new JLabel(Messages.getString("Range"), SwingConstants.CENTER); @@ -113,5 +113,5 @@ rangeBox.setHorizontalAlignment(SwingConstants.CENTER); add(rangeBox); - rangeBox.addActionListener(alRange); + rangeBox.addFocusListener(flRange); } 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 27423) @@ -19,6 +19,6 @@ public JLabel groupLabel; public JTextField groupBox; - private ActionListener alGroup = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flGroup = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setLightAtt(Att.GRP, 0, groupBox.getText()); } @@ -26,6 +26,6 @@ public JLabel periodLabel; public JTextField periodBox; - private ActionListener alPeriod = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flPeriod = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setLightAtt(Att.PER, 0, periodBox.getText()); } @@ -33,6 +33,6 @@ public JLabel sequenceLabel; public JTextField sequenceBox; - private ActionListener alSequence = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flSequence = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setLightAtt(Att.SEQ, 0, sequenceBox.getText()); } @@ -52,6 +52,6 @@ public JLabel heightLabel; public JTextField heightBox; - private ActionListener alHeight = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flHeight = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setLightAtt(Att.HGT, 0, heightBox.getText()); } @@ -59,6 +59,6 @@ public JLabel rangeLabel; public JTextField rangeBox; - private ActionListener alRange = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flRange = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setLightAtt(Att.RNG, 0, rangeBox.getText()); } @@ -66,6 +66,6 @@ public JLabel orientationLabel; public JTextField orientationBox; - private ActionListener alOrientation = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flOrientation = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setLightAtt(Att.ORT, 0, orientationBox.getText()); } @@ -73,6 +73,6 @@ public JLabel multipleLabel; public JTextField multipleBox; - private ActionListener alMultiple = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flMultiple = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setLightAtt(Att.MLT, 0, multipleBox.getText()); } @@ -168,5 +168,5 @@ groupBox.setHorizontalAlignment(SwingConstants.CENTER); add(groupBox); - groupBox.addActionListener(alGroup); + groupBox.addFocusListener(flGroup); periodLabel = new JLabel(Messages.getString("Period"), SwingConstants.CENTER); @@ -177,5 +177,5 @@ periodBox.setHorizontalAlignment(SwingConstants.CENTER); add(periodBox); - periodBox.addActionListener(alPeriod); + periodBox.addFocusListener(flPeriod); heightLabel = new JLabel(Messages.getString("Height"), SwingConstants.CENTER); @@ -186,5 +186,5 @@ heightBox.setHorizontalAlignment(SwingConstants.CENTER); add(heightBox); - heightBox.addActionListener(alHeight); + heightBox.addFocusListener(flHeight); rangeLabel = new JLabel(Messages.getString("Range"), SwingConstants.CENTER); @@ -195,5 +195,5 @@ rangeBox.setHorizontalAlignment(SwingConstants.CENTER); add(rangeBox); - rangeBox.addActionListener(alRange); + rangeBox.addFocusListener(flRange); sequenceLabel = new JLabel(Messages.getString("Sequence"), SwingConstants.CENTER); @@ -204,5 +204,5 @@ sequenceBox.setHorizontalAlignment(SwingConstants.CENTER); add(sequenceBox); - sequenceBox.addActionListener(alSequence); + sequenceBox.addFocusListener(flSequence); categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER); @@ -266,5 +266,5 @@ orientationBox.setVisible(false); add(orientationBox); - orientationBox.addActionListener(alOrientation); + orientationBox.addFocusListener(flOrientation); multipleLabel = new JLabel(Messages.getString("Multiplicity"), SwingConstants.CENTER); @@ -277,5 +277,5 @@ multipleBox.setVisible(false); add(multipleBox); - multipleBox.addActionListener(alMultiple); + multipleBox.addFocusListener(flMultiple); } 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 27423) @@ -26,7 +26,9 @@ public JLabel nameLabel = null; public JTextField nameBox = null; - private ActionListener alName = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flName = new FocusListener() { + public void focusLost(java.awt.event.FocusEvent e) { mark.setName(nameBox.getText()); + } + public void focusGained(java.awt.event.FocusEvent e) { } }; @@ -233,5 +235,5 @@ nameBox.setHorizontalAlignment(SwingConstants.CENTER); add(nameBox); - nameBox.addActionListener(alName); + nameBox.addFocusListener(flName); saveButton = new JButton(); 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java (revision 27423) @@ -17,6 +17,6 @@ public JLabel infoLabel; public JTextField infoBox; - private ActionListener alInfo = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flInfo = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setInfo(infoBox.getText()); } @@ -24,6 +24,6 @@ public JLabel sourceLabel; public JTextField sourceBox; - private ActionListener alSource = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flSource = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setSource(sourceBox.getText()); } @@ -31,6 +31,6 @@ public JLabel elevLabel; public JTextField elevBox; - private ActionListener alElev = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flElev = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setElevation(elevBox.getText()); } @@ -38,6 +38,6 @@ public JLabel heightLabel; public JTextField heightBox; - private ActionListener alHeight = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flHeight = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setObjectHeight(heightBox.getText()); } @@ -203,5 +203,5 @@ elevBox.setHorizontalAlignment(SwingConstants.CENTER); add(elevBox); - elevBox.addActionListener(alElev); + elevBox.addFocusListener(flElev); heightLabel = new JLabel(Messages.getString("Height"), SwingConstants.CENTER); @@ -212,5 +212,5 @@ heightBox.setHorizontalAlignment(SwingConstants.CENTER); add(heightBox); - heightBox.addActionListener(alHeight); + heightBox.addFocusListener(flHeight); sourceLabel = new JLabel(Messages.getString("Source"), SwingConstants.CENTER); @@ -221,5 +221,5 @@ sourceBox.setHorizontalAlignment(SwingConstants.CENTER); add(sourceBox); - sourceBox.addActionListener(alSource); + sourceBox.addFocusListener(flSource); infoLabel = new JLabel(Messages.getString("Information"), SwingConstants.CENTER); @@ -230,5 +230,5 @@ infoBox.setHorizontalAlignment(SwingConstants.CENTER); add(infoBox); - infoBox.addActionListener(alInfo); + infoBox.addFocusListener(flInfo); statusLabel = new JLabel(Messages.getString("Status"), SwingConstants.CENTER); 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java (revision 27423) @@ -35,6 +35,6 @@ public JLabel groupLabel; public JTextField groupBox; - private ActionListener alGroup = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flGroup = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setRaconGroup(groupBox.getText()); } @@ -42,6 +42,6 @@ public JLabel periodLabel; public JTextField periodBox; - private ActionListener alPeriod = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flPeriod = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setRaconPeriod(periodBox.getText()); } @@ -49,6 +49,6 @@ public JLabel seqLabel; public JTextField seqBox; - private ActionListener alSeq = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flSeq = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setRaconSequence(seqBox.getText()); } @@ -56,6 +56,6 @@ public JLabel rangeLabel; public JTextField rangeBox; - private ActionListener alRange = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flRange = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setRaconRange(rangeBox.getText()); } @@ -63,6 +63,6 @@ public JLabel sector1Label; public JTextField sector1Box; - private ActionListener alSector1 = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flSector1 = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setRaconSector1(sector1Box.getText()); } @@ -70,6 +70,6 @@ public JLabel sector2Label; public JTextField sector2Box; - private ActionListener alSector2 = new ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { + private FocusListener flSector2 = new FocusAdapter() { + public void focusLost(java.awt.event.FocusEvent e) { dlg.panelMain.mark.setRaconSector2(sector2Box.getText()); } @@ -93,5 +93,5 @@ groupBox.setHorizontalAlignment(SwingConstants.CENTER); add(groupBox); - groupBox.addActionListener(alGroup); + groupBox.addFocusListener(flGroup); periodLabel = new JLabel(Messages.getString("Period"), SwingConstants.CENTER); @@ -102,5 +102,5 @@ periodBox.setHorizontalAlignment(SwingConstants.CENTER); add(periodBox); - periodBox.addActionListener(alPeriod); + periodBox.addFocusListener(flPeriod); seqLabel = new JLabel(Messages.getString("Sequence"), SwingConstants.CENTER); @@ -111,5 +111,5 @@ seqBox.setHorizontalAlignment(SwingConstants.CENTER); add(seqBox); - seqBox.addActionListener(alSeq); + seqBox.addFocusListener(flSeq); rangeLabel = new JLabel(Messages.getString("Range"), SwingConstants.CENTER); @@ -119,5 +119,5 @@ rangeBox.setBounds(new Rectangle(155, 60, 50, 20)); rangeBox.setHorizontalAlignment(SwingConstants.CENTER); - rangeBox.addActionListener(alRange); + rangeBox.addFocusListener(flRange); sectorsLabel = new JLabel(Messages.getString("VisibleSector"), SwingConstants.CENTER); @@ -132,5 +132,5 @@ sector1Box.setHorizontalAlignment(SwingConstants.CENTER); add(sector1Box); - sector1Box.addActionListener(alSector1); + sector1Box.addFocusListener(flSector1); sector2Label = new JLabel(Messages.getString("End"), SwingConstants.CENTER); @@ -141,5 +141,5 @@ sector2Box.setHorizontalAlignment(SwingConstants.CENTER); add(sector2Box); - sector2Box.addActionListener(alSector2); + sector2Box.addFocusListener(flSector2); } 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 27423) @@ -43,4 +43,5 @@ } } + if (dlg.node != null) syncPanel(); } }; @@ -66,12 +67,15 @@ if (button.isSelected()) { dlg.panelMain.mark.setShape(shp); - dlg.panelMain.mark.setObject(objects.get(shp)); - if (button == cairnButton) { - dlg.panelMain.mark.setObjPattern(Pat.NOPAT); - dlg.panelMain.mark.setObjColour(Col.UNKCOL); - } - if (dlg.panelMain.mark.getObjColour(0) == Col.UNKCOL) { - dlg.panelMain.mark.setObjPattern(Pat.NOPAT); - dlg.panelMain.mark.setObjColour(Col.YELLOW); + if (SeaMark.EntMAP.get(dlg.panelMain.mark.getObject()) != Ent.MOORING) { + dlg.panelMain.mark.setObject(objects.get(shp)); + if (dlg.panelMain.mark.getObjColour(0) == Col.UNKCOL) { + dlg.panelMain.mark.setObjPattern(Pat.NOPAT); + dlg.panelMain.mark.setObjColour(Col.YELLOW); + } + if (button == cairnButton) { + dlg.panelMain.mark.setObjPattern(Pat.NOPAT); + dlg.panelMain.mark.setObjColour(Col.UNKCOL); + } + topmarkButton.setVisible(dlg.panelMain.mark.testValid()); } button.setBorderPainted(true); @@ -79,5 +83,4 @@ button.setBorderPainted(false); } - topmarkButton.setVisible(dlg.panelMain.mark.testValid()); dlg.panelMain.panelMore.syncPanel(); } @@ -105,5 +108,5 @@ dlg.panelMain.mark.setObject(Obj.UNKOBJ); dlg.panelMain.mark.setCategory(Cat.NOCAT); - syncPanel(); + dlg.panelMain.mark.setTopmark(Top.NOTOP); if (mooringButton.isSelected()) { categoryBox.setVisible(false); @@ -184,9 +187,9 @@ add(topmarkButton); - mooringButton.setBounds(new Rectangle(136, 64, 34, 32)); - mooringButton.setToolTipText(Messages.getString("Mooring")); - mooringButton.setBorder(BorderFactory.createLoweredBevelBorder()); - mooringButton.addActionListener(alMooring); - add(mooringButton); +// mooringButton.setBounds(new Rectangle(136, 64, 34, 32)); +// mooringButton.setToolTipText(Messages.getString("Mooring")); +// mooringButton.setBorder(BorderFactory.createLoweredBevelBorder()); +// mooringButton.addActionListener(alMooring); +// add(mooringButton); } @@ -196,4 +199,5 @@ categoryBox.setVisible(false); mooringBox.setVisible(true); + topmarkButton.setVisible(false); for (Cat cat : moorings.keySet()) { int item = moorings.get(cat); @@ -205,4 +209,7 @@ mooringBox.setVisible(false); categoryBox.setVisible(true); + topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NOTOP); + topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NOTOP); + topmarkButton.setVisible(dlg.panelMain.mark.testValid()); for (Cat cat : categories.keySet()) { int item = categories.get(cat); @@ -218,7 +225,5 @@ button.setBorderPainted(false); } - topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NOTOP); - topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NOTOP); - topmarkButton.setVisible(dlg.panelMain.mark.testValid()); + dlg.panelMain.mark.testValid(); } 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 27423) @@ -32,5 +32,4 @@ public JRadioButton squareDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SquareDayButton.png"))); public JRadioButton circleDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CircleDayButton.png"))); - public JRadioButton mooringTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/MooringTopButton.png"))); private EnumMap tops = new EnumMap(Top.class); private ActionListener alTop = new ActionListener() { @@ -44,5 +43,4 @@ button.setBorderPainted(false); } - mooringTopButton.setBorderPainted(mooringTopButton.isSelected()); } }; @@ -70,5 +68,4 @@ add(getTopButton(squareDayButton, 120, 65, 27, 27, "SquareDay", Top.SQUARE)); add(getTopButton(circleDayButton, 120, 95, 27, 27, "CircleDay", Top.CIRCLE)); - add(getMoorButton(mooringTopButton, 0, 95, 27, 27, "MooringTop")); } @@ -77,5 +74,4 @@ button.setEnabled(state); } - mooringTopButton.setEnabled(state); } @@ -101,12 +97,3 @@ } - 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.createLoweredBevelBorder()); - button.setToolTipText(Messages.getString(tip)); - button.addActionListener(alTop); - topButtons.add(button); - return button; - } - } 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 27422) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27423) @@ -1136,8 +1136,9 @@ case LITVES: case LITHSE: - case MORFAC: case SISTAW: case SISTAT: case OFSPLF: + case MORFAC: + case BOYINB: tmp = true; break; @@ -1827,8 +1828,8 @@ colStr += ".png"; if (getClass().getResource(colStr) == null) { - System.out.println("Missing image: " + colStr); + System.out.println("Missing image1: " + colStr); imgStr += ".png"; if (getClass().getResource(imgStr) == null) { - System.out.println("Missing image: " + imgStr); + System.out.println("Missing image2: " + imgStr); } else { g2.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); @@ -1899,9 +1900,28 @@ imgStr += "Platform"; break; + case MORFAC: + switch (getCategory()) { + case MOR_DLPN: + imgStr += "Dolphin"; + break; + case MOR_DDPN: + imgStr += "DeviationDolphin"; + break; + case MOR_POST: + imgStr += "Post"; + break; + case MOR_BUOY: + imgStr += "Sphere"; + break; + } + break; + case BOYINB: + imgStr += "Super"; + break; } if (!imgStr.equals("/images/")) { imgStr += ".png"; if (getClass().getResource(imgStr) == null) { - System.out.println("Missing image: " + imgStr); + System.out.println("Missing image3: " + imgStr); } else { g2.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); @@ -2006,8 +2026,8 @@ colStr += ".png"; if (getClass().getResource(colStr) == null) { - System.out.println("Missing image: " + colStr); + System.out.println("Missing image4: " + colStr); imgStr += ".png"; if (getClass().getResource(imgStr) == null) { - System.out.println("Missing image: " + imgStr); + System.out.println("Missing image5: " + imgStr); return; } else { @@ -2016,4 +2036,38 @@ } else { g2.drawImage(new ImageIcon(getClass().getResource(colStr)).getImage(), 7, -15, null); + } + } else { + if ((getObject() == Obj.BOYINB) || ((getObject() == Obj.MORFAC) && (getCategory() == Cat.MOR_BUOY))) { + imgStr = "/images/Top_Mooring"; + switch (getShape()) { + case CAN: + case CONI: + case SPHERI: + case BARREL: + imgStr += "_Buoy_Small"; + break; + case PILLAR: + case SPAR: + imgStr += "_Buoy"; + break; + case FLOAT: + case SUPER: + imgStr += "_Float"; + break; + default: + if (getObject() == Obj.MORFAC) { + imgStr += "_Buoy_Small"; + } else { + imgStr += "_Float"; + } + break; + } + imgStr += ".png"; + if (getClass().getResource(imgStr) == null) { + System.out.println("Missing image6: " + imgStr); + return; + } else { + g2.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); + } } }