Changeset 27230 in osm
- Timestamp:
- 2011-12-14T02:56:38+01:00 (13 years ago)
- Location:
- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam
- Files:
-
- 18 edited
-
panels/PanelChan.java (modified) (11 diffs)
-
panels/PanelChr.java (modified) (3 diffs)
-
panels/PanelCol.java (modified) (4 diffs)
-
panels/PanelFog.java (modified) (1 diff)
-
panels/PanelHaz.java (modified) (5 diffs)
-
panels/PanelLights.java (modified) (6 diffs)
-
panels/PanelLit.java (modified) (3 diffs)
-
panels/PanelMain.java (modified) (1 diff)
-
panels/PanelMore.java (modified) (8 diffs)
-
panels/PanelPat.java (modified) (3 diffs)
-
panels/PanelPort.java (modified) (2 diffs)
-
panels/PanelRadar.java (modified) (2 diffs)
-
panels/PanelSaw.java (modified) (1 diff)
-
panels/PanelSectors.java (modified) (6 diffs)
-
panels/PanelSpec.java (modified) (5 diffs)
-
panels/PanelStbd.java (modified) (2 diffs)
-
panels/PanelTop.java (modified) (1 diff)
-
seamarks/SeaMark.java (modified) (93 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java
r27219 r27230 39 39 } else { 40 40 panelPort.shapeButtons.clearSelection(); 41 dlg.panelMain.mark.setShape(Shp.UNK NOWN);41 dlg.panelMain.mark.setShape(Shp.UNKSHP); 42 42 } 43 43 panelPort.alShape.actionPerformed(null); … … 53 53 } else { 54 54 panelPort.shapeButtons.clearSelection(); 55 dlg.panelMain.mark.setShape(Shp.UNK NOWN);55 dlg.panelMain.mark.setShape(Shp.UNKSHP); 56 56 } 57 57 panelPort.alShape.actionPerformed(null); … … 67 67 } else { 68 68 panelStbd.shapeButtons.clearSelection(); 69 dlg.panelMain.mark.setShape(Shp.UNK NOWN);69 dlg.panelMain.mark.setShape(Shp.UNKSHP); 70 70 } 71 71 panelStbd.alShape.actionPerformed(null); … … 81 81 } else { 82 82 panelStbd.shapeButtons.clearSelection(); 83 dlg.panelMain.mark.setShape(Shp.UNK NOWN);83 dlg.panelMain.mark.setShape(Shp.UNKSHP); 84 84 } 85 85 panelStbd.alShape.actionPerformed(null); … … 90 90 } 91 91 if (safeWaterButton.isSelected()) { 92 dlg.panelMain.mark.setCategory(Cat.NO NE);92 dlg.panelMain.mark.setCategory(Cat.NOCAT); 93 93 panelSaw.setVisible(true); 94 94 if (panelSaw.shapes.containsKey(shp)) { … … 96 96 } else { 97 97 panelSaw.shapeButtons.clearSelection(); 98 dlg.panelMain.mark.setShape(Shp.UNK NOWN);98 dlg.panelMain.mark.setShape(Shp.UNKSHP); 99 99 } 100 100 panelSaw.alShape.actionPerformed(null); … … 116 116 if (SeaMark.GrpMAP.get(dlg.panelMain.mark.getObject()) == Grp.SAW) { 117 117 dlg.panelMain.mark.setTopmark(Top.SPHERE); 118 dlg.panelMain.mark.setTopPattern(Pat.NO NE);118 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 119 119 dlg.panelMain.mark.setTopColour(Col.RED); 120 120 } else { … … 125 125 switch (dlg.panelMain.mark.getRegion()) { 126 126 case A: 127 dlg.panelMain.mark.setTopPattern(Pat.NO NE);127 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 128 128 dlg.panelMain.mark.setTopColour(Col.RED); 129 129 break; 130 130 case B: 131 dlg.panelMain.mark.setTopPattern(Pat.NO NE);131 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 132 132 dlg.panelMain.mark.setTopColour(Col.GREEN); 133 133 break; … … 144 144 switch (dlg.panelMain.mark.getRegion()) { 145 145 case A: 146 dlg.panelMain.mark.setTopPattern(Pat.NO NE);146 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 147 147 dlg.panelMain.mark.setTopColour(Col.GREEN); 148 148 break; 149 149 case B: 150 dlg.panelMain.mark.setTopPattern(Pat.NO NE);150 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 151 151 dlg.panelMain.mark.setTopColour(Col.RED); 152 152 break; … … 162 162 topmarkButton.setBorderPainted(true); 163 163 } else { 164 dlg.panelMain.mark.setTopmark(Top.NO NE);165 dlg.panelMain.mark.setTopPattern(Pat.NO NE);166 dlg.panelMain.mark.setTopColour(Col.UNK NOWN);164 dlg.panelMain.mark.setTopmark(Top.NOTOP); 165 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 166 dlg.panelMain.mark.setTopColour(Col.UNKCOL); 167 167 topmarkButton.setBorderPainted(false); 168 168 } … … 284 284 safeWaterButton.setBorderPainted(false); 285 285 } 286 topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NO NE);287 topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NO NE);286 topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NOTOP); 287 topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NOTOP); 288 288 topmarkButton.setVisible(dlg.panelMain.mark.testValid()); 289 Boolean lit = (dlg.panelMain.mark.getLightAtt(Att.COL, 0) != Col.UNK NOWN) && !((String)dlg.panelMain.mark.getLightAtt(Att.CHR, 0)).isEmpty();289 Boolean lit = (dlg.panelMain.mark.getLightAtt(Att.COL, 0) != Col.UNKCOL) && !((String)dlg.panelMain.mark.getLightAtt(Att.CHR, 0)).isEmpty(); 290 290 lightButton.setBorderPainted(lit); 291 291 lightButton.setSelected(lit); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java
r27219 r27230 70 70 if (!str.contains("Al")) { 71 71 col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.COL, 0))); 72 dlg.panelMain.mark.setLightAtt(Att.ALT, 0, Col.UNK NOWN);72 dlg.panelMain.mark.setLightAtt(Att.ALT, 0, Col.UNKCOL); 73 73 } else { 74 74 col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.ALT, 0))); … … 99 99 if (!str.contains("Al")) { 100 100 col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.COL, 0))); 101 dlg.panelMain.mark.setLightAtt(Att.ALT, 0, Col.UNK NOWN);101 dlg.panelMain.mark.setLightAtt(Att.ALT, 0, Col.UNKCOL); 102 102 } else { 103 103 col2Label.setBackground(SeaMark.ColMAP.get(dlg.panelMain.mark.getLightAtt(Att.ALT, 0))); … … 109 109 dlg = dia; 110 110 setLayout(null); 111 add(getChrButton(noneButton, 0, 0, 44, 16, Messages.getString("NoChar"), Chr.UNK NOWN));111 add(getChrButton(noneButton, 0, 0, 44, 16, Messages.getString("NoChar"), Chr.UNKCHR)); 112 112 add(getChrButton(fixedButton, 0, 16, 44, 16, Messages.getString("FChar"), Chr.FIXED)); 113 113 add(getChrButton(flashButton, 0, 32, 44, 16, Messages.getString("FlChar"), Chr.FLASH)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java
r27223 r27230 40 40 JRadioButton button = colours.get(col); 41 41 if (button.isSelected()) { 42 if (ent == Ent.LIGHT) { 43 if (((String)dlg.panelMain.mark.getLightAtt(Att.CHR, 0)).contains("Al")) { 44 if (((button == delButton) && (dlg.panelMain.mark.getLightAtt(Att.ALT, 0) == Col.UNKNOWN)) 45 || (dlg.panelMain.mark.getLightAtt(Att.COL, 0) == Col.UNKNOWN)) { 46 dlg.panelMain.mark.setLightAtt(Att.COL, 0, col); 47 dlg.panelMain.panelLit.panelChr.col1Label.setBackground(SeaMark.ColMAP.get(col)); 48 } else { 49 dlg.panelMain.mark.setLightAtt(Att.ALT, 0, col); 50 dlg.panelMain.panelLit.panelChr.col2Label.setBackground(SeaMark.ColMAP.get(col)); 51 } 52 } else { 42 if (ent == Ent.LIGHT) { 43 if (((String) dlg.panelMain.mark.getLightAtt(Att.CHR, 0)).contains("Al")) { 44 if (((button == delButton) && (dlg.panelMain.mark.getLightAtt(Att.ALT, 0) == Col.UNKCOL)) 45 || (dlg.panelMain.mark.getLightAtt(Att.COL, 0) == Col.UNKCOL)) { 53 46 dlg.panelMain.mark.setLightAtt(Att.COL, 0, col); 54 47 dlg.panelMain.panelLit.panelChr.col1Label.setBackground(SeaMark.ColMAP.get(col)); 48 } else { 49 dlg.panelMain.mark.setLightAtt(Att.ALT, 0, col); 55 50 dlg.panelMain.panelLit.panelChr.col2Label.setBackground(SeaMark.ColMAP.get(col)); 56 51 } 57 button.setBorderPainted(true);58 52 } else { 59 if (button == delButton) { 60 dlg.panelMain.mark.subColour(ent, stackIdx); 61 } else if (button == addButton) { 62 if (stackCol.size() != 0) 63 stackIdx++; 64 if (stackCol.size() == 0) 65 dlg.panelMain.mark.setColour(ent, col); 66 else 53 dlg.panelMain.mark.setLightAtt(Att.COL, 0, col); 54 dlg.panelMain.panelLit.panelChr.col1Label.setBackground(SeaMark.ColMAP.get(col)); 55 dlg.panelMain.panelLit.panelChr.col2Label.setBackground(SeaMark.ColMAP.get(col)); 56 } 57 button.setBorderPainted(true); 58 } else { 59 if (button == delButton) { 60 dlg.panelMain.mark.subColour(ent, stackIdx); 61 } else if (button == addButton) { 62 if (stackCol.size() != 0) 63 stackIdx++; 64 if (stackCol.size() == 0) 65 dlg.panelMain.mark.setColour(ent, col); 66 else 67 switch (dlg.panelMain.mark.getPattern(ent)) { 68 case NOPAT: 69 break; 70 case BORDER: 71 case CROSS: 72 if (stackCol.size() < 2) 73 dlg.panelMain.mark.addColour(ent, stackIdx, col); 74 break; 75 case SQUARE: 76 if (stackCol.size() < 4) 77 dlg.panelMain.mark.addColour(ent, stackIdx, col); 78 break; 79 default: 67 80 dlg.panelMain.mark.addColour(ent, stackIdx, col); 68 } else {69 dlg.panelMain.mark.setColour(ent, stackIdx, col);70 }71 syncPanel();81 break; 82 } 83 } else { 84 dlg.panelMain.mark.setColour(ent, stackIdx, col); 72 85 } 86 syncPanel(); 87 } 73 88 } else { 74 89 button.setBorderPainted(false); … … 99 114 ent = entity; 100 115 setLayout(null); 101 add(getColButton(delButton, 0, 0, 34, 16, Messages.getString("RemColour"), Col.UNK NOWN));116 add(getColButton(delButton, 0, 0, 34, 16, Messages.getString("RemColour"), Col.UNKCOL)); 102 117 add(getColButton(whiteButton, 0, 16, 34, 16, Messages.getString("White"), Col.WHITE)); 103 118 add(getColButton(redButton, 0, 32, 34, 16, Messages.getString("Red"), Col.RED)); … … 142 157 } else { 143 158 int idx; 144 for (idx = 0; dlg.panelMain.mark.getColour(ent, idx) != Col.UNK NOWN; idx++) {159 for (idx = 0; dlg.panelMain.mark.getColour(ent, idx) != Col.UNKCOL; idx++) { 145 160 if (stackCol.size() <= idx) { 146 161 stackCol.add(idx, new JRadioButton(new ImageIcon(getClass().getResource("/images/ColourButton.png")))); … … 159 174 stackCol.remove(idx); 160 175 } 161 if ( (stackIdx >= stackCol.size()) && (stackIdx > 0))176 if (stackIdx >= stackCol.size()) 162 177 stackIdx = stackCol.size() - 1; 163 178 if (stackIdx < 0) -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelFog.java
r27219 r27230 69 69 dlg = dia; 70 70 setLayout(null); 71 add(getFogButton(noFogButton, 0, 2, 27, 27, "NoFog", Fog.NO NE));72 add(getFogButton(yesFogButton, 0, 32, 27, 27, "FogSignal", Fog. UNKNOWN));71 add(getFogButton(noFogButton, 0, 2, 27, 27, "NoFog", Fog.NOFOG)); 72 add(getFogButton(yesFogButton, 0, 32, 27, 27, "FogSignal", Fog.FOGSIG)); 73 73 add(getFogButton(hornButton, 0, 62, 27, 27, "Horn", Fog.HORN)); 74 74 add(getFogButton(sirenButton, 0, 92, 27, 27, "Siren", Fog.SIREN)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java
r27219 r27230 60 60 } 61 61 if (isolButton.isSelected()) { 62 dlg.panelMain.mark.setCategory(Cat.NO NE);62 dlg.panelMain.mark.setCategory(Cat.NOCAT); 63 63 dlg.panelMain.mark.setObjColour(Col.BLACK); 64 64 dlg.panelMain.mark.addObjColour(Col.RED); … … 107 107 public void actionPerformed(java.awt.event.ActionEvent e) { 108 108 if (topmarkButton.isSelected()) { 109 dlg.panelMain.mark.setTopPattern(Pat.NO NE);109 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 110 110 dlg.panelMain.mark.setTopColour(Col.BLACK); 111 111 switch (dlg.panelMain.mark.getCategory()) { … … 128 128 topmarkButton.setBorderPainted(true); 129 129 } else { 130 dlg.panelMain.mark.setTopmark(Top.NO NE);131 dlg.panelMain.mark.setTopPattern(Pat.NO NE);132 dlg.panelMain.mark.setTopColour(Col.UNK NOWN);130 dlg.panelMain.mark.setTopmark(Top.NOTOP); 131 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 132 dlg.panelMain.mark.setTopColour(Col.UNKCOL); 133 133 topmarkButton.setBorderPainted(false); 134 134 } … … 184 184 add(getShapeButton(sparButton, 55, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYCAR, Obj.BOYISD)); 185 185 add(getShapeButton(canButton, 55, 64, 34, 32, "Can", Shp.CAN, Obj.BOYCAR, Obj.BOYISD)); 186 add(getShapeButton(coneButton, 55, 96, 34, 32, "Cone", Shp.CON E, Obj.BOYCAR, Obj.BOYISD));187 add(getShapeButton(sphereButton, 55, 128, 34, 32, "Sphere", Shp.SPHER E, Obj.BOYCAR, Obj.BOYISD));186 add(getShapeButton(coneButton, 55, 96, 34, 32, "Cone", Shp.CONI, Obj.BOYCAR, Obj.BOYISD)); 187 add(getShapeButton(sphereButton, 55, 128, 34, 32, "Sphere", Shp.SPHERI, Obj.BOYCAR, Obj.BOYISD)); 188 188 add(getShapeButton(floatButton, 90, 0, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT, Obj.LITFLT)); 189 189 add(getShapeButton(beaconButton, 90, 32, 34, 32, "Beacon", Shp.BEACON, Obj.BCNCAR, Obj.BCNISD)); … … 214 214 button.setBorderPainted(dlg.panelMain.mark.getShape() == shp); 215 215 } 216 topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NO NE);217 topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NO NE);216 topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NOTOP); 217 topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NOTOP); 218 218 topmarkButton.setVisible(dlg.panelMain.mark.testValid()); 219 Boolean lit = (dlg.panelMain.mark.getLightAtt(Att.COL, 0) != Col.UNK NOWN) && !((String)dlg.panelMain.mark.getLightAtt(Att.CHR, 0)).isEmpty();219 Boolean lit = (dlg.panelMain.mark.getLightAtt(Att.COL, 0) != Col.UNKCOL) && !((String)dlg.panelMain.mark.getLightAtt(Att.CHR, 0)).isEmpty(); 220 220 lightButton.setBorderPainted(lit); 221 221 lightButton.setSelected(lit); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java
r27219 r27230 81 81 else if (dlg.panelMain.mark.getObject() == Obj.LITFLT) 82 82 dlg.panelMain.mark.setShape(Shp.FLOAT); 83 else dlg.panelMain.mark.setShape(Shp.UNK NOWN);83 else dlg.panelMain.mark.setShape(Shp.UNKSHP); 84 84 if (landButton.isSelected()) { 85 85 categoryLabel.setVisible(true); … … 101 101 alWarningCatBox.actionPerformed(null); 102 102 } else { 103 dlg.panelMain.mark.setCategory(Cat.NO NE);103 dlg.panelMain.mark.setCategory(Cat.NOCAT); 104 104 categoryLabel.setVisible(false); 105 105 landCatBox.setVisible(false); … … 132 132 add(landCatBox); 133 133 landCatBox.addActionListener(alLandCatBox); 134 addLCItem("", Cat.NO NE);134 addLCItem("", Cat.NOCAT); 135 135 addLCItem(Messages.getString("Tower"), Cat.LMK_TOWR); 136 136 addLCItem(Messages.getString("WaterTower"), Cat.LMK_WTRT); … … 159 159 add(trafficCatBox); 160 160 trafficCatBox.addActionListener(alTrafficCatBox); 161 addTCItem("", Cat.NO NE);161 addTCItem("", Cat.NOCAT); 162 162 addTCItem(Messages.getString("Traffic"), Cat.SIS_TRFC); 163 163 addTCItem(Messages.getString("PortControl"), Cat.SIS_PTCL); … … 176 176 add(warningCatBox); 177 177 warningCatBox.addActionListener(alWarningCatBox); 178 addWCItem("", Cat.NO NE);178 addWCItem("", Cat.NOCAT); 179 179 addWCItem(Messages.getString("Danger"), Cat.SIS_DNGR); 180 180 addWCItem(Messages.getString("Storm"), Cat.SIS_STRM); … … 197 197 198 198 public void syncPanel() { 199 if ((dlg.panelMain.mark.getObject() == Obj.LNDMRK) && (dlg.panelMain.mark.getCategory() != Cat.NO NE)) {199 if ((dlg.panelMain.mark.getObject() == Obj.LNDMRK) && (dlg.panelMain.mark.getCategory() != Cat.NOCAT)) { 200 200 categoryLabel.setVisible(true); 201 201 landCatBox.setVisible(true); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java
r27219 r27230 212 212 categoryBox.setBounds(new Rectangle(185, 20, 165, 20)); 213 213 add(categoryBox); 214 addCatItem("", Lit.UNK NOWN);214 addCatItem("", Lit.UNKLIT); 215 215 addCatItem(Messages.getString("VertDisp"), Lit.VERT); 216 216 addCatItem(Messages.getString("HorizDisp"), Lit.HORIZ); … … 238 238 visibilityBox.setBounds(new Rectangle(185, 60, 165, 20)); 239 239 add(visibilityBox); 240 addVisibItem("", Vis.UNK NOWN);240 addVisibItem("", Vis.UNKVIS); 241 241 addVisibItem(Messages.getString("Intensified"), Vis.INTEN); 242 242 addVisibItem(Messages.getString("Unintensified"), Vis.UNINTEN); … … 250 250 exhibitionBox.setBounds(new Rectangle(280, 100, 70, 20)); 251 251 add(exhibitionBox); 252 addExhibItem("", Exh.UNK NOWN);252 addExhibItem("", Exh.UNKEXH); 253 253 addExhibItem(Messages.getString("24h"), Exh.H24); 254 254 addExhibItem(Messages.getString("Day"), Exh.DAY); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java
r27219 r27230 308 308 panelSpec.syncPanel(); 309 309 break; 310 case L IT:310 case LGT: 311 311 case SIS: 312 312 lightsButton.setBorderPainted(true); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java
r27219 r27230 103 103 case LAM_PORT: 104 104 dlg.panelMain.mark.setObjColour(Col.RED); 105 dlg.panelMain.mark.setObjPattern(Pat.NO NE);105 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 106 106 break; 107 107 case LAM_PPORT: … … 113 113 case LAM_STBD: 114 114 dlg.panelMain.mark.setObjColour(Col.GREEN); 115 dlg.panelMain.mark.setObjPattern(Pat.NO NE);115 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 116 116 break; 117 117 case LAM_PSTBD: … … 131 131 case LAM_PORT: 132 132 dlg.panelMain.mark.setObjColour(Col.GREEN); 133 dlg.panelMain.mark.setObjPattern(Pat.NO NE);133 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 134 134 break; 135 135 case LAM_PPORT: … … 141 141 case LAM_STBD: 142 142 dlg.panelMain.mark.setObjColour(Col.RED); 143 dlg.panelMain.mark.setObjPattern(Pat.NO NE);143 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 144 144 break; 145 145 case LAM_PSTBD: … … 236 236 statusBox = new JComboBox(); 237 237 statusBox.setBounds(new Rectangle(250, 20, 100, 20)); 238 addStsItem("", Sts.UNK NOWN);238 addStsItem("", Sts.UNKSTS); 239 239 addStsItem(Messages.getString("Permanent"), Sts.PERM); 240 240 addStsItem(Messages.getString("Occasional"), Sts.OCC); … … 263 263 constrBox = new JComboBox(); 264 264 constrBox.setBounds(new Rectangle(250, 60, 100, 20)); 265 addCnsItem("", Cns.UNK NOWN);265 addCnsItem("", Cns.UNKCNS); 266 266 addCnsItem(Messages.getString("Masonry"), Cns.BRICK); 267 267 addCnsItem(Messages.getString("Concreted"), Cns.CONC); … … 281 281 conBox = new JComboBox(); 282 282 conBox.setBounds(new Rectangle(250, 100, 100, 20)); 283 addConItem("", Con.UNK NOWN);283 addConItem("", Con.UNKCON); 284 284 addConItem(Messages.getString("Conspicuous"), Con.CONSP); 285 285 addConItem(Messages.getString("NotConspicuous"), Con.NCONS); … … 292 292 reflBox = new JComboBox(); 293 293 reflBox.setBounds(new Rectangle(250, 140, 100, 20)); 294 addReflItem("", Con.UNK NOWN);294 addReflItem("", Con.UNKCON); 295 295 addReflItem(Messages.getString("Conspicuous"), Con.CONSP); 296 296 addReflItem(Messages.getString("NotConspicuous"), Con.NCONS); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPat.java
r27219 r27230 37 37 } 38 38 switch (dlg.panelMain.mark.getPattern(ent)) { 39 case NO NE:39 case NOPAT: 40 40 panelCol.trimStack(1); 41 41 break; … … 48 48 break; 49 49 case BORDER: 50 case CROSS: 50 51 panelCol.trimStack(2); 51 52 break; … … 61 62 panelCol.setBounds(new Rectangle(0, 0, 72, 160)); 62 63 add(panelCol); 63 add(getPatButton(noneButton, 76, 0, 27, 27, "NoPat", Pat.NO NE));64 add(getPatButton(noneButton, 76, 0, 27, 27, "NoPat", Pat.NOPAT)); 64 65 add(getPatButton(horizButton, 76, 26, 27, 27, "HorizPat", Pat.HORIZ)); 65 66 add(getPatButton(vertButton, 76, 52, 27, 27, "VertPat", Pat.VERT)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java
r27219 r27230 43 43 switch (dlg.panelMain.mark.getRegion()) { 44 44 case A: 45 dlg.panelMain.mark.setObjPattern(Pat.NO NE);45 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 46 46 dlg.panelMain.mark.setObjColour(Col.RED); 47 47 break; 48 48 case B: 49 dlg.panelMain.mark.setObjPattern(Pat.NO NE);49 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 50 50 dlg.panelMain.mark.setObjColour(Col.GREEN); 51 51 break; … … 93 93 add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT)); 94 94 add(getShapeButton(canButton, 0, 64, 34, 32, "Can", Shp.CAN, Obj.BOYLAT)); 95 add(getShapeButton(sphereButton, 0, 96, 34, 32, "Sphere", Shp.SPHER E, Obj.BOYLAT));95 add(getShapeButton(sphereButton, 0, 96, 34, 32, "Sphere", Shp.SPHERI, Obj.BOYLAT)); 96 96 add(getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, Obj.FLTLAT)); 97 97 add(getShapeButton(beaconButton, 35, 0, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelRadar.java
r27219 r27230 80 80 dlg = dia; 81 81 setLayout(null); 82 add(getRadButton(noRadButton, 0, 3, 27, 27, "NoRadar", Rtb.NO NE));82 add(getRadButton(noRadButton, 0, 3, 27, 27, "NoRadar", Rtb.NORTB)); 83 83 add(getRadButton(reflButton, 0, 33, 27, 27, "RadarReflector", Rtb.REFLECTOR)); 84 84 add(getRadButton(ramarkButton, 0, 63, 27, 27, "Ramark", Rtb.RAMARK)); … … 145 145 146 146 public void syncPanel() { 147 boolean rad = ((dlg.panelMain.mark.getRadar() != Rtb.NO NE) && (dlg.panelMain.mark.getRadar() != Rtb.REFLECTOR));147 boolean rad = ((dlg.panelMain.mark.getRadar() != Rtb.NORTB) && (dlg.panelMain.mark.getRadar() != Rtb.REFLECTOR)); 148 148 groupLabel.setVisible(rad); 149 149 groupBox.setVisible(rad); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java
r27219 r27230 50 50 add(getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYSAW)); 51 51 add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYSAW)); 52 add(getShapeButton(sphereButton, 0, 64, 34, 32, "Sphere", Shp.SPHER E, Obj.BOYSAW));52 add(getShapeButton(sphereButton, 0, 64, 34, 32, "Sphere", Shp.SPHERI, Obj.BOYSAW)); 53 53 add(getShapeButton(floatButton, 0, 96, 34, 32, "Float", Shp.FLOAT, Obj.FLTSAW)); 54 54 add(getShapeButton(beaconButton, 0, 128, 34, 32, "Beacon", Shp.BEACON, Obj.BCNSAW)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSectors.java
r27223 r27230 76 76 TableColumn colColumn = table.getColumnModel().getColumn(1); 77 77 colourBox = new JComboBox(); 78 addColItem(new ImageIcon(getClass().getResource("/images/DelButton.png")), Col.UNK NOWN);78 addColItem(new ImageIcon(getClass().getResource("/images/DelButton.png")), Col.UNKCOL); 79 79 addColItem(new ImageIcon(getClass().getResource("/images/WhiteButton.png")), Col.WHITE); 80 80 addColItem(new ImageIcon(getClass().getResource("/images/RedButton.png")), Col.RED); … … 89 89 TableColumn visColumn = table.getColumnModel().getColumn(12); 90 90 visibilityBox = new JComboBox(); 91 addVisibItem("", Vis.UNK NOWN);91 addVisibItem("", Vis.UNKVIS); 92 92 addVisibItem(Messages.getString("Intensified"), Vis.INTEN); 93 93 addVisibItem(Messages.getString("Unintensified"), Vis.UNINTEN); … … 97 97 TableColumn exhColumn = table.getColumnModel().getColumn(13); 98 98 exhibitionBox = new JComboBox(); 99 addExhibItem("", Exh.UNK NOWN);99 addExhibItem("", Exh.UNKEXH); 100 100 addExhibItem(Messages.getString("24h"), Exh.H24); 101 101 addExhibItem(Messages.getString("Day"), Exh.DAY); … … 154 154 case 1: 155 155 if (((String)dlg.panelMain.mark.getLightAtt(Att.CHR, row)).contains("Al")) { 156 if (dlg.panelMain.mark.getLightAtt(Att.COL, row) == Col.UNK NOWN) {157 return Col.UNK NOWN;156 if (dlg.panelMain.mark.getLightAtt(Att.COL, row) == Col.UNKCOL) { 157 return Col.UNKCOL; 158 158 } else { 159 159 return dlg.panelMain.mark.getLightAtt(Att.ALT, row); … … 186 186 if (img == value) 187 187 if (((String)dlg.panelMain.mark.getLightAtt(Att.CHR, row)).contains("Al")) { 188 if (((colour == Col.UNK NOWN) && (dlg.panelMain.mark.getLightAtt(Att.ALT, row) == Col.UNKNOWN))189 || (dlg.panelMain.mark.getLightAtt(Att.COL, row) == Col.UNK NOWN)) {188 if (((colour == Col.UNKCOL) && (dlg.panelMain.mark.getLightAtt(Att.ALT, row) == Col.UNKCOL)) 189 || (dlg.panelMain.mark.getLightAtt(Att.COL, row) == Col.UNKCOL)) { 190 190 dlg.panelMain.mark.setLightAtt(Att.COL, row, colour); 191 191 } else { … … 209 209 dlg.panelMain.mark.setLightAtt(Att.END, row, ""); 210 210 } else { 211 dlg.panelMain.mark.setLightAtt(Att.LIT, row, Lit.UNK NOWN);211 dlg.panelMain.mark.setLightAtt(Att.LIT, row, Lit.UNKLIT); 212 212 dlg.panelMain.mark.setLightAtt(Att.ORT, row, ""); 213 213 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java
r27219 r27230 50 50 dlg.panelMain.mark.setObject(objects.get(shp)); 51 51 if (button == cairnButton) { 52 dlg.panelMain.mark.setObjPattern(Pat.NO NE);53 dlg.panelMain.mark.setObjColour(Col.UNK NOWN);52 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 53 dlg.panelMain.mark.setObjColour(Col.UNKCOL); 54 54 } 55 if (dlg.panelMain.mark.getObjColour(0) == Col.UNK NOWN) {56 dlg.panelMain.mark.setObjPattern(Pat.NO NE);55 if (dlg.panelMain.mark.getObjColour(0) == Col.UNKCOL) { 56 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 57 57 dlg.panelMain.mark.setObjColour(Col.YELLOW); 58 58 } … … 70 70 if (topmarkButton.isSelected()) { 71 71 dlg.panelMain.mark.setTopmark(Top.X_SHAPE); 72 dlg.panelMain.mark.setTopPattern(Pat.NO NE);72 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 73 73 dlg.panelMain.mark.setTopColour(Col.YELLOW); 74 74 topmarkButton.setBorderPainted(true); 75 75 } else { 76 dlg.panelMain.mark.setTopmark(Top.NO NE);77 dlg.panelMain.mark.setTopPattern(Pat.NO NE);78 dlg.panelMain.mark.setTopColour(Col.UNK NOWN);76 dlg.panelMain.mark.setTopmark(Top.NOTOP); 77 dlg.panelMain.mark.setTopPattern(Pat.NOPAT); 78 dlg.panelMain.mark.setTopColour(Col.UNKCOL); 79 79 topmarkButton.setBorderPainted(false); 80 80 } … … 89 89 add(getShapeButton(sparButton, 34, 0, 34, 32, "Spar", Shp.SPAR, Obj.BOYSPP)); 90 90 add(getShapeButton(canButton, 68, 0, 34, 32, "Can", Shp.CAN, Obj.BOYSPP)); 91 add(getShapeButton(coneButton, 102, 0, 34, 32, "Cone", Shp.CON E, Obj.BOYSPP));92 add(getShapeButton(sphereButton, 0, 32, 34, 32, "Sphere", Shp.SPHER E, Obj.BOYSPP));91 add(getShapeButton(coneButton, 102, 0, 34, 32, "Cone", Shp.CONI, Obj.BOYSPP)); 92 add(getShapeButton(sphereButton, 0, 32, 34, 32, "Sphere", Shp.SPHERI, Obj.BOYSPP)); 93 93 add(getShapeButton(barrelButton, 34, 32, 34, 32, "Barrel", Shp.BARREL, Obj.BOYSPP)); 94 94 add(getShapeButton(superButton, 68, 32, 34, 32, "Super", Shp.SUPER, Obj.BOYSPP)); … … 106 106 add(categoryBox); 107 107 categoryBox.addActionListener(alCategoryBox); 108 addCatItem("", Cat.NO NE);108 addCatItem("", Cat.NOCAT); 109 109 addCatItem(Messages.getString("UKPurpose"), Cat.SPM_UNKN); 110 110 addCatItem(Messages.getString("Warning"), Cat.SPM_WARN); … … 144 144 categoryBox.setSelectedIndex(item); 145 145 } 146 topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NO NE);147 topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NO NE);146 topmarkButton.setBorderPainted(dlg.panelMain.mark.getTopmark() != Top.NOTOP); 147 topmarkButton.setSelected(dlg.panelMain.mark.getTopmark() != Top.NOTOP); 148 148 topmarkButton.setVisible(dlg.panelMain.mark.testValid()); 149 149 } -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java
r27219 r27230 43 43 switch (dlg.panelMain.mark.getRegion()) { 44 44 case A: 45 dlg.panelMain.mark.setObjPattern(Pat.NO NE);45 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 46 46 dlg.panelMain.mark.setObjColour(Col.GREEN); 47 47 break; 48 48 case B: 49 dlg.panelMain.mark.setObjPattern(Pat.NO NE);49 dlg.panelMain.mark.setObjPattern(Pat.NOPAT); 50 50 dlg.panelMain.mark.setObjColour(Col.RED); 51 51 break; … … 92 92 add(getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT)); 93 93 add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT)); 94 add(getShapeButton(coneButton, 0, 64, 34, 32, "Cone", Shp.CON E, Obj.BOYLAT));95 add(getShapeButton(sphereButton, 0, 96, 34, 32, "Sphere", Shp.SPHER E, Obj.BOYLAT));94 add(getShapeButton(coneButton, 0, 64, 34, 32, "Cone", Shp.CONI, Obj.BOYLAT)); 95 add(getShapeButton(sphereButton, 0, 96, 34, 32, "Sphere", Shp.SPHERI, Obj.BOYLAT)); 96 96 add(getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, Obj.FLTLAT)); 97 97 add(getShapeButton(beaconButton, 35, 0, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java
r27219 r27230 54 54 panelPat.setBounds(new Rectangle(160, 0, 110, 160)); 55 55 add(panelPat); 56 add(getTopButton(noTopButton, 0, 5, 27, 27, "NoTop", Top.NO NE));56 add(getTopButton(noTopButton, 0, 5, 27, 27, "NoTop", Top.NOTOP)); 57 57 add(getTopButton(canTopButton, 30, 5, 27, 27, "CanTop", Top.CAN)); 58 58 add(getTopButton(coneTopButton, 60, 5, 27, 27, "ConeTop", Top.CONE)); -
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
r27223 r27230 61 61 62 62 public enum Obj { 63 UNK NOWN, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP,63 UNKOBJ, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, 64 64 BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, 65 65 FLTCAR, FLTISD, FLTLAT, FLTSAW, FLTSPP, … … 96 96 } 97 97 98 private Obj object = Obj.UNK NOWN;98 private Obj object = Obj.UNKOBJ; 99 99 100 100 public Obj getObject() { … … 104 104 public void setObject(Obj obj) { 105 105 object = obj; 106 if (obj == Obj.UNK NOWN) {107 setCategory(Cat.NO NE);108 setShape(Shp.UNK NOWN);109 setColour(Ent.BODY, Col.UNK NOWN);110 setPattern(Ent.BODY, Pat.NO NE);111 setTopmark(Top.NO NE);112 setColour(Ent.TOPMARK, Col.UNK NOWN);113 setPattern(Ent.TOPMARK, Pat.NO NE);114 setFogSound(Fog.NO NE);115 setRadar(Rtb.NO NE);116 setStatus(Sts.UNK NOWN);117 setConstr(Cns.UNK NOWN);118 setConsp(Con.UNK NOWN);119 setRefl(Con.UNK NOWN);106 if (obj == Obj.UNKOBJ) { 107 setCategory(Cat.NOCAT); 108 setShape(Shp.UNKSHP); 109 setColour(Ent.BODY, Col.UNKCOL); 110 setPattern(Ent.BODY, Pat.NOPAT); 111 setTopmark(Top.NOTOP); 112 setColour(Ent.TOPMARK, Col.UNKCOL); 113 setPattern(Ent.TOPMARK, Pat.NOPAT); 114 setFogSound(Fog.NOFOG); 115 setRadar(Rtb.NORTB); 116 setStatus(Sts.UNKSTS); 117 setConstr(Cns.UNKCNS); 118 setConsp(Con.UNKCON); 119 setRefl(Con.UNKCON); 120 120 setRef(""); 121 121 setObjectHeight(""); … … 129 129 130 130 public enum Ent { 131 BODY, BUOY, BEACON, FLOAT, TOPMARK, LIGHT, MOORING, STATION131 BODY, BUOY, BEACON, LFLOAT, TOPMARK, LIGHT, MOORING, STATION 132 132 } 133 133 … … 146 146 EntMAP.put(Obj.LITMAJ, Ent.LIGHT); 147 147 EntMAP.put(Obj.LITMIN, Ent.LIGHT); 148 EntMAP.put(Obj.LITFLT, Ent. FLOAT);149 EntMAP.put(Obj.FLTCAR, Ent. FLOAT);150 EntMAP.put(Obj.FLTLAT, Ent. FLOAT);151 EntMAP.put(Obj.FLTSAW, Ent. FLOAT);152 EntMAP.put(Obj.FLTISD, Ent. FLOAT);153 EntMAP.put(Obj.FLTSPP, Ent. FLOAT);154 EntMAP.put(Obj.LITVES, Ent. FLOAT);148 EntMAP.put(Obj.LITFLT, Ent.LFLOAT); 149 EntMAP.put(Obj.FLTCAR, Ent.LFLOAT); 150 EntMAP.put(Obj.FLTLAT, Ent.LFLOAT); 151 EntMAP.put(Obj.FLTSAW, Ent.LFLOAT); 152 EntMAP.put(Obj.FLTISD, Ent.LFLOAT); 153 EntMAP.put(Obj.FLTSPP, Ent.LFLOAT); 154 EntMAP.put(Obj.LITVES, Ent.LFLOAT); 155 155 EntMAP.put(Obj.LITHSE, Ent.LIGHT); 156 156 EntMAP.put(Obj.LNDMRK, Ent.LIGHT); … … 161 161 162 162 public enum Grp { 163 NUL, LAT, CAR, SAW, ISD, SPP, L IT, SIS163 NUL, LAT, CAR, SAW, ISD, SPP, LGT, SIS 164 164 } 165 165 166 166 public static final EnumMap<Obj, Grp> GrpMAP = new EnumMap<Obj, Grp>(Obj.class); 167 167 static { 168 GrpMAP.put(Obj.UNK NOWN, Grp.NUL);168 GrpMAP.put(Obj.UNKOBJ, Grp.NUL); 169 169 GrpMAP.put(Obj.BCNCAR, Grp.CAR); 170 170 GrpMAP.put(Obj.BCNISD, Grp.ISD); … … 182 182 GrpMAP.put(Obj.FLTISD, Grp.ISD); 183 183 GrpMAP.put(Obj.FLTSPP, Grp.SPP); 184 GrpMAP.put(Obj.LITFLT, Grp.L IT);185 GrpMAP.put(Obj.LITMAJ, Grp.L IT);186 GrpMAP.put(Obj.LITMIN, Grp.L IT);187 GrpMAP.put(Obj.LITVES, Grp.L IT);188 GrpMAP.put(Obj.LITHSE, Grp.L IT);189 GrpMAP.put(Obj.LNDMRK, Grp.L IT);184 GrpMAP.put(Obj.LITFLT, Grp.LGT); 185 GrpMAP.put(Obj.LITMAJ, Grp.LGT); 186 GrpMAP.put(Obj.LITMIN, Grp.LGT); 187 GrpMAP.put(Obj.LITVES, Grp.LGT); 188 GrpMAP.put(Obj.LITHSE, Grp.LGT); 189 GrpMAP.put(Obj.LNDMRK, Grp.LGT); 190 190 GrpMAP.put(Obj.MORFAC, Grp.SPP); 191 191 GrpMAP.put(Obj.SISTAW, Grp.SIS); … … 194 194 195 195 public enum Cat { 196 NO NE, LAM_PORT, LAM_STBD, LAM_PPORT, LAM_PSTBD, CAM_NORTH, CAM_EAST, CAM_SOUTH, CAM_WEST,196 NOCAT, LAM_PORT, LAM_STBD, LAM_PPORT, LAM_PSTBD, CAM_NORTH, CAM_EAST, CAM_SOUTH, CAM_WEST, 197 197 ACH_URST, ACH_DEEP, ACH_TANK, ACH_EXPL, ACH_QUAR, ACH_SPLN, ACH_SCAN, ACH_SCMO, ACH_T24H, ACH_TLIM, 198 198 SPM_UNKN, SPM_WARN, SPM_CHBF, SPM_YCHT, SPM_CABL, SPM_OFAL, SPM_ODAS, SPM_RECN, SPM_MOOR, SPM_LNBY, … … 287 287 } 288 288 289 private Cat category = Cat.NO NE;289 private Cat category = Cat.NOCAT; 290 290 291 291 public Cat getCategory() { … … 299 299 300 300 public enum Shp { 301 UNK NOWN, PILLAR, SPAR, CAN, CONE, SPHERE, BARREL, FLOAT, SUPER, BUOYANT, CAIRN, PILE, LATTICE, TOWER, STAKE, POLE, POST, PERCH, BUOY, BEACON301 UNKSHP, PILLAR, SPAR, CAN, CONI, SPHERI, BARREL, FLOAT, SUPER, BUOYANT, CAIRN, PILE, LATTICE, TOWER, STAKE, POLE, POST, PERCH, BUOY, BEACON 302 302 } 303 303 … … 307 307 ShpSTR.put(Shp.SPAR, "spar"); 308 308 ShpSTR.put(Shp.CAN, "can"); 309 ShpSTR.put(Shp.CON E, "conical");310 ShpSTR.put(Shp.SPHER E, "spherical");309 ShpSTR.put(Shp.CONI, "conical"); 310 ShpSTR.put(Shp.SPHERI, "spherical"); 311 311 ShpSTR.put(Shp.BARREL, "barrel"); 312 312 ShpSTR.put(Shp.FLOAT, "float"); … … 321 321 } 322 322 323 private Shp shape = Shp.UNK NOWN;323 private Shp shape = Shp.UNKSHP; 324 324 325 325 public Shp getShape() { … … 333 333 334 334 public enum Col { 335 UNK NOWN, BLANK, WHITE, RED, ORANGE, AMBER, YELLOW, GREEN, BLUE, VIOLET, BLACK, GREY, BROWN, MAGENTA, PINK335 UNKCOL, BLANK, WHITE, RED, ORANGE, AMBER, YELLOW, GREEN, BLUE, VIOLET, BLACK, GREY, BROWN, MAGENTA, PINK 336 336 } 337 337 338 338 public static final EnumMap<Col, Color> ColMAP = new EnumMap<Col, Color>(Col.class); 339 339 static { 340 ColMAP.put(Col.UNK NOWN, new Color(0xc0c0c0));340 ColMAP.put(Col.UNKCOL, new Color(0xc0c0c0)); 341 341 ColMAP.put(Col.WHITE, Color.WHITE); 342 342 ColMAP.put(Col.RED, Color.RED); … … 412 412 return bodyColour.get(i); 413 413 else 414 return Col.UNK NOWN;414 return Col.UNKCOL; 415 415 } 416 416 … … 430 430 if (bodyColour.size() >= i) 431 431 bodyColour.add(i, col); 432 repaint(); 432 433 } 433 434 434 435 public void addObjColour(Col col) { 435 436 bodyColour.add(col); 437 repaint(); 436 438 } 437 439 … … 439 441 if (bodyColour.size() > i) 440 442 bodyColour.remove(i); 443 repaint(); 441 444 } 442 445 … … 447 450 return topmarkColour.get(i); 448 451 else 449 return Col.UNK NOWN;452 return Col.UNKCOL; 450 453 } 451 454 … … 465 468 if (topmarkColour.size() >= i) 466 469 topmarkColour.add(i, col); 470 repaint(); 467 471 } 468 472 469 473 public void addTopColour(Col col) { 470 474 topmarkColour.add(col); 475 repaint(); 471 476 } 472 477 … … 474 479 if (topmarkColour.size() > i) 475 480 topmarkColour.remove(i); 481 repaint(); 476 482 } 477 483 478 484 public enum Chr { 479 UNK NOWN, FIXED, FLASH, LFLASH, QUICK, VQUICK, UQUICK, ISOPHASED, OCCULTING, MORSE, ALTERNATING, IQUICK, IVQUICK, IUQUICK485 UNKCHR, FIXED, FLASH, LFLASH, QUICK, VQUICK, UQUICK, ISOPHASED, OCCULTING, MORSE, ALTERNATING, IQUICK, IVQUICK, IUQUICK 480 486 } 481 487 482 488 public static final Map<EnumSet<Chr>, String> ChrMAP = new HashMap<EnumSet<Chr>, String>(); 483 489 static { 484 ChrMAP.put(EnumSet.of(Chr.UNKNOWN), "");485 490 ChrMAP.put(EnumSet.of(Chr.FIXED), "F"); 486 491 ChrMAP.put(EnumSet.of(Chr.FLASH), "Fl"); … … 512 517 513 518 public enum Vis { 514 UNK NOWN, HIGH, LOW, FAINT, INTEN, UNINTEN, REST, OBS, PARTOBS519 UNKVIS, HIGH, LOW, FAINT, INTEN, UNINTEN, REST, OBS, PARTOBS 515 520 } 516 521 517 522 public static final EnumMap<Vis, String> VisSTR = new EnumMap<Vis, String>(Vis.class); 518 523 static { 519 VisSTR.put(Vis.UNKNOWN, "");520 524 VisSTR.put(Vis.HIGH, "high"); 521 525 VisSTR.put(Vis.LOW, "low"); … … 529 533 530 534 public enum Lit { 531 UNK NOWN, VERT, HORIZ, DIR, UPPER, LOWER, LEAD, REAR, FRONT, AERO, AIROBS, FOGDET, FLOOD, STRIP, SUBS, SPOT, MOIRE, EMERG, BEAR535 UNKLIT, VERT, HORIZ, DIR, UPPER, LOWER, LEAD, REAR, FRONT, AERO, AIROBS, FOGDET, FLOOD, STRIP, SUBS, SPOT, MOIRE, EMERG, BEAR 532 536 } 533 537 534 538 public static final EnumMap<Lit, String> LitSTR = new EnumMap<Lit, String>(Lit.class); 535 539 static { 536 LitSTR.put(Lit.UNKNOWN, "");537 540 LitSTR.put(Lit.VERT, "vertical"); 538 541 LitSTR.put(Lit.HORIZ, "horizontal"); … … 556 559 557 560 public enum Exh { 558 UNK NOWN, H24, DAY, NIGHT, FOG, WARN, STORM561 UNKEXH, H24, DAY, NIGHT, FOG, WARN, STORM 559 562 } 560 563 561 564 public static final EnumMap<Exh, String> ExhSTR = new EnumMap<Exh, String>(Exh.class); 562 565 static { 563 ExhSTR.put(Exh.UNKNOWN, "");564 566 ExhSTR.put(Exh.H24, "24h"); 565 567 ExhSTR.put(Exh.DAY, "day"); … … 574 576 } 575 577 576 public Object[] sector = { Col.UNK NOWN, "", "", "", "", Lit.UNKNOWN, "", "",577 "", "", "", Vis.UNK NOWN, Exh.UNKNOWN, "", "", Col.UNKNOWN};578 public Object[] sector = { Col.UNKCOL, "", "", "", "", Lit.UNKLIT, "", "", 579 "", "", "", Vis.UNKVIS, Exh.UNKEXH, "", "", Col.UNKCOL }; 578 580 579 581 private ArrayList<Object[]> sectors = new ArrayList<Object[]>(); … … 608 610 switch (att) { 609 611 case 4: 610 case 8:611 612 case 9: 612 613 case 10: … … 653 654 654 655 public enum Pat { 655 NO NE, HORIZ, VERT, DIAG, SQUARE, BORDER656 NOPAT, HORIZ, VERT, DIAG, SQUARE, BORDER, CROSS 656 657 } 657 658 … … 663 664 PatSTR.put(Pat.SQUARE, "squared"); 664 665 PatSTR.put(Pat.BORDER, "border"); 666 PatSTR.put(Pat.CROSS, "cross"); 665 667 } 666 668 … … 679 681 } 680 682 681 private Pat bodyPattern = Pat.NO NE;683 private Pat bodyPattern = Pat.NOPAT; 682 684 683 685 public Pat getObjPattern() { … … 689 691 } 690 692 691 private Pat topPattern = Pat.NO NE;693 private Pat topPattern = Pat.NOPAT; 692 694 693 695 public Pat getTopPattern() { … … 700 702 701 703 public enum Top { 702 NO NE, CAN, CONE, SPHERE, X_SHAPE, NORTH, SOUTH, EAST, WEST, SPHERES2, BOARD, DIAMOND, CIRCLE, TRIANGLE, TRIANGLE_INV, SQUARE704 NOTOP, CAN, CONE, SPHERE, X_SHAPE, NORTH, SOUTH, EAST, WEST, SPHERES2, BOARD, DIAMOND, CIRCLE, TRIANGLE, TRIANGLE_INV, SQUARE 703 705 } 704 706 … … 722 724 } 723 725 724 private Top topShape = Top.NO NE;726 private Top topShape = Top.NOTOP; 725 727 726 728 public Top getTopmark() { … … 734 736 735 737 public enum Rtb { 736 NO NE, REFLECTOR, RACON, RAMARK, LEADING738 NORTB, REFLECTOR, RACON, RAMARK, LEADING 737 739 } 738 740 … … 744 746 } 745 747 746 private Rtb RaType = Rtb.NO NE;748 private Rtb RaType = Rtb.NORTB; 747 749 748 750 public Rtb getRadar() { … … 752 754 public void setRadar(Rtb type) { 753 755 RaType = type; 754 if (type == Rtb.NO NE) {756 if (type == Rtb.NORTB) { 755 757 setRaconGroup(""); 756 758 setRaconSequence(""); … … 830 832 831 833 public enum Fog { 832 NO NE, UNKNOWN, HORN, SIREN, DIA, BELL, WHIS, GONG, EXPLOS834 NOFOG, FOGSIG, HORN, SIREN, DIA, BELL, WHIS, GONG, EXPLOS 833 835 } 834 836 835 837 public static final EnumMap<Fog, String> FogSTR = new EnumMap<Fog, String>(Fog.class); 836 838 static { 837 FogSTR.put(Fog. UNKNOWN, "yes");839 FogSTR.put(Fog.FOGSIG, "yes"); 838 840 FogSTR.put(Fog.HORN, "horn"); 839 841 FogSTR.put(Fog.SIREN, "siren"); … … 845 847 } 846 848 847 private Fog fogSound = Fog.NO NE;849 private Fog fogSound = Fog.NOFOG; 848 850 849 851 public Fog getFogSound() { … … 853 855 public void setFogSound(Fog sound) { 854 856 fogSound = sound; 855 if (sound == Fog.NO NE) {857 if (sound == Fog.NOFOG) { 856 858 setFogGroup(""); 857 859 setFogSequence(""); … … 907 909 908 910 public enum Sts { 909 UNK NOWN, PERM, OCC, REC, NIU, INT, RESV, TEMP, PRIV, MAND, DEST, EXT, ILLUM, HIST, PUB, SYNC, WATCH, UNWAT, DOUBT911 UNKSTS, PERM, OCC, REC, NIU, INT, RESV, TEMP, PRIV, MAND, DEST, EXT, ILLUM, HIST, PUB, SYNC, WATCH, UNWAT, DOUBT 910 912 } 911 913 … … 932 934 } 933 935 934 private Sts status = Sts.UNK NOWN;936 private Sts status = Sts.UNKSTS; 935 937 936 938 public Sts getStatus() { … … 943 945 944 946 public enum Cns { 945 UNK NOWN, BRICK, CONC, BOULD, HSURF, USURF, WOOD, METAL, GRP, PAINT947 UNKCNS, BRICK, CONC, BOULD, HSURF, USURF, WOOD, METAL, GRP, PAINT 946 948 } 947 949 … … 959 961 } 960 962 961 private Cns construction = Cns.UNK NOWN;963 private Cns construction = Cns.UNKCNS; 962 964 963 965 public Cns getConstr() { … … 970 972 971 973 public enum Con { 972 UNK NOWN, CONSP, NCONS, REFL974 UNKCON, CONSP, NCONS, REFL 973 975 } 974 976 … … 980 982 } 981 983 982 private Con conspicuity = Con.UNK NOWN;984 private Con conspicuity = Con.UNKCON; 983 985 984 986 public Con getConsp() { … … 990 992 } 991 993 992 private Con reflectivity = Con.UNK NOWN;994 private Con reflectivity = Con.UNKCON; 993 995 994 996 public Con getRefl() { … … 1078 1080 case BOYCAR: 1079 1081 case BOYLAT: 1080 if ((getCategory() != Cat.NO NE) && (getShape() != Shp.UNKNOWN))1082 if ((getCategory() != Cat.NOCAT) && (getShape() != Shp.UNKSHP)) 1081 1083 tmp = true; 1082 1084 break; … … 1087 1089 case BOYSAW: 1088 1090 case BOYSPP: 1089 if (getShape() != Shp.UNK NOWN)1091 if (getShape() != Shp.UNKSHP) 1090 1092 tmp = true; 1091 1093 break; … … 1095 1097 case FLTSAW: 1096 1098 case FLTSPP: 1097 if (getObjColour(0) != Col.UNK NOWN)1099 if (getObjColour(0) != Col.UNKCOL) 1098 1100 tmp = true; 1099 1101 break; … … 1109 1111 break; 1110 1112 case LNDMRK: 1111 if (getCategory() != Cat.NO NE)1113 if (getCategory() != Cat.NOCAT) 1112 1114 tmp = true; 1113 1115 break; … … 1118 1120 Ent ent = EntMAP.get(getObject()); 1119 1121 dlg.panelMain.topButton.setEnabled((ent == Ent.BUOY) 1120 || (ent == Ent.BEACON) || (ent == Ent. FLOAT));1122 || (ent == Ent.BEACON) || (ent == Ent.LFLOAT)); 1121 1123 dlg.panelMain.fogButton.setEnabled(true); 1122 1124 dlg.panelMain.radButton.setEnabled(true); … … 1136 1138 1137 1139 public void clearSign() { 1138 setObject(Obj.UNK NOWN);1140 setObject(Obj.UNKOBJ); 1139 1141 setName(""); 1140 1142 clrLight(); … … 1181 1183 str = keys.get("seamark:type"); 1182 1184 1183 setObject(Obj.UNK NOWN);1185 setObject(Obj.UNKOBJ); 1184 1186 for (Obj obj : ObjSTR.keySet()) { 1185 1187 if (ObjSTR.get(obj).equals(str)) { … … 1191 1193 dlg.manager.showVisualMessage("No seamark"); 1192 1194 } 1193 if (getObject() == Obj.UNK NOWN) {1195 if (getObject() == Obj.UNKOBJ) { 1194 1196 dlg.manager.showVisualMessage("Seamark not recognised"); 1195 1197 } … … 1213 1215 } 1214 1216 1215 1216 1217 if (keys.containsKey("seamark:longname")) 1217 1218 longName = keys.get("seamark:longname"); … … 1222 1223 if (keys.containsKey("seamark:" + ObjSTR.get(obj) + ":category")) { 1223 1224 str = keys.get("seamark:" + ObjSTR.get(obj) + ":category"); 1224 setCategory(Cat.NO NE);1225 setCategory(Cat.NOCAT); 1225 1226 for (Cat cat : CatSTR.keySet()) { 1226 1227 if (CatSTR.get(cat).equals(str)) { … … 1234 1235 if (keys.containsKey("seamark:" + ObjSTR.get(obj) + ":shape")) { 1235 1236 str = keys.get("seamark:" + ObjSTR.get(obj) + ":shape"); 1236 setShape(Shp.UNK NOWN);1237 setShape(Shp.UNKSHP); 1237 1238 for (Shp shp : ShpSTR.keySet()) { 1238 1239 if (ShpSTR.get(shp).equals(str)) { … … 1242 1243 } 1243 1244 } 1244 if (getShape() == Shp.UNK NOWN) {1245 if (getShape() == Shp.UNKSHP) { 1245 1246 if (EntMAP.get(getObject()) == Ent.BUOY) 1246 1247 setShape(Shp.BUOY); 1247 1248 if (EntMAP.get(getObject()) == Ent.BEACON) 1248 1249 setShape(Shp.BEACON); 1249 if (EntMAP.get(getObject()) == Ent. FLOAT)1250 if (EntMAP.get(getObject()) == Ent.LFLOAT) 1250 1251 if (getObject() == Obj.LITVES) 1251 1252 setShape(Shp.SUPER); … … 1271 1272 if (keys.containsKey("seamark:" + ObjSTR.get(obj) + ":colour_pattern")) { 1272 1273 str = keys.get("seamark:" + ObjSTR.get(obj) + ":colour_pattern"); 1273 setObjPattern(Pat.NO NE);1274 setObjPattern(Pat.NOPAT); 1274 1275 for (Pat pat : PatSTR.keySet()) { 1275 1276 if (PatSTR.get(pat).equals(str)) { … … 1287 1288 } 1288 1289 1289 if ((getObject() == Obj.LNDMRK) && (getCategory() == Cat.NO NE)) {1290 if ((getObject() == Obj.LNDMRK) && (getCategory() == Cat.NOCAT)) { 1290 1291 setObject(Obj.LITHSE); 1291 1292 } … … 1294 1295 switch (getObjColour(0)) { 1295 1296 case RED: 1296 if ((getObjColour(1) == Col.WHITE) && (getObjColour(2) == Col.UNK NOWN)) {1297 if ((getObjColour(1) == Col.WHITE) && (getObjColour(2) == Col.UNKCOL)) { 1297 1298 setObject(Obj.FLTSAW); 1298 setCategory(Cat.NO NE);1299 } else if (getObjColour(1) == Col.UNK NOWN) {1299 setCategory(Cat.NOCAT); 1300 } else if (getObjColour(1) == Col.UNKCOL) { 1300 1301 setObject(Obj.FLTLAT); 1301 1302 if (getRegion() == Reg.B) { … … 1318 1319 } else { 1319 1320 setObject(Obj.FLTSPP); 1320 setCategory(Cat.NO NE);1321 setCategory(Cat.NOCAT); 1321 1322 } 1322 1323 break; 1323 1324 case GREEN: 1324 if (getObjColour(1) == Col.UNK NOWN) {1325 if (getObjColour(1) == Col.UNKCOL) { 1325 1326 setObject(Obj.FLTLAT); 1326 1327 if (getRegion() == Reg.B) { … … 1343 1344 } else { 1344 1345 setObject(Obj.FLTSPP); 1345 setCategory(Cat.NO NE);1346 setCategory(Cat.NOCAT); 1346 1347 } 1347 1348 break; … … 1356 1357 } else { 1357 1358 setObject(Obj.FLTSPP); 1358 setCategory(Cat.NO NE);1359 setCategory(Cat.NOCAT); 1359 1360 } 1360 1361 break; … … 1362 1363 if (getObjColour(1) == Col.RED) { 1363 1364 setObject(Obj.FLTISD); 1364 setCategory(Cat.NO NE);1365 setCategory(Cat.NOCAT); 1365 1366 } else if (getObjColour(1) == Col.YELLOW) { 1366 1367 setObject(Obj.FLTCAR); … … 1372 1373 } else { 1373 1374 setObject(Obj.FLTSPP); 1374 setCategory(Cat.NO NE);1375 setCategory(Cat.NOCAT); 1375 1376 } 1376 1377 break; 1377 1378 default: 1378 setCategory(Cat.NO NE);1379 setCategory(Cat.NOCAT); 1379 1380 } 1380 1381 } … … 1437 1438 if (keys.containsKey("seamark:topmark:shape")) { 1438 1439 str = keys.get("seamark:topmark:shape"); 1439 setTopmark(Top.NO NE);1440 setTopmark(Top.NOTOP); 1440 1441 for (Top top : TopSTR.keySet()) { 1441 1442 if (TopSTR.get(top).equals(str)) { … … 1446 1447 if (keys.containsKey("seamark:topmark:colour")) { 1447 1448 str = keys.get("seamark:topmark:colour"); 1448 setTopColour(Col.UNK NOWN);1449 setTopColour(Col.UNKCOL); 1449 1450 for (Col col : ColSTR.keySet()) { 1450 1451 if (ColSTR.get(col).equals(str)) { … … 1455 1456 if (keys.containsKey("seamark:topmark:colour_pattern")) { 1456 1457 str = keys.get("seamark:topmark:colour_pattern"); 1457 setTopPattern(Pat.NO NE);1458 setTopPattern(Pat.NOPAT); 1458 1459 for (Pat pat : PatSTR.keySet()) { 1459 1460 if (PatSTR.get(pat).equals(str)) { … … 1533 1534 1534 1535 if (keys.containsKey("seamark:fog_signal")) { 1535 setFogSound(Fog. UNKNOWN);1536 setFogSound(Fog.FOGSIG); 1536 1537 } 1537 1538 if (keys.containsKey("seamark:fog_signal:category")) { 1538 1539 str = keys.get("seamark:fog_signal:category"); 1539 setFogSound(Fog.NO NE);1540 setFogSound(Fog.NOFOG); 1540 1541 for (Fog fog : FogSTR.keySet()) { 1541 1542 if (FogSTR.get(fog).equals(str)) { … … 1562 1563 if (keys.containsKey("seamark:radar_transponder:category")) { 1563 1564 str = keys.get("seamark:radar_transponder:category"); 1564 setRadar(Rtb.NO NE);1565 setRadar(Rtb.NORTB); 1565 1566 for (Rtb rtb : RtbSTR.keySet()) { 1566 1567 if (RtbSTR.get(rtb).equals(str)) { … … 1602 1603 if (keys.containsKey("seamark:status")) { 1603 1604 str = keys.get("seamark:status"); 1604 setStatus(Sts.UNK NOWN);1605 setStatus(Sts.UNKSTS); 1605 1606 for (Sts sts : StsSTR.keySet()) { 1606 1607 if (StsSTR.get(sts).equals(str)) { … … 1611 1612 if (keys.containsKey("seamark:construction")) { 1612 1613 str = keys.get("seamark:construction"); 1613 setConstr(Cns.UNK NOWN);1614 setConstr(Cns.UNKCNS); 1614 1615 for (Cns cns : CnsSTR.keySet()) { 1615 1616 if (CnsSTR.get(cns).equals(str)) { … … 1620 1621 if (keys.containsKey("seamark:conspicuity")) { 1621 1622 str = keys.get("seamark:conspicuity"); 1622 setConsp(Con.UNK NOWN);1623 setConsp(Con.UNKCON); 1623 1624 for (Con con : ConSTR.keySet()) { 1624 1625 if (ConSTR.get(con).equals(str)) { … … 1629 1630 if (keys.containsKey("seamark:reflectivity")) { 1630 1631 str = keys.get("seamark:reflectivity"); 1631 setRefl(Con.UNK NOWN);1632 setRefl(Con.UNKCON); 1632 1633 for (Con con : ConSTR.keySet()) { 1633 1634 if (ConSTR.get(con).equals(str)) { … … 1666 1667 String lblStr; 1667 1668 String imgStr = "/images/"; 1668 if (getShape() != Shp.UNK NOWN) {1669 if (getShape() != Shp.UNKSHP) { 1669 1670 switch (getShape()) { 1670 1671 case TOWER: … … 1681 1682 imgStr += "Can"; 1682 1683 break; 1683 case CON E:1684 case CONI: 1684 1685 imgStr += "Cone"; 1685 1686 break; 1686 case SPHER E:1687 case SPHERI: 1687 1688 imgStr += "Sphere"; 1688 1689 break; … … 1791 1792 } 1792 1793 } 1793 } else if (getObject() != Obj.UNK NOWN) {1794 } else if (getObject() != Obj.UNKOBJ) { 1794 1795 switch (getObject()) { 1795 1796 case LNDMRK: … … 1859 1860 } 1860 1861 1861 if (getTopmark() != Top.NO NE) {1862 if (getTopmark() != Top.NOTOP) { 1862 1863 imgStr = "/images/Top_"; 1863 1864 switch (getTopmark()) { … … 1924 1925 switch (getShape()) { 1925 1926 case CAN: 1926 case CON E:1927 case SPHER E:1927 case CONI: 1928 case SPHERI: 1928 1929 case BARREL: 1929 1930 imgStr += "_Buoy_Small"; … … 1972 1973 g2.setStroke(new BasicStroke(6.0f)); 1973 1974 if (!((String)getLightAtt(Att.BEG, i)).isEmpty() && !((String)getLightAtt(Att.END, i)).isEmpty()) { 1974 if (getLightAtt(Att.COL, i) != Col.UNK NOWN) {1975 if (getLightAtt(Att.COL, i) != Col.UNKCOL) { 1975 1976 g2.setPaint(ColMAP.get(getLightAtt(Att.COL, i))); 1976 1977 Double a0 = 270 - Double.parseDouble((String) getLightAtt(Att.BEG, i)); … … 1979 1980 g2.draw(new Arc2D.Double(12, 15, 140, 140, a0, da, Arc2D.OPEN)); 1980 1981 } 1981 if (getLightAtt(Att.ALT, i) != Col.UNK NOWN) {1982 if (getLightAtt(Att.ALT, i) != Col.UNKCOL) { 1982 1983 g2.setPaint(ColMAP.get(getLightAtt(Att.ALT, i))); 1983 1984 Double a0 = 270 - Double.parseDouble((String) getLightAtt(Att.BEG, i)); … … 1989 1990 } 1990 1991 g2.setPaint(Color.BLACK); 1991 if ((getLightAtt(Att.COL, 0) != Col.UNK NOWN) || !(((String)getLightAtt(Att.CHR, 0)).isEmpty())) {1992 if ((getLightAtt(Att.COL, 0) != Col.UNKCOL) || !(((String)getLightAtt(Att.CHR, 0)).isEmpty())) { 1992 1993 if (sectors.size() == 1) { 1993 1994 if (((String) getLightAtt(Att.CHR, 0)).contains("Al")) { … … 2078 2079 if (!tmp.isEmpty()) 2079 2080 c = tmp + c; 2080 if (getLightAtt(Att.LIT, 0) != Lit.UNK NOWN) {2081 if (getLightAtt(Att.LIT, 0) != Lit.UNKLIT) { 2081 2082 switch ((Lit)getLightAtt(Att.LIT, 0)) { 2082 2083 case VERT: … … 2094 2095 } 2095 2096 2096 if (getFogSound() != Fog.NO NE) {2097 if (getFogSound() != Fog.NOFOG) { 2097 2098 g2.drawImage(new ImageIcon(getClass().getResource("/images/Fog_Signal.png")).getImage(), 7, -15, null); 2098 2099 String str = ""; 2099 if (getFogSound() != Fog. UNKNOWN)2100 if (getFogSound() != Fog.FOGSIG) 2100 2101 switch (getFogSound()) { 2101 2102 case HORN: … … 2130 2131 } 2131 2132 2132 if (RaType != Rtb.NO NE) {2133 if (RaType != Rtb.NORTB) { 2133 2134 if (getRadar() == Rtb.REFLECTOR) { 2134 2135 g2.drawImage(new ImageIcon(getClass().getResource("/images/Radar_Reflector_355.png")).getImage(), 7, -15, null); … … 2153 2154 public void saveSign(Node node) { 2154 2155 2155 if (getObject() != Obj.UNK NOWN) {2156 if (getObject() != Obj.UNKOBJ) { 2156 2157 2157 2158 Main.pref.put("smedplugin.IALA", getRegion() == Reg.C ? "C" : (getRegion() == Reg.B ? "B" : "A")); … … 2180 2181 } 2181 2182 2182 if ((getObjColour(0) != Col.UNK NOWN) && getShape() != Shp.PERCH) {2183 if ((getObjColour(0) != Col.UNKCOL) && getShape() != Shp.PERCH) { 2183 2184 String str = ColSTR.get(getObjColour(0)); 2184 2185 for (int i = 1; bodyColour.size() > i; i++) { … … 2188 2189 } 2189 2190 2190 if (getObjPattern() != Pat.NO NE) {2191 if (getObjPattern() != Pat.NOPAT) { 2191 2192 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":colour_pattern", PatSTR.get(getObjPattern()))); 2192 2193 } … … 2213 2214 } 2214 2215 } 2215 if (getTopmark() != Top.NO NE) {2216 if (getTopmark() != Top.NOTOP) { 2216 2217 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:topmark:shape", TopSTR.get(getTopmark()))); 2217 if (getTopPattern() != Pat.NO NE)2218 if (getTopPattern() != Pat.NOPAT) 2218 2219 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:topmark:colour_pattern", PatSTR.get(getTopPattern()))); 2219 if (getTopColour(0) != Col.UNK NOWN) {2220 if (getTopColour(0) != Col.UNKCOL) { 2220 2221 String str = ColSTR.get(getTopColour(0)); 2221 2222 for (int i = 1; topmarkColour.size() > i; i++) { … … 2228 2229 for (int i = 0; i < sectors.size(); i++) { 2229 2230 String secStr = (i == 0) ? "" : (":" + Integer.toString(i)); 2230 if (sectors.get(i)[0] != Col.UNK NOWN)2231 if ((sectors.get(i)[15] != Col.UNK NOWN) && ((String)sectors.get(i)[1]).contains("Al"))2231 if (sectors.get(i)[0] != Col.UNKCOL) 2232 if ((sectors.get(i)[15] != Col.UNKCOL) && ((String)sectors.get(i)[1]).contains("Al")) 2232 2233 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":colour", (ColSTR.get(sectors.get(i)[0])) 2233 2234 + ";" + ColSTR.get(sectors.get(i)[15]))); … … 2242 2243 if (!((String) sectors.get(i)[4]).isEmpty()) 2243 2244 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":period", (String) sectors.get(i)[4])); 2244 if (sectors.get(i)[5] != Lit.UNK NOWN)2245 if (sectors.get(i)[5] != Lit.UNKLIT) 2245 2246 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":category", LitSTR.get(sectors.get(i)[5]))); 2246 2247 if (!((String) sectors.get(i)[6]).isEmpty()) … … 2254 2255 if (!((String) sectors.get(i)[10]).isEmpty()) 2255 2256 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":range", (String) sectors.get(i)[10])); 2256 if (sectors.get(i)[11] != Vis.UNK NOWN)2257 if (sectors.get(i)[11] != Vis.UNKVIS) 2257 2258 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":visibility", VisSTR.get(sectors.get(i)[11]))); 2258 if (sectors.get(i)[12] != Exh.UNK NOWN)2259 if (sectors.get(i)[12] != Exh.UNKEXH) 2259 2260 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:light" + secStr + ":exhibition", ExhSTR.get(sectors.get(i)[12]))); 2260 2261 if (!((String) sectors.get(i)[13]).isEmpty()) … … 2264 2265 } 2265 2266 2266 if (getFogSound() != Fog.NO NE) {2267 if (getFogSound() == Fog. UNKNOWN)2267 if (getFogSound() != Fog.NOFOG) { 2268 if (getFogSound() == Fog.FOGSIG) 2268 2269 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:fog_signal", "yes")); 2269 2270 else … … 2283 2284 } 2284 2285 2285 if (RaType != Rtb.NO NE) {2286 if (RaType != Rtb.NORTB) { 2286 2287 if (getRadar() == Rtb.REFLECTOR) { 2287 2288 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:radar_reflector", "yes")); … … 2313 2314 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:source", getSource())); 2314 2315 } 2315 if (getStatus() != Sts.UNK NOWN) {2316 if (getStatus() != Sts.UNKSTS) { 2316 2317 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:status", StsSTR.get(getStatus()))); 2317 2318 } 2318 if (getConstr() != Cns.UNK NOWN) {2319 if (getConstr() != Cns.UNKCNS) { 2319 2320 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:construction", CnsSTR.get(getConstr()))); 2320 2321 } 2321 if (getConsp() != Con.UNK NOWN) {2322 if (getConsp() != Con.UNKCON) { 2322 2323 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:conspicuity", ConSTR.get(getConsp()))); 2323 2324 } 2324 if (getRefl() != Con.UNK NOWN) {2325 if (getRefl() != Con.UNKCON) { 2325 2326 Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:reflectivity", ConSTR.get(getRefl()))); 2326 2327 }
Note:
See TracChangeset
for help on using the changeset viewer.
