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

[<fle...@us...>]

Revision: 540
          http://svn.sourceforge.net/magicmap/?rev=540&view=rev
Author:   flederohr
Date:     2007-02-16 12:47:06 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
changed behavior of measurement table model
now only updates for selected node

Modified Paths:
--------------
    trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java
    trunk/magicmapclient/src/net/sf/magicmap/client/measurement/MeasurementUtils.java
    trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java
    trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementTableModel.java

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java	2007-02-16 19:36:24 UTC (rev 539)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java	2007-02-16 20:47:06 UTC (rev 540)
@@ -5,6 +5,7 @@
 package net.sf.magicmap.client.interfaces;
 
 import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
+import net.sf.magicmap.client.model.node.AccessPointSeerNode;
 
 import java.util.EventListener;
 
@@ -13,11 +14,11 @@
  */
 public interface MeasurementModelListener extends EventListener {
 
-    public void seesAccessPoint(SeenAccessPoint ap);
+    public void seesAccessPoint(AccessPointSeerNode node, SeenAccessPoint ap);
 
-    public void notseesAccessPoint(SeenAccessPoint ap);
+    public void notseesAccessPoint(AccessPointSeerNode node, SeenAccessPoint ap);
 
-    public void updateAccessPoint(SeenAccessPoint ap);
+    public void updateAccessPoint(AccessPointSeerNode node, SeenAccessPoint ap);
 
     public void updateAccessPoints();
 

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/measurement/MeasurementUtils.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/measurement/MeasurementUtils.java	2007-02-16 19:36:24 UTC (rev 539)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/measurement/MeasurementUtils.java	2007-02-16 20:47:06 UTC (rev 540)
@@ -30,7 +30,6 @@
         result = result * Constants.MIN_SIGNALLEVEL / (Constants.MIN_SIGNALLEVEL - Constants.MAX_SIGNALLEVEL);
         if (result > Constants.MIN_SIGNALLEVEL) {
             result = Constants.MIN_SIGNALLEVEL;
-            System.out.println(Constants.MIN_SIGNALLEVEL + " \xFCberschritten");
         }
         return result;
     }

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java	2007-02-16 19:36:24 UTC (rev 539)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java	2007-02-16 20:47:06 UTC (rev 540)
@@ -122,21 +122,21 @@
     protected final void fireAccessPointAdded(AccessPointSeerNode node, SeenAccessPoint ap){
         MeasurementModelListener[] modelListeners = listeners.getListeners(MeasurementModelListener.class);
         for (MeasurementModelListener l : modelListeners) {
-            l.seesAccessPoint(ap);
+            l.seesAccessPoint(node, ap);
         }
     }
 
     protected final void fireAccessPointRemoved(AccessPointSeerNode node, SeenAccessPoint ap){
         MeasurementModelListener[] modelListeners = listeners.getListeners(MeasurementModelListener.class);
         for (MeasurementModelListener l : modelListeners) {
-            l.notseesAccessPoint(ap);
+            l.notseesAccessPoint(node, ap);
         }
     }
 
     protected final void fireAccessPointChanged(AccessPointSeerNode node, SeenAccessPoint ap){
         MeasurementModelListener[] modelListeners = listeners.getListeners(MeasurementModelListener.class);
         for (MeasurementModelListener l : modelListeners) {
-            l.updateAccessPoint(ap);
+            l.updateAccessPoint(node, ap);
         }
     }
 

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementTableModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementTableModel.java	2007-02-16 19:36:24 UTC (rev 539)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementTableModel.java	2007-02-16 20:47:06 UTC (rev 540)
@@ -84,7 +84,7 @@
 	 * Removes an accespoint from this model.
 	 * @param ap the accesspoint to remove
 	 */
-	public void notseesAccessPoint(SeenAccessPoint ap){
+	public void notseesAccessPoint(AccessPointSeerNode node, SeenAccessPoint ap){
 		MeasurementTableModel.log.info("notseesAccessPoint");
 		if (null == this.seerNode) return;
 		String key = ap.getMac().toLowerCase();
@@ -105,9 +105,9 @@
 	/**
 	 * Adds an accesspoint to this model.
 	 */
-	public void seesAccessPoint(SeenAccessPoint ap){
+	public void seesAccessPoint(AccessPointSeerNode node, SeenAccessPoint ap){
 		MeasurementTableModel.log.info("seesAccessPoint");
-		if (null == this.seerNode) return;
+		if (null == this.seerNode || this.seerNode != node) return;
 		//ArrayList<AccessPointNode> seenAccessPoints = this.seerNode.getSeenAccessPoints();
 		// if (seenAccessPoints.contains(ap)) {
 		String key = ap.getMac().toLowerCase();
@@ -125,9 +125,9 @@
 	 *
 	 * @param ap the changed access point
 	 */
-	public void updateAccessPoint(SeenAccessPoint ap){
+	public void updateAccessPoint(AccessPointSeerNode node, SeenAccessPoint ap){
 		// We have no seer.
-		if (this.seerNode == null){
+		if (this.seerNode == null || this.seerNode != node){
 			return;
 		}
 
@@ -138,7 +138,7 @@
 			// should not happen? but does from time to time ;-)
 			if (row >= getRowCount()){
 				log.error("Row: " + row + ": RowCount: " + getRowCount());
-				seesAccessPoint(ap);
+				seesAccessPoint(node, ap);
 			}
 			else if (row >= 0) {
 				setValueAt(ap.isDead() ? "-" : new Double(ap.getLastSignalLevel()) + " dB", row, 1);
@@ -147,7 +147,10 @@
 				setValueAt(ap, row, 4);
 				fireTableRowsUpdated(row, row);
 			}
-		}
+		} else {
+            seesAccessPoint(node, ap);
+        }
+            
 
 	}
 


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