Menu
▾
▴
[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/controller RFIDTagRead.java,NONE,1.1 RFIDTagReader.java,NONE,1.1 RFIDController.java,NONE,1.1 PollHandler.java,1.8,1.9 Controller.java,1.12,1.13 VirtualServerManager.java,1.8,1.9 ServerManager.java,1.13,1.14 SOAPServerManager.java,1.9,1.10 ServerPoller.java,1.6,1.7
|
From: Johannes Z. <jza...@us...> - 2006-03-06 22:21:49
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18597/src/net/sf/magicmap/client/controller Modified Files: PollHandler.java Controller.java VirtualServerManager.java ServerManager.java SOAPServerManager.java ServerPoller.java Added Files: RFIDTagRead.java RFIDTagReader.java RFIDController.java Log Message: changed access to server communication for maps and geo points added base rfid support --- NEW FILE: RFIDController.java --- /** * */ package net.sf.magicmap.client.controller; import sun.security.jca.GetInstance; import de.feig.FeIscListener; import de.feig.FePortDriverException; import de.feig.FeReaderDriverException; import de.feig.FedmException; import de.feig.FedmIscReader; /** * @author Johannes Zapotoczky (joh...@za...) * */ public class RFIDController implements FeIscListener, RFIDTagRead { FedmIscReader rfidReader; RFIDTagReader tagReader; /** * */ public RFIDController(FedmIscReader reader) { this.rfidReader = reader; } public boolean connect() { try { if (rfidReader.isConnected()) { try { rfidReader.removeEventListener(this, FeIscListener.RECEIVE_STRING_EVENT); rfidReader.removeEventListener(this, FeIscListener.SEND_STRING_EVENT); rfidReader.removeEventListener(this, FeIscListener.SCANNER_PRT_EVENT); } catch (Exception ex) {} try { rfidReader.disConnect(); } catch (Exception ex) {} } rfidReader.connectTCP("192.168.10.10", 10001); } catch (FedmException e) { // TODO Auto-generated catch block e.printStackTrace(); } catch (FePortDriverException e) { // TODO Auto-generated catch block e.printStackTrace(); } catch (FeReaderDriverException e) { // TODO Auto-generated catch block e.printStackTrace(); } return rfidReader.isConnected(); } /* (non-Javadoc) * @see de.feig.FeIscListener#onSendProtocol(de.feig.FedmIscReader, java.lang.String) */ public void onSendProtocol(FedmIscReader arg0, String arg1) { // TODO Auto-generated method stub } /* (non-Javadoc) * @see de.feig.FeIscListener#onReceiveProtocol(de.feig.FedmIscReader, java.lang.String) */ public void onReceiveProtocol(FedmIscReader arg0, String arg1) { System.out.println("received: " + arg1); } /* (non-Javadoc) * @see de.feig.FeIscListener#onSendProtocol(de.feig.FedmIscReader, byte[]) */ public void onSendProtocol(FedmIscReader arg0, byte[] arg1) { // TODO Auto-generated method stub } /* (non-Javadoc) * @see de.feig.FeIscListener#onReceiveProtocol(de.feig.FedmIscReader, byte[]) */ public void onReceiveProtocol(FedmIscReader arg0, byte[] arg1) { System.out.println("received: " + arg1); } /* (non-Javadoc) * @see net.sf.magicmap.client.controller.RFIDTagRead#tagChanged(java.lang.String[], java.lang.String[]) */ public void tagChanged(String[] tagType, String[] serialNumber) { if (tagType.length > 0) { System.err.println("tags read:"); if (tagType.length == serialNumber.length) { for (int i=0; i< tagType.length; i++) { System.err.println("type " + tagType[i] + ", serial " + serialNumber[i]); } } else { System.err.println("number inconsistency, aborting"); } } } /* (non-Javadoc) * @see net.sf.magicmap.client.controller.RFIDTagRead#lastError(java.lang.String) */ public void lastError(String error) { System.err.println("error: " + error); } public void startReading() { tagReader = new RFIDTagReader(this, rfidReader); tagReader.start(); } public void stopReading() { tagReader.stop(); } } Index: VirtualServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VirtualServerManager.java 2 Mar 2006 11:06:32 -0000 1.8 --- VirtualServerManager.java 6 Mar 2006 22:21:42 -0000 1.9 *************** *** 11,15 **** --- 11,20 ---- import net.sf.magicmap.client.interfaces.CreatePositionCallback; import net.sf.magicmap.client.interfaces.DeletePositionCallback; + import net.sf.magicmap.client.interfaces.FetchGeoPointsCallback; + import net.sf.magicmap.client.interfaces.FetchInfoPointsCallback; + import net.sf.magicmap.client.interfaces.FetchMapsCallback; import net.sf.magicmap.client.interfaces.FetchPositionsCallback; + import net.sf.magicmap.client.interfaces.FetchRFIDAntennasCallback; + import net.sf.magicmap.client.interfaces.FetchRFIDTagsCallback; import net.sf.magicmap.client.interfaces.MapCallback; import net.sf.magicmap.client.interfaces.MapNamesCallback; *************** *** 520,522 **** --- 525,581 ---- } + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#deleteGeoPoint(long, java.lang.String, net.sf.magicmap.client.interfaces.DeletePositionCallback) + */ + @Override + public void deleteGeoPoint(long id, String string, DeletePositionCallback callback) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#fetchGeoPointsFromServer(net.sf.magicmap.client.interfaces.FetchGeoPointsCallback) + */ + @Override + public void fetchGeoPointsFromServer(FetchGeoPointsCallback callback) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#fetchMapsFromServer(net.sf.magicmap.client.interfaces.FetchMapsCallback) + */ + @Override + public void fetchMapsFromServer(FetchMapsCallback callback) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#fetchInfoPointsFromServer(net.sf.magicmap.client.interfaces.FetchInfoPointsCallback) + */ + @Override + public void fetchInfoPointsFromServer(FetchInfoPointsCallback poller) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#fetchRFIDAntennasFromServer(net.sf.magicmap.client.interfaces.FetchRFIDAntennasCallback) + */ + @Override + public void fetchRFIDAntennasFromServer(FetchRFIDAntennasCallback poller) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#fetchRFIDTagsFromServer(net.sf.magicmap.client.interfaces.FetchRFIDTagsCallback) + */ + @Override + public void fetchRFIDTagsFromServer(FetchRFIDTagsCallback poller) { + // TODO Auto-generated method stub + + } + } \ No newline at end of file Index: Controller.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Controller.java 2 Mar 2006 11:06:32 -0000 1.12 --- Controller.java 6 Mar 2006 22:21:42 -0000 1.13 *************** *** 11,15 **** --- 11,21 ---- import java.util.ArrayList; import java.util.Collection; + import java.util.HashMap; + + import de.feig.FedmException; + import de.feig.FedmIscReader; + import net.sf.magicmap.client.gui.MainGUI; + import net.sf.magicmap.client.gui.MapPanel; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.interfaces.CreateNewMapCallback; *************** *** 75,78 **** --- 81,85 ---- private boolean invisble; // Invisible-Modus (keine Daten an Server) + private boolean rfidPollingActive; // pseudo server items *************** *** 80,83 **** --- 87,92 ---- private Collection rfidAntennas; private ArrayList rfidTags; + private HashMap rfidDataChunks; + private RFIDController rfidController; /** *************** *** 120,123 **** --- 129,140 ---- rfidAntennas = new ArrayList(); rfidTags = new ArrayList(); + try { + rfidController = new RFIDController(new FedmIscReader()); + } catch (FedmException e) { + System.err.println("error creating RFID controller"); + } catch (Exception e) { + System.err.println("error creating RFID controller"); + } + setRfidPollingActive(false); initializeScanner(); *************** *** 477,480 **** --- 494,498 ---- } else{ serverManager.createRFIDAntenna(x, y, fixed, antenna, mapName, callback); + MainGUI.getInstance().getRfidPollAction().setEnabled(true); } *************** *** 495,498 **** --- 513,544 ---- } } + + + /** + * @param name + * @param string + * @param panel + */ + public void deleteRfidAntenna(String name, String string, DeletePositionCallback callback) { + // TODO Auto-generated method stub + + } + + /** + * @param name + * @param string + * @param panel + */ + public void deleteGeoPoint(String name, String string, DeletePositionCallback callback) { + Node node = nodeModel.findNode(name); + if (node != null){ + if (node.getId() != -1){ + serverManager.deleteGeoPoint(node.getId(), Controller.getInstance().getCurrentMap().name, callback); + } else{ + System.out.println("Node has no positionId, so its position cannot be deleted."); + } + } + } + public void setClientPosition(final int x, final int y, final boolean fixed, final String clientMac, *************** *** 556,563 **** int index = rfidTags.indexOf(id); ((RFIDTag) rfidTags.get(index)).setTimestamp(timestamp); ! } else{ rfidTags.add(new RFIDTag(id, timestamp)); } } } --- 602,622 ---- int index = rfidTags.indexOf(id); ((RFIDTag) rfidTags.get(index)).setTimestamp(timestamp); ! } else { rfidTags.add(new RFIDTag(id, timestamp)); } } + + public RFIDController getRfidController() { + return rfidController; + } + + public boolean isRfidPollingActive() { + return rfidPollingActive; + } + + public void setRfidPollingActive(boolean rfidPollingActive) { + this.rfidPollingActive = rfidPollingActive; + } + } --- NEW FILE: RFIDTagReader.java --- (This appears to be a binary file; contents omitted.) Index: PollHandler.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PollHandler.java 2 Mar 2006 11:06:32 -0000 1.8 --- PollHandler.java 6 Mar 2006 22:21:42 -0000 1.9 *************** *** 135,139 **** SignalCharacterDTO sc = position.getCharacter(); SimpleScanResultDTO[] sr = sc.getSimpleScanResults(); ! for (int i = 0; i < sr.length; i++) { SimpleScanResultDTO r = sr[i]; String mac = r.getMacAP(); --- 135,139 ---- SignalCharacterDTO sc = position.getCharacter(); SimpleScanResultDTO[] sr = sc.getSimpleScanResults(); ! for (int i = 0; sr != null && i < sr.length; i++) { SimpleScanResultDTO r = sr[i]; String mac = r.getMacAP(); *************** *** 389,393 **** pointDTO.getGeoPointAlt().intValue()); geoNode.setName(pointDTO.toString()); ! geoNode.setId(geoNode.hashCode()); geoNode.setGeoPos(geoPos); nodeModel.addNode(geoNode); --- 389,394 ---- pointDTO.getGeoPointAlt().intValue()); geoNode.setName(pointDTO.toString()); ! geoNode.setId(pointDTO.getId()); ! System.err.println("created geo node: " + geoNode.getId()); geoNode.setGeoPos(geoPos); nodeModel.addNode(geoNode); *************** *** 463,466 **** --- 464,468 ---- RFIDAntennaNode antennaNode = new RFIDAntennaNode(nodeModel); antennaNode.setName(antenna.getURL()); + antennaNode.setAntenna(antenna); antennaNode.setId(antenna.hashCode()); if (antenna.getMap().equals(Controller.getInstance().getCurrentMap().name)) { Index: SOAPServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SOAPServerManager.java 2 Mar 2006 11:06:32 -0000 1.9 --- SOAPServerManager.java 6 Mar 2006 22:21:42 -0000 1.10 *************** *** 18,22 **** --- 18,27 ---- import net.sf.magicmap.client.interfaces.CreatePositionCallback; import net.sf.magicmap.client.interfaces.DeletePositionCallback; + import net.sf.magicmap.client.interfaces.FetchGeoPointsCallback; + import net.sf.magicmap.client.interfaces.FetchInfoPointsCallback; + import net.sf.magicmap.client.interfaces.FetchMapsCallback; import net.sf.magicmap.client.interfaces.FetchPositionsCallback; + import net.sf.magicmap.client.interfaces.FetchRFIDAntennasCallback; + import net.sf.magicmap.client.interfaces.FetchRFIDTagsCallback; import net.sf.magicmap.client.interfaces.MapCallback; import net.sf.magicmap.client.interfaces.MapNamesCallback; *************** *** 362,365 **** --- 367,392 ---- } } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#deleteGeoPoint(long, java.lang.String, net.sf.magicmap.client.interfaces.DeletePositionCallback) + */ + @Override + public void deleteGeoPoint(final long id, final String string, final DeletePositionCallback callback) { + if (isConnected()) { + Thread deleteGeoPosThread = new Thread() { + public void run() { + synchronized(mutex) { + try { + SOAPServerManager.this.mapDelegate.deleteGeoPoint(SOAPServerManager.this.sessionId, id); + } catch (Exception e){ + callback.positionDeleteError(e); + } + } + } + }; + deleteGeoPosThread.start(); + } + + } /** *************** *** 502,554 **** } ! callback.positionsFetched(positions); ! ! //TODO: retrieve maps ! ! //TODO: retrieve info objects ! ! //TODO: retrieve RFID antennas ! ! // geoPoses.toString(); ! // callback.geoPointsFetched(geoPoses); ! ! } catch (Exception e){ ! callback.positionFetchError(e); ! } ! ! // retrieve other positions (e.g. geopoints, infoobjects, rfid antennas) ! try{ ! // retrieve maps ! String[] names = SOAPServerManager.this.mapDelegate.getMapNames(); ! MapDTO[] mapDTOs = new MapDTO[names.length]; ! for (int i = 0; i < names.length; i++){ ! mapDTOs[i] = SOAPServerManager.this.mapDelegate.getMap(names[i]); ! } ! callback.mapsFetched(mapDTOs); ! ! // retrieve geo points ! GeoPointDTO[] geoPoses = SOAPServerManager.this.mapDelegate.getGeoPointsForMap( ! SOAPServerManager.this.sessionId, controller.getCurrentMap().name); ! if (geoPoses != null){ ! callback.geoPointsFetches(geoPoses); ! } ! ! // retrieve info points ! Collection infoObjects = Controller.getInstance().getInfoObjects(); ! if (infoObjects != null && infoObjects.size() > 0){ ! callback.infoPointsFetched(infoObjects); ! } ! ! // retrieve RFID antennas ! Collection rfidAntennas = Controller.getInstance().getRfidAntennas(); ! if (rfidAntennas != null && rfidAntennas.size() > 0){ ! callback.rfidAntennasFetched(rfidAntennas); ! } ! ! // retrieve RFID tags ! Collection rfidTags = Controller.getInstance().getRfidTags(); ! if (rfidTags != null && rfidTags.size() > 0){ ! callback.rfidTagsFetched(rfidTags); ! } } catch (Exception e){ --- 529,533 ---- } ! callback.positionsFetched(positions); } catch (Exception e){ *************** *** 630,632 **** } ! } \ No newline at end of file --- 609,747 ---- } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#fetchGeoPointsFromServer(net.sf.magicmap.client.interfaces.FetchGeoPointsCallback) ! */ ! @Override ! public void fetchGeoPointsFromServer(final FetchGeoPointsCallback callback) { ! ! if (isConnected()) { ! ! Thread fetchGeoPointsThread = new Thread() { ! public void run() { ! synchronized (mutex) { ! try { ! // retrieve geo points ! GeoPointDTO[] geoPoses = SOAPServerManager.this.mapDelegate.getGeoPointsForMap ( ! SOAPServerManager.this.sessionId, controller.getCurrentMap().name); ! if (geoPoses != null) { ! callback.geoPointsFetched(geoPoses); ! } ! } catch (Exception e) { ! callback.geoPointFetchError(e); ! } ! } ! } ! }; ! fetchGeoPointsThread.start(); ! } ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#fetchMapsFromServer(net.sf.magicmap.client.interfaces.FetchMapsCallback) ! */ ! @Override ! public void fetchMapsFromServer(final FetchMapsCallback callback) { ! ! if (isConnected()) { ! ! Thread fetchMapsThread = new Thread() { ! ! public void run() { ! synchronized (mutex) { ! try { ! // retrieve maps ! String[] names = SOAPServerManager.this.mapDelegate.getMapNames(); ! MapDTO[] mapDTOs = new MapDTO[names.length]; ! for (int i = 0; i < names.length; i++) { ! mapDTOs[i] = SOAPServerManager.this.mapDelegate.getMap(names[i]); ! } ! callback.mapsFetched(mapDTOs); ! } catch (Exception e) { ! callback.mapFetchError(e); ! } ! } ! } ! }; ! fetchMapsThread.start(); ! } ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#fetchInfoPointsFromServer(net.sf.magicmap.client.interfaces.FetchInfoPointsCallback) ! */ ! @Override ! public void fetchInfoPointsFromServer(final FetchInfoPointsCallback callback) { ! if (isConnected()) { ! Thread fetchInfoPointsThread = new Thread() { ! public void run() { ! synchronized (mutex) { ! try { ! // retrieve info points ! Collection infoObjects = Controller.getInstance().getInfoObjects(); ! if (infoObjects != null && infoObjects.size() > 0) { ! callback.infoPointsFetched(infoObjects); ! } ! } catch (Exception e){ ! callback.infoPointFetchError(e); ! } ! } ! } ! }; ! fetchInfoPointsThread.start(); ! } ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#fetchRFIDAntennasFromServer(net.sf.magicmap.client.interfaces.FetchRFIDAntennasCallback) ! */ ! @Override ! public void fetchRFIDAntennasFromServer(final FetchRFIDAntennasCallback callback) { ! if (isConnected()) { ! Thread fetchMapsThread = new Thread() { ! public void run() { ! synchronized (mutex) { ! try { ! // retrieve RFID antennas ! Collection rfidAntennas = Controller.getInstance().getRfidAntennas(); ! if (rfidAntennas != null && rfidAntennas.size() > 0) { ! callback.rfidAntennasFetched(rfidAntennas); ! } ! } catch (Exception e){ ! callback.rfidAntennasFetchError(e); ! } ! } ! } ! }; ! fetchMapsThread.start(); ! } ! ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#fetchRFIDTagsFromServer(net.sf.magicmap.client.interfaces.FetchRFIDTagsCallback) ! */ ! @Override ! public void fetchRFIDTagsFromServer(final FetchRFIDTagsCallback callback) { ! if (isConnected()) { ! Thread fetchMapsThread = new Thread() { ! public void run() { ! synchronized (mutex) { ! try { ! // retrieve RFID tags ! Collection rfidTags = Controller.getInstance().getRfidTags(); ! if (rfidTags != null && rfidTags.size() > 0){ ! callback.rfidTagsFetched(rfidTags); ! } ! } catch (Exception e){ ! callback.rfidTagFetchError(e); ! } ! } ! } ! }; ! fetchMapsThread.start(); ! } ! ! } ! ! } ! --- NEW FILE: RFIDTagRead.java --- (This appears to be a binary file; contents omitted.) Index: ServerPoller.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ServerPoller.java 28 Feb 2006 11:23:16 -0000 1.6 --- ServerPoller.java 6 Mar 2006 22:21:42 -0000 1.7 *************** *** 10,14 **** --- 10,19 ---- import java.util.TimerTask; + import net.sf.magicmap.client.interfaces.FetchGeoPointsCallback; + import net.sf.magicmap.client.interfaces.FetchInfoPointsCallback; + import net.sf.magicmap.client.interfaces.FetchMapsCallback; import net.sf.magicmap.client.interfaces.FetchPositionsCallback; + import net.sf.magicmap.client.interfaces.FetchRFIDAntennasCallback; + import net.sf.magicmap.client.interfaces.FetchRFIDTagsCallback; import net.sf.magicmap.client.interfaces.ServerPollerListener; import net.sf.magicmap.client.model.node.InfoObject; *************** *** 26,30 **** * @author thuebner */ ! public class ServerPoller implements FetchPositionsCallback { private static String syncObj = "TEST"; --- 31,37 ---- * @author thuebner */ ! public class ServerPoller implements FetchPositionsCallback, ! FetchGeoPointsCallback, FetchMapsCallback, FetchInfoPointsCallback, ! FetchRFIDAntennasCallback, FetchRFIDTagsCallback { private static String syncObj = "TEST"; *************** *** 63,66 **** --- 70,78 ---- isFetching = true; ServerPoller.this.serverManager.fetchPositionsFromServer(ServerPoller.this); + ServerPoller.this.serverManager.fetchGeoPointsFromServer(ServerPoller.this); + ServerPoller.this.serverManager.fetchMapsFromServer(ServerPoller.this); + ServerPoller.this.serverManager.fetchInfoPointsFromServer(ServerPoller.this); + ServerPoller.this.serverManager.fetchRFIDAntennasFromServer(ServerPoller.this); + ServerPoller.this.serverManager.fetchRFIDTagsFromServer(ServerPoller.this); ServerPoller.this.serverManager.submitClientInfo(); } *************** *** 95,102 **** } /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#geoPointsFetches(net.sf.magicmap.server.dto.GeoPointDTO[]) */ ! public void geoPointsFetches(GeoPointDTO[] geoPoses) { for (int i = 0; i < geoPoses.length; i++) { --- 107,115 ---- } + /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.FetchGeoPointsCallback#geoPointsFetched(net.sf.magicmap.server.dto.GeoPointDTO[]) */ ! public void geoPointsFetched(GeoPointDTO[] geoPoses) { for (int i = 0; i < geoPoses.length; i++) { *************** *** 106,109 **** --- 119,123 ---- isFetching = false; } + } *************** *** 163,166 **** --- 177,230 ---- } + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.FetchGeoPointsCallback#geoPointFetchError(java.lang.Exception) + */ + public void geoPointFetchError(Exception e) { + e.printStackTrace(); + synchronized (syncObj){ + isFetching = false; + } + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.FetchMapsCallback#mapFetchError(java.lang.Exception) + */ + public void mapFetchError(Exception e) { + e.printStackTrace(); + synchronized (syncObj){ + isFetching = false; + } + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.FetchInfoPointsCallback#infoPointFetchError(java.lang.Exception) + */ + public void infoPointFetchError(Exception e) { + e.printStackTrace(); + synchronized (syncObj){ + isFetching = false; + } + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.FetchRFIDAntennasCallback#rfidAntennasFetchError(java.lang.Exception) + */ + public void rfidAntennasFetchError(Exception e) { + e.printStackTrace(); + synchronized (syncObj){ + isFetching = false; + } + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.FetchRFIDTagsCallback#rfidTagFetchError(java.lang.Exception) + */ + public void rfidTagFetchError(Exception e) { + e.printStackTrace(); + synchronized (syncObj){ + isFetching = false; + } + } + } Index: ServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ServerManager.java 2 Mar 2006 11:06:32 -0000 1.13 --- ServerManager.java 6 Mar 2006 22:21:42 -0000 1.14 *************** *** 18,22 **** --- 18,27 ---- import net.sf.magicmap.client.interfaces.CreatePositionCallback; import net.sf.magicmap.client.interfaces.DeletePositionCallback; + import net.sf.magicmap.client.interfaces.FetchGeoPointsCallback; + import net.sf.magicmap.client.interfaces.FetchInfoPointsCallback; + import net.sf.magicmap.client.interfaces.FetchMapsCallback; import net.sf.magicmap.client.interfaces.FetchPositionsCallback; + import net.sf.magicmap.client.interfaces.FetchRFIDAntennasCallback; + import net.sf.magicmap.client.interfaces.FetchRFIDTagsCallback; import net.sf.magicmap.client.interfaces.MapCallback; import net.sf.magicmap.client.interfaces.MapNamesCallback; *************** *** 223,226 **** --- 228,241 ---- public abstract void fetchPositionsFromServer(final FetchPositionsCallback callback); + + public abstract void fetchGeoPointsFromServer(final FetchGeoPointsCallback callback); + + public abstract void fetchMapsFromServer(final FetchMapsCallback callback); + + public abstract void fetchInfoPointsFromServer(final FetchInfoPointsCallback poller); + + public abstract void fetchRFIDAntennasFromServer(final FetchRFIDAntennasCallback poller); + + public abstract void fetchRFIDTagsFromServer(final FetchRFIDTagsCallback poller); /* (non-Javadoc) *************** *** 233,236 **** --- 248,259 ---- public abstract void submitClientInfo(); + /** + * @param id + * @param string + * @param callback + */ + public abstract void deleteGeoPoint(long id, String string, DeletePositionCallback callback); + + // /** // * Load new map |
