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

Timestamp:

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

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/symbols/Symbols.java (modified) (4 diffs)

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

@@ -97 +97 @@
         }
 
-        public static class Symbol {
-                ArrayList<Instr> instr;
+        public static class Symbol extends ArrayList<Instr> {
+                private static final long serialVersionUID = 1L;
+
+                public Symbol() {
+                        super();
+                }
+        }
+        
+        public static class SubSymbol {
+                Symbol instr;
                 double scale;
                 double x;
@@ -105 +113 @@
                 Scheme scheme;
 
-                public Symbol(ArrayList<Instr> iinstr, double iscale, double ix, double iy, Delta idelta, Scheme ischeme) {
+                public SubSymbol(Symbol iinstr, double iscale, double ix, double iy, Delta idelta, Scheme ischeme) {
                         instr = iinstr;
                         scale = iscale;
@@ -115 +123 @@
         }
 
-        public static void drawSymbol(Graphics2D g2, ArrayList<Instr> symbol, double scale, double x, double y, Delta dd, Scheme cs) {
+        public static void drawSymbol(Graphics2D g2, Symbol symbol, double scale, double x, double y, Delta dd, Scheme cs) {
                 int pn = 0;
                 int cn = 0;
@@ -260 +268 @@
                                         break;
                                 case SYMB:
-                                        Symbol s = (Symbol) item.params;
+                                        SubSymbol s = (SubSymbol) item.params;
                                         drawSymbol(g2, s.instr, s.scale, s.x, s.y, s.delta, s.scheme);
                                         break;