magicmap-commits Mailing List for MagicMap (Page 4)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 658
          http://svn.sourceforge.net/magicmap/?rev=658&view=rev
Author:   anweiss
Date:     2007-05-30 07:50:55 -0700 (Wed, 30 May 2007)

Log Message:
-----------
added the possibility to add listeners to the pollhandler

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

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
===================================================================

--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java	2007-05-30 14:49:26 UTC (rev 657)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java	2007-05-30 14:50:55 UTC (rev 658)
@@ -6,9 +6,11 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Collection;
 
 import javax.swing.SwingUtilities;
 
+import net.sf.magicmap.client.interfaces.PollHandlerListener;
 import net.sf.magicmap.client.interfaces.ServerPollerListener;
 import net.sf.magicmap.client.model.node.AccessPointNode;
 import net.sf.magicmap.client.model.node.ClientNode;
@@ -19,7 +21,6 @@
 import net.sf.magicmap.client.model.node.MapNode;
 import net.sf.magicmap.client.model.node.Node;
 import net.sf.magicmap.client.model.node.NodeModelConstants;
-import net.sf.magicmap.client.model.node.AccessPointSeerNode.MeasurementModel;
 import net.sf.magicmap.server.dto.AccessPointDTO;
 import net.sf.magicmap.server.dto.ClientDTO;
 import net.sf.magicmap.server.dto.GeoPointDTO;
@@ -28,6 +29,8 @@
 import net.sf.magicmap.server.dto.SignalCharacterDTO;
 import net.sf.magicmap.server.dto.SimpleScanResultDTO;
 
+import org.apache.log4j.Logger;
+
 /**
  * Wertet die Ergebnisse des Pollers aus und gibt sie in geeigneter Weise an den
  * Client weiter.
@@ -36,11 +39,14 @@
  */
 public class PollHandler implements ServerPollerListener {
 
-    private Controller controller;
+    private Controller                            controller;
 
+    private final static Collection<PollHandlerListener> listeners = new ArrayList<PollHandlerListener>();
+
     public PollHandler(Controller controller) {
         this.controller = controller;
     }
+    private final Logger log = Logger.getLogger(PollHandler.class);
 
     /**
      * Werte ein PositionDTO-Objekt aus und generiert entsprechende Ergenisse
@@ -58,7 +64,7 @@
 
                 public void run(){
                     try {
-                        if (!controller.isConnected()){
+                        if (!controller.isConnected()) {
                             return;
                         }
                         INodeModel nodeModel = PollHandler.this.controller.getNodeModel();
@@ -74,11 +80,11 @@
                                         ((LocationNode) node).remove();
                                         nodeModel.removeNode(node);
                                     } else
-                                        System.out
-                                                .println("Position with location information deleted, but node with given name is not a location!");
+                                        log
+                                                .info("Position with location information deleted, but node with given name is not a location!");
                                 } else
-                                    System.out
-                                            .println("Position with location information deleted, but no node found for it.");
+                                    log.info("Position with location information deleted, but no node found for it.");
+                                firePositionCreatedOrUpdatedOrDeleted();
                                 return;
                             }
                             if (position.getClient() != null) // Node client =
@@ -88,31 +94,34 @@
                                 if (ap != null) {
                                     // AccessPoint wurde "frei" gemacht
                                     ap.setFix(false);
-                                    System.out.println("Accesspoint unfixed.");
+                                    log.info("Accesspoint unfixed.");
                                 } else
-                                    System.out.println("Position with accesspoint deleted, but no node found for it.");
+                                    log.info("Position with accesspoint deleted, but no node found for it.");
                                 return;
                             }
-                            System.out
-                                    .println("Position with id " + position.getId() + " was deleted but not handled.");
+                            log.info("Position with id " + position.getId() + " was deleted but not handled.");
+                            firePositionCreatedOrUpdatedOrDeleted();                                
                             return;
                         } else {
                             // Neues Positionsobjekt oder altes wurde
                             // aktualisiert (Location)
                             if (position.getClient() == null && position.getAccessPoint() == null) {
                                 handlePositionXYZ(node, nodeModel, position);
+                                firePositionCreatedOrUpdatedOrDeleted();
                                 return;
                             }
                             if (position.getAccessPoint() != null) {
                                 handleAccessPointXYZ(nodeModel, position);
+                                firePositionCreatedOrUpdatedOrDeleted();
                                 return;
                             }
                             if (position.getClient() != null && position.getCharacter() != null) {
                                 handleClientXYZ(nodeModel, position);
+                                firePositionCreatedOrUpdatedOrDeleted();
                                 return;
                             }
                         }
-                        System.out.println("Unbekannte Position. Kann nix anfangen damit.");
+                        log.error("Unbekannte Position. Kann nix anfangen damit.");
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -173,7 +182,7 @@
                 if (!ap.isHidden()) location.seesAccessPoint(ap, r.getSignalLevel());
             }
         } else {
-            System.out.println("Referenzpunkt verschoben.");
+            log.info("Referenzpunkt verschoben.");
             // Referenzpunkt wird nur aktualisiert, wir
             // gehen davon aus
             // das sich nur die Position ver\xE4ndern darf
@@ -240,7 +249,7 @@
      * @param position
      */
     private void handleAccessPointXYZ(INodeModel nodeModel, PositionDTO position){
-        System.out.println("Accesspointposition erzeugt oder aktualisiert.");
+        log.info("Accesspointposition erzeugt oder aktualisiert.");
         AccessPointDTO apdto = position.getAccessPoint();
         AccessPointNode ap = nodeModel.findAccessPoint(apdto.getMac());
         if (ap == null) {
@@ -261,7 +270,7 @@
         } else {
             // Loser AccessPoint gemeldet
             ap.setFix(false);
-            System.out.println("Unfix accesspoint received. This was not in our contract.");
+            log.error("Unfixed accesspoint received. This was not in our contract.");
         }
     }
 
@@ -279,15 +288,15 @@
         if (client == this.controller.getClient() && !position.isFixed()) {
             // Aber noch schnell unfixieren
             client.setFix(false);
-            System.out.println("Eigener Client wird ignoriert");
+            log.info("Eigener Client wird ignoriert");
             return;
         } else if (client == this.controller.getClient() && position.isFixed())
-            System.out.println("Eigener Client empfangen mit fixierter Position.");
+            log.info("Eigener Client empfangen mit fixierter Position.");
 
         // Sonst beachten wir alle Positionen die wir
         // bekommen
         if (client == null) {
-            System.out.println("Neuer Client empfangen (" + clientdto.getMac() + ", " + clientdto.getName()
+            log.info("Neuer Client empfangen (" + clientdto.getMac() + ", " + clientdto.getName()
                     + ". F\xFCge zum Graphen hinzu.");
             client = new ClientNode(nodeModel);
             client.setMacAddress(clientdto.getMac());
@@ -295,7 +304,7 @@
             nodeModel.addNode(client);
         }
 
-        System.out.println("Position f\xFCr Client " + client.getName() + " empfangen. fix = " + position.isFixed());
+        log.info("Position f\xFCr Client " + client.getName() + " empfangen. fix = " + position.isFixed());
         // client.setPosition(position.getPosX().intValue(),
         // position.getPosY().intValue());
 
@@ -318,8 +327,7 @@
         SignalCharacterDTO sc = position.getCharacter();
         SimpleScanResultDTO[] sr = sc.getSimpleScanResults();
         // Alle momentan gesehenen AccessPoints merken
-        ArrayList seenAps = client.getSeenAccessPoints();
-
+        
         if (sr != null) {
             double[] signalLevels = new double[sr.length];
             String[] macs = new String[sr.length];
@@ -353,16 +361,20 @@
                             nodeModel.addNode(mapNode);
                         }
 
+                        for (PollHandlerListener phl : listeners) {
+                            phl.mapCreatedOrUpdatedOrDeleted();
+                        }
                     } catch (Exception e) {
+                        for (PollHandlerListener phl : listeners) {
+                            phl.mapCreatedOrUpdatedOrDeletedError(e);
+                        }
                         e.printStackTrace();
                     }
                 }
             });
         } catch (InterruptedException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         } catch (InvocationTargetException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
@@ -388,24 +400,83 @@
                                     .getGeoPointAlt());
                             geoNode.setName(pointDTO.toString());
                             geoNode.setId(pointDTO.getId());
-                            System.err.println("created geo node: " + geoNode.getId());
+                            log.info("created geo node: " + geoNode.getId());
                             geoNode.setGeoPos(geoPos);
                             nodeModel.addNode(geoNode);
                             geoNode.setFix(true);
                             geoNode.setPosition(pointDTO.getGeoPointX(), pointDTO.getGeoPointY(), 0);
+
                         }
-
+                        fireGeoPosCreatedOrUpdatedOrDeleted();
                     } catch (Exception e) {
+                        fireGeoPositionFetchError(e);
                         e.printStackTrace();
                     }
                 }
             });
         } catch (InterruptedException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         } catch (InvocationTargetException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
+
         }
     }
+
+    public void geoPositionFetchError(Exception e){
+        fireGeoPositionFetchError(e);
+
+    }
+
+    public void positionFetchError(Exception e){
+        firePositionFetchError(e);
+
+    }
+
+    public static void addListener(PollHandlerListener listener){
+        listeners.add(listener);
+    }
+    
+    public void removeListener(PollHandlerListener listener){
+        this.listeners.remove(listener);
+    }
+
+    private void firePositionCreatedOrUpdatedOrDeleted(){
+        for (PollHandlerListener phl : listeners) {
+            phl.positionCreatedOrUpdatedOrDeleted();
+        }
+    }
+
+    private void firePositionFetchError(Exception e){
+        for (PollHandlerListener phl : listeners) {
+            phl.positionFetchError(e);
+        }
+    }
+
+    protected void fireMapCreatedOrUpdatedOrDeleted(){
+        for (PollHandlerListener phl : listeners) {
+            phl.mapCreatedOrUpdatedOrDeleted();
+        }
+
+    }
+
+    protected void fireMapCreatedOrUpdatedOrDeletedError(Exception e){
+        for (PollHandlerListener phl : listeners) {
+            phl.mapCreatedOrUpdatedOrDeletedError(e);
+        }
+
+    }
+
+    protected void fireGeoPositionFetchError(Exception e){
+        for (PollHandlerListener phl : listeners) {
+            phl.geoPositionFetchError(e);
+        }
+
+    }
+
+    protected void fireGeoPosCreatedOrUpdatedOrDeleted(){
+        for (PollHandlerListener phl : listeners) {
+            phl.geoPosCreatedOrUpdatedOrDeleted();
+        }
+    }
+        
 }


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




2005	Jan	Feb (14)	Mar	Apr (4)	May (57)	Jun (14)	Jul (15)	Aug (5)	Sep (29)	Oct (13)	Nov (44)	Dec (3)
2006	Jan (14)	Feb (78)	Mar (55)	Apr	May	Jun	Jul	Aug	Sep	Oct (4)	Nov (12)	Dec (9)
2007	Jan (21)	Feb (67)	Mar (39)	Apr (28)	May (7)	Jun	Jul (6)	Aug (2)	Sep (1)	Oct (18)	Nov (8)	Dec (11)
2008	Jan (16)	Feb (12)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

magicmap-commits Mailing List for MagicMap (Page 4)

magicmap-commits — SVN commits