Ignore:
Timestamp:
2011-06-04T21:17:49+02:00 (14 years ago)
Author:
malcolmh
Message:

save

Location:
applications/editors/josm/plugins/smed/plugs/oseam/src/oseam
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties

    r24830 r26096  
    11TabInfo=Seamark editor
    22TabName=Seamarks
    3 ChanTip=Lateral & Safe Water marks
    4 HazTip=Cardinal & Isolated Danger marks
    5 SpecTip=Special Purpose marks
    6 LightsTip=Lights marks
    7 PortTip=Port hand marks
    8 StbdTip=Starboard hand marks
    9 PrefPortTip=Preferred Port hand marks
    10 PrefStbdTip=Preferred Starboard hand marks
    11 SafeWaterTip=Safe Water marks
    12 NorthTip=North cardinal marks
    13 SouthTip=South cardinal marks
    14 EastTip=East cardinal marks
    15 WestTip=West cardinal marks
    16 IsolTip=Isolated danger marks
    17 LighthouseTip=Lighthouse
    18 MajorLightTip=Major light
    19 MinorLightTip=Minor light
    20 LightVesselTip=Light vessel
    21 LightFloatTip=Light float
    22 TopmarksTip=Topmarks
    23 FogSignalsTip=Fog signals
    24 RadarTip=Radar
    25 LitTip=Lights
    26 PillarTip=Pillar buoy
    27 SparTip=Spar buoy
    28 CanTip=Can buoy
    29 ConeTip=Cone buoy
    30 SphereTip=Sphere buoy
    31 BarrelTip=Barrel buoy
    32 FloatTip=Light float
    33 SuperTip=Super-buoy
    34 BeaconTip=Beacon
    35 TowerTip=Beacon tower
    36 StakeTip=Stake beacon
    37 PerchTip=Perch beacon
    38 RegionATip=IALA Region A
    39 RegionBTip=IALA Region B
    40 NoTopTip=No topmark
    41 CanTopTip=Can topmark
    42 ConeTopTip=Conical topmark
    43 SphereTopTip=Spherical topmark
    44 XTopTip=X-shape topmark
    45 NorthTopTip=North cardinal topmark
    46 SouthTopTip=South cardinal topmark
    47 EastTopTip=East cardinal topmark
    48 WestTopTip=West cardinal topmark
    49 Spheres2TopTip=2 spheres topmark
    50 BoardDayTip=Board daymark
    51 DiamondDayTip=Diamond daymark
    52 TriangleDayTip=Triangular daymark
    53 TriangleInvDayTip=Inverted triangular daymark
    54 SquareDayTip=Square daymark
    55 MooringTopTip=Mooring
     3Chan=Lateral & Safe Water marks
     4Haz=Cardinal & Isolated Danger marks
     5Spec=Special Purpose marks
     6Lights=Lights marks
     7Port=Port hand marks
     8Stbd=Starboard hand marks
     9PrefPort=Preferred Port hand marks
     10PrefStbd=Preferred Starboard hand marks
     11SafeWater=Safe Water marks
     12North=North cardinal marks
     13South=South cardinal marks
     14East=East cardinal marks
     15West=West cardinal marks
     16Isol=Isolated danger marks
     17Lighthouse=Lighthouse
     18MajorLight=Major light
     19MinorLight=Minor light
     20LightVessel=Light vessel
     21LightFloat=Light float
     22Topmarks=Topmarks
     23FogSignals=Fog signals
     24Radar=Radar
     25Lit=Lights
     26
     27Pillar=Pillar buoy
     28Spar=Spar buoy
     29Can=Can buoy
     30Cone=Cone buoy
     31Sphere=Sphere buoy
     32Barrel=Barrel buoy
     33Float=Light float
     34Super=Super-buoy
     35Beacon=Beacon
     36Tower=Beacon tower
     37Stake=Stake beacon
     38Perch=Perch beacon
     39
     40RegionA=IALA Region A
     41RegionB=IALA Region B
     42
     43NoTop=No topmark
     44CanTop=Can topmark
     45ConeTop=Conical topmark
     46SphereTop=Spherical topmark
     47XTop=X-shape topmark
     48NorthTop=North cardinal topmark
     49SouthTop=South cardinal topmark
     50EastTop=East cardinal topmark
     51WestTop=West cardinal topmark
     52Spheres2Top=2 spheres topmark
     53BoardDay=Board daymark
     54DiamondDay=Diamond daymark
     55TriangleDay=Triangular daymark
     56TriangleInvDay=Inverted triangular daymark
     57SquareDay=Square daymark
     58CircleDay=Circular daymark
     59MooringTop=Mooring
     60
    5661SelectNode=Please select a node
    5762OneNode=Please select only one node
    5863NoMark=No seamark recognised at this node
     64
     65NoChar=No character
     66FChar=F: Fixed
     67FlChar=Fl: Flashing
     68LFlChar=LFl: Long flash
     69QChar=Q: Quick flashing
     70VQChar=VQ: Very quick flashing
     71UQChar=UQ: Ultra quick flashing
     72AlChar=Al: Alternating
     73IsoChar=Iso: Isophased flashing
     74OcChar=Oc: Occulting flash
     75MoChar=Mo: Morse
     76IQChar=IQ: Interrupted quick flashing
     77IVQChar=IVQ: Interrupted very quick flashing
     78IUQChar=IUQ: Interrupted ultra quick flashing
     79Character=Character
     80
     81NoColour=No colour
     82White=White
     83Red=Red
     84Orange=Orange
     85Amber=Amber
     86Yellow=Yellow
     87Green=Green
     88Blue=Blue
     89Violet=Violet
     90Black=Black

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties

    r24830 r26096  
    11TabInfo=Seamark editor
    22TabName=Seezeichen
    3 ChanTip=Lateral & Safe Water marks
    4 HazTip=Cardinal & Isolated Danger marks
    5 SpecTip=Special Purpose marks
    6 LightsTip=Lights marks
    7 PortTip=Backbord
    8 StbdTip=Steuerbord
    9 PrefPortTip=Abzweigung Backboard
    10 PrefStbdTip=Abzweigung Steuerbord
    11 SafeWaterTip=Safe water marks
    12 NorthTip=North cardinal marks
    13 SouthTip=South cardinal marks
    14 EastTip=East cardinal marks
    15 WestTip=West cardinal marks
    16 IsolTip=Isolated danger marks
    17 LighthouseTip=Leuchtturm
    18 MajorLightTip=primäres Feuer
    19 MinorLightTip=sekundäres Feuer
    20 LightVesselTip=Feuerschiff
    21 LightFloatTip=Leuchtfloß
    22 TopmarksTip=Topmarks
    23 FogSignalsTip=Fog signals
    24 RadarTip=Radar
    25 LitTip=Lights
    26 PillarTip=Bakentonne
    27 SparTip=Spierentonne
    28 CanTip=Stumpftonne
    29 ConeTip=Spitztonne
    30 SphereTip=Kugeltonne
    31 BarrelTip=Fasstonne
    32 FloatTip=Leuchtfloß
    33 SuperTip=Super-buoy
    34 BeaconTip=Spiere
    35 TowerTip=Beacon tower
    36 StakeTip=Stake beacon
    37 PerchTip=Pricke
    38 RegionATip=IALA Region A
    39 RegionBTip=IALA Region B
    40 NoTopTip=No topmark
    41 CanTopTip=Can topmark
    42 ConeTopTip=Conical topmark
    43 SphereTopTip=Spherical topmark
    44 XTopTip=X-shape topmark
    45 NorthTopTip=North cardinal topmark
    46 SouthTopTip=South cardinal topmark
    47 EastTopTip=East cardinal topmark
    48 WestTopTip=West cardinal topmark
    49 Spheres2TopTip=2 spheres topmark
    50 BoardDayTip=Board daymark
    51 DiamondDayTip=Diamond daymark
    52 TriangleDayTip=Triangular daymark
    53 TriangleInvDayTip=Inverted triangular daymark
    54 SquareDayTip=Square daymark
    55 MooringTopTip=Mooring
     3Chan=Lateral & Safe Water marks
     4Haz=Cardinal & Isolated Danger marks
     5Spec=Special Purpose marks
     6Lights=Lights marks
     7Port=Backbord
     8Stbd=Steuerbord
     9PrefPort=Abzweigung Backboard
     10PrefStbd=Abzweigung Steuerbord
     11SafeWater=Safe water marks
     12North=North cardinal marks
     13South=South cardinal marks
     14East=East cardinal marks
     15West=West cardinal marks
     16Isol=Isolated danger marks
     17Lighthouse=Leuchtturm
     18MajorLight=primäres Feuer
     19MinorLight=sekundäres Feuer
     20LightVessel=Feuerschiff
     21LightFloat=Leuchtfloß
     22Topmarks=Topmarks
     23FogSignals=Fog signals
     24Radar=Radar
     25Lit=Lights
     26
     27Pillar=Bakentonne
     28Spar=Spierentonne
     29Can=Stumpftonne
     30Cone=Spitztonne
     31Sphere=Kugeltonne
     32Barrel=Fasstonne
     33Float=Leuchtfloß
     34Super=Super-buoy
     35Beacon=Spiere
     36Tower=Beacon tower
     37Stake=Stake beacon
     38Perch=Pricke
     39
     40RegionA=IALA Region A
     41RegionB=IALA Region B
     42
     43NoTop=No topmark
     44CanTop=Can topmark
     45ConeTop=Conical topmark
     46SphereTop=Spherical topmark
     47XTop=X-shape topmark
     48NorthTop=North cardinal topmark
     49SouthTop=South cardinal topmark
     50EastTop=East cardinal topmark
     51WestTop=West cardinal topmark
     52Spheres2Top=2 spheres topmark
     53BoardDay=Board daymark
     54DiamondDay=Diamond daymark
     55TriangleDay=Triangular daymark
     56TriangleInvDay=Inverted triangular daymark
     57SquareDay=Square daymark
     58CircleDay=Circular daymark
     59MooringTop=Mooring
     60
    5661SelectNode=Please select a node
    5762OneNode=Please select only one node
    5863NoMark=No seamark recognised at this node
     64
     65NoChar=No character
     66FChar=F: Fixed
     67FlChar=Fl: Flashing
     68LFlChar=LFl: Long flash
     69QChar=Q: Quick flashing
     70VQChar=VQ: Very quick flashing
     71UQChar=UQ: Ultra quick flashing
     72AlChar=Al: Alternating
     73IsoChar=Iso: Isophased flashing
     74OcChar=Oc: Occulting flash
     75MoChar=Mo: Morse
     76IQChar=IQ: Interrupted quick flashing
     77IVQChar=IVQ: Interrupted very quick flashing
     78IUQChar=IUQ: Interrupted ultra quick flashing
     79Character=Character
     80
     81NoColour=No colour
     82White=White
     83Red=Red
     84Orange=Orange
     85Amber=Amber
     86Yellow=Yellow
     87Green=Green
     88Blue=Blue
     89Violet=Violet
     90Black=Black

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties

    r24830 r26096  
    11TabInfo=Seamark editor
    22TabName=Seamarks
    3 ChanTip=Lateral & Safe Water marks
    4 HazTip=Cardinal & Isolated Danger marks
    5 SpecTip=Special Purpose marks
    6 LightsTip=Lights marks
    7 PortTip=Port hand marks
    8 StbdTip=Starboard hand marks
    9 PrefPortTip=Preferred Port hand marks
    10 PrefStbdTip=Preferred Starboard hand marks
    11 SafeWaterTip=Safe Water marks
    12 NorthTip=North cardinal marks
    13 SouthTip=South cardinal marks
    14 EastTip=East cardinal marks
    15 WestTip=West cardinal marks
    16 IsolTip=Isolated danger marks
    17 LighthouseTip=Lighthouse
    18 MajorLightTip=Major light
    19 MinorLightTip=Minor light
    20 LightVesselTip=Light vessel
    21 LightFloatTip=Light float
    22 TopmarksTip=Topmarks
    23 FogSignalsTip=Fog signals
    24 RadarTip=Radar
    25 LitTip=Lights
    26 PillarTip=Pillar buoy
    27 SparTip=Spar buoy
    28 CanTip=Can buoy
    29 ConeTip=Cone buoy
    30 SphereTip=Sphere buoy
    31 BarrelTip=Barrel buoy
    32 FloatTip=Light float
    33 SuperTip=Super-buoy
    34 BeaconTip=Beacon
    35 TowerTip=Beacon tower
    36 StakeTip=Stake beacon
    37 PerchTip=Perch beacon
    38 RegionATip=IALA Region A
    39 RegionBTip=IALA Region B
    40 NoTopTip=No topmark
    41 CanTopTip=Can topmark
    42 ConeTopTip=Conical topmark
    43 SphereTopTip=Spherical topmark
    44 XTopTip=X-shape topmark
    45 NorthTopTip=North cardinal topmark
    46 SouthTopTip=South cardinal topmark
    47 EastTopTip=East cardinal topmark
    48 WestTopTip=West cardinal topmark
    49 Spheres2TopTip=2 spheres topmark
    50 BoardDayTip=Board daymark
    51 DiamondDayTip=Diamond daymark
    52 TriangleDayTip=Triangular daymark
    53 TriangleInvDayTip=Inverted triangular daymark
    54 SquareDayTip=Square daymark
    55 MooringTopTip=Mooring
     3Chan=Lateral & Safe Water marks
     4Haz=Cardinal & Isolated Danger marks
     5Spec=Special Purpose marks
     6Lights=Lights marks
     7Port=Port hand marks
     8Stbd=Starboard hand marks
     9PrefPort=Preferred Port hand marks
     10PrefStbd=Preferred Starboard hand marks
     11SafeWater=Safe Water marks
     12North=North cardinal marks
     13South=South cardinal marks
     14East=East cardinal marks
     15West=West cardinal marks
     16Isol=Isolated danger marks
     17Lighthouse=Lighthouse
     18MajorLight=Major light
     19MinorLight=Minor light
     20LightVessel=Light vessel
     21LightFloat=Light float
     22Topmarks=Topmarks
     23FogSignals=Fog signals
     24Radar=Radar
     25Lit=Lights
     26
     27Pillar=Pillar buoy
     28Spar=Spar buoy
     29Can=Can buoy
     30Cone=Cone buoy
     31Sphere=Sphere buoy
     32Barrel=Barrel buoy
     33Float=Light float
     34Super=Super-buoy
     35Beacon=Beacon
     36Tower=Beacon tower
     37Stake=Stake beacon
     38Perch=Perch beacon
     39
     40RegionA=IALA Region A
     41RegionB=IALA Region B
     42
     43NoTop=No topmark
     44CanTop=Can topmark
     45ConeTop=Conical topmark
     46SphereTop=Spherical topmark
     47XTop=X-shape topmark
     48NorthTop=North cardinal topmark
     49SouthTop=South cardinal topmark
     50EastTop=East cardinal topmark
     51WestTop=West cardinal topmark
     52Spheres2Top=2 spheres topmark
     53BoardDay=Board daymark
     54DiamondDay=Diamond daymark
     55TriangleDay=Triangular daymark
     56TriangleInvDay=Inverted triangular daymark
     57SquareDay=Square daymark
     58CircleDay=Circular daymark
     59MooringTop=Mooring
     60
    5661SelectNode=Please select a node
    5762OneNode=Please select only one node
    5863NoMark=No seamark recognised at this node
     64
     65NoChar=No character
     66FChar=F: Fixed
     67FlChar=Fl: Flashing
     68LFlChar=LFl: Long flash
     69QChar=Q: Quick flashing
     70VQChar=VQ: Very quick flashing
     71UQChar=UQ: Ultra quick flashing
     72AlChar=Al: Alternating
     73IsoChar=Iso: Isophased flashing
     74OcChar=Oc: Occulting flash
     75MoChar=Mo: Morse
     76IQChar=IQ: Interrupted quick flashing
     77IVQChar=IVQ: Interrupted very quick flashing
     78IUQChar=IUQ: Interrupted ultra quick flashing
     79Character=Character
     80
     81NoColour=No colour
     82White=White
     83Red=Red
     84Orange=Orange
     85Amber=Amber
     86Yellow=Yellow
     87Green=Green
     88Blue=Blue
     89Violet=Violet
     90Black=Black

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java

    r24931 r26096  
    205205                this.add(panelStbd, null);
    206206                this.add(panelSaw, null);
    207                 this.add(getCatButton(portButton, 0, 0, 52, 32, "PortTip"), null);
    208                 this.add(getCatButton(stbdButton, 0, 32, 52, 32, "StbdTip"), null);
    209                 this.add(getCatButton(prefPortButton, 0, 64, 52, 32, "PrefPortTip"), null);
    210                 this.add(getCatButton(prefStbdButton, 0, 96, 52, 32, "PrefStbdTip"), null);
    211                 this.add(getCatButton(safeWaterButton, 0, 128, 52, 32, "SafeWaterTip"), null);
     207                this.add(getCatButton(portButton, 0, 0, 52, 32, "Port"), null);
     208                this.add(getCatButton(stbdButton, 0, 32, 52, 32, "Stbd"), null);
     209                this.add(getCatButton(prefPortButton, 0, 64, 52, 32, "PrefPort"), null);
     210                this.add(getCatButton(prefStbdButton, 0, 96, 52, 32, "PrefStbd"), null);
     211                this.add(getCatButton(safeWaterButton, 0, 128, 52, 32, "SafeWater"), null);
    212212        }
    213213

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java

    r26087 r26096  
    1717import java.util.EnumMap;
    1818import java.util.EnumSet;
    19 import java.util.HashMap;
    20 import java.util.Map;
    2119
     20import oseam.Messages;
    2221import oseam.dialogs.OSeaMAction;
    2322import oseam.seamarks.SeaMark.Chr;
    … …  
    5958                                }
    6059                        }
    61                         charBox.setText("");
    62                         for (EnumSet<Chr> map : SeaMark.ChrMAP.keySet()) {
    63                                 if (map.equals(combo)) {
    64                                         charBox.setText(SeaMark.ChrMAP.get(map));
    65                                 }
    66                         }
    67                         if (charBox.getText().isEmpty()) {
     60                        if (SeaMark.ChrMAP.containsKey(combo)) {
     61                                charBox.setText(SeaMark.ChrMAP.get(combo));
     62                        } else {
    6863                                for (Chr chr : buttons.keySet()) {
    6964                                        JToggleButton button = buttons.get(chr);
    … …  
    106101                dlg = dia;
    107102                this.setLayout(null);
    108                 this.add(getChrButton(noneButton, 0, 0, 44, 16, "No character", Chr.UNKNOWN), null);
    109                 this.add(getChrButton(fixedButton, 0, 16, 44, 16, "F: Fixed", Chr.FIXED), null);
    110                 this.add(getChrButton(flashButton, 0, 32, 44, 16, "Fl: Flashing", Chr.FLASH), null);
    111                 this.add(getChrButton(longFlashButton, 0, 48, 44, 16, "LFl: Long flash", Chr.LONGFLASH), null);
    112                 this.add(getChrButton(quickButton, 0, 64, 44, 16, "Q: Quick flashing", Chr.QUICK), null);
    113                 this.add(getChrButton(veryQuickButton, 0, 80, 44, 16, "VQ: Very quick flashing", Chr.VERYQUICK), null);
    114                 this.add(getChrButton(ultraQuickButton, 0, 96, 44, 16, "UQ: Ultra quick flashing", Chr.ULTRAQUICK), null);
    115                 this.add(getChrButton(alternatingButton, 44, 0, 44, 16, "Al: Alternating", Chr.ALTERNATING), null);
    116                 this.add(getChrButton(isophasedButton, 44, 16, 44, 16, "Iso: Isophased flashing", Chr.ISOPHASED), null);
    117                 this.add(getChrButton(occultingButton, 44, 32, 44, 16, "Oc: Occulting flash", Chr.OCCULTING), null);
    118                 this.add(getChrButton(morseButton, 44, 48, 44, 16, "Mo: Morse", Chr.MORSE), null);
    119                 this.add(getChrButton(interruptedQuickButton, 44, 64, 44, 16, "IQ: Interrupted quick flashing", Chr.INTERRUPTEDQUICK), null);
    120                 this.add(getChrButton(interruptedVeryQuickButton, 44, 80, 44, 16, "IVQ: Interrupted very quick flashing", Chr.INTERRUPTEDVERYQUICK), null);
    121                 this.add(getChrButton(interruptedUltraQuickButton, 44, 96, 44, 16, "IUQ: Interrupted ultra quick flashing", Chr.INTERRUPTEDULTRAQUICK), null);
     103                this.add(getChrButton(noneButton, 0, 0, 44, 16, Messages.getString("NoChar"), Chr.UNKNOWN), null);
     104                this.add(getChrButton(fixedButton, 0, 16, 44, 16, Messages.getString("FChar"), Chr.FIXED), null);
     105                this.add(getChrButton(flashButton, 0, 32, 44, 16, Messages.getString("FlChar"), Chr.FLASH), null);
     106                this.add(getChrButton(longFlashButton, 0, 48, 44, 16, Messages.getString("LFlChar"), Chr.LONGFLASH), null);
     107                this.add(getChrButton(quickButton, 0, 64, 44, 16, Messages.getString("QChar"), Chr.QUICK), null);
     108                this.add(getChrButton(veryQuickButton, 0, 80, 44, 16, Messages.getString("VQChar"), Chr.VERYQUICK), null);
     109                this.add(getChrButton(ultraQuickButton, 0, 96, 44, 16, Messages.getString("UQChar"), Chr.ULTRAQUICK), null);
     110                this.add(getChrButton(alternatingButton, 44, 0, 44, 16, Messages.getString("AlChar"), Chr.ALTERNATING), null);
     111                this.add(getChrButton(isophasedButton, 44, 16, 44, 16, Messages.getString("IsoChar"), Chr.ISOPHASED), null);
     112                this.add(getChrButton(occultingButton, 44, 32, 44, 16, Messages.getString("OcChar"), Chr.OCCULTING), null);
     113                this.add(getChrButton(morseButton, 44, 48, 44, 16, Messages.getString("MoChar"), Chr.MORSE), null);
     114                this.add(getChrButton(interruptedQuickButton, 44, 64, 44, 16, Messages.getString("IQChar"), Chr.INTERRUPTEDQUICK), null);
     115                this.add(getChrButton(interruptedVeryQuickButton, 44, 80, 44, 16, Messages.getString("IVQChar"), Chr.INTERRUPTEDVERYQUICK), null);
     116                this.add(getChrButton(interruptedUltraQuickButton, 44, 96, 44, 16, Messages.getString("IUQChar"), Chr.INTERRUPTEDULTRAQUICK), null);
    122117                charLabel.setBounds(new Rectangle(0, 113, 88, 20));
    123118                charLabel.setHorizontalAlignment(SwingConstants.CENTER);
    124                 charLabel.setText("Character");
     119                charLabel.setText(Messages.getString("Character"));
    125120                this.add(charLabel, null);
    126121                charBox.setBounds(new Rectangle(20, 135, 50, 20));

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java

    r24931 r26096  
    1515import java.util.EnumMap;
    1616
     17import oseam.Messages;
    1718import oseam.dialogs.OSeaMAction;
    1819import oseam.seamarks.SeaMark.Col;
    … …  
    5253                ent = entity;
    5354                this.setLayout(null);
    54                 this.add(getColButton(offButton, 0, 0, 34, 16, "No colour", Col.UNKNOWN), null);
    55                 this.add(getColButton(whiteButton, 0, 16, 34, 16, "White", Col.WHITE), null);
    56                 this.add(getColButton(redButton, 0, 32, 34, 16, "Red", Col.RED), null);
    57                 this.add(getColButton(orangeButton, 0, 48, 34, 16, "Orange", Col.ORANGE), null);
    58                 this.add(getColButton(amberButton, 0, 64, 34, 16, "Amber", Col.AMBER), null);
    59                 this.add(getColButton(yellowButton, 0, 80, 34, 16, "Yellow", Col.YELLOW), null);
    60                 this.add(getColButton(greenButton, 0, 96, 34, 16, "Green", Col.GREEN), null);
    61                 this.add(getColButton(blueButton, 0, 112, 34, 16, "Blue", Col.BLUE), null);
    62                 this.add(getColButton(violetButton, 0, 128, 34, 16, "Violet", Col.VIOLET), null);
    63                 this.add(getColButton(blackButton, 0, 144, 34, 16, "Black", Col.BLACK), null);
     55                this.add(getColButton(offButton, 0, 0, 34, 16, Messages.getString("NoColour"), Col.UNKNOWN), null);
     56                this.add(getColButton(whiteButton, 0, 16, 34, 16, Messages.getString("White"), Col.WHITE), null);
     57                this.add(getColButton(redButton, 0, 32, 34, 16, Messages.getString("Red"), Col.RED), null);
     58                this.add(getColButton(orangeButton, 0, 48, 34, 16, Messages.getString("Orange"), Col.ORANGE), null);
     59                this.add(getColButton(amberButton, 0, 64, 34, 16, Messages.getString("Amber"), Col.AMBER), null);
     60                this.add(getColButton(yellowButton, 0, 80, 34, 16, Messages.getString("Yellow"), Col.YELLOW), null);
     61                this.add(getColButton(greenButton, 0, 96, 34, 16, Messages.getString("Green"), Col.GREEN), null);
     62                this.add(getColButton(blueButton, 0, 112, 34, 16, Messages.getString("Blue"), Col.BLUE), null);
     63                this.add(getColButton(violetButton, 0, 128, 34, 16, Messages.getString("Violet"), Col.VIOLET), null);
     64                this.add(getColButton(blackButton, 0, 144, 34, 16, Messages.getString("Black"), Col.BLACK), null);
    6465        }
    6566

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java

    r24963 r26096  
    122122                dlg = dia;
    123123                this.setLayout(null);
    124                 this.add(getCatButton(northButton, 0, 0, 52, 32, "NorthTip"), null);
    125                 this.add(getCatButton(southButton, 0, 32, 52, 32, "SouthTip"), null);
    126                 this.add(getCatButton(eastButton, 0, 64, 52, 32, "EastTip"), null);
    127                 this.add(getCatButton(westButton, 0, 96, 52, 32, "WestTip"), null);
    128                 this.add(getCatButton(isolButton, 0, 128, 52, 32, "IsolTip"), null);
     124                this.add(getCatButton(northButton, 0, 0, 52, 32, "North"), null);
     125                this.add(getCatButton(southButton, 0, 32, 52, 32, "South"), null);
     126                this.add(getCatButton(eastButton, 0, 64, 52, 32, "East"), null);
     127                this.add(getCatButton(westButton, 0, 96, 52, 32, "West"), null);
     128                this.add(getCatButton(isolButton, 0, 128, 52, 32, "Isol"), null);
    129129
    130                 this.add(getShapeButton(pillarButton, 55, 0, 34, 32, "PillarTip", Shp.PILLAR, Obj.BOYCAR, Obj.BOYISD), null);
    131                 this.add(getShapeButton(sparButton, 55, 32, 34, 32, "SparTip", Shp.SPAR, Obj.BOYCAR, Obj.BOYISD), null);
    132                 this.add(getShapeButton(floatButton, 55, 64, 34, 32, "FloatTip", Shp.FLOAT, Obj.LITFLT, Obj.LITFLT), null);
    133                 this.add(getShapeButton(beaconButton, 55, 96, 34, 32, "BeaconTip", Shp.BEACON, Obj.BCNCAR, Obj.BCNISD), null);
    134                 this.add(getShapeButton(towerButton, 55, 128, 34, 32, "TowerTip", Shp.TOWER, Obj.BCNCAR, Obj.BCNISD), null);
     130                this.add(getShapeButton(pillarButton, 55, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYCAR, Obj.BOYISD), null);
     131                this.add(getShapeButton(sparButton, 55, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYCAR, Obj.BOYISD), null);
     132                this.add(getShapeButton(floatButton, 55, 64, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT, Obj.LITFLT), null);
     133                this.add(getShapeButton(beaconButton, 55, 96, 34, 32, "Beacon", Shp.BEACON, Obj.BCNCAR, Obj.BCNISD), null);
     134                this.add(getShapeButton(towerButton, 55, 128, 34, 32, "Tower", Shp.TOWER, Obj.BCNCAR, Obj.BCNISD), null);
    135135        }
    136136

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java

    r24963 r26096  
    4848                dlg = dia;
    4949                this.setLayout(null);
    50                 this.add(getCatButton(houseButton, 0, 0, 34, 32, "LighthouseTip", Cat.LIGHT_HOUSE, Obj.LNDMRK), null);
    51                 this.add(getCatButton(majorButton, 0, 32, 34, 32, "MajorLightTip", Cat.LIGHT_MAJOR, Obj.LITMAJ), null);
    52                 this.add(getCatButton(minorButton, 0, 64, 34, 32, "MinorLightTip", Cat.LIGHT_MINOR, Obj.LITMIN), null);
    53                 this.add(getCatButton(vesselButton, 0, 96, 34, 32, "LightVesselTip", Cat.LIGHT_VESSEL, Obj.LITVES), null);
    54                 this.add(getCatButton(stationButton, 0, 128, 34, 32, "SignalStationTip", Cat.SIGNAL_STATION, Obj.SIGSTA), null);
     50                this.add(getCatButton(houseButton, 0, 0, 34, 32, "Lighthouse", Cat.LIGHT_HOUSE, Obj.LNDMRK), null);
     51                this.add(getCatButton(majorButton, 0, 32, 34, 32, "MajorLight", Cat.LIGHT_MAJOR, Obj.LITMAJ), null);
     52                this.add(getCatButton(minorButton, 0, 64, 34, 32, "MinorLight", Cat.LIGHT_MINOR, Obj.LITMIN), null);
     53                this.add(getCatButton(vesselButton, 0, 96, 34, 32, "LightVessel", Cat.LIGHT_VESSEL, Obj.LITVES), null);
     54                this.add(getCatButton(stationButton, 0, 128, 34, 32, "SignalStation", Cat.SIGNAL_STATION, Obj.SIGSTA), null);
    5555        }
    5656

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java

    r26076 r26096  
    9696                this.add(fogIcon, null);
    9797
    98                 this.add(getButton(chanButton, 0, 0, 62, 40, "ChanTip"), null);
    99                 this.add(getButton(hazButton, 0, 40, 62, 40, "HazTip"), null);
    100                 this.add(getButton(specButton, 0, 80, 62, 40, "SpecTip"), null);
    101                 this.add(getButton(lightsButton, 0, 120, 62, 40, "LightsTip"), null);
     98                this.add(getButton(chanButton, 0, 0, 62, 40, "Chan"), null);
     99                this.add(getButton(hazButton, 0, 40, 62, 40, "Haz"), null);
     100                this.add(getButton(specButton, 0, 80, 62, 40, "Spec"), null);
     101                this.add(getButton(lightsButton, 0, 120, 62, 40, "Lights"), null);
    102102                this.add(panelChan, null);
    103103                this.add(panelHaz, null);
    … …  
    170170                lightsButton.addActionListener(alType);
    171171
    172                 this.add(getButton(topButton, 0, 165, 34, 32, "TopmarksTip"), null);
    173                 this.add(getButton(fogButton, 0, 205, 34, 32, "FogSignalsTip"), null);
    174                 this.add(getButton(radButton, 0, 245, 34, 32, "RadarTip"), null);
    175                 this.add(getButton(litButton, 0, 285, 34, 32, "LitTip"), null);
     172                this.add(getButton(topButton, 0, 165, 34, 32, "Topmarks"), null);
     173                this.add(getButton(fogButton, 0, 205, 34, 32, "FogSignals"), null);
     174                this.add(getButton(radButton, 0, 245, 34, 32, "Radar"), null);
     175                this.add(getButton(litButton, 0, 285, 34, 32, "Lit"), null);
    176176                miscButtons = new ButtonGroup();
    177177                miscButtons.add(topButton);

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java

    r24931 r26096  
    6060                dlg = dia;
    6161                this.setLayout(null);
    62                 this.add(getRegionButton(regionAButton, 0, 2, 34, 30, "RegionATip"), null);
    63                 this.add(getRegionButton(regionBButton, 0, 32, 34, 30, "RegionBTip"), null);
    64                 this.add(getShapeButton(pillarButton, 0, 64, 34, 32, "PillarTip", Shp.PILLAR, Obj.BOYLAT), null);
    65                 this.add(getShapeButton(sparButton, 0, 96, 34, 32, "SparTip", Shp.SPAR, Obj.BOYLAT), null);
    66                 this.add(getShapeButton(canButton, 0, 128, 34, 32, "CanTip", Shp.CAN, Obj.BOYLAT), null);
    67                 this.add(getShapeButton(floatButton, 35, 0, 34, 32, "FloatTip", Shp.FLOAT, Obj.LITFLT), null);
    68                 this.add(getShapeButton(beaconButton, 35, 32, 34, 32, "BeaconTip", Shp.BEACON, Obj.BCNLAT), null);
    69                 this.add(getShapeButton(towerButton, 35, 64, 34, 32, "TowerTip", Shp.TOWER, Obj.BCNLAT), null);
    70                 this.add(getShapeButton(perchButton, 35, 96, 34, 32, "PerchTip", Shp.PERCH, Obj.BCNLAT), null);
     62                this.add(getRegionButton(regionAButton, 0, 2, 34, 30, "RegionA"), null);
     63                this.add(getRegionButton(regionBButton, 0, 32, 34, 30, "RegionB"), null);
     64                this.add(getShapeButton(pillarButton, 0, 64, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT), null);
     65                this.add(getShapeButton(sparButton, 0, 96, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), null);
     66                this.add(getShapeButton(canButton, 0, 128, 34, 32, "Can", Shp.CAN, Obj.BOYLAT), null);
     67                this.add(getShapeButton(floatButton, 35, 0, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null);
     68                this.add(getShapeButton(beaconButton, 35, 32, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT), null);
     69                this.add(getShapeButton(towerButton, 35, 64, 34, 32, "Tower", Shp.TOWER, Obj.BCNLAT), null);
     70                this.add(getShapeButton(perchButton, 35, 96, 34, 32, "Perch", Shp.PERCH, Obj.BCNLAT), null);
    7171        }
    7272

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSaw.java

    r24931 r26096  
    4848                dlg = dia;
    4949                this.setLayout(null);
    50                 this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "PillarTip", Shp.PILLAR, Obj.BOYSAW), null);
    51                 this.add(getShapeButton(sparButton, 0, 32, 34, 32, "SparTip", Shp.SPAR, Obj.BOYSAW), null);
    52                 this.add(getShapeButton(sphereButton, 0, 64, 34, 32, "SphereTip", Shp.SPHERE, Obj.BOYSAW), null);
    53                 this.add(getShapeButton(barrelButton, 0, 96, 34, 32, "BarrelTip", Shp.BARREL, Obj.BOYSAW), null);
    54                 this.add(getShapeButton(floatButton, 0, 128, 34, 32, "FloatTip", Shp.FLOAT, Obj.LITFLT), null);
     50                this.add(getShapeButton(pillarButton, 0, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYSAW), null);
     51                this.add(getShapeButton(sparButton, 0, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYSAW), null);
     52                this.add(getShapeButton(sphereButton, 0, 64, 34, 32, "Sphere", Shp.SPHERE, Obj.BOYSAW), null);
     53                this.add(getShapeButton(barrelButton, 0, 96, 34, 32, "Barrel", Shp.BARREL, Obj.BOYSAW), null);
     54                this.add(getShapeButton(floatButton, 0, 128, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null);
    5555        }
    5656

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java

    r24931 r26096  
    5959                this.setLayout(null);
    6060                this.add(panelCol, null);
    61                 this.add(getShapeButton(pillarButton, 55, 0, 34, 32, "PillarTip", Shp.PILLAR, Obj.BOYSPP), null);
    62                 this.add(getShapeButton(sparButton, 55, 32, 34, 32, "SparTip", Shp.SPAR, Obj.BOYSPP), null);
    63                 this.add(getShapeButton(canButton, 55, 64, 34, 32, "CanTip", Shp.CAN, Obj.BOYSPP), null);
    64                 this.add(getShapeButton(coneButton, 55, 96, 34, 32, "ConeTip", Shp.CONE, Obj.BOYSPP), null);
    65                 this.add(getShapeButton(sphereButton, 55, 128, 34, 32, "SphereTip", Shp.SPHERE, Obj.BOYSPP), null);
    66                 this.add(getShapeButton(barrelButton, 90, 0, 34, 32, "BarrelTip", Shp.BARREL, Obj.BOYSPP), null);
    67                 this.add(getShapeButton(superButton, 90, 32, 34, 32, "SuperTip", Shp.SUPER, Obj.BOYSPP), null);
    68                 this.add(getShapeButton(floatButton, 90, 64, 34, 32, "FloatTip", Shp.FLOAT, Obj.LITFLT), null);
    69                 this.add(getShapeButton(beaconButton, 90, 96, 34, 32, "BeaconTip", Shp.BEACON, Obj.BCNSPP), null);
    70                 this.add(getShapeButton(towerButton, 90, 128, 34, 32, "TowerTip", Shp.TOWER, Obj.BCNSPP), null);
     61                this.add(getShapeButton(pillarButton, 55, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYSPP), null);
     62                this.add(getShapeButton(sparButton, 55, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYSPP), null);
     63                this.add(getShapeButton(canButton, 55, 64, 34, 32, "Can", Shp.CAN, Obj.BOYSPP), null);
     64                this.add(getShapeButton(coneButton, 55, 96, 34, 32, "Cone", Shp.CONE, Obj.BOYSPP), null);
     65                this.add(getShapeButton(sphereButton, 55, 128, 34, 32, "Sphere", Shp.SPHERE, Obj.BOYSPP), null);
     66                this.add(getShapeButton(barrelButton, 90, 0, 34, 32, "Barrel", Shp.BARREL, Obj.BOYSPP), null);
     67                this.add(getShapeButton(superButton, 90, 32, 34, 32, "Super", Shp.SUPER, Obj.BOYSPP), null);
     68                this.add(getShapeButton(floatButton, 90, 64, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null);
     69                this.add(getShapeButton(beaconButton, 90, 96, 34, 32, "Beacon", Shp.BEACON, Obj.BCNSPP), null);
     70                this.add(getShapeButton(towerButton, 90, 128, 34, 32, "Tower", Shp.TOWER, Obj.BCNSPP), null);
    7171        }
    7272

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java

    r24931 r26096  
    6060                dlg = dia;
    6161                this.setLayout(null);
    62                 this.add(getRegionButton(regionAButton, 0, 2, 34, 30, "RegionATip"), null);
    63                 this.add(getRegionButton(regionBButton, 0, 32, 34, 30, "RegionBTip"), null);
    64                 this.add(getShapeButton(pillarButton, 0, 64, 34, 32, "PillarTip", Shp.PILLAR, Obj.BOYLAT), null);
    65                 this.add(getShapeButton(sparButton, 0, 96, 34, 32, "SparTip", Shp.SPAR, Obj.BOYLAT), null);
    66                 this.add(getShapeButton(coneButton, 0, 128, 34, 32, "ConeTip", Shp.CONE, Obj.BOYLAT), null);
    67                 this.add(getShapeButton(floatButton, 35, 0, 34, 32, "FloatTip", Shp.FLOAT, Obj.LITFLT), null);
    68                 this.add(getShapeButton(beaconButton, 35, 32, 34, 32, "BeaconTip", Shp.BEACON, Obj.BCNLAT), null);
    69                 this.add(getShapeButton(towerButton, 35, 64, 34, 32, "TowerTip", Shp.TOWER, Obj.BCNLAT), null);
    70                 this.add(getShapeButton(perchButton, 35, 96, 34, 32, "PerchTip", Shp.PERCH, Obj.BCNLAT), null);
     62                this.add(getRegionButton(regionAButton, 0, 2, 34, 30, "RegionA"), null);
     63                this.add(getRegionButton(regionBButton, 0, 32, 34, 30, "RegionB"), null);
     64                this.add(getShapeButton(pillarButton, 0, 64, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYLAT), null);
     65                this.add(getShapeButton(sparButton, 0, 96, 34, 32, "Spar", Shp.SPAR, Obj.BOYLAT), null);
     66                this.add(getShapeButton(coneButton, 0, 128, 34, 32, "Cone", Shp.CONE, Obj.BOYLAT), null);
     67                this.add(getShapeButton(floatButton, 35, 0, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null);
     68                this.add(getShapeButton(beaconButton, 35, 32, 34, 32, "Beacon", Shp.BEACON, Obj.BCNLAT), null);
     69                this.add(getShapeButton(towerButton, 35, 64, 34, 32, "Tower", Shp.TOWER, Obj.BCNLAT), null);
     70                this.add(getShapeButton(perchButton, 35, 96, 34, 32, "Perch", Shp.PERCH, Obj.BCNLAT), null);
    7171        }
    7272

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java

    r24931 r26096  
    7272                this.setLayout(null);
    7373                this.add(panelCol, null);
    74                 this.add(getTopButton(noTopButton, 40, 5, 27, 27, "NoTopTip", Top.NONE), null);
    75                 this.add(getTopButton(canTopButton, 70, 5, 27, 27, "CanTopTip", Top.CAN), null);
    76                 this.add(getTopButton(coneTopButton, 100, 5, 27, 27, "ConeTopTip", Top.CONE), null);
    77                 this.add(getTopButton(sphereTopButton, 130, 5, 27, 27, "SphereTopTip", Top.SPHERE), null);
    78                 this.add(getTopButton(XTopButton, 160, 5, 27, 27, "XTopTip", Top.X_SHAPE), null);
    79                 this.add(getTopButton(northTopButton, 40, 35, 27, 27, "NorthTopTip", Top.NORTH), null);
    80                 this.add(getTopButton(southTopButton, 70, 35, 27, 27, "SouthTopTip", Top.SOUTH), null);
    81                 this.add(getTopButton(eastTopButton, 100, 35, 27, 27, "EastTopTip", Top.EAST), null);
    82                 this.add(getTopButton(westTopButton, 130, 35, 27, 27, "WestTopTip", Top.WEST), null);
    83                 this.add(getTopButton(spheres2TopButton, 160, 35, 27, 27, "Spheres2TopTip", Top.SPHERES2), null);
    84                 this.add(getDayButton(boardDayButton, 40, 65, 27, 27, "BoardDayTip", Day.BOARD), null);
    85                 this.add(getDayButton(diamondDayButton, 70, 65, 27, 27, "DiamondDayTip", Day.DIAMOND), null);
    86                 this.add(getDayButton(triangleDayButton, 100, 65, 27, 27, "TriangleDayTip", Day.TRIANGLE), null);
    87                 this.add(getDayButton(triangleInvDayButton, 130, 65, 27, 27, "TriangleInvDayTip", Day.TRIANGLE_INV), null);
    88                 this.add(getDayButton(squareDayButton, 160, 65, 27, 27, "SquareDayTip", Day.SQUARE), null);
    89                 this.add(getDayButton(circleDayButton, 160, 95, 27, 27, "CircleDayTip", Day.CIRCLE), null);
    90                 this.add(getMoorButton(mooringTopButton, 40, 95, 27, 27, "MooringTopTip"), null);
     74                this.add(getTopButton(noTopButton, 40, 5, 27, 27, "NoTop", Top.NONE), null);
     75                this.add(getTopButton(canTopButton, 70, 5, 27, 27, "CanTop", Top.CAN), null);
     76                this.add(getTopButton(coneTopButton, 100, 5, 27, 27, "ConeTop", Top.CONE), null);
     77                this.add(getTopButton(sphereTopButton, 130, 5, 27, 27, "SphereTop", Top.SPHERE), null);
     78                this.add(getTopButton(XTopButton, 160, 5, 27, 27, "XTop", Top.X_SHAPE), null);
     79                this.add(getTopButton(northTopButton, 40, 35, 27, 27, "NorthTop", Top.NORTH), null);
     80                this.add(getTopButton(southTopButton, 70, 35, 27, 27, "SouthTop", Top.SOUTH), null);
     81                this.add(getTopButton(eastTopButton, 100, 35, 27, 27, "EastTop", Top.EAST), null);
     82                this.add(getTopButton(westTopButton, 130, 35, 27, 27, "WestTop", Top.WEST), null);
     83                this.add(getTopButton(spheres2TopButton, 160, 35, 27, 27, "Spheres2Top", Top.SPHERES2), null);
     84                this.add(getDayButton(boardDayButton, 40, 65, 27, 27, "BoardDay", Day.BOARD), null);
     85                this.add(getDayButton(diamondDayButton, 70, 65, 27, 27, "DiamondDay", Day.DIAMOND), null);
     86                this.add(getDayButton(triangleDayButton, 100, 65, 27, 27, "TriangleDay", Day.TRIANGLE), null);
     87                this.add(getDayButton(triangleInvDayButton, 130, 65, 27, 27, "TriangleInvDay", Day.TRIANGLE_INV), null);
     88                this.add(getDayButton(squareDayButton, 160, 65, 27, 27, "SquareDay", Day.SQUARE), null);
     89                this.add(getDayButton(circleDayButton, 160, 95, 27, 27, "CircleDay", Day.CIRCLE), null);
     90                this.add(getMoorButton(mooringTopButton, 40, 95, 27, 27, "MooringTop"), null);
    9191        }
    9292

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

    r26087 r26096  
    464464                ChrMAP.put(EnumSet.of(Chr.FIXED), "F");
    465465                ChrMAP.put(EnumSet.of(Chr.FLASH), "Fl");
    466                 ChrMAP.put(EnumSet.of(Chr.FIXED, Chr.FLASH), "FFl");
    467466                ChrMAP.put(EnumSet.of(Chr.LONGFLASH), "LFl");
    468467                ChrMAP.put(EnumSet.of(Chr.QUICK), "Q");
    469                 ChrMAP.put(EnumSet.of(Chr.QUICK, Chr.LONGFLASH), "Q+LFl");
    470468                ChrMAP.put(EnumSet.of(Chr.VERYQUICK), "VQ");
    471                 ChrMAP.put(EnumSet.of(Chr.VERYQUICK, Chr.LONGFLASH), "VQ+LFl");
    472469                ChrMAP.put(EnumSet.of(Chr.ULTRAQUICK), "UQ");
    473470                ChrMAP.put(EnumSet.of(Chr.INTERRUPTEDQUICK), "IQ");
    … …  
    480477                ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FIXED), "Al.F");
    481478                ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FLASH), "Al.Fl");
     479                ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FIXED, Chr.FLASH), "F.Al.Fl");
     480                ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.LONGFLASH), "Al.LFl");
    482481                ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.ISOPHASED), "Al.Iso");
    483482                ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.OCCULTING), "Al.Oc");
     483                ChrMAP.put(EnumSet.of(Chr.FIXED, Chr.FLASH), "FFl");
     484                ChrMAP.put(EnumSet.of(Chr.FIXED, Chr.LONGFLASH), "FLFl");
     485                ChrMAP.put(EnumSet.of(Chr.OCCULTING, Chr.FLASH), "OcFl");
     486                ChrMAP.put(EnumSet.of(Chr.FLASH, Chr.LONGFLASH), "FlLFl");
     487                ChrMAP.put(EnumSet.of(Chr.QUICK, Chr.LONGFLASH), "Q+LFl");
     488                ChrMAP.put(EnumSet.of(Chr.VERYQUICK, Chr.LONGFLASH), "VQ+LFl");
     489                ChrMAP.put(EnumSet.of(Chr.ULTRAQUICK, Chr.LONGFLASH), "UQ+LFl");
    484490        }
    485491       
Note: See TracChangeset for help on using the changeset viewer.