Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 27198) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 27199) @@ -38,5 +38,5 @@ mark = new SeaMark(dlg); mark.setBounds(new Rectangle(235, 0, 165, 160)); - panelMain.add(mark, 0); + panelMain.add(mark); mark.parseMark(node); } 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 27198) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 27199) @@ -124,10 +124,10 @@ categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER); - categoryLabel.setBounds(new Rectangle(10, 80, 160, 20)); + categoryLabel.setBounds(new Rectangle(5, 80, 160, 20)); this.add(categoryLabel, null); categoryLabel.setVisible(false); landCatBox = new JComboBox(); - landCatBox.setBounds(new Rectangle(10, 100, 160, 20)); + landCatBox.setBounds(new Rectangle(5, 100, 160, 20)); this.add(landCatBox, null); landCatBox.addActionListener(alLandCatBox); @@ -156,5 +156,5 @@ trafficCatBox = new JComboBox(); - trafficCatBox.setBounds(new Rectangle(10, 100, 160, 20)); + trafficCatBox.setBounds(new Rectangle(5, 100, 160, 20)); this.add(trafficCatBox, null); trafficCatBox.addActionListener(alTrafficCatBox); 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 27198) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 27199) @@ -43,5 +43,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { if (panelMore.isVisible()) { - moreButton.setText("v v v"); + moreButton.setText(">>"); panelMore.setVisible(false); topButton.setEnabled(true); @@ -51,5 +51,5 @@ } else { panelMore.setVisible(true); - moreButton.setText("^ ^ ^"); + moreButton.setText("<<"); miscButtons.clearSelection(); panelTop.setVisible(false); @@ -121,5 +121,5 @@ public void actionPerformed(java.awt.event.ActionEvent e) { if (topButton.isSelected()) { - moreButton.setText("v v v"); + moreButton.setText(">>"); panelMore.setVisible(false); topButton.setBorderPainted(true); @@ -130,5 +130,5 @@ } if (fogButton.isSelected()) { - moreButton.setText("v v v"); + moreButton.setText(">>"); panelMore.setVisible(false); fogButton.setBorderPainted(true); @@ -139,5 +139,5 @@ } if (radButton.isSelected()) { - moreButton.setText("v v v"); + moreButton.setText(">>"); panelMore.setVisible(false); radButton.setBorderPainted(true); @@ -148,5 +148,5 @@ } if (litButton.isSelected()) { - moreButton.setText("v v v"); + moreButton.setText(">>"); panelMore.setVisible(false); litButton.setBorderPainted(true); @@ -163,14 +163,14 @@ dlg = dia; panelChan = new PanelChan(dlg); - panelChan.setBounds(new Rectangle(65, 0, 185, 160)); + panelChan.setBounds(new Rectangle(65, 0, 170, 160)); panelChan.setVisible(false); panelHaz = new PanelHaz(dlg); - panelHaz.setBounds(new Rectangle(65, 0, 185, 160)); + panelHaz.setBounds(new Rectangle(65, 0, 170, 160)); panelHaz.setVisible(false); panelSpec = new PanelSpec(dlg); - panelSpec.setBounds(new Rectangle(65, 0, 185, 160)); + panelSpec.setBounds(new Rectangle(65, 0, 170, 160)); panelSpec.setVisible(false); panelLights = new PanelLights(dlg); - panelLights.setBounds(new Rectangle(65, 0, 185, 160)); + panelLights.setBounds(new Rectangle(65, 0, 170, 160)); panelLights.setVisible(false); panelMore = new PanelMore(dlg); @@ -213,8 +213,8 @@ lightsButton.addActionListener(alType); - this.add(getButton(topButton, 0, 165, 34, 32, "Topmarks"), null); - this.add(getButton(fogButton, 0, 205, 34, 32, "FogSignals"), null); - this.add(getButton(radButton, 0, 245, 34, 32, "Radar"), null); - this.add(getButton(litButton, 0, 285, 34, 32, "Lit"), null); + this.add(getButton(topButton, 0, 185, 34, 32, "Topmarks"), null); + this.add(getButton(fogButton, 0, 220, 34, 32, "FogSignals"), null); + this.add(getButton(radButton, 0, 255, 34, 32, "Radar"), null); + this.add(getButton(litButton, 0, 290, 34, 32, "Lit"), null); miscButtons = new ButtonGroup(); miscButtons.add(topButton); @@ -244,7 +244,7 @@ moreButton = new JButton(); - moreButton.setBounds(new Rectangle(190, 145, 40, 15)); + moreButton.setBounds(new Rectangle(0, 165, 34, 15)); moreButton.setMargin(new Insets(0, 0, 0, 0)); - moreButton.setText("v v v"); + moreButton.setText(">>"); this.add(moreButton, null); moreButton.addActionListener(alMore); @@ -273,5 +273,5 @@ saveButton.setEnabled(false); moreButton.setVisible(false); - moreButton.setText("v v v"); + moreButton.setText(">>"); moreButton.setSelected(false); panelChan.setVisible(false); 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 27198) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27199) @@ -1082,5 +1082,5 @@ } else { dlg.panelMain.moreButton.setVisible(false); - dlg.panelMain.moreButton.setText("v v v"); + dlg.panelMain.moreButton.setText(">>"); dlg.panelMain.topButton.setEnabled(false); dlg.panelMain.fogButton.setEnabled(false); @@ -1619,5 +1619,9 @@ Graphics2D g2 = (Graphics2D) g; - + + if (dlg.mark == null) { + return; + } + String colStr; String lblStr; @@ -1741,9 +1745,9 @@ System.out.println("Missing image: " + imgStr); } else { - g.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); - g.drawString(lblStr, 75, 110); + g2.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); + g2.drawString(lblStr, 75, 110); } } else { - g.drawImage(new ImageIcon(getClass().getResource(colStr)).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource(colStr)).getImage(), 7, -15, null); } } @@ -1811,5 +1815,5 @@ System.out.println("Missing image: " + imgStr); } else { - g.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); } } @@ -1918,8 +1922,8 @@ return; } else { - g.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource(imgStr)).getImage(), 7, -15, null); } } else { - g.drawImage(new ImageIcon(getClass().getResource(colStr)).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource(colStr)).getImage(), 7, -15, null); } } @@ -1941,15 +1945,15 @@ switch ((Col) getLightAtt(Att.COL, 0)) { case RED: - g.drawImage(new ImageIcon(getClass().getResource("/images/Light_Red_120.png")).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource("/images/Light_Red_120.png")).getImage(), 7, -15, null); break; case GREEN: - g.drawImage(new ImageIcon(getClass().getResource("/images/Light_Green_120.png")).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource("/images/Light_Green_120.png")).getImage(), 7, -15, null); break; case WHITE: case YELLOW: - g.drawImage(new ImageIcon(getClass().getResource("/images/Light_White_120.png")).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource("/images/Light_White_120.png")).getImage(), 7, -15, null); break; default: - g.drawImage(new ImageIcon(getClass().getResource("/images/Light_Magenta_120.png")).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource("/images/Light_Magenta_120.png")).getImage(), 7, -15, null); } } @@ -2003,9 +2007,9 @@ if (!tmp.isEmpty()) c += " " + tmp + "s"; - g.drawString(c, 100, 70); + g2.drawString(c, 100, 70); } if (getFogSound() != Fog.NONE) { - g.drawImage(new ImageIcon(getClass().getResource("/images/Fog_Signal.png")).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource("/images/Fog_Signal.png")).getImage(), 7, -15, null); String str = ""; if (getFogSound() != Fog.UNKNOWN) @@ -2039,12 +2043,12 @@ if (!getFogPeriod().isEmpty()) str += getFogPeriod() + "s"; - g.drawString(str, 0, 70); + g2.drawString(str, 0, 70); } if (RaType != Rtb.NONE) { if (getRadar() == Rtb.REFLECTOR) { - g.drawImage(new ImageIcon(getClass().getResource("/images/Radar_Reflector_355.png")).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource("/images/Radar_Reflector_355.png")).getImage(), 7, -15, null); } else { - g.drawImage(new ImageIcon(getClass().getResource("/images/Radar_Station.png")).getImage(), 7, -15, null); + g2.drawImage(new ImageIcon(getClass().getResource("/images/Radar_Station.png")).getImage(), 7, -15, null); String str = ""; if (getRadar() == Rtb.RAMARK) @@ -2058,8 +2062,7 @@ if (!getRaconPeriod().isEmpty()) str += getRaconPeriod() + "s"; - g.drawString(str, 0, 50); - } - } - + g2.drawString(str, 0, 50); + } + } }