[Magicmap-commits] SF.net SVN: magicmap: [474] trunk/magicmapclient/src/net/sf/magicmap/client /controller

[<Jan...@us...>]

Revision: 474
          http://svn.sourceforge.net/magicmap/?rev=474&view=rev
Author:   Jan_fride
Date:     2006-10-29 03:34:35 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
Removed unnecessary (un)registerXYZListerner from Controller.

Modified Paths:
--------------
    trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
    trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java	2006-10-26 14:17:56 UTC (rev 473)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java	2006-10-29 11:34:35 UTC (rev 474)
@@ -57,8 +57,8 @@
 import org.apache.log4j.xml.DOMConfigurator;
 
 /**
- * Kann \xC4nderungen an View und am Modell vornehmen und zieht alle F\xE4den der
- * Anwendung.
+ * Kann \xC4nderungen an View und am Modell vornehmen und zieht alle F\xE4den 
+ * der Anwendung.
  *
  * @author thuebner
  */
@@ -169,7 +169,7 @@
 		this.measurementView = new MeasurementView(getMeasurementModel(), nodeModel);
 		// registerMeasurementModelListener(measurementView);
 		setMeasurementViewLocal(true);
-		registerNodeModelListener(mapView);
+        nodeModel.addNodeModelListener(mapView);
 		//registerNodeModelListener(outlineView);
 	}
 
@@ -232,46 +232,6 @@
 	}
 
 	/**
-	 * Register the node model listener
-	 *
-	 * @param listener -
-	 *            the node model listener
-	 */
-	public void registerNodeModelListener(NodeModelListener listener){
-		nodeModel.addNodeModelListener(listener);
-	}
-
-	/**
-	 * Unregister the node model listener
-	 *
-	 * @param listener -
-	 *            the node model listener
-	 */
-	public void unregisterNodeModelListener(NodeModelListener listener){
-		nodeModel.removeNodeModelListener(listener);
-	}
-
-	/**
-	 * Register the measurement model listener
-	 *
-	 * @param listener
-	 *            the measurement model listener
-	 */
-	public void registerMeasurementModelListener(MeasurementModelListener listener){
-		measurementModel.addMeasurementModelListener(listener);
-	}
-
-	/**
-	 * Unregister the measurement model listener
-	 *
-	 * @param listener -
-	 *            the measurement model listener
-	 */
-	public void unregisterMeasurementModelListener(MeasurementModelListener listener){
-		measurementModel.removeMeasurementModelListener(listener);
-	}
-
-	/**
 	 * Baut das MeasurementModelOther neu auf.
 	 *
 	 * @param ap -
@@ -352,7 +312,7 @@
 			closeMap();
 		}
 		if (isMapLoaded() && isConnected()){
-			registerNodeModelListener(mapView);
+            nodeModel.addNodeModelListener(mapView);
 			serverManager.resetTimestamp();
 			setMeasurementViewLocal(true);
 			poller.start();
@@ -404,7 +364,7 @@
 		serverManager.closeMap();
 		poller.stop();
 		nodeModel.clear();
-		unregisterNodeModelListener(mapView);
+        nodeModel.removeNodeModelListener(mapView);
 //    nodeModel.addNode(client);
 	}
 

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java	2006-10-26 14:17:56 UTC (rev 473)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java	2006-10-29 11:34:35 UTC (rev 474)
@@ -62,38 +62,6 @@
 	INodeModel getNodeModel();
 
 	/**
-	 * Register the node model listener
-	 *
-	 * @param listener -
-	 *            the node model listener
-	 */
-	void registerNodeModelListener(NodeModelListener listener);
-
-	/**
-	 * Unregister the node model listener
-	 *
-	 * @param listener -
-	 *            the node model listener
-	 */
-	void unregisterNodeModelListener(NodeModelListener listener);
-
-	/**
-	 * Register the measurement model listener
-	 *
-	 * @param listener
-	 *            the measurement model listener
-	 */
-	void registerMeasurementModelListener(MeasurementModelListener listener);
-
-	/**
-	 * Unregister the measurement model listener
-	 *
-	 * @param listener -
-	 *            the measurement model listener
-	 */
-	void unregisterMeasurementModelListener(MeasurementModelListener listener);
-
-	/**
 	 * Baut das MeasurementModelOther neu auf.
 	 *
 	 * @param ap -


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.