Ignore:
Timestamp:
2013-01-10T17:31:17+01:00 (13 years ago)
Author:
malcolmh
Message:

save

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/smed2/src/symbols/Facilities.java

    r29134 r29186  
    1313import java.awt.Color;
    1414import java.awt.geom.*;
    15 import java.util.ArrayList;
    1615
    17 import symbols.Symbols.Instr;
    18 import symbols.Symbols.Prim;
     16import symbols.Symbols.*;
    1917
    2018public class Facilities {
    21         private static final ArrayList<Instr> Facility = new ArrayList<Instr>();
     19        private static final Symbol Facility = new Symbol();
    2220        static {
    2321                Facility.add(new Instr(Prim.STRK, new BasicStroke(2.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
    … …  
    2826                Facility.add(new Instr(Prim.RRCT, s));
    2927        }
    30         public static final ArrayList<Instr> Boatlift = new ArrayList<Instr>();//was Crane
     28        public static final Symbol Boatlift = new Symbol();//was Crane
    3129        static {
    32                 Boatlift.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     30                Boatlift.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    3331                Boatlift.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)));
    3432                Boatlift.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-3.7,-19.7,12,12)));
    … …  
    3634                Boatlift.add(new Instr(Prim.EARC, new Arc2D.Double(-10.0,-1.5,20,20,75.0,-260.0,Arc2D.OPEN)));
    3735        }
    38         public static final ArrayList<Instr> Boatyard = new ArrayList<Instr>();
     36        public static final Symbol Boatyard = new Symbol();
    3937        static {
    40                 Boatyard.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     38                Boatyard.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    4139                Boatyard.add(new Instr(Prim.STRK, new BasicStroke(8.0f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
    4240                Boatyard.add(new Instr(Prim.LINE, new Line2D.Double(19,19,-8,-8)));
    … …  
    4543                Boatyard.add(new Instr(Prim.PGON, p));
    4644        }
    47         public static final ArrayList<Instr> Chandler = new ArrayList<Instr>();
     45        public static final Symbol Chandler = new Symbol();
    4846        static {
    49                 Chandler.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     47                Chandler.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    5048                Chandler.add(new Instr(Prim.STRK, new BasicStroke(5.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
    5149                Chandler.add(new Instr(Prim.ELPS, new Ellipse2D.Double(14,7,10,10)));
    … …  
    5553                Chandler.add(new Instr(Prim.EARC, new Arc2D.Double(-16.0,-20.5,24,24,0.0,180.0,Arc2D.OPEN)));
    5654        }
    57         public static final ArrayList<Instr> Fuel = new ArrayList<Instr>();
     55        public static final Symbol Fuel = new Symbol();
    5856        static {
    59                 Fuel.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     57                Fuel.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    6058                Fuel.add(new Instr(Prim.STRK, new BasicStroke(2.5f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
    6159                Fuel.add(new Instr(Prim.FILL, new Color(0xa30075)));
    … …  
    6967                Fuel.add(new Instr(Prim.PLIN, p));
    7068        }
    71         public static final ArrayList<Instr> Laundrette = new ArrayList<Instr>();
     69        public static final Symbol Laundrette = new Symbol();
    7270        static {
    73                 Laundrette.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     71                Laundrette.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    7472                Laundrette.add(new Instr(Prim.STRK, new BasicStroke(1.5f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
    7573                Laundrette.add(new Instr(Prim.FILL, new Color(0xa30075)));
    … …  
    8078                Laundrette.add(new Instr(Prim.PLIN, p));
    8179        }
    82         public static final ArrayList<Instr> PumpOut = new ArrayList<Instr>();
     80        public static final Symbol PumpOut = new Symbol();
    8381        static {
    84                 PumpOut.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     82                PumpOut.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    8583                PumpOut.add(new Instr(Prim.STRK, new BasicStroke(2.5f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
    8684                PumpOut.add(new Instr(Prim.FILL, new Color(0xa30075)));
    … …  
    9694                PumpOut.add(new Instr(Prim.PGON, p));
    9795        }
    98         public static final ArrayList<Instr> SailingClub = new ArrayList<Instr>();
     96        public static final Symbol SailingClub = new Symbol();
    9997        static {
    100                 SailingClub.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     98                SailingClub.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    10199                SailingClub.add(new Instr(Prim.STRK, new BasicStroke(2.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
    102100                SailingClub.add(new Instr(Prim.FILL, new Color(0xa30075)));
    … …  
    105103                SailingClub.add(new Instr(Prim.PGON, p));
    106104        }
    107         public static final ArrayList<Instr> Shower = new ArrayList<Instr>();
     105        public static final Symbol Shower = new Symbol();
    108106        static {
    109                 Shower.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     107                Shower.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    110108                Shower.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
    111109                Shower.add(new Instr(Prim.FILL, new Color(0xa30075)));
    … …  
    119117                Shower.add(new Instr(Prim.PLIN, p));
    120118        }
    121         public static final ArrayList<Instr> Slipway = new ArrayList<Instr>();
     119        public static final Symbol Slipway = new Symbol();
    122120        static {
    123                 Slipway.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     121                Slipway.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    124122                Slipway.add(new Instr(Prim.STRK, new BasicStroke(3.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
    125123                Slipway.add(new Instr(Prim.FILL, new Color(0xa30075)));
    … …  
    136134                Slipway.add(new Instr(Prim.PGON, p));
    137135        }
    138         public static final ArrayList<Instr> Toilet = new ArrayList<Instr>();
     136        public static final Symbol Toilet = new Symbol();
    139137        static {
    140                 Toilet.add(new Instr(Prim.SYMB, new Symbols.Symbol(Facilities.Facility, 1.0, 0, 0, null, null)));
     138                Toilet.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Facilities.Facility, 1.0, 0, 0, null, null)));
    141139                Toilet.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
    142140                Toilet.add(new Instr(Prim.FILL, new Color(0xa30075)));
    … …  
    153151                Toilet.add(new Instr(Prim.PGON, p));
    154152        }
    155         public static final ArrayList<Instr> VisitorBerth = new ArrayList<Instr>();
     153        public static final Symbol VisitorBerth = new Symbol();
    156154        static {
    157155                VisitorBerth.add(new Instr(Prim.FILL, new Color(0xa30075)));
    … …  
    162160                VisitorBerth.add(new Instr(Prim.PGON, p));
    163161        }
    164         public static final ArrayList<Instr> VisitorMooring = new ArrayList<Instr>();
     162        public static final Symbol VisitorMooring = new Symbol();
    165163        static {
    166164                VisitorMooring.add(new Instr(Prim.FILL, new Color(0xa30075)));
Note: See TracChangeset for help on using the changeset viewer.