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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 26110) @@ -31,9 +31,14 @@ public PanelSaw panelSaw = null; private ButtonGroup catButtons = new ButtonGroup(); - public JRadioButton portButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PortButton.png"))); - public JRadioButton stbdButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StbdButton.png"))); - public JRadioButton prefPortButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PrefPortButton.png"))); - public JRadioButton prefStbdButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PrefStbdButton.png"))); - public JRadioButton safeWaterButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SafeWaterButton.png"))); + public JRadioButton portButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/PortButton.png"))); + public JRadioButton stbdButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/StbdButton.png"))); + public JRadioButton prefPortButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/PrefPortButton.png"))); + public JRadioButton prefStbdButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/PrefStbdButton.png"))); + public JRadioButton safeWaterButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/SafeWaterButton.png"))); private ActionListener alCat = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -220,5 +225,6 @@ } - private JRadioButton getCatButton(JRadioButton button, int x, int y, int w, int h, String tip) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java (revision 26110) @@ -23,28 +23,46 @@ import oseam.seamarks.SeaMark; -public class PanelChr extends JPanel { -//System.out.println(map); +public class PanelChr extends JPanel { + // System.out.println(map); private OSeaMAction dlg; public JLabel charLabel = new JLabel(); public JTextField charBox = new JTextField(); - public JToggleButton noneButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/NoCharButton.png"))); - public JToggleButton fixedButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/FixedButton.png"))); - public JToggleButton flashButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/FlashButton.png"))); - public JToggleButton longFlashButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/LongFlashButton.png"))); - public JToggleButton quickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/QuickButton.png"))); - public JToggleButton veryQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/VeryQuickButton.png"))); - public JToggleButton ultraQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/UltraQuickButton.png"))); - public JToggleButton interruptedQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/InterruptedQuickButton.png"))); - public JToggleButton interruptedVeryQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/InterruptedVeryQuickButton.png"))); - public JToggleButton interruptedUltraQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/InterruptedUltraQuickButton.png"))); - public JToggleButton isophasedButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/IsophasedButton.png"))); - public JToggleButton occultingButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/OccultingButton.png"))); - public JToggleButton morseButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/MorseButton.png"))); - public JToggleButton alternatingButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/AlternatingButton.png"))); - private EnumMap buttons = new EnumMap(Chr.class); + public JToggleButton noneButton = new JToggleButton(new ImageIcon(getClass() + .getResource("/images/NoCharButton.png"))); + public JToggleButton fixedButton = new JToggleButton(new ImageIcon(getClass() + .getResource("/images/FixedButton.png"))); + public JToggleButton flashButton = new JToggleButton(new ImageIcon(getClass() + .getResource("/images/FlashButton.png"))); + public JToggleButton longFlashButton = new JToggleButton(new ImageIcon( + getClass().getResource("/images/LongFlashButton.png"))); + public JToggleButton quickButton = new JToggleButton(new ImageIcon(getClass() + .getResource("/images/QuickButton.png"))); + public JToggleButton veryQuickButton = new JToggleButton(new ImageIcon( + getClass().getResource("/images/VeryQuickButton.png"))); + public JToggleButton ultraQuickButton = new JToggleButton(new ImageIcon( + getClass().getResource("/images/UltraQuickButton.png"))); + public JToggleButton interruptedQuickButton = new JToggleButton( + new ImageIcon(getClass() + .getResource("/images/InterruptedQuickButton.png"))); + public JToggleButton interruptedVeryQuickButton = new JToggleButton( + new ImageIcon(getClass().getResource( + "/images/InterruptedVeryQuickButton.png"))); + public JToggleButton interruptedUltraQuickButton = new JToggleButton( + new ImageIcon(getClass().getResource( + "/images/InterruptedUltraQuickButton.png"))); + public JToggleButton isophasedButton = new JToggleButton(new ImageIcon( + getClass().getResource("/images/IsophasedButton.png"))); + public JToggleButton occultingButton = new JToggleButton(new ImageIcon( + getClass().getResource("/images/OccultingButton.png"))); + public JToggleButton morseButton = new JToggleButton(new ImageIcon(getClass() + .getResource("/images/MorseButton.png"))); + public JToggleButton alternatingButton = new JToggleButton(new ImageIcon( + getClass().getResource("/images/AlternatingButton.png"))); + private EnumMap buttons = new EnumMap( + Chr.class); private ActionListener alCharButton = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - JToggleButton source = (JToggleButton)e.getSource(); + JToggleButton source = (JToggleButton) e.getSource(); EnumSet combo = EnumSet.noneOf(Chr.class); for (Chr chr : buttons.keySet()) { @@ -101,18 +119,46 @@ dlg = dia; this.setLayout(null); - this.add(getChrButton(noneButton, 0, 0, 44, 16, Messages.getString("NoChar"), Chr.UNKNOWN), null); - this.add(getChrButton(fixedButton, 0, 16, 44, 16, Messages.getString("FChar"), Chr.FIXED), null); - this.add(getChrButton(flashButton, 0, 32, 44, 16, Messages.getString("FlChar"), Chr.FLASH), null); - this.add(getChrButton(longFlashButton, 0, 48, 44, 16, Messages.getString("LFlChar"), Chr.LONGFLASH), null); - this.add(getChrButton(quickButton, 0, 64, 44, 16, Messages.getString("QChar"), Chr.QUICK), null); - this.add(getChrButton(veryQuickButton, 0, 80, 44, 16, Messages.getString("VQChar"), Chr.VERYQUICK), null); - this.add(getChrButton(ultraQuickButton, 0, 96, 44, 16, Messages.getString("UQChar"), Chr.ULTRAQUICK), null); - this.add(getChrButton(alternatingButton, 44, 0, 44, 16, Messages.getString("AlChar"), Chr.ALTERNATING), null); - this.add(getChrButton(isophasedButton, 44, 16, 44, 16, Messages.getString("IsoChar"), Chr.ISOPHASED), null); - this.add(getChrButton(occultingButton, 44, 32, 44, 16, Messages.getString("OcChar"), Chr.OCCULTING), null); - this.add(getChrButton(morseButton, 44, 48, 44, 16, Messages.getString("MoChar"), Chr.MORSE), null); - this.add(getChrButton(interruptedQuickButton, 44, 64, 44, 16, Messages.getString("IQChar"), Chr.INTERRUPTEDQUICK), null); - this.add(getChrButton(interruptedVeryQuickButton, 44, 80, 44, 16, Messages.getString("IVQChar"), Chr.INTERRUPTEDVERYQUICK), null); - this.add(getChrButton(interruptedUltraQuickButton, 44, 96, 44, 16, Messages.getString("IUQChar"), Chr.INTERRUPTEDULTRAQUICK), null); + this.add( + getChrButton(noneButton, 0, 0, 44, 16, Messages.getString("NoChar"), + Chr.UNKNOWN), null); + this.add( + getChrButton(fixedButton, 0, 16, 44, 16, Messages.getString("FChar"), + Chr.FIXED), null); + this.add( + getChrButton(flashButton, 0, 32, 44, 16, Messages.getString("FlChar"), + Chr.FLASH), null); + this.add( + getChrButton(longFlashButton, 0, 48, 44, 16, + Messages.getString("LFlChar"), Chr.LONGFLASH), null); + this.add( + getChrButton(quickButton, 0, 64, 44, 16, Messages.getString("QChar"), + Chr.QUICK), null); + this.add( + getChrButton(veryQuickButton, 0, 80, 44, 16, + Messages.getString("VQChar"), Chr.VERYQUICK), null); + this.add( + getChrButton(ultraQuickButton, 0, 96, 44, 16, + Messages.getString("UQChar"), Chr.ULTRAQUICK), null); + this.add( + getChrButton(alternatingButton, 44, 0, 44, 16, + Messages.getString("AlChar"), Chr.ALTERNATING), null); + this.add( + getChrButton(isophasedButton, 44, 16, 44, 16, + Messages.getString("IsoChar"), Chr.ISOPHASED), null); + this.add( + getChrButton(occultingButton, 44, 32, 44, 16, + Messages.getString("OcChar"), Chr.OCCULTING), null); + this.add( + getChrButton(morseButton, 44, 48, 44, 16, Messages.getString("MoChar"), + Chr.MORSE), null); + this.add( + getChrButton(interruptedQuickButton, 44, 64, 44, 16, + Messages.getString("IQChar"), Chr.INTERRUPTEDQUICK), null); + this.add( + getChrButton(interruptedVeryQuickButton, 44, 80, 44, 16, + Messages.getString("IVQChar"), Chr.INTERRUPTEDVERYQUICK), null); + this.add( + getChrButton(interruptedUltraQuickButton, 44, 96, 44, 16, + Messages.getString("IUQChar"), Chr.INTERRUPTEDULTRAQUICK), null); charLabel.setBounds(new Rectangle(0, 113, 88, 20)); charLabel.setHorizontalAlignment(SwingConstants.CENTER); @@ -139,5 +185,6 @@ } - private JToggleButton getChrButton(JToggleButton button, int x, int y, int w, int h, String tip, Chr chr) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java (revision 26110) @@ -25,15 +25,26 @@ private Ent ent; private ButtonGroup colourButtons = new ButtonGroup(); - public JRadioButton offButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton whiteButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WhiteButton.png"))); - public JRadioButton redButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RedButton.png"))); - public JRadioButton orangeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OrangeButton.png"))); - public JRadioButton amberButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/AmberButton.png"))); - public JRadioButton yellowButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/YellowButton.png"))); - public JRadioButton greenButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/GreenButton.png"))); - public JRadioButton blueButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BlueButton.png"))); - public JRadioButton violetButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/VioletButton.png"))); - public JRadioButton blackButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BlackButton.png"))); - private EnumMap colours = new EnumMap(Col.class); + public JRadioButton offButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/OffButton.png"))); + public JRadioButton whiteButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/WhiteButton.png"))); + public JRadioButton redButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/RedButton.png"))); + public JRadioButton orangeButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/OrangeButton.png"))); + public JRadioButton amberButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/AmberButton.png"))); + public JRadioButton yellowButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/YellowButton.png"))); + public JRadioButton greenButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/GreenButton.png"))); + public JRadioButton blueButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/BlueButton.png"))); + public JRadioButton violetButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/VioletButton.png"))); + public JRadioButton blackButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/BlackButton.png"))); + private EnumMap colours = new EnumMap( + Col.class); private ActionListener alColour = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -41,5 +52,6 @@ JRadioButton button = colours.get(col); if (button.isSelected()) { - if (dlg.mark != null) dlg.mark.setColour(ent, col); + if (dlg.mark != null) + dlg.mark.setColour(ent, col); button.setBorderPainted(true); } else @@ -53,14 +65,34 @@ ent = entity; this.setLayout(null); - this.add(getColButton(offButton, 0, 0, 34, 16, Messages.getString("NoColour"), 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); - this.add(getColButton(orangeButton, 0, 48, 34, 16, Messages.getString("Orange"), Col.ORANGE), null); - this.add(getColButton(amberButton, 0, 64, 34, 16, Messages.getString("Amber"), Col.AMBER), null); - this.add(getColButton(yellowButton, 0, 80, 34, 16, Messages.getString("Yellow"), Col.YELLOW), null); - this.add(getColButton(greenButton, 0, 96, 34, 16, Messages.getString("Green"), Col.GREEN), null); - this.add(getColButton(blueButton, 0, 112, 34, 16, Messages.getString("Blue"), Col.BLUE), null); - this.add(getColButton(violetButton, 0, 128, 34, 16, Messages.getString("Violet"), Col.VIOLET), null); - this.add(getColButton(blackButton, 0, 144, 34, 16, Messages.getString("Black"), Col.BLACK), null); + this.add( + getColButton(offButton, 0, 0, 34, 16, Messages.getString("NoColour"), + 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); + this.add( + getColButton(orangeButton, 0, 48, 34, 16, Messages.getString("Orange"), + Col.ORANGE), null); + this.add( + getColButton(amberButton, 0, 64, 34, 16, Messages.getString("Amber"), + Col.AMBER), null); + this.add( + getColButton(yellowButton, 0, 80, 34, 16, Messages.getString("Yellow"), + Col.YELLOW), null); + this.add( + getColButton(greenButton, 0, 96, 34, 16, Messages.getString("Green"), + Col.GREEN), null); + this.add( + getColButton(blueButton, 0, 112, 34, 16, Messages.getString("Blue"), + Col.BLUE), null); + this.add( + getColButton(violetButton, 0, 128, 34, 16, + Messages.getString("Violet"), Col.VIOLET), null); + this.add( + getColButton(blackButton, 0, 144, 34, 16, Messages.getString("Black"), + Col.BLACK), null); } @@ -76,5 +108,6 @@ } - private JRadioButton getColButton(JRadioButton button, int x, int y, int w, int h, String tip, Col col) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 26110) @@ -25,9 +25,14 @@ private OSeaMAction dlg; private ButtonGroup catButtons = new ButtonGroup(); - public JRadioButton northButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CardNButton.png"))); - public JRadioButton southButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CardSButton.png"))); - public JRadioButton eastButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CardEButton.png"))); - public JRadioButton westButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CardWButton.png"))); - public JRadioButton isolButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/IsolButton.png"))); + public JRadioButton northButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/CardNButton.png"))); + public JRadioButton southButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/CardSButton.png"))); + public JRadioButton eastButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/CardEButton.png"))); + public JRadioButton westButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/CardWButton.png"))); + public JRadioButton isolButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/IsolButton.png"))); private ActionListener alCat = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -92,10 +97,16 @@ private ButtonGroup shapeButtons = new ButtonGroup(); - public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); - public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); - public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); - public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); - public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); - public EnumMap shapes = new EnumMap(Shp.class); + public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/PillarButton.png"))); + public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SparButton.png"))); + public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/FloatButton.png"))); + public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/BeaconButton.png"))); + public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/TowerButton.png"))); + public EnumMap shapes = new EnumMap( + Shp.class); public EnumMap carObjects = new EnumMap(Shp.class); public EnumMap isdObjects = new EnumMap(Shp.class); @@ -128,9 +139,19 @@ this.add(getCatButton(isolButton, 0, 128, 52, 32, "Isol"), null); - this.add(getShapeButton(pillarButton, 55, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYCAR, Obj.BOYISD), null); - this.add(getShapeButton(sparButton, 55, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYCAR, Obj.BOYISD), null); - this.add(getShapeButton(floatButton, 55, 64, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT, Obj.LITFLT), null); - this.add(getShapeButton(beaconButton, 55, 96, 34, 32, "Beacon", Shp.BEACON, Obj.BCNCAR, Obj.BCNISD), null); - this.add(getShapeButton(towerButton, 55, 128, 34, 32, "Tower", Shp.TOWER, Obj.BCNCAR, Obj.BCNISD), null); + this.add( + getShapeButton(pillarButton, 55, 0, 34, 32, "Pillar", Shp.PILLAR, + Obj.BOYCAR, Obj.BOYISD), null); + this.add( + getShapeButton(sparButton, 55, 32, 34, 32, "Spar", Shp.SPAR, + Obj.BOYCAR, Obj.BOYISD), null); + this.add( + getShapeButton(floatButton, 55, 64, 34, 32, "Float", Shp.FLOAT, + Obj.LITFLT, Obj.LITFLT), null); + this.add( + getShapeButton(beaconButton, 55, 96, 34, 32, "Beacon", Shp.BEACON, + Obj.BCNCAR, Obj.BCNISD), null); + this.add( + getShapeButton(towerButton, 55, 128, 34, 32, "Tower", Shp.TOWER, + Obj.BCNCAR, Obj.BCNISD), null); } @@ -142,5 +163,6 @@ } - private JRadioButton getCatButton(JRadioButton button, int x, int y, int w, int h, String tip) { + 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)); @@ -151,5 +173,6 @@ } - private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj car, Obj isd) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 26110) @@ -22,10 +22,16 @@ private OSeaMAction dlg; private ButtonGroup catButtons = new ButtonGroup(); - public JRadioButton houseButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LighthouseButton.png"))); - public JRadioButton majorButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightMajorButton.png"))); - public JRadioButton minorButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightMinorButton.png"))); - public JRadioButton vesselButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightVesselButton.png"))); - public JRadioButton stationButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StationButton.png"))); - private EnumMap categories = new EnumMap(Cat.class); + public JRadioButton houseButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/LighthouseButton.png"))); + public JRadioButton majorButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/LightMajorButton.png"))); + public JRadioButton minorButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/LightMinorButton.png"))); + public JRadioButton vesselButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/LightVesselButton.png"))); + public JRadioButton stationButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/StationButton.png"))); + private EnumMap categories = new EnumMap( + Cat.class); private EnumMap objects = new EnumMap(Cat.class); private ActionListener alCat = new ActionListener() { @@ -48,9 +54,19 @@ dlg = dia; this.setLayout(null); - this.add(getCatButton(houseButton, 0, 0, 34, 32, "Lighthouse", Cat.LIGHT_HOUSE, Obj.LNDMRK), null); - this.add(getCatButton(majorButton, 0, 32, 34, 32, "MajorLight", Cat.LIGHT_MAJOR, Obj.LITMAJ), null); - this.add(getCatButton(minorButton, 0, 64, 34, 32, "MinorLight", Cat.LIGHT_MINOR, Obj.LITMIN), null); - this.add(getCatButton(vesselButton, 0, 96, 34, 32, "LightVessel", Cat.LIGHT_VESSEL, Obj.LITVES), null); - this.add(getCatButton(stationButton, 0, 128, 34, 32, "SignalStation", Cat.SIGNAL_STATION, Obj.SIGSTA), null); + this.add( + getCatButton(houseButton, 0, 0, 34, 32, "Lighthouse", Cat.LIGHT_HOUSE, + Obj.LNDMRK), null); + this.add( + getCatButton(majorButton, 0, 32, 34, 32, "MajorLight", Cat.LIGHT_MAJOR, + Obj.LITMAJ), null); + this.add( + getCatButton(minorButton, 0, 64, 34, 32, "MinorLight", Cat.LIGHT_MINOR, + Obj.LITMIN), null); + this.add( + getCatButton(vesselButton, 0, 96, 34, 32, "LightVessel", + Cat.LIGHT_VESSEL, Obj.LITVES), null); + this.add( + getCatButton(stationButton, 0, 128, 34, 32, "SignalStation", + Cat.SIGNAL_STATION, Obj.SIGSTA), null); } @@ -59,5 +75,6 @@ } - private JRadioButton getCatButton(JRadioButton button, int x, int y, int w, int h, String tip, Cat cat, Obj obj) { + private JRadioButton getCatButton(JRadioButton button, int x, int y, int w, + int h, String tip, Cat cat, Obj obj) { button.setBounds(new Rectangle(x, y, w, h)); button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 26110) @@ -9,5 +9,7 @@ import javax.swing.JTextField; import javax.swing.JComboBox; +import javax.swing.JTable; import javax.swing.SwingConstants; +import javax.swing.JFrame; import java.awt.Color; @@ -22,4 +24,5 @@ private OSeaMAction dlg; + public PanelSectors panelSector; public PanelCol panelCol; public PanelChr panelChr; @@ -58,4 +61,7 @@ public PanelLit(OSeaMAction dia) { dlg = dia; + panelSector = new PanelSectors(); + panelSector.setAlwaysOnTop(true); + panelSector.setLocation(450, 0); panelChr = new PanelChr(dlg); panelChr.setBounds(new Rectangle(0, 0, 88, 160)); @@ -66,18 +72,25 @@ this.add(panelChr, null); this.add(panelCol, null); - + alType = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { singleButton.setBorderPainted(singleButton.isSelected()); sectorButton.setBorderPainted(sectorButton.isSelected()); + if (sectorButton.isSelected()) { + panelSector.setVisible(true); + } else { + panelSector.setVisible(false); + } dlg.mark.paintSign(); } }; typeButtons = new ButtonGroup(); - singleButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SingleButton.png"))); + singleButton = new JRadioButton(new ImageIcon(getClass().getResource( + "/images/SingleButton.png"))); this.add(getTypeButton(singleButton, 280, 125, 34, 30, "Single"), null); - sectorButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SectorButton.png"))); + sectorButton = new JRadioButton(new ImageIcon(getClass().getResource( + "/images/SectorButton.png"))); this.add(getTypeButton(sectorButton, 315, 125, 34, 30, "Sector"), null); - + alGroupBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -92,5 +105,5 @@ this.add(groupBox, null); groupBox.addActionListener(alGroupBox); - + alPeriodBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -98,5 +111,6 @@ } }; - periodLabel = new JLabel(Messages.getString("Period"), SwingConstants.CENTER); + periodLabel = new JLabel(Messages.getString("Period"), + SwingConstants.CENTER); periodLabel.setBounds(new Rectangle(123, 40, 65, 20)); this.add(periodLabel, null); @@ -106,5 +120,5 @@ this.add(periodBox, null); periodBox.addActionListener(alPeriodBox); - + alHeightBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -112,5 +126,6 @@ } }; - heightLabel = new JLabel(Messages.getString("Height"), SwingConstants.CENTER); + heightLabel = new JLabel(Messages.getString("Height"), + SwingConstants.CENTER); heightLabel.setBounds(new Rectangle(123, 80, 65, 20)); this.add(heightLabel, null); @@ -120,5 +135,5 @@ this.add(heightBox, null); heightBox.addActionListener(alHeightBox); - + alRangeBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -134,5 +149,5 @@ this.add(rangeBox, null); rangeBox.addActionListener(alRangeBox); - + alSequenceBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -140,5 +155,6 @@ } }; - sequenceLabel = new JLabel(Messages.getString("Sequence"), SwingConstants.CENTER); + sequenceLabel = new JLabel(Messages.getString("Sequence"), + SwingConstants.CENTER); sequenceLabel.setBounds(new Rectangle(188, 120, 80, 20)); this.add(sequenceLabel, null); @@ -148,10 +164,11 @@ this.add(sequenceBox, null); sequenceBox.addActionListener(alSequenceBox); - + alCategoryBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { } }; - categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER); + categoryLabel = new JLabel(Messages.getString("Category"), + SwingConstants.CENTER); categoryLabel.setBounds(new Rectangle(185, 0, 165, 20)); this.add(categoryLabel, null); @@ -162,10 +179,11 @@ categoryBox.addItem(Messages.getString("NoneSpecified")); categoryBox.addItem(Messages.getString("Vert2")); - + alVisibilityBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { } }; - visibilityLabel = new JLabel(Messages.getString("Visibility"), SwingConstants.CENTER); + visibilityLabel = new JLabel(Messages.getString("Visibility"), + SwingConstants.CENTER); visibilityLabel.setBounds(new Rectangle(185, 40, 165, 20)); this.add(visibilityLabel, null); @@ -178,10 +196,11 @@ visibilityBox.addItem(Messages.getString("Unintensified")); visibilityBox.addItem(Messages.getString("PartiallyObscured")); - + alExhibitionBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { } }; - exhibitionLabel = new JLabel(Messages.getString("Exhibition"), SwingConstants.CENTER); + exhibitionLabel = new JLabel(Messages.getString("Exhibition"), + SwingConstants.CENTER); exhibitionLabel.setBounds(new Rectangle(280, 80, 70, 20)); this.add(exhibitionLabel, null); @@ -194,5 +213,5 @@ exhibitionBox.addItem(Messages.getString("Night")); exhibitionBox.addItem(Messages.getString("Fog")); - + alOrientationBox = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -200,5 +219,6 @@ } }; - orientationLabel = new JLabel(Messages.getString("Orientation"), SwingConstants.CENTER); + orientationLabel = new JLabel(Messages.getString("Orientation"), + SwingConstants.CENTER); orientationLabel.setBounds(new Rectangle(188, 80, 80, 20)); this.add(orientationLabel, null); @@ -210,5 +230,6 @@ } - private JRadioButton getTypeButton(JRadioButton button, int x, int y, int w, int h, String tip) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 26110) @@ -31,14 +31,22 @@ private JButton saveButton = null; public ButtonGroup typeButtons = null; - public JRadioButton chanButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ChanButton.png"))); - public JRadioButton hazButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/HazButton.png"))); - public JRadioButton specButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SpecButton.png"))); - public JRadioButton lightsButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightsButton.png"))); + public JRadioButton chanButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/ChanButton.png"))); + public JRadioButton hazButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/HazButton.png"))); + public JRadioButton specButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SpecButton.png"))); + public JRadioButton lightsButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/LightsButton.png"))); private ActionListener alType = null; private ButtonGroup miscButtons = null; - public JRadioButton topButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TopButton.png"))); - public JRadioButton fogButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogButton.png"))); - public JRadioButton radButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RadarButton.png"))); - public JRadioButton litButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LitButton.png"))); + public JRadioButton topButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/TopButton.png"))); + public JRadioButton fogButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/FogButton.png"))); + public JRadioButton radButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/RadarButton.png"))); + public JRadioButton litButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/LitButton.png"))); private ActionListener alMisc = null; private ActionListener alName = null; @@ -271,5 +279,6 @@ } - private JRadioButton getButton(JRadioButton button, int x, int y, int w, int h, String tip) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 26110) @@ -22,6 +22,8 @@ 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 regionAButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/RegionAButton.png"))); + public JRadioButton regionBButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/RegionBButton.png"))); private ActionListener alRegion = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -32,12 +34,20 @@ }; private ButtonGroup shapeButtons = new ButtonGroup(); - public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); - public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); - public JRadioButton canButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CanButton.png"))); - public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); - public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); - public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); - public JRadioButton perchButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PerchPButton.png"))); - public EnumMap shapes = new EnumMap(Shp.class); + public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/PillarButton.png"))); + public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SparButton.png"))); + public JRadioButton canButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/CanButton.png"))); + public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/FloatButton.png"))); + public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/BeaconButton.png"))); + public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/TowerButton.png"))); + public JRadioButton perchButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/PerchPButton.png"))); + public EnumMap shapes = new EnumMap( + Shp.class); public EnumMap objects = new EnumMap(Shp.class); private ActionListener alShape = new ActionListener() { @@ -62,11 +72,25 @@ this.add(getRegionButton(regionAButton, 0, 2, 34, 30, "RegionA"), null); this.add(getRegionButton(regionBButton, 0, 32, 34, 30, "RegionB"), null); - this.add(getShapeButton(pillarButton, 0, 64, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT), null); - this.add(getShapeButton(sparButton, 0, 96, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), null); - this.add(getShapeButton(canButton, 0, 128, 34, 32, "Can", Shp.CAN, Obj.BOYLAT), null); - this.add(getShapeButton(floatButton, 35, 0, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null); - this.add(getShapeButton(beaconButton, 35, 32, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT), null); - this.add(getShapeButton(towerButton, 35, 64, 34, 32, "Tower", Shp.TOWER, Obj.BCNLAT), null); - this.add(getShapeButton(perchButton, 35, 96, 34, 32, "Perch", Shp.PERCH, Obj.BCNLAT), null); + this.add( + getShapeButton(pillarButton, 0, 64, 34, 32, "Pillar", Shp.PILLAR, + Obj.BOYLAT), null); + this.add( + getShapeButton(sparButton, 0, 96, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), + null); + this.add( + getShapeButton(canButton, 0, 128, 34, 32, "Can", Shp.CAN, Obj.BOYLAT), + null); + this.add( + getShapeButton(floatButton, 35, 0, 34, 32, "Float", Shp.FLOAT, + Obj.LITFLT), null); + this.add( + getShapeButton(beaconButton, 35, 32, 34, 32, "Beacon", Shp.BEACON, + Obj.BCNLAT), null); + this.add( + getShapeButton(towerButton, 35, 64, 34, 32, "Tower", Shp.TOWER, + Obj.BCNLAT), null); + this.add( + getShapeButton(perchButton, 35, 96, 34, 32, "Perch", Shp.PERCH, + Obj.BCNLAT), null); } @@ -76,5 +100,6 @@ } - private JRadioButton getRegionButton(JRadioButton button, int x, int y, int w, int h, String tip) { + 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)); @@ -85,5 +110,6 @@ } - private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java (revision 26110) @@ -22,10 +22,16 @@ private OSeaMAction dlg; private ButtonGroup shapeButtons = new ButtonGroup(); - public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); - public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); - public JRadioButton sphereButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SphereButton.png"))); - public JRadioButton barrelButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BarrelButton.png"))); - public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); - public EnumMap shapes = new EnumMap(Shp.class); + public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/PillarButton.png"))); + public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SparButton.png"))); + public JRadioButton sphereButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SphereButton.png"))); + public JRadioButton barrelButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/BarrelButton.png"))); + public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/FloatButton.png"))); + public EnumMap shapes = new EnumMap( + Shp.class); public EnumMap objects = new EnumMap(Shp.class); private ActionListener alShape = new ActionListener() { @@ -48,9 +54,19 @@ dlg = dia; this.setLayout(null); - this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYSAW), null); - this.add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYSAW), null); - this.add(getShapeButton(sphereButton, 0, 64, 34, 32, "Sphere", Shp.SPHERE, Obj.BOYSAW), null); - this.add(getShapeButton(barrelButton, 0, 96, 34, 32, "Barrel", Shp.BARREL, Obj.BOYSAW), null); - this.add(getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null); + this.add( + getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, + Obj.BOYSAW), null); + this.add( + getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYSAW), + null); + this.add( + getShapeButton(sphereButton, 0, 64, 34, 32, "Sphere", Shp.SPHERE, + Obj.BOYSAW), null); + this.add( + getShapeButton(barrelButton, 0, 96, 34, 32, "Barrel", Shp.BARREL, + Obj.BOYSAW), null); + this.add( + getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, + Obj.LITFLT), null); } @@ -60,5 +76,6 @@ } - private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) { + 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)); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java (revision 26110) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java (revision 26110) @@ -0,0 +1,68 @@ +package oseam.panels; + +import javax.swing.ImageIcon; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JButton; +import javax.swing.table.AbstractTableModel; + +public class PanelSectors extends JFrame { + + public JPanel panel; + public JButton minusButton; + public JButton plusButton; + public JTable table; + + class TableModel extends AbstractTableModel { + + private String[] columns = { "Sector", "Start", "End", "Colour", + "Character", "Group", "Period", "Height", "Range", "Visibility" }; + private Object[][] data = { { new Integer(1), "", "", "", "", "", "", "", "", "" } }; + + public String getColumnName(int col) { + return columns[col].toString(); + } + + public int getColumnCount() { + return columns.length; + } + + public int getRowCount() { + return data.length; + } + + public Object getValueAt(int row, int col) { + return data[row][col]; + } + + public boolean isCellEditable(int row, int col) { + return (col > 0); + } + + public void setValueAt(Object value, int row, int col) { + data[row][col] = value; + fireTableCellUpdated(row, col); + } +} + + public PanelSectors() { + super("Sector Table"); + panel = new JPanel(); + this.setSize(700, 100); + panel.setBounds(0, 0, 700, 512); + this.getContentPane().add(panel); + minusButton = new JButton(new ImageIcon(getClass().getResource("/images/MinusButton.png"))); + minusButton.setBounds(0, 0, 32, 34); + plusButton = new JButton(new ImageIcon(getClass().getResource("/images/PlusButton.png"))); + plusButton.setBounds(0, 34, 32, 34); + table = new JTable(new TableModel()); + JScrollPane tablePane = new JScrollPane(table); + tablePane.setBounds(40, 0, 660, 34); + panel.setLayout(null); + panel.add(minusButton); + panel.add(plusButton); + panel.add(tablePane); + } +} 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 26110) @@ -23,15 +23,26 @@ private OSeaMAction dlg; private ButtonGroup shapeButtons = new ButtonGroup(); - public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); - public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); - public JRadioButton canButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CanButton.png"))); - public JRadioButton coneButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ConeButton.png"))); - public JRadioButton sphereButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SphereButton.png"))); - public JRadioButton barrelButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BarrelButton.png"))); - public JRadioButton superButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SuperButton.png"))); - public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); - public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); - public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); - public EnumMap shapes = new EnumMap(Shp.class); + public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/PillarButton.png"))); + public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SparButton.png"))); + public JRadioButton canButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/CanButton.png"))); + public JRadioButton coneButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/ConeButton.png"))); + public JRadioButton sphereButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SphereButton.png"))); + public JRadioButton barrelButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/BarrelButton.png"))); + public JRadioButton superButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SuperButton.png"))); + public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/FloatButton.png"))); + public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/BeaconButton.png"))); + public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/TowerButton.png"))); + public EnumMap shapes = new EnumMap( + Shp.class); public EnumMap objects = new EnumMap(Shp.class); public PanelCol panelCol = null; @@ -59,14 +70,34 @@ this.setLayout(null); this.add(panelCol, null); - this.add(getShapeButton(pillarButton, 55, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYSPP), null); - this.add(getShapeButton(sparButton, 55, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYSPP), null); - this.add(getShapeButton(canButton, 55, 64, 34, 32, "Can", Shp.CAN, Obj.BOYSPP), null); - this.add(getShapeButton(coneButton, 55, 96, 34, 32, "Cone", Shp.CONE, Obj.BOYSPP), null); - this.add(getShapeButton(sphereButton, 55, 128, 34, 32, "Sphere", Shp.SPHERE, Obj.BOYSPP), null); - this.add(getShapeButton(barrelButton, 90, 0, 34, 32, "Barrel", Shp.BARREL, Obj.BOYSPP), null); - this.add(getShapeButton(superButton, 90, 32, 34, 32, "Super", Shp.SUPER, Obj.BOYSPP), null); - this.add(getShapeButton(floatButton, 90, 64, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null); - this.add(getShapeButton(beaconButton, 90, 96, 34, 32, "Beacon", Shp.BEACON, Obj.BCNSPP), null); - this.add(getShapeButton(towerButton, 90, 128, 34, 32, "Tower", Shp.TOWER, Obj.BCNSPP), null); + this.add( + getShapeButton(pillarButton, 55, 0, 34, 32, "Pillar", Shp.PILLAR, + Obj.BOYSPP), null); + this.add( + getShapeButton(sparButton, 55, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYSPP), + null); + this.add( + getShapeButton(canButton, 55, 64, 34, 32, "Can", Shp.CAN, Obj.BOYSPP), + null); + this.add( + getShapeButton(coneButton, 55, 96, 34, 32, "Cone", Shp.CONE, Obj.BOYSPP), + null); + this.add( + getShapeButton(sphereButton, 55, 128, 34, 32, "Sphere", Shp.SPHERE, + Obj.BOYSPP), null); + this.add( + getShapeButton(barrelButton, 90, 0, 34, 32, "Barrel", Shp.BARREL, + Obj.BOYSPP), null); + this.add( + getShapeButton(superButton, 90, 32, 34, 32, "Super", Shp.SUPER, + Obj.BOYSPP), null); + this.add( + getShapeButton(floatButton, 90, 64, 34, 32, "Float", Shp.FLOAT, + Obj.LITFLT), null); + this.add( + getShapeButton(beaconButton, 90, 96, 34, 32, "Beacon", Shp.BEACON, + Obj.BCNSPP), null); + this.add( + getShapeButton(towerButton, 90, 128, 34, 32, "Tower", Shp.TOWER, + Obj.BCNSPP), null); } @@ -75,5 +106,6 @@ } - private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 26110) @@ -22,6 +22,8 @@ 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 regionAButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/RegionAButton.png"))); + public JRadioButton regionBButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/RegionBButton.png"))); private ActionListener alRegion = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -32,12 +34,20 @@ }; private ButtonGroup shapeButtons = new ButtonGroup(); - public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png"))); - public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SparButton.png"))); - public JRadioButton coneButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ConeButton.png"))); - public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png"))); - public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png"))); - public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png"))); - public JRadioButton perchButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PerchSButton.png"))); - public EnumMap shapes = new EnumMap(Shp.class); + public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/PillarButton.png"))); + public JRadioButton sparButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/SparButton.png"))); + public JRadioButton coneButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/ConeButton.png"))); + public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/FloatButton.png"))); + public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/BeaconButton.png"))); + public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/TowerButton.png"))); + public JRadioButton perchButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/PerchSButton.png"))); + public EnumMap shapes = new EnumMap( + Shp.class); public EnumMap objects = new EnumMap(Shp.class); private ActionListener alShape = new ActionListener() { @@ -62,11 +72,25 @@ this.add(getRegionButton(regionAButton, 0, 2, 34, 30, "RegionA"), null); this.add(getRegionButton(regionBButton, 0, 32, 34, 30, "RegionB"), null); - this.add(getShapeButton(pillarButton, 0, 64, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT), null); - this.add(getShapeButton(sparButton, 0, 96, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), null); - this.add(getShapeButton(coneButton, 0, 128, 34, 32, "Cone", Shp.CONE, Obj.BOYLAT), null); - this.add(getShapeButton(floatButton, 35, 0, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null); - this.add(getShapeButton(beaconButton, 35, 32, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT), null); - this.add(getShapeButton(towerButton, 35, 64, 34, 32, "Tower", Shp.TOWER, Obj.BCNLAT), null); - this.add(getShapeButton(perchButton, 35, 96, 34, 32, "Perch", Shp.PERCH, Obj.BCNLAT), null); + this.add( + getShapeButton(pillarButton, 0, 64, 34, 32, "Pillar", Shp.PILLAR, + Obj.BOYLAT), null); + this.add( + getShapeButton(sparButton, 0, 96, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), + null); + this.add( + getShapeButton(coneButton, 0, 128, 34, 32, "Cone", Shp.CONE, Obj.BOYLAT), + null); + this.add( + getShapeButton(floatButton, 35, 0, 34, 32, "Float", Shp.FLOAT, + Obj.LITFLT), null); + this.add( + getShapeButton(beaconButton, 35, 32, 34, 32, "Beacon", Shp.BEACON, + Obj.BCNLAT), null); + this.add( + getShapeButton(towerButton, 35, 64, 34, 32, "Tower", Shp.TOWER, + Obj.BCNLAT), null); + this.add( + getShapeButton(perchButton, 35, 96, 34, 32, "Perch", Shp.PERCH, + Obj.BCNLAT), null); } @@ -76,5 +100,6 @@ } - private JRadioButton getRegionButton(JRadioButton button, int x, int y, int w, int h, String tip) { + 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)); @@ -85,5 +110,6 @@ } - private JRadioButton getShapeButton(JRadioButton button, int x, int y, int w, int h, String tip, Shp shp, Obj obj) { + 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)); 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 26109) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 26110) @@ -23,23 +23,42 @@ public PanelCol panelCol = null; private ButtonGroup topButtons = new ButtonGroup(); - public JRadioButton noTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/NoTopButton.png"))); - public JRadioButton canTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CanTopButton.png"))); - public JRadioButton coneTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ConeTopButton.png"))); - public JRadioButton sphereTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SphereTopButton.png"))); - public JRadioButton XTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/XTopButton.png"))); - public JRadioButton northTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/NorthTopButton.png"))); - public JRadioButton southTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SouthTopButton.png"))); - public JRadioButton eastTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/EastTopButton.png"))); - public JRadioButton westTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WestTopButton.png"))); - public JRadioButton spheres2TopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/Spheres2TopButton.png"))); - public JRadioButton boardDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BoardDayButton.png"))); - public JRadioButton diamondDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/DiamondDayButton.png"))); - public JRadioButton triangleDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TriangleDayButton.png"))); - public JRadioButton triangleInvDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TriangleInvDayButton.png"))); - 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 EnumMap days = new EnumMap(Day.class); + public JRadioButton noTopButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/NoTopButton.png"))); + public JRadioButton canTopButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/CanTopButton.png"))); + public JRadioButton coneTopButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/ConeTopButton.png"))); + public JRadioButton sphereTopButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/SphereTopButton.png"))); + public JRadioButton XTopButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/XTopButton.png"))); + public JRadioButton northTopButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/NorthTopButton.png"))); + public JRadioButton southTopButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/SouthTopButton.png"))); + public JRadioButton eastTopButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/EastTopButton.png"))); + public JRadioButton westTopButton = new JRadioButton(new ImageIcon(getClass() + .getResource("/images/WestTopButton.png"))); + public JRadioButton spheres2TopButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/Spheres2TopButton.png"))); + public JRadioButton boardDayButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/BoardDayButton.png"))); + public JRadioButton diamondDayButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/DiamondDayButton.png"))); + public JRadioButton triangleDayButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/TriangleDayButton.png"))); + public JRadioButton triangleInvDayButton = new JRadioButton(new ImageIcon( + getClass().getResource("/images/TriangleInvDayButton.png"))); + 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 EnumMap days = new EnumMap( + Day.class); private ActionListener alTop = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -74,19 +93,44 @@ this.add(getTopButton(noTopButton, 40, 5, 27, 27, "NoTop", Top.NONE), null); this.add(getTopButton(canTopButton, 70, 5, 27, 27, "CanTop", Top.CAN), null); - this.add(getTopButton(coneTopButton, 100, 5, 27, 27, "ConeTop", Top.CONE), null); - this.add(getTopButton(sphereTopButton, 130, 5, 27, 27, "SphereTop", Top.SPHERE), null); - this.add(getTopButton(XTopButton, 160, 5, 27, 27, "XTop", Top.X_SHAPE), null); - this.add(getTopButton(northTopButton, 40, 35, 27, 27, "NorthTop", Top.NORTH), null); - this.add(getTopButton(southTopButton, 70, 35, 27, 27, "SouthTop", Top.SOUTH), null); - this.add(getTopButton(eastTopButton, 100, 35, 27, 27, "EastTop", Top.EAST), null); - this.add(getTopButton(westTopButton, 130, 35, 27, 27, "WestTop", Top.WEST), null); - this.add(getTopButton(spheres2TopButton, 160, 35, 27, 27, "Spheres2Top", Top.SPHERES2), null); - this.add(getDayButton(boardDayButton, 40, 65, 27, 27, "BoardDay", Day.BOARD), null); - this.add(getDayButton(diamondDayButton, 70, 65, 27, 27, "DiamondDay", Day.DIAMOND), null); - this.add(getDayButton(triangleDayButton, 100, 65, 27, 27, "TriangleDay", Day.TRIANGLE), null); - this.add(getDayButton(triangleInvDayButton, 130, 65, 27, 27, "TriangleInvDay", Day.TRIANGLE_INV), null); - this.add(getDayButton(squareDayButton, 160, 65, 27, 27, "SquareDay", Day.SQUARE), null); - this.add(getDayButton(circleDayButton, 160, 95, 27, 27, "CircleDay", Day.CIRCLE), null); - this.add(getMoorButton(mooringTopButton, 40, 95, 27, 27, "MooringTop"), null); + this.add(getTopButton(coneTopButton, 100, 5, 27, 27, "ConeTop", Top.CONE), + null); + this.add( + getTopButton(sphereTopButton, 130, 5, 27, 27, "SphereTop", Top.SPHERE), + null); + this.add(getTopButton(XTopButton, 160, 5, 27, 27, "XTop", Top.X_SHAPE), + null); + this.add( + getTopButton(northTopButton, 40, 35, 27, 27, "NorthTop", Top.NORTH), + null); + this.add( + getTopButton(southTopButton, 70, 35, 27, 27, "SouthTop", Top.SOUTH), + null); + this.add(getTopButton(eastTopButton, 100, 35, 27, 27, "EastTop", Top.EAST), + null); + this.add(getTopButton(westTopButton, 130, 35, 27, 27, "WestTop", Top.WEST), + null); + this.add( + getTopButton(spheres2TopButton, 160, 35, 27, 27, "Spheres2Top", + Top.SPHERES2), null); + this.add( + getDayButton(boardDayButton, 40, 65, 27, 27, "BoardDay", Day.BOARD), + null); + this.add( + getDayButton(diamondDayButton, 70, 65, 27, 27, "DiamondDay", + Day.DIAMOND), null); + this.add( + getDayButton(triangleDayButton, 100, 65, 27, 27, "TriangleDay", + Day.TRIANGLE), null); + this.add( + getDayButton(triangleInvDayButton, 130, 65, 27, 27, "TriangleInvDay", + Day.TRIANGLE_INV), null); + this.add( + getDayButton(squareDayButton, 160, 65, 27, 27, "SquareDay", Day.SQUARE), + null); + this.add( + getDayButton(circleDayButton, 160, 95, 27, 27, "CircleDay", Day.CIRCLE), + null); + this.add(getMoorButton(mooringTopButton, 40, 95, 27, 27, "MooringTop"), + null); } @@ -98,10 +142,11 @@ public void enableAll(boolean state) { - for (JRadioButton button : tops.values()) { + for (JRadioButton button : tops.values()) { button.setEnabled(state); } } - private JRadioButton getTopButton(JRadioButton button, int x, int y, int w, int h, String tip, Top top) { + 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)); @@ -110,8 +155,9 @@ topButtons.add(button); tops.put(top, button); - return button; -} + return button; + } - private JRadioButton getDayButton(JRadioButton button, int x, int y, int w, int h, String tip, Day day) { + 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)); @@ -120,8 +166,9 @@ topButtons.add(button); days.put(day, button); - return button; -} + return button; + } - private JRadioButton getMoorButton(JRadioButton button, int x, int y, int w, int h, String tip) { + 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)); @@ -129,6 +176,6 @@ button.addActionListener(alTop); topButtons.add(button); - return button; -} + return button; + } }