Index: applications/editors/josm/plugins/smed2/js57toosm/build.xml
===================================================================
--- applications/editors/josm/plugins/smed2/js57toosm/build.xml (revision 30284)
+++ applications/editors/josm/plugins/smed2/js57toosm/build.xml (revision 30285)
@@ -11,5 +11,5 @@
-
+
Index: applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java
===================================================================
--- applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
@@ -51,7 +51,7 @@
MapBounds bounds = S57dec.decodeFile(in, types, map);
- out.format("");
- out.format("");
- out.format("", bounds.minlat, bounds.minlon, bounds.maxlat, bounds.maxlon);
+ out.format("%n");
+ out.format("%n");
+ out.format("%n", bounds.minlat, bounds.minlon, bounds.maxlat, bounds.maxlon);
for (long id : map.index.keySet()) {
Index: applications/editors/josm/plugins/smed2/src/messages/Messages.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/messages/Messages.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/messages/Messages.java (revision 30285)
@@ -1,2 +1,11 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see .
+ */
+
package messages;
Index: applications/editors/josm/plugins/smed2/src/panels/PanelMain.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/panels/PanelMain.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/panels/PanelMain.java (revision 30285)
@@ -1,2 +1,11 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see .
+ */
+
package panels;
@@ -9,7 +18,5 @@
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.io.*;
import javax.imageio.ImageIO;
@@ -20,7 +27,6 @@
import org.openstreetmap.josm.Main;
-import s57.S57att.Att;
-import s57.S57obj.Obj;
-import s57.S57val.*;
+import s57.S57att.*;
+import s57.S57obj.*;
import s57.S57map.*;
import render.Renderer;
@@ -29,5 +35,4 @@
public class PanelMain extends JPanel {
- Smed2Action dlg;
BufferedImage img;
int w, h, z, f;
@@ -42,16 +47,24 @@
};
private JButton importButton = null;
- final JFileChooser ifc = new JFileChooser();
+ JFileChooser ifc = new JFileChooser(Main.pref.get("smed2plugin.file"));
private ActionListener alImport = new ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
if (e.getSource() == importButton) {
- messageBar.setText("Select file");
- int returnVal = ifc.showOpenDialog(Main.parent);
- if (returnVal == JFileChooser.APPROVE_OPTION) {
-// xxx.startImport(ifc.getSelectedFile());
- } else {
- messageBar.setText("");
- }
- }
+ Smed2Action.panelS57.setVisible(true);
+ messageBar.setText("Select S-57 ENC file for import");
+ int returnVal = ifc.showOpenDialog(Main.parent);
+ if (returnVal == JFileChooser.APPROVE_OPTION) {
+ try {
+ Main.pref.put("smed2plugin.file", ifc.getSelectedFile().getPath());
+ Smed2Action.panelS57.startImport(ifc.getSelectedFile());
+ } catch (IOException e1) {
+ Smed2Action.panelS57.setVisible(false);
+ messageBar.setText("IO Exception");
+ }
+ } else {
+ Smed2Action.panelS57.setVisible(false);
+ messageBar.setText("");
+ }
+ }
}
};
@@ -62,10 +75,17 @@
public void actionPerformed(java.awt.event.ActionEvent e) {
if (e.getSource() == exportButton) {
- messageBar.setText("Select file");
+ Smed2Action.panelS57.setVisible(true);
+ messageBar.setText("Select S-57 ENC file for export");
int returnVal = efc.showOpenDialog(Main.parent);
if (returnVal == JFileChooser.APPROVE_OPTION) {
-// xxx.startExport(efc.getSelectedFile());
+ try {
+ Smed2Action.panelS57.startExport(efc.getSelectedFile());
+ } catch (IOException e1) {
+ Smed2Action.panelS57.setVisible(false);
+ messageBar.setText("IO Exception");
+ }
} else {
- messageBar.setText("");
+ Smed2Action.panelS57.setVisible(false);
+ messageBar.setText("");
}
}
@@ -73,6 +93,5 @@
};
- public PanelMain(Smed2Action dia) {
- dlg = dia;
+ public PanelMain() {
setLayout(null);
setSize(new Dimension(480, 480));
@@ -120,5 +139,5 @@
img = new BufferedImage(Integer.parseInt(wt.getText()), Integer.parseInt(ht.getText()), BufferedImage.TYPE_INT_ARGB);
Graphics2D g2 = img.createGraphics();
- Renderer.reRender(g2, Integer.parseInt(zt.getText()), Integer.parseInt(ft.getText()), dlg.map, dlg.rendering);
+ Renderer.reRender(g2, Integer.parseInt(zt.getText()), Integer.parseInt(ft.getText()), Smed2Action.map, Smed2Action.rendering);
try {
ImageIO.write(img, "png", new File("/Users/mherring/Desktop/export.png"));
Index: applications/editors/josm/plugins/smed2/src/panels/ShowFrame.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/panels/ShowFrame.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/panels/ShowFrame.java (revision 30285)
@@ -1,2 +1,11 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see .
+ */
+
package panels;
Index: applications/editors/josm/plugins/smed2/src/render/MapContext.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/render/MapContext.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/render/MapContext.java (revision 30285)
@@ -1,2 +1,11 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see .
+ */
+
package render;
Index: applications/editors/josm/plugins/smed2/src/render/Renderer.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/render/Renderer.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/render/Renderer.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/render/Rules.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/render/Rules.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/render/Rules.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/render/Signals.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/render/Signals.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/render/Signals.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/s57/S57att.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/s57/S57att.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/s57/S57att.java (revision 30285)
@@ -1,2 +1,11 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see .
+ */
+
package s57;
Index: applications/editors/josm/plugins/smed2/src/s57/S57dat.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/s57/S57dat.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/s57/S57dat.java (revision 30285)
@@ -1,4 +1,14 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see .
+ */
+
package s57;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -165,4 +175,6 @@
private static int index;
private static S57field field;
+ private static String aall = "US-ASCII";
+ private static String nall = "US-ASCII";
public static int rnum;
@@ -219,9 +231,17 @@
if (conv.bin == 0) {
String str = "";
+ int i = 0;
if (conv.asc == 0) {
- while (buffer[offset] != 0x1f) {
- str += (char)(buffer[offset++]);
- }
- offset++;
+ for (i=0; buffer[offset+i] != 0x1f; i++) {}
+ try {
+ String charset = "";
+ if (field == S57field.ATTF) charset = aall;
+ else if (field == S57field.NATF) charset = nall;
+ else charset = "US-ASCII";
+ str = new String(buffer, offset, i, charset);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ offset += i + 1;
} else {
str = new String(buffer, offset, conv.asc);
@@ -239,4 +259,23 @@
}
offset += Math.abs(conv.bin);
+ if ((subf == S57subf.AALL) || (subf == S57subf.NALL)) {
+ String charset = "";
+ switch ((int)val) {
+ case 0:
+ charset = "US-ASCII";
+ break;
+ case 1:
+ charset = "ISO-8859-1";
+ break;
+ case 2:
+ charset = "UTF-16LE";
+ break;
+ }
+ if (subf == S57subf.NALL) {
+ nall = charset;
+ } else {
+ aall = charset;
+ }
+ }
return val;
} else {
Index: applications/editors/josm/plugins/smed2/src/s57/S57dec.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/s57/S57dec.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/s57/S57dec.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
@@ -65,4 +65,8 @@
}
break;
+ case DSSI:
+ S57dat.getSubf(record, fields + pos, S57field.DSSI, S57subf.AALL);
+ S57dat.getSubf(S57subf.NALL);
+ break;
case DSPM:
comf = (double) (Long) S57dat.getSubf(record, fields + pos, S57field.DSPM, S57subf.COMF);
Index: applications/editors/josm/plugins/smed2/src/s57/S57map.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/s57/S57map.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/s57/S57map.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
@@ -93,5 +93,5 @@
public enum Rflag {
- UNKN, AGGR, MASTER, SLAVE
+ UNKN, MASTER, SLAVE
}
@@ -120,13 +120,4 @@
public ObjMap() {
super(Obj.class);
- }
- }
-
- public class Aggr {
- public RelTab rels;
- public long par;
- public Aggr() {
- rels = new RelTab();
- par = 0;
}
}
@@ -218,5 +209,5 @@
public Obj type; // Feature type
public AttMap atts; // Feature attributes
- public Aggr aggr; // Related objects
+ public RelTab rels; // Related objects
public ObjMap objs; // Slave object attributes
@@ -224,7 +215,7 @@
reln = Rflag.UNKN;
geom = new Geom(Pflag.NOSP);
- type = Obj.C_AGGR;
+ type = Obj.UNKOBJ;
atts = new AttMap();
- aggr = new Aggr();
+ rels = new RelTab();
objs = new ObjMap();
}
@@ -271,5 +262,5 @@
obj = Obj.BOYLAT;
if (obj == Obj.C_AGGR)
- feature.reln = Rflag.AGGR;
+ feature.reln = Rflag.UNKN;
feature.geom = new Geom(p);
feature.type = obj;
@@ -280,5 +271,5 @@
public void newObj(long id, int rind) {
- Rflag r = Rflag.AGGR;
+ Rflag r = Rflag.UNKN;
switch (rind) {
case 1:
@@ -292,5 +283,5 @@
break;
}
- feature.aggr.rels.add(new Reln(id, r));
+ feature.rels.add(new Reln(id, r));
}
@@ -354,11 +345,8 @@
for (long id : index.keySet()) {
Feature feature = index.get(id);
- for (Reln reln : feature.aggr.rels) {
+ for (Reln reln : feature.rels) {
Feature rel = index.get(reln.id);
if (cmpGeoms(feature.geom, rel.geom)) {
switch (reln.reln) {
- case MASTER:
- feature.reln = Rflag.AGGR;
- break;
case SLAVE:
feature.reln = Rflag.MASTER;
@@ -388,5 +376,5 @@
for (long id : index.keySet()) {
Feature feature = index.get(id);
- for (Reln reln : feature.aggr.rels) {
+ for (Reln reln : feature.rels) {
Feature rel = index.get(reln.id);
if (rel.reln == Rflag.SLAVE) {
@@ -408,5 +396,5 @@
nodes.put(id, node);
feature = new Feature();
- feature.reln = Rflag.AGGR;
+ feature.reln = Rflag.UNKN;
feature.geom.prim = Pflag.POINT;
feature.geom.elems.add(new Prim(id));
@@ -416,5 +404,5 @@
public void addEdge(long id) {
feature = new Feature();
- feature.reln = Rflag.AGGR;
+ feature.reln = Rflag.UNKN;
feature.geom.prim = Pflag.LINE;
feature.geom.elems.add(new Prim(id));
@@ -436,5 +424,5 @@
public void addArea(long id) {
feature = new Feature();
- feature.reln = Rflag.AGGR;
+ feature.reln = Rflag.UNKN;
feature.geom.prim = Pflag.AREA;
feature.geom.elems.add(new Prim(id));
@@ -447,4 +435,5 @@
public void addTag(String key, String val) {
+ feature.reln = Rflag.MASTER;
String subkeys[] = key.split(":");
if ((subkeys.length > 1) && subkeys[0].equals("seamark")) {
@@ -461,30 +450,30 @@
att = S57att.enumAttribute(subkeys[2], obj);
}
- ObjTab items = feature.objs.get(obj);
- if (items == null) {
- items = new ObjTab();
- feature.objs.put(obj, items);
- Feature type = new Feature();
- type.reln = Rflag.SLAVE;
- type.type = obj;
- type.geom = feature.geom;
- }
-// AttMap atts = items.get(idx);
-// if (atts == null) {
-// atts = new AttMap();
-// items.put(idx, atts);
-// }
-// AttVal attval = S57val.convertValue(val, att);
-// if (attval.val != null)
-// atts.put(att, attval);
+ ObjTab objs = feature.objs.get(obj);
+ if (objs == null) {
+ objs = new ObjTab();
+ feature.objs.put(obj, objs);
+ }
+ AttMap atts = objs.get(idx);
+ if (atts == null) {
+ atts = new AttMap();
+ objs.put(idx, atts);
+ }
+ AttVal attval = S57val.convertValue(val, att);
+ if (attval.val != null)
+ atts.put(att, attval);
} else {
if (subkeys[1].equals("type")) {
obj = S57obj.enumType(val);
- if (feature.objs.get(feature.type) == null) {
- feature.objs.put(feature.type, new ObjTab());
- Feature type = new Feature();
- type.reln = Rflag.MASTER;
- type.type = obj;
- type.geom = feature.geom;
+ feature.type = obj;
+ ObjTab objs = feature.objs.get(obj);
+ if (objs == null) {
+ objs = new ObjTab();
+ feature.objs.put(obj, objs);
+ }
+ AttMap atts = objs.get(0);
+ if (atts == null) {
+ atts = new AttMap();
+ objs.put(0, atts);
}
} else {
Index: applications/editors/josm/plugins/smed2/src/s57/S57obj.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/s57/S57obj.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/s57/S57obj.java (revision 30285)
@@ -1,2 +1,11 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see .
+ */
+
package s57;
Index: applications/editors/josm/plugins/smed2/src/s57/S57val.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/s57/S57val.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/s57/S57val.java (revision 30285)
@@ -1,2 +1,11 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see .
+ */
+
package s57;
Index: applications/editors/josm/plugins/smed2/src/smed2/MapImage.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/smed2/MapImage.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/smed2/MapImage.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/smed2/Smed2.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/smed2/Smed2.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/smed2/Smed2.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
@@ -31,5 +31,5 @@
import s57.S57map;
import s57.S57map.*;
-
+import panels.PanelS57;
import panels.PanelMain;
import panels.ShowFrame;
@@ -41,6 +41,7 @@
private boolean isOpen = false;
public static PanelMain panelMain = null;
- public MapImage rendering;
- public S57map map = null;
+ public static PanelS57 panelS57 = null;
+ public static MapImage rendering;
+ public static S57map map = null;
public DataSet data = null;
@@ -118,11 +119,13 @@
editFrame.setAlwaysOnTop(true);
editFrame.setVisible(true);
- panelMain = new PanelMain(this);
+ panelMain = new PanelMain();
editFrame.add(panelMain);
+
+ panelS57 = new PanelS57();
+ editFrame.add(panelS57);
showFrame = new ShowFrame(tr("Seamark Inspector"));
showFrame.setSize(new Dimension(300, 300));
- Rectangle rect = Main.map.mapView.getBounds();
- showFrame.setLocation(50, (rect.y + rect.height - 200));
+ showFrame.setLocation(50, 400);
showFrame.setResizable(false);
showFrame.setAlwaysOnTop(true);
@@ -159,5 +162,5 @@
newLayer.data.addDataSetListener(dataSetListener);
data = newLayer.data;
- makeMap();
+// makeMap();
} else {
data = null;
@@ -181,5 +184,5 @@
Feature id = map.index.get(feature.getUniqueId());
if (id != null) {
- panelMain.parseMark(id);
+// panelMain.parseMark(id);
showFrame.setVisible(true);
showFrame.showFeature(feature, map);
Index: applications/editors/josm/plugins/smed2/src/symbols/Areas.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Areas.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Areas.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2012 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/symbols/Beacons.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Beacons.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Beacons.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2012 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/symbols/Buoys.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Buoys.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Buoys.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2012 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/symbols/Facilities.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Facilities.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Facilities.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2012 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/symbols/Harbours.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Harbours.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Harbours.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2012 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/symbols/Landmarks.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Landmarks.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Landmarks.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2012 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/symbols/Notices.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Notices.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Notices.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2012 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/symbols/Symbols.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Symbols.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Symbols.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2013 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify
Index: applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java
===================================================================
--- applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java (revision 30284)
+++ applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java (revision 30285)
@@ -1,3 +1,3 @@
-/* Copyright 2012 Malcolm Herring
+/* Copyright 2014 Malcolm Herring
*
* This is free software: you can redistribute it and/or modify