Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionCButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionCButton.svg (revision 26173) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionCButton.svg (revision 26173) @@ -0,0 +1,4497 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + C + + + + + + + + + + + + + + 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 26173) @@ -80,4 +80,4 @@ return panelMain; } - + } 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 26173) @@ -40,4 +40,5 @@ RegionA=IALA Region A RegionB=IALA Region B +RegionC=CEVNI NoTop=No topmark 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties (revision 26173) @@ -40,4 +40,5 @@ RegionA=IALA Region A RegionB=IALA Region B +RegionC=CEVNI NoTop=No topmark 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 26173) @@ -40,4 +40,5 @@ RegionA=IALA Region A RegionB=IALA Region B +RegionC=CEVNI NoTop=No topmark 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 26173) @@ -31,14 +31,9 @@ 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) { @@ -198,11 +193,11 @@ dlg = dia; panelPort = new PanelPort(dlg); - panelPort.setBounds(new Rectangle(55, 0, 225, 160)); + panelPort.setBounds(new Rectangle(55, 0, 180, 160)); panelPort.setVisible(false); panelStbd = new PanelStbd(dlg); - panelStbd.setBounds(new Rectangle(55, 0, 225, 160)); + panelStbd.setBounds(new Rectangle(55, 0, 180, 160)); panelStbd.setVisible(false); panelSaw = new PanelSaw(dlg); - panelSaw.setBounds(new Rectangle(55, 0, 225, 160)); + panelSaw.setBounds(new Rectangle(55, 0, 180, 160)); panelSaw.setVisible(false); this.setLayout(null); @@ -225,6 +220,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java (revision 26173) @@ -30,37 +30,22 @@ 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) { @@ -120,46 +105,20 @@ 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); @@ -186,6 +145,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java (revision 26173) @@ -25,26 +25,15 @@ 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) { @@ -65,34 +54,14 @@ 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); } @@ -108,6 +77,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 26173) @@ -25,14 +25,9 @@ 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) { @@ -97,16 +92,10 @@ 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); @@ -139,19 +128,9 @@ 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); } @@ -163,6 +142,5 @@ } - 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)); @@ -173,6 +151,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 26173) @@ -22,16 +22,10 @@ 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() { @@ -54,19 +48,9 @@ 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); } @@ -75,6 +59,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 26173) @@ -91,9 +91,7 @@ }; 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); @@ -116,6 +114,5 @@ } }; - 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); @@ -131,6 +128,5 @@ } }; - 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); @@ -160,6 +156,5 @@ } }; - 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); @@ -174,6 +169,5 @@ } }; - 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); @@ -189,6 +183,5 @@ } }; - 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); @@ -206,6 +199,5 @@ } }; - 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); @@ -224,6 +216,5 @@ } }; - 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); @@ -235,6 +226,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 26173) @@ -31,22 +31,14 @@ 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; @@ -64,14 +56,14 @@ dlg = dia; panelChan = new PanelChan(dlg); - panelChan.setBounds(new Rectangle(65, 0, 205, 160)); + panelChan.setBounds(new Rectangle(65, 0, 185, 160)); panelChan.setVisible(false); panelHaz = new PanelHaz(dlg); - panelHaz.setBounds(new Rectangle(65, 0, 205, 160)); + panelHaz.setBounds(new Rectangle(65, 0, 185, 160)); panelHaz.setVisible(false); panelSpec = new PanelSpec(dlg); - panelSpec.setBounds(new Rectangle(65, 0, 205, 160)); + panelSpec.setBounds(new Rectangle(65, 0, 185, 160)); panelSpec.setVisible(false); panelLights = new PanelLights(dlg); - panelLights.setBounds(new Rectangle(65, 0, 205, 160)); + panelLights.setBounds(new Rectangle(65, 0, 185, 160)); panelLights.setVisible(false); panelTop = new PanelTop(dlg); @@ -89,17 +81,18 @@ shapeIcon = new JLabel(); - shapeIcon.setBounds(new Rectangle(220, 0, 130, 185)); + shapeIcon.setBounds(new Rectangle(250, 0, 150, 185)); this.add(shapeIcon, null); lightIcon = new JLabel(); - lightIcon.setBounds(new Rectangle(220, 0, 130, 185)); + lightIcon.setBounds(new Rectangle(250, 0, 150, 185)); this.add(lightIcon, null); topIcon = new JLabel(); - topIcon.setBounds(new Rectangle(220, 0, 130, 185)); + topIcon.setBounds(new Rectangle(250, 0, 150, 185)); this.add(topIcon, null); radarIcon = new JLabel(); - radarIcon.setBounds(new Rectangle(220, 0, 130, 185)); + radarIcon.setBounds(new Rectangle(250, 0, 150, 185)); + radarIcon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png"))); this.add(radarIcon, null); fogIcon = new JLabel(); - fogIcon.setBounds(new Rectangle(220, 0, 130, 185)); + fogIcon.setBounds(new Rectangle(250, 0, 150, 185)); this.add(fogIcon, null); @@ -275,10 +268,10 @@ lightIcon.setIcon(null); topIcon.setIcon(null); - radarIcon.setIcon(null); + // radarIcon.setIcon(null); + radarIcon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png"))); fogIcon.setIcon(null); } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 26173) @@ -22,32 +22,25 @@ 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"))); + public JRadioButton regionCButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionCButton.png"))); private ActionListener alRegion = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { regionAButton.setBorderPainted(regionAButton.isSelected()); regionBButton.setBorderPainted(regionBButton.isSelected()); + regionCButton.setBorderPainted(regionCButton.isSelected()); dlg.mark.paintSign(); } }; 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 sphereButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SphereButton.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() { @@ -70,27 +63,15 @@ dlg = dia; this.setLayout(null); - 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(getRegionButton(regionAButton, 70, 0, 34, 30, "RegionA"), null); + this.add(getRegionButton(regionBButton, 70, 32, 34, 30, "RegionB"), null); + this.add(getRegionButton(regionCButton, 70, 64, 34, 30, "RegionC"), null); + this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT), null); + this.add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), null); + this.add(getShapeButton(canButton, 0, 64, 34, 32, "Can", Shp.CAN, Obj.BOYLAT), null); + this.add(getShapeButton(sphereButton, 0, 96, 34, 32, "Sphere", Shp.SPHERE, Obj.LITFLT), null); + this.add(getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null); + this.add(getShapeButton(beaconButton, 35, 0, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT), null); + this.add(getShapeButton(towerButton, 35, 32, 34, 32, "Tower", Shp.TOWER, Obj.BCNLAT), null); + this.add(getShapeButton(perchButton, 35, 64, 34, 32, "Perch", Shp.PERCH, Obj.BCNLAT), null); } @@ -100,6 +81,5 @@ } - 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)); @@ -110,6 +90,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java (revision 26173) @@ -22,16 +22,10 @@ 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() { @@ -54,19 +48,9 @@ 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); } @@ -76,6 +60,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java (revision 26173) @@ -14,5 +14,5 @@ public class PanelSectors extends JFrame { - + public JPanel panel; public JButton minusButton; @@ -23,5 +23,5 @@ private ActionListener alMinusButton; private ActionListener alPlusButton; - + public PanelSectors(Light lit) { super("Sector Table"); @@ -36,5 +36,5 @@ panel.setLayout(null); panel.add(tablePane); - + alMinusButton = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -46,5 +46,5 @@ minusButton.addActionListener(alMinusButton); panel.add(minusButton); - + alPlusButton = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -57,9 +57,9 @@ panel.add(plusButton); } - + public int getSectorCount() { return light.getRowCount(); } - + public void addSector(int idx) { light.addSector(idx); @@ -72,5 +72,5 @@ light.fireTableRowsInserted(idx, idx); } - + public void deleteSector(int idx) { light.deleteSector(idx); @@ -83,4 +83,4 @@ light.fireTableRowsDeleted(idx, idx); } - + } 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 26173) @@ -23,26 +23,15 @@ 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; @@ -70,34 +59,14 @@ 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); } @@ -106,6 +75,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 26173) @@ -22,32 +22,25 @@ 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"))); + public JRadioButton regionCButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RegionCButton.png"))); private ActionListener alRegion = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { regionAButton.setBorderPainted(regionAButton.isSelected()); regionBButton.setBorderPainted(regionBButton.isSelected()); + regionCButton.setBorderPainted(regionCButton.isSelected()); dlg.mark.paintSign(); } }; 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 sphereButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SphereButton.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() { @@ -70,27 +63,15 @@ dlg = dia; this.setLayout(null); - 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(getRegionButton(regionAButton, 70, 0, 34, 30, "RegionA"), null); + this.add(getRegionButton(regionBButton, 70, 32, 34, 30, "RegionB"), null); + this.add(getRegionButton(regionCButton, 70, 64, 34, 30, "RegionC"), null); + this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT), null); + this.add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), null); + this.add(getShapeButton(coneButton, 0, 64, 34, 32, "Cone", Shp.CONE, Obj.BOYLAT), null); + this.add(getShapeButton(sphereButton, 0, 96, 34, 32, "Sphere", Shp.SPHERE, Obj.LITFLT), null); + this.add(getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null); + this.add(getShapeButton(beaconButton, 35, 0, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT), null); + this.add(getShapeButton(towerButton, 35, 32, 34, 32, "Tower", Shp.TOWER, Obj.BCNLAT), null); + this.add(getShapeButton(perchButton, 35, 64, 34, 32, "Perch", Shp.PERCH, Obj.BCNLAT), null); } @@ -100,6 +81,5 @@ } - 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)); @@ -110,6 +90,5 @@ } - 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 26172) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 26173) @@ -23,42 +23,24 @@ 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) { @@ -93,44 +75,19 @@ 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); } @@ -147,6 +104,5 @@ } - 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)); @@ -158,6 +114,5 @@ } - 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)); @@ -169,6 +124,5 @@ } - 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));