Changeset 29186 in osm for applications/editors/josm/plugins/smed2/src/symbols/Areas.java

Timestamp:

2013-01-10T17:31:17+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/symbols/Areas.java (modified) (14 diffs)

applications/editors/josm/plugins/smed2/src/symbols/Areas.java

@@ -14 +14 @@
 import java.awt.Rectangle;
 import java.awt.geom.*;
-import java.util.ArrayList;
 
 import symbols.Symbols.*;
 
 public class Areas {
-        public static final ArrayList<Instr> Plane = new ArrayList<Instr>();
+        public static final Symbol Plane = new Symbol();
         static {
                 Plane.add(new Instr(Prim.BBOX, new Rectangle(-60,-60,120,120)));
@@ -26 +25 @@
                 Plane.add(new Instr(Prim.PGON, p));
         }
-        public static final ArrayList<Instr> Cable = new ArrayList<Instr>();
+        public static final Symbol Cable = new Symbol();
         static {
                 Cable.add(new Instr(Prim.BBOX, new Rectangle(-30,-60,60,60)));
@@ -34 +33 @@
                 Cable.add(new Instr(Prim.PLIN, p));
         }
-        public static final ArrayList<Instr> LaneArrow = new ArrayList<Instr>();
+        public static final Symbol LaneArrow = new Symbol();
         static {
                 LaneArrow.add(new Instr(Prim.STRK, new BasicStroke(10.0f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER)));
@@ -42 +41 @@
                 LaneArrow.add(new Instr(Prim.PLIN, p));
         }
-        public static final ArrayList<Instr> LineAnchor = new ArrayList<Instr>();
+        public static final Symbol LineAnchor = new Symbol();
         static {
                 LineAnchor.add(new Instr(Prim.FILL, new Color(0xc480ff)));
-                LineAnchor.add(new Instr(Prim.SYMB, new Symbols.Symbol(Harbours.Anchor, 0.5, 0, 0, new Delta(Handle.CC, AffineTransform.getRotateInstance(Math.toRadians(-90.0))), null)));
+                LineAnchor.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Harbours.Anchor, 0.5, 0, 0, new Delta(Handle.CC, AffineTransform.getRotateInstance(Math.toRadians(-90.0))), null)));
         }
-        public static final ArrayList<Instr> LinePlane = new ArrayList<Instr>();
+        public static final Symbol LinePlane = new Symbol();
         static {
                 LinePlane.add(new Instr(Prim.FILL, new Color(0xc480ff)));
-                LinePlane.add(new Instr(Prim.SYMB, new Symbols.Symbol(Areas.Plane, 0.5, 0, 0, new Delta(Handle.CC, AffineTransform.getRotateInstance(Math.toRadians(-90.0))), null)));
+                LinePlane.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Areas.Plane, 0.5, 0, 0, new Delta(Handle.CC, AffineTransform.getRotateInstance(Math.toRadians(-90.0))), null)));
         }
-        public static final ArrayList<Instr> MarineFarm = new ArrayList<Instr>();
+        public static final Symbol MarineFarm = new Symbol();
         static {
                 MarineFarm.add(new Instr(Prim.STRK, new BasicStroke(3.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
@@ -62 +61 @@
                 MarineFarm.add(new Instr(Prim.RSHP, new Ellipse2D.Double(9,-2,4,4)));
         }
-        public static final ArrayList<Instr> NoWake = new ArrayList<Instr>();
+        public static final Symbol NoWake = new Symbol();
         static {
                 NoWake.add(new Instr(Prim.STRK, new BasicStroke(12.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
@@ -72 +71 @@
                 NoWake.add(new Instr(Prim.LINE, new Line2D.Double(-60,-60,60,60)));
         }
-        public static final ArrayList<Instr> Pipeline = new ArrayList<Instr>();
+        public static final Symbol Pipeline = new Symbol();
         static {
                 Pipeline.add(new Instr(Prim.BBOX, new Rectangle(-15,-60,30,60)));
@@ -80 +79 @@
                 Pipeline.add(new Instr(Prim.RSHP, new Ellipse2D.Double(-10,-60,20,20)));
         }
-        public static final ArrayList<Instr> Restricted = new ArrayList<Instr>();
+        public static final Symbol Restricted = new Symbol();
         static {
                 Restricted.add(new Instr(Prim.BBOX, new Rectangle(-15,-30,30,30)));
@@ -88 +87 @@
                 Restricted.add(new Instr(Prim.LINE, new Line2D.Double(0,-15,17,-15)));
         }
-        public static final ArrayList<Instr> Rock = new ArrayList<Instr>();
+        public static final Symbol Rock = new Symbol();
         static {
                 Rock.add(new Instr(Prim.FILL, new Color(0x80c0ff)));
@@ -99 +98 @@
                 Rock.add(new Instr(Prim.LINE, new Line2D.Double(0,-20,0,20)));
         }
-        public static final ArrayList<Instr> RockA = new ArrayList<Instr>();
+        public static final Symbol RockA = new Symbol();
         static {
                 RockA.add(new Instr(Prim.FILL, new Color(0x80c0ff)));
@@ -114 +113 @@
                 RockA.add(new Instr(Prim.RSHP, new Ellipse2D.Double(9,9,8,8)));
         }
-        public static final ArrayList<Instr> RockC = new ArrayList<Instr>();
+        public static final Symbol RockC = new Symbol();
         static {
                 RockC.add(new Instr(Prim.FILL, new Color(0x80c0ff)));
@@ -126 +125 @@
                 RockC.add(new Instr(Prim.LINE, new Line2D.Double(10,17.3,-10,-17.3)));
         }
-        public static final ArrayList<Instr> Sandwaves = new ArrayList<Instr>();
-        public static final ArrayList<Instr> Seaplane = new ArrayList<Instr>();
+        public static final Symbol Sandwaves = new Symbol();
+        public static final Symbol Seaplane = new Symbol();
         static {
                 Seaplane.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
                 Seaplane.add(new Instr(Prim.FILL, new Color(0xa30075)));
                 Seaplane.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-60,-60,120,120)));
-                Seaplane.add(new Instr(Prim.SYMB, new Symbols.Symbol(Areas.Plane, 1.0, 0, 0, null, null)));
+                Seaplane.add(new Instr(Prim.SYMB, new Symbols.SubSymbol(Areas.Plane, 1.0, 0, 0, null, null)));
         }
-        public static final ArrayList<Instr> WindFarm = new ArrayList<Instr>();
+        public static final Symbol WindFarm = new Symbol();
         static {
                 WindFarm.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
@@ -145 +144 @@
                 WindFarm.add(new Instr(Prim.LINE, new Line2D.Double(0,-27.5,-13.8,-53.6)));
         }
-        public static final ArrayList<Instr> WreckD = new ArrayList<Instr>();
+        public static final Symbol WreckD = new Symbol();
         static {
                 WreckD.add(new Instr(Prim.FILL, new Color(0x80c0ff)));
@@ -158 +157 @@
                 WreckD.add(new Instr(Prim.LINE, new Line2D.Double(20,-15,20,15)));
         }
-        public static final ArrayList<Instr> WreckND = new ArrayList<Instr>();
+        public static final Symbol WreckND = new Symbol();
         static {
                 WreckND.add(new Instr(Prim.STRK, new BasicStroke(5.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));
@@ -167 +166 @@
                 WreckND.add(new Instr(Prim.LINE, new Line2D.Double(20,-15,20,15)));
         }
-        public static final ArrayList<Instr> WreckS = new ArrayList<Instr>();
+        public static final Symbol WreckS = new Symbol();
         static {
                 WreckS.add(new Instr(Prim.STRK, new BasicStroke(3.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)));