Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogBellButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogBellButton.svg (revision 27035) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogBellButton.svg (revision 27035) @@ -0,0 +1,4809 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogExplosButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogExplosButton.svg (revision 27035) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogExplosButton.svg (revision 27035) @@ -0,0 +1,4907 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogGongButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogGongButton.svg (revision 27035) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogGongButton.svg (revision 27035) @@ -0,0 +1,4794 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogHornButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogHornButton.svg (revision 27034) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogHornButton.svg (revision 27035) @@ -4736,5 +4736,5 @@ - + @@ -4758,55 +4758,58 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> - - - - - - + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogWhisButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogWhisButton.svg (revision 27035) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogWhisButton.svg (revision 27035) @@ -0,0 +1,4808 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27034) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 27035) @@ -100,4 +100,5 @@ PartiallyObscured=Partially obscured Orientation=Orientation +Multiplicity=Multiplicity Exhibition=Exhibition 24h=24h @@ -105,4 +106,22 @@ Night=Night Fog=Fog + +VertDisp=Vertically Disposed +HorizDisp=Horizontally Disposed +Directional=Directional +Upper=Upper +Lower=Lower +Rear=Rear +Front=Front +Aero=Aero +AirObstruction=Air Obstruction +FogDetector=Fog Detector +Floodlight=Floodlight +Striplight=Striplight +Subsidiary=Subsidiary +Spotlight=Spotlight +MoireEffect=Moire Effect +Emergency=Emergency +Bearing=Bearing RemColour=Remove colour @@ -226,4 +245,5 @@ Siren=Siren Diaphone=Diaphone +Gong=Gong Bell=Bell Whistle=Whistle 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 27034) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties (revision 27035) @@ -100,4 +100,5 @@ PartiallyObscured=Partially obscured Orientation=Orientation +Multiplicity=Multiplicity Exhibition=Exhibition 24h=24h @@ -105,4 +106,22 @@ Night=Night Fog=Fog + +VertDisp=Vertically Disposed +HorizDisp=Horizontally Disposed +Directional=Directional +Upper=Upper +Lower=Lower +Rear=Rear +Front=Front +Aero=Aero +AirObstruction=Air Obstruction +FogDetector=Fog Detector +Floodlight=Floodlight +Striplight=Striplight +Subsidiary=Subsidiary +Spotlight=Spotlight +MoireEffect=Moire Effect +Emergency=Emergency +Bearing=Bearing RemColour=Remove colour @@ -226,4 +245,5 @@ Siren=Siren Diaphone=Diaphone +Gong=Gong Bell=Bell Whistle=Whistle 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 27034) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java (revision 27035) @@ -174,6 +174,6 @@ panelSaw.setVisible(false); } + topmarkButton.setBorderPainted(dlg.mark.hasTopmark()); if (dlg.mark.isValid()) { - topmarkButton.setBorderPainted(dlg.mark.hasTopmark()); topmarkButton.setVisible(true); dlg.panelMain.moreButton.setVisible(true); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java (revision 27034) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java (revision 27035) @@ -20,8 +20,8 @@ public JRadioButton sirenButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); public JRadioButton diaButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton bellButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton whisButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton gongButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); - public JRadioButton explosButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OffButton.png"))); + public JRadioButton bellButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogBellButton.png"))); + public JRadioButton whisButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogWhisButton.png"))); + public JRadioButton gongButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogGongButton.png"))); + public JRadioButton explosButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogExplosButton.png"))); private EnumMap fogs = new EnumMap(Fog.class); private ActionListener alFog = new ActionListener() { @@ -73,12 +73,13 @@ dlg = dia; this.setLayout(null); - this.add(getFogButton(noFogButton, 0, 5, 27, 27, "NoFog", Fog.NONE), null); - this.add(getFogButton(yesFogButton, 0, 35, 27, 27, "FogSignal", Fog.UNKNOWN), null); - this.add(getFogButton(hornButton, 0, 65, 27, 27, "Horn", Fog.HORN), null); - this.add(getFogButton(sirenButton, 0, 95, 27, 27, "Siren", Fog.SIREN), null); - this.add(getFogButton(diaButton, 30, 5, 27, 27, "Diaphone", Fog.DIA), null); - this.add(getFogButton(bellButton, 30, 35, 27, 27, "Bell", Fog.BELL), null); - this.add(getFogButton(whisButton, 30, 65, 27, 27, "Whistle", Fog.WHIS), null); - this.add(getFogButton(explosButton, 30, 95, 27, 27, "Explosion", Fog.EXPLOS), null); + this.add(getFogButton(noFogButton, 0, 2, 27, 27, "NoFog", Fog.NONE), null); + this.add(getFogButton(yesFogButton, 0, 32, 27, 27, "FogSignal", Fog.UNKNOWN), null); + this.add(getFogButton(hornButton, 0, 62, 27, 27, "Horn", Fog.HORN), null); + this.add(getFogButton(sirenButton, 0, 92, 27, 27, "Siren", Fog.SIREN), null); + this.add(getFogButton(gongButton, 0, 122, 27, 27, "Gong", Fog.SIREN), null); + this.add(getFogButton(diaButton, 30, 2, 27, 27, "Diaphone", Fog.DIA), null); + this.add(getFogButton(bellButton, 30, 32, 27, 27, "Bell", Fog.BELL), null); + this.add(getFogButton(whisButton, 30, 62, 27, 27, "Whistle", Fog.WHIS), null); + this.add(getFogButton(explosButton, 30, 92, 27, 27, "Explosion", Fog.EXPLOS), null); groupLabel = new JLabel(Messages.getString("Group"), SwingConstants.CENTER); 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 27034) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 27035) @@ -98,5 +98,5 @@ this.add(trafficCatBox, null); trafficCatBox.addActionListener(alTrafficCatBox); - addTCItem(Messages.getString("UKCategory"), Cat.NONE); + addTCItem("", Cat.NONE); addTCItem(Messages.getString("Traffic"), Cat.SIS_TRFC); addTCItem(Messages.getString("PortControl"), Cat.SIS_PTCL); @@ -115,5 +115,5 @@ this.add(warningCatBox, null); warningCatBox.addActionListener(alWarningCatBox); - addWCItem(Messages.getString("UKCategory"), Cat.NONE); + addWCItem("", Cat.NONE); addWCItem(Messages.getString("Danger"), Cat.SIS_DNGR); addWCItem(Messages.getString("Storm"), Cat.SIS_STRM); @@ -136,5 +136,20 @@ public void syncPanel() { - + trafficCatBox.setSelectedIndex(0); + for (Cat cat : trafficCats.keySet()) { + int item = trafficCats.get(cat); + if (dlg.mark.getCategory() == cat) + trafficCatBox.setSelectedIndex(item); + } + warningCatBox.setSelectedIndex(0); + for (Cat cat : warningCats.keySet()) { + int item = warningCats.get(cat); + if (dlg.mark.getCategory() == cat) + warningCatBox.setSelectedIndex(item); + } + for (Obj obj : objects.keySet()) { + JRadioButton button = objects.get(obj); + button.setBorderPainted(dlg.mark.getObject() == obj); + } } 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 27034) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java (revision 27035) @@ -71,4 +71,11 @@ } }; + public JLabel multipleLabel; + public JTextField multipleBox; + private ActionListener alMultiple = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + dlg.mark.setLightMultiple(multipleBox.getText()); + } + }; public JLabel categoryLabel; public JComboBox categoryBox; @@ -80,4 +87,20 @@ if (idx == categoryBox.getSelectedIndex()) dlg.mark.setLightAtt(Att.LIT, 0, lit); + } + if (dlg.mark.getLightAtt(Att.LIT, 0) == Lit.DIR) { + orientationLabel.setVisible(true); + orientationBox.setVisible(true); + multipleLabel.setVisible(false); + multipleBox.setVisible(false); + } else if ((dlg.mark.getLightAtt(Att.LIT, 0) == Lit.VERT) || (dlg.mark.getLightAtt(Att.LIT, 0) == Lit.HORIZ)) { + orientationLabel.setVisible(false); + orientationBox.setVisible(false); + multipleLabel.setVisible(true); + multipleBox.setVisible(true); + } else { + orientationLabel.setVisible(false); + orientationBox.setVisible(false); + multipleLabel.setVisible(false); + multipleBox.setVisible(false); } } @@ -185,20 +208,21 @@ this.add(categoryBox, null); addCatItem("", Lit.UNKNOWN); - addCatItem(Messages.getString("VerticallyDisposedLights"), Lit.VERT); - addCatItem(Messages.getString("HorizontallyDisposedLights"), Lit.HORIZ); + addCatItem(Messages.getString("VertDisp"), Lit.VERT); + addCatItem(Messages.getString("HorizDisp"), Lit.HORIZ); + addCatItem(Messages.getString("Directional"), Lit.DIR); addCatItem(Messages.getString("Upper"), Lit.UPPER); addCatItem(Messages.getString("Lower"), Lit.LOWER); addCatItem(Messages.getString("Rear"), Lit.REAR); addCatItem(Messages.getString("Front"), Lit.FRONT); - addCatItem(Messages.getString("AeroLight"), Lit.AERO); - addCatItem(Messages.getString("AirObstructionLight"), Lit.AIROBS); - addCatItem(Messages.getString("FogDetectorLight"), Lit.FOGDET); + addCatItem(Messages.getString("Aero"), Lit.AERO); + addCatItem(Messages.getString("AirObstruction"), Lit.AIROBS); + addCatItem(Messages.getString("FogDetector"), Lit.FOGDET); addCatItem(Messages.getString("Floodlight"), Lit.FLOOD); addCatItem(Messages.getString("Striplight"), Lit.STRIP); - addCatItem(Messages.getString("SubsidiaryLight"), Lit.SUBS); + addCatItem(Messages.getString("Subsidiary"), Lit.SUBS); addCatItem(Messages.getString("Spotlight"), Lit.SPOT); - addCatItem(Messages.getString("MoireEffectLight"), Lit.MOIRE); - addCatItem(Messages.getString("EmergencyLight"), Lit.EMERG); - addCatItem(Messages.getString("BearingLight"), Lit.BEAR); + addCatItem(Messages.getString("MoireEffect"), Lit.MOIRE); + addCatItem(Messages.getString("Emergency"), Lit.EMERG); + addCatItem(Messages.getString("Bearing"), Lit.BEAR); categoryBox.addActionListener(alCategory); @@ -230,13 +254,30 @@ orientationLabel = new JLabel(Messages.getString("Orientation"), SwingConstants.CENTER); orientationLabel.setBounds(new Rectangle(188, 80, 80, 20)); + orientationLabel.setVisible(false); this.add(orientationLabel, null); orientationBox = new JTextField(); orientationBox.setBounds(new Rectangle(208, 100, 40, 20)); orientationBox.setHorizontalAlignment(SwingConstants.CENTER); + orientationBox.setVisible(false); this.add(orientationBox, null); orientationBox.addActionListener(alOrientation); + + multipleLabel = new JLabel(Messages.getString("Multiplicity"), SwingConstants.CENTER); + multipleLabel.setBounds(new Rectangle(188, 80, 80, 20)); + multipleLabel.setVisible(false); + this.add(multipleLabel, null); + multipleBox = new JTextField(); + multipleBox.setBounds(new Rectangle(208, 100, 40, 20)); + multipleBox.setHorizontalAlignment(SwingConstants.CENTER); + multipleBox.setVisible(false); + this.add(multipleBox, null); + multipleBox.addActionListener(alMultiple); } public void syncPanel() { + orientationLabel.setVisible(false); + orientationBox.setVisible(false); + multipleLabel.setVisible(false); + multipleBox.setVisible(false); } Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27034) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java (revision 27035) @@ -154,7 +154,4 @@ GrpMAP.put(Obj.BOYSAW, Grp.SAW); GrpMAP.put(Obj.BOYSPP, Grp.SPP); - GrpMAP.put(Obj.LITMAJ, Grp.LIT); - GrpMAP.put(Obj.LITMIN, Grp.LIT); - GrpMAP.put(Obj.LITFLT, Grp.FLT); GrpMAP.put(Obj.FLTCAR, Grp.CAR); GrpMAP.put(Obj.FLTLAT, Grp.LAT); @@ -162,4 +159,7 @@ GrpMAP.put(Obj.FLTISD, Grp.ISD); GrpMAP.put(Obj.FLTSPP, Grp.SPP); + GrpMAP.put(Obj.LITFLT, Grp.FLT); + GrpMAP.put(Obj.LITMAJ, Grp.LIT); + GrpMAP.put(Obj.LITMIN, Grp.LIT); GrpMAP.put(Obj.LITVES, Grp.LIT); GrpMAP.put(Obj.LNDMRK, Grp.LIT); @@ -587,4 +587,14 @@ } + private String lightMultiple = ""; + + public String getLightMiltiple() { + return lightMultiple; + } + + public void setLightMultiple(String str) { + lightMultiple = str; + } + public enum Pat { NONE, HORIZ, VERT, DIAG, SQUARE, BORDER @@ -700,72 +710,72 @@ } - private String RaconGroup = ""; + private String raconGroup = ""; public String getRaconGroup() { - return RaconGroup; + return raconGroup; } public void setRaconGroup(String grp) { - RaconGroup = grp; - } - - private String RaconSequence = ""; + raconGroup = grp; + } + + private String raconSequence = ""; public String getRaconSequence() { - return RaconSequence; + return raconSequence; } public void setRaconSequence(String seq) { - RaconSequence = seq; - } - - private String RaconPeriod = ""; + raconSequence = seq; + } + + private String raconPeriod = ""; public String getRaconPeriod() { - return RaconPeriod; + return raconPeriod; } public void setRaconPeriod(String per) { - RaconPeriod = validDecimal(per); - } - - private String RaconRange = ""; + raconPeriod = validDecimal(per); + } + + private String raconRange = ""; public String getRaconRange() { - return RaconRange; + return raconRange; } public void setRaconRange(String rng) { - RaconRange = validDecimal(rng); - } - - private String RaconSector1 = ""; + raconRange = validDecimal(rng); + } + + private String raconSector1 = ""; public String getRaconSector1() { - return RaconSector1; + return raconSector1; } public void setRaconSector1(String sec) { - RaconSector1 = validDecimal(sec); - } - - private String RaconSector2 = ""; + raconSector1 = validDecimal(sec); + } + + private String raconSector2 = ""; public String getRaconSector2() { - return RaconSector2; + return raconSector2; } public void setRaconSector2(String sec) { - RaconSector2 = validDecimal(sec); - } - - private boolean FogSignal = false; + raconSector2 = validDecimal(sec); + } + + private boolean fogSignal = false; public boolean hasFog() { - return FogSignal; + return fogSignal; } public void setFog(boolean fog) { - FogSignal = fog; + fogSignal = fog; } @@ -786,52 +796,52 @@ } - private Fog FogSound = Fog.NONE; + private Fog fogSound = Fog.NONE; public Fog getFogSound() { - return FogSound; + return fogSound; } public void setFogSound(Fog sound) { - FogSound = sound; - } - - private String FogGroup = ""; + fogSound = sound; + } + + private String fogGroup = ""; public String getFogGroup() { - return FogGroup; + return fogGroup; } public void setFogGroup(String grp) { - FogGroup = grp; - } - - private String FogSequence = ""; + fogGroup = grp; + } + + private String fogSequence = ""; public String getFogSequence() { - return FogSequence; + return fogSequence; } public void setFogSequence(String seq) { - FogSequence = seq; - } - - private String FogRange = ""; + fogSequence = seq; + } + + private String fogRange = ""; public String getFogRange() { - return FogRange; + return fogRange; } public void setFogRange(String rng) { - FogRange = validDecimal(rng); - } - - private String FogPeriod = ""; + fogRange = validDecimal(rng); + } + + private String fogPeriod = ""; public String getFogPeriod() { - return FogPeriod; + return fogPeriod; } public void setFogPeriod(String per) { - FogPeriod = validDecimal(per); + fogPeriod = validDecimal(per); } @@ -1192,4 +1202,5 @@ setCategory(Cat.NONE); } else if (getObjColour(1) == Col.YELLOW) { + setObject(Obj.FLTCAR); if (getObjColour(2) == Col.BLACK) { setCategory(Cat.CAM_EAST);