Index: /applications/editors/josm/plugins/graphview/build.xml
===================================================================
--- /applications/editors/josm/plugins/graphview/build.xml	(revision 19053)
+++ /applications/editors/josm/plugins/graphview/build.xml	(revision 19054)
@@ -1,4 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+** This is the build file for the graphview plugin
+**
+** Maintaining versions
+** ====================
+** see README.template
+**
+** Usage
+** =====
+** To build it run
+**
+**    > ant  dist
+**
+** To install the generated plugin locally (in your default plugin directory) run
+**
+**    > ant  install
+**
+** To build against the core in ../../core, create a correct manifest and deploy to
+** SVN, 
+**    set the properties commit.message and plugin.main.version
+** and run
+**    > ant  publish
+**
+**
+-->
 <project name="graphview" default="dist" basedir=".">
 
+	<property name="commit.message" value="Updated to JOSM 2621; updated build.xml" />
+	<property name="plugin.main.version" value="2621" />
+	
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.build.dir"       value="build"/>
@@ -57,5 +86,5 @@
                 <attribute name="Plugin-Description" value="Visualizes routing information as a routing graph."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Graphview"/>
-                <attribute name="Plugin-Mainversion" value="2578"/>
+                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
@@ -106,3 +135,103 @@
         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
+	
+	
+	<!--
+		 ************************** Publishing the plugin *********************************** 
+		-->
+		<!--
+		** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+		** property ${coreversion.info.entry.revision}
+		**
+		-->
+		<target name="core-info">
+			<exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+				<env key="LANG" value="C"/>
+				<arg value="info"/>
+				<arg value="--xml"/>
+				<arg value="../../core"/>
+			</exec>
+			<xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+			<echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+			<echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+			<delete file="core.info.xml" />
+		</target>
+
+		<!--
+		** commits the source tree for this plugin
+		-->
+		<target name="commit-current">
+			<echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+			<exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+				<env key="LANG" value="C"/>
+				<arg value="commit"/>
+				<arg value="-m '${commit.message}'"/>
+				<arg value="."/>
+			</exec>
+		</target>
+
+		<!--
+		** updates (svn up) the source tree for this plugin
+		-->
+		<target name="update-current">
+			<echo>Updating plugin source ...</echo>
+			<exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+				<env key="LANG" value="C"/>
+				<arg value="up"/>
+				<arg value="."/>
+			</exec>
+			<echo>Updating ${plugin.jar} ...</echo>
+			<exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+				<env key="LANG" value="C"/>
+				<arg value="up"/>
+				<arg value="../dist/${plugin.jar}"/>
+			</exec>
+		</target>
+
+		<!--
+		** commits the plugin.jar 
+		-->
+		<target name="commit-dist">
+			<echo>
+	***** Properties of published ${plugin.jar} *****
+	Commit message    : '${commit.message}'					
+	Plugin-Mainversion: ${plugin.main.version}
+	JOSM build version: ${coreversion.info.entry.revision}
+	Plugin-Version    : ${version.entry.commit.revision}
+	***** / Properties of published ${plugin.jar} *****					
+						
+	Now commiting ${plugin.jar} ...
+	</echo>
+			<exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+				<env key="LANG" value="C"/>
+				<arg value="-m '${commit.message}'"/>
+				<arg value="commit"/>
+				<arg value="${plugin.jar}"/>
+			</exec>
+		</target>
+
+		<!-- ** make sure svn is present as a command line tool ** -->
+		<target name="ensure-svn-present">
+			<exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+				<env key="LANG" value="C" />
+				<arg value="--version" />
+			</exec>
+			<fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+				<!-- return code not set at all? Most likely svn isn't installed -->
+				<condition>
+					<not>
+						<isset property="svn.exit.code" />
+					</not>
+				</condition>
+			</fail>
+			<fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+				<!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+				<condition>
+					<isfailure code="${svn.exit.code}" />
+				</condition>
+			</fail>
+		</target>
+
+		<target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+		</target>
 </project>
Index: /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java
===================================================================
--- /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java	(revision 19053)
+++ /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java	(revision 19054)
@@ -16,6 +16,7 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -236,7 +237,7 @@
 				newFrame.addToggleDialog(laneDialog);
 			}
-			Layer.listeners.add(this);
+			MapView.addLayerChangeListener(this);
 		} else {
-			Layer.listeners.remove(this);
+			MapView.removeLayerChangeListener(this);
 		}
 	}
Index: /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java
===================================================================
--- /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java	(revision 19053)
+++ /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java	(revision 19054)
@@ -24,8 +24,8 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.plugins.graphview.core.graph.GraphEdge;
 import org.openstreetmap.josm.plugins.graphview.core.graph.GraphNode;
@@ -84,5 +84,5 @@
 	public GraphViewLayer() {
 		super("Graph view");
-		Layer.listeners.add(this);
+		MapView.addLayerChangeListener(this);
 	}
 
@@ -343,5 +343,7 @@
 	}
 	public void layerRemoved(Layer oldLayer) {
-		//do nothing
+		if (oldLayer == this) {
+			MapView.removeLayerChangeListener(this);
+		}
 	}
 }