Menu
▾
▴
magicmap-commits — SVN commits
You can subscribe to this list here.
| 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
|
|
From: Johannes Z. <jza...@us...> - 2006-03-06 22:19:03
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17017/res Modified Files: screentext_en_US.properties screentext_de_DE.properties Log Message: added several texts Index: screentext_de_DE.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_de_DE.properties,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** screentext_de_DE.properties 28 Feb 2006 12:40:13 -0000 1.10 --- screentext_de_DE.properties 6 Mar 2006 22:18:58 -0000 1.11 *************** *** 83,86 **** --- 83,88 ---- visible=Sichtbar invisibletooltip=Setzt Client in den Unsichtbarkeitsmodus + rfidpolling=RFID-Polling + rfidpollingtooltip=Aktiviert RFID-Polling connecttooltip=Verbindung zu Server herstellen disconnecttooltip=Verbindung zu Server unterbrechen Index: screentext_en_US.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_en_US.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** screentext_en_US.properties 28 Feb 2006 12:40:13 -0000 1.4 --- screentext_en_US.properties 6 Mar 2006 22:18:58 -0000 1.5 *************** *** 28,30 **** delete=Delete properties=Properties... ! outline_maps=Maps \ No newline at end of file --- 28,32 ---- delete=Delete properties=Properties... ! outline_maps=Maps ! rfidpolling=RFID-Polling ! rfidpollingtooltip=Activates RFID Polling \ No newline at end of file |
|
From: Johannes Z. <jza...@us...> - 2006-03-06 22:18:43
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16900 Modified Files: .classpath Log Message: library for rfid reader added Index: .classpath =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** .classpath 28 Sep 2005 10:33:07 -0000 1.5 --- .classpath 6 Mar 2006 22:18:38 -0000 1.6 *************** *** 28,31 **** --- 28,32 ---- <classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/> <classpathentry kind="lib" path="lib/ostermillerutils_1_05_00.jar"/> + <classpathentry kind="lib" path="lib/OBIDISC4J.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Johannes Z. <jza...@us...> - 2006-03-06 22:18:31
|
Update of /cvsroot/magicmap/magicmapclient/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16815/lib Added Files: OBIDISC4J.jar Log Message: library for rfid reader added --- NEW FILE: OBIDISC4J.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Andreas W. <an...@us...> - 2006-03-06 10:59:32
|
Update of /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9906/src/net/sf/magicmap/server/facade Modified Files: SessionFacade.java MapFacade.java PositionFacade2.java PositionFacade.java Log Message: kleinere wichtige Bugfixes Index: MapFacade.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MapFacade.java 23 Feb 2006 22:53:37 -0000 1.14 --- MapFacade.java 6 Mar 2006 10:59:03 -0000 1.15 *************** *** 304,307 **** --- 304,311 ---- JDOUtil.closePM(pm); } + if (result == null) + { + result = new GeoPointDTO[0]; + } return result; } Index: SessionFacade.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/SessionFacade.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SessionFacade.java 11 May 2005 10:45:05 -0000 1.5 --- SessionFacade.java 6 Mar 2006 10:59:03 -0000 1.6 *************** *** 41,45 **** // check Version if (!Version.PROTOCOL_VERSION.equals(version)){ ! throw new AuthenticationException("Client-Server-Versionen passen nicht: " + Version.PROTOCOL_VERSION + " <> " + version); } --- 41,45 ---- // check Version if (!Version.PROTOCOL_VERSION.equals(version)){ ! throw new AuthenticationException("Client-Server-Versionen passen nicht: (Serverprotokollversion) " + Version.PROTOCOL_VERSION + " <> (Clientprotokollversion) " + version); } *************** *** 87,91 **** JDOUtil.commit(tx); } catch (Exception e){ ! this.logger.fatal("fehler", e); JDOUtil.rollBack(tx); throw new AuthenticationException(e.getMessage(), e); --- 87,91 ---- JDOUtil.commit(tx); } catch (Exception e){ ! this.logger.fatal("Fehler", e); JDOUtil.rollBack(tx); throw new AuthenticationException(e.getMessage(), e); Index: PositionFacade2.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade2.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PositionFacade2.java 23 Feb 2006 21:40:34 -0000 1.12 --- PositionFacade2.java 6 Mar 2006 10:59:03 -0000 1.13 *************** *** 90,94 **** pos.setPosX(positionX); pos.setPosY(positionY); ! PositionCache.getPositionCache().createOrUpdatePosition(map,pos); } --- 90,94 ---- pos.setPosX(positionX); pos.setPosY(positionY); ! PositionCache.getPositionCache().createOrUpdatePosition(map,pos,client.getMac()); } *************** *** 468,471 **** --- 468,472 ---- pos.getAccessPoint().setHidden(hidden); PositionCache.getPositionCache().createOrUpdatePosition(map,pos); + pm.currentTransaction().commit(); } catch (Exception e){ e.printStackTrace(); Index: PositionFacade.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PositionFacade.java 23 Feb 2006 22:18:27 -0000 1.13 --- PositionFacade.java 6 Mar 2006 10:59:03 -0000 1.14 *************** *** 708,712 **** } this.logger.info("getPositionsForMapSince() - done "); ! return (PositionDTO[]) result.toArray(new PositionDTO[0]); } --- 708,715 ---- } this.logger.info("getPositionsForMapSince() - done "); ! PositionDTO[] positions = (PositionDTO[])result.toArray(new PositionDTO[0]); ! if (positions == null) ! positions = new PositionDTO[0]; ! return positions; } |
|
From: Andreas W. <an...@us...> - 2006-03-06 10:59:32
|
Update of /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9906/src/net/sf/magicmap/server/cache Modified Files: PositionCache.java Log Message: kleinere wichtige Bugfixes Index: PositionCache.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/cache/PositionCache.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PositionCache.java 23 Feb 2006 22:18:26 -0000 1.11 --- PositionCache.java 6 Mar 2006 10:59:03 -0000 1.12 *************** *** 168,171 **** --- 168,176 ---- pos.setAccessPoint(ap); } + if (position.getClient()==null && position.getAccessPoint()== null){ + Client client = checkClient(getMapHashtable(map).getLocationCreator(position.getId()),pm); + setNewSignalCharacter(position,pm, client,pos); + } + JDOUtil.commit(tx); } catch (Exception e) { *************** *** 223,226 **** --- 228,236 ---- dto.setClient(clientDTO); } + if (client == null && ap == null){ + String mac = ((ScanResult) pos.getScanResults().iterator().next()).getClient().getMac(); + getMapHashtable(map).addLocationCreator(pos.getId(),mac); + } + dto.setId(new Long(pos.getId())); dto.setDeleted(pos.isDeleted()); *************** *** 350,353 **** --- 360,371 ---- } + public void createOrUpdatePosition(Map map, PositionDTO pos, String clientMac){ + + createOrUpdatePosition(map,pos); + getMapHashtable(map).addLocationCreator(getPositionForClientOnMap(map,pos.getName()).getId(),clientMac); + + + } + } *************** *** 359,367 **** --- 377,398 ---- private Hashtable<Long, String> idHash; + + private Hashtable<Long, String> locationCreatorHash; + protected void addLocationCreator(Long id, String clientMac) { + if (locationCreatorHash.containsKey(id)) + locationCreatorHash.remove(id); + locationCreatorHash.put(id, clientMac); + } + + protected String getLocationCreator(Long id){ + return locationCreatorHash.get(id); + } + protected PositionCacheEntry() { positionHash = new Hashtable<String, PositionDTO>(60); timeMap = new TreeMap<Long, String>(); idHash = new Hashtable<Long, String>(60); + locationCreatorHash = new Hashtable<Long, String>(60); } *************** *** 463,466 **** --- 494,498 ---- positions[i++] = getPosition((String) it.next()); } + System.out.println("leaving getPositionsSince()"); return positions; } |
|
From: Florian L. <fle...@us...> - 2006-03-06 10:48:32
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4615/src/net/sf/magicmap/client/model/node Modified Files: AccessPointSeerNode.java Log Message: Accesspoint berechnungsstatus implementiert Index: AccessPointSeerNode.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/AccessPointSeerNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AccessPointSeerNode.java 16 Jan 2005 16:01:26 -0000 1.1 --- AccessPointSeerNode.java 6 Mar 2006 10:48:07 -0000 1.2 *************** *** 40,44 **** while (it.hasNext()){ AccessPointEdge ae = (AccessPointEdge) it.next(); ! result.add(ae.getAccessPoint()); } return result; --- 40,45 ---- while (it.hasNext()){ AccessPointEdge ae = (AccessPointEdge) it.next(); ! if (!ae.getAccessPoint().isHidden()) ! result.add(ae.getAccessPoint()); } return result; *************** *** 89,93 **** public void seesAccessPoint(AccessPointNode ap, double signalStrength){ ! if (!getSeenAccessPoints().contains(ap)){ AccessPointEdge ae = new AccessPointEdge(); ae.setAccessPoint(ap); --- 90,94 ---- public void seesAccessPoint(AccessPointNode ap, double signalStrength){ ! if (!getSeenAccessPoints().contains(ap) && !ap.isHidden()){ AccessPointEdge ae = new AccessPointEdge(); ae.setAccessPoint(ap); |
|
From: Florian L. <fle...@us...> - 2006-03-06 10:47:30
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3950/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: bugfix updateintervall Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MainGUI.java 1 Mar 2006 21:05:48 -0000 1.16 --- MainGUI.java 6 Mar 2006 10:46:57 -0000 1.17 *************** *** 489,493 **** } dataInvocationRateAction[thisAction].setSelected(true); ! Settings.setPollIntevall(thisAction * 1000); Controller.getInstance().restartServerPoller(); } --- 489,493 ---- } dataInvocationRateAction[thisAction].setSelected(true); ! Settings.setPollIntevall((thisAction+1) * 1000); Controller.getInstance().restartServerPoller(); } |
|
From: Johannes Z. <jza...@us...> - 2006-03-02 21:57:16
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv987/src/net/sf/magicmap/client/views Modified Files: OutlineView.java Log Message: minor chg: selected vertex now highlighted in map view Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** OutlineView.java 2 Mar 2006 10:39:37 -0000 1.10 --- OutlineView.java 2 Mar 2006 21:57:08 -0000 1.11 *************** *** 271,275 **** } } else { ! // Controller.getInstance().getMapView().getPACWGraphDraw().setSelected(Controller.getInstance().getMapView().findVertex(node)); Controller.getInstance().getMapView().vertexSelected(Controller.getInstance().getMapView().findVertex(node)); } --- 271,275 ---- } } else { ! Controller.getInstance().getMapView().getPACWGraphDraw().setSelected(Controller.getInstance().getMapView().findVertex(node)); Controller.getInstance().getMapView().vertexSelected(Controller.getInstance().getMapView().findVertex(node)); } |
|
From: Florian L. <fle...@us...> - 2006-03-02 11:06:47
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7673/src/net/sf/magicmap/client/controller Modified Files: VirtualServerManager.java PollHandler.java Controller.java ServerManager.java SOAPServerManager.java Log Message: Accesspoint brechnung Index: VirtualServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** VirtualServerManager.java 28 Feb 2006 11:23:16 -0000 1.7 --- VirtualServerManager.java 2 Mar 2006 11:06:32 -0000 1.8 *************** *** 166,174 **** } String[] names = (String[]) result.toArray(new String[0]); ! ! if (openDialog) { ! callback.openMapDialog(names); ! } else { ! callback.addMapNamesToOutline(names); } } catch (Exception e){ --- 166,174 ---- } String[] names = (String[]) result.toArray(new String[0]); ! ! if (openDialog){ ! callback.openMapDialog(names); ! } else{ ! callback.addMapNamesToOutline(names); } } catch (Exception e){ *************** *** 237,272 **** } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createGeoPos(int, int, boolean, net.sf.magicmap.client.model.node.GeoPos, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! public void createGeoPos(final int x, final int y, final boolean fixed, ! final GeoPos geoPos, final String name, final CreatePositionCallback callback) { ! ! if (isConnected()) { ! // final SignalCharacterDTO signalCharacter = currentSignalCharacter(); ! // final GeoPointDTO geoPoint = ! // new GeoPointDTO(geoPos.getAltitude(), geoPos.getLatitude(), geoPos.getLongitude(), x, y, (long) -1); ! Thread createPositionThread = new Thread() { - public void run(){ - synchronized (mutex){ - try { - // VirtualServerManager.this.mapDelegate.createGeoPoint( - // sessionId, name, x, y, geoPos.getLongitude(), - // geoPos.getLatitude(), geoPos.getAltitude()); - // TODO: Zusätzliche Parameter zur Position - callback.positionCreated(); - } catch (Exception e){ - callback.positionCreationError(e); - } - } - } - }; - createPositionThread.start(); - } - } - - /* * (non-Javadoc) --- 237,271 ---- } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createGeoPos(int, int, boolean, net.sf.magicmap.client.model.node.GeoPos, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! public void createGeoPos(final int x, final int y, final boolean fixed, final GeoPos geoPos, final String name, ! final CreatePositionCallback callback){ ! if (isConnected()){ ! // final SignalCharacterDTO signalCharacter = currentSignalCharacter(); ! // final GeoPointDTO geoPoint = ! // new GeoPointDTO(geoPos.getAltitude(), geoPos.getLatitude(), geoPos.getLongitude(), x, y, (long) -1); ! ! Thread createPositionThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! // VirtualServerManager.this.mapDelegate.createGeoPoint( ! // sessionId, name, x, y, geoPos.getLongitude(), ! // geoPos.getLatitude(), geoPos.getAltitude()); ! // TODO: Zusätzliche Parameter zur Position ! callback.positionCreated(); ! } catch (Exception e){ ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createPositionThread.start(); ! } ! } /* * (non-Javadoc) *************** *** 383,386 **** --- 382,410 ---- } + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#setAccessPointHiddenStatus(long, java.lang.String, java.lang.String, boolean, net.sf.magicmap.client.interfaces.PositionCallback) + */ + @Override + public void setAccessPointHiddenStatus(final String accessPointMac, final boolean hidden, + final PositionCallback callback){ + if (isConnected()){ + Thread positionThread = new Thread() { + + public void run(){ + synchronized (mutex){ + try{ + positionFacade.setAccessPointHiddenStatus(sessionId, controller.getCurrentMap().name, accessPointMac, + hidden); + callback.positionUpdated(accessPointMac); + } catch (Exception e){ + callback.positionError(e); + } + } + } + }; + positionThread.start(); + } + } + /* * (non-Javadoc) *************** *** 420,424 **** */ public void positionCreatedOrUpdatedOrDeleted(String mapName, long timeStamp, PositionDTO position){ ! // TODO Auto-generated method stub } --- 444,448 ---- */ public void positionCreatedOrUpdatedOrDeleted(String mapName, long timeStamp, PositionDTO position){ ! // TODO Auto-generated method stub } *************** *** 464,468 **** */ public void reloadMap(){ ! // TODO Auto-generated method stub } --- 488,492 ---- */ public void reloadMap(){ ! // TODO Auto-generated method stub } *************** *** 472,496 **** */ public void closeMap(){ ! // TODO Auto-generated method stub } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createInfoObject(int, int, boolean, net.sf.magicmap.client.model.node.InfoObject, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createInfoObject(int x, int y, boolean fixed, InfoObject infoObject, String mapName, CreatePositionCallback callback) { ! // TODO Auto-generated method stub ! ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createRFIDAntenna(int, int, boolean, net.sf.magicmap.client.model.node.RFIDAntenna, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createRFIDAntenna(int x, int y, boolean fixed, RFIDAntenna antenna, String mapName, CreatePositionCallback callback) { ! // TODO Auto-generated method stub ! ! } } \ No newline at end of file --- 496,522 ---- */ public void closeMap(){ ! // TODO Auto-generated method stub } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createInfoObject(int, int, boolean, net.sf.magicmap.client.model.node.InfoObject, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createInfoObject(int x, int y, boolean fixed, InfoObject infoObject, String mapName, ! CreatePositionCallback callback){ ! // TODO Auto-generated method stub ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createRFIDAntenna(int, int, boolean, net.sf.magicmap.client.model.node.RFIDAntenna, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createRFIDAntenna(int x, int y, boolean fixed, RFIDAntenna antenna, String mapName, ! CreatePositionCallback callback){ ! // 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.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Controller.java 28 Feb 2006 11:23:16 -0000 1.11 --- Controller.java 2 Mar 2006 11:06:32 -0000 1.12 *************** *** 53,605 **** public class Controller { ! private static Controller controller = null; ! private NodeModel nodeModel; // Model für Graphen ! private MeasurementModel measurementModel; // Model für Messungen ! private MeasurementModel measurementModelOther; // Messungen anderen Clients / Orte ! private Handler handler; // Für Scannen ! private AbstractScanner scanner; // Scanner ! private ClientNode client; // Ausgezeichneter Knoten [...1035 lines suppressed...] + + public Collection getRfidAntennas(){ + return rfidAntennas; + } + + public Collection getRfidTags(){ + return rfidTags; + } + + public void addRfidTag(String id){ + long timestamp = System.currentTimeMillis(); + if (rfidTags.contains(id)){ + int index = rfidTags.indexOf(id); + ((RFIDTag) rfidTags.get(index)).setTimestamp(timestamp); + } else{ + rfidTags.add(new RFIDTag(id, timestamp)); + } + } } Index: PollHandler.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PollHandler.java 28 Feb 2006 11:23:16 -0000 1.7 --- PollHandler.java 2 Mar 2006 11:06:32 -0000 1.8 *************** *** 215,219 **** } ap.setId(position.getId().longValue()); ! // Nur Position von fixierten AccessPoints beachten if (position.isFixed()){ --- 215,219 ---- } ap.setId(position.getId().longValue()); ! ap.setHiddenStatus(apdto.isHidden()); // Nur Position von fixierten AccessPoints beachten if (position.isFixed()){ Index: ServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ServerManager.java 28 Feb 2006 11:23:16 -0000 1.12 --- ServerManager.java 2 Mar 2006 11:06:32 -0000 1.13 *************** *** 144,148 **** public abstract void createLocation(final int x, final int y, final boolean fixed, final String name, final CreatePositionCallback callback); ! /** * Erzeugt eine Geokoordinate auf dem Server --- 144,148 ---- public abstract void createLocation(final int x, final int y, final boolean fixed, final String name, final CreatePositionCallback callback); ! /** * Erzeugt eine Geokoordinate auf dem Server *************** *** 150,156 **** * @param callback */ ! public abstract void createGeoPos(final int x, final int y, final boolean fixed, final GeoPos geoPos, final String name, ! final CreatePositionCallback callback); ! /** * @param x --- 150,156 ---- * @param callback */ ! public abstract void createGeoPos(final int x, final int y, final boolean fixed, final GeoPos geoPos, ! final String name, final CreatePositionCallback callback); ! /** * @param x *************** *** 161,166 **** * @param callback */ ! public abstract void createInfoObject(final int x, final int y, final boolean fixed, final InfoObject infoObject, ! final String mapName, final CreatePositionCallback callback); /** --- 161,166 ---- * @param callback */ ! public abstract void createInfoObject(final int x, final int y, final boolean fixed, final InfoObject infoObject, ! final String mapName, final CreatePositionCallback callback); /** *************** *** 172,179 **** * @param callback */ ! public abstract void createRFIDAntenna(final int x, final int y, final boolean fixed, final RFIDAntenna antenna, ! final String mapName, final CreatePositionCallback callback); ! ! /** * Entfernt einen Referenzpunkt oder die Positionierung eines --- 172,178 ---- * @param callback */ ! public abstract void createRFIDAntenna(final int x, final int y, final boolean fixed, final RFIDAntenna antenna, ! final String mapName, final CreatePositionCallback callback); ! /** * Entfernt einen Referenzpunkt oder die Positionierung eines *************** *** 190,195 **** * @param callback */ ! public abstract void movePosition(final long positionId,final String mapname, final int x, final int y, final boolean fixed, ! final MovePositionCallback callback); /* --- 189,194 ---- * @param callback */ ! public abstract void movePosition(final long positionId, final String mapname, final int x, final int y, ! final boolean fixed, final MovePositionCallback callback); /* *************** *** 212,215 **** --- 211,225 ---- final String accessPointMac, final PositionCallback callback); + /** + * Setzt den Berechnungsstatus des Accesspoint + * @param sessionId + * @param mapName + * @param accessPointMac + * @param hidden + * @param callback + */ + public abstract void setAccessPointHiddenStatus(final String accessPointMac, final boolean hidden, + final PositionCallback callback); + public abstract void fetchPositionsFromServer(final FetchPositionsCallback callback); *************** *** 223,232 **** public abstract void submitClientInfo(); ! ! // /** ! // * Load new map ! // * @param info ! // */ ! // public abstract void loadMap(MapInfo info); } \ No newline at end of file --- 233,241 ---- public abstract void submitClientInfo(); ! // /** ! // * Load new map ! // * @param info ! // */ ! // public abstract void loadMap(MapInfo info); } \ No newline at end of file Index: SOAPServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SOAPServerManager.java 28 Feb 2006 11:23:16 -0000 1.8 --- SOAPServerManager.java 2 Mar 2006 11:06:32 -0000 1.9 *************** *** 162,169 **** try{ String[] names = SOAPServerManager.this.mapDelegate.getMapNames(); ! if (openDialog) { ! callback.openMapDialog(names); ! } else { ! callback.addMapNamesToOutline(names); } } catch (Exception e){ --- 162,169 ---- try{ String[] names = SOAPServerManager.this.mapDelegate.getMapNames(); ! if (openDialog){ ! callback.openMapDialog(names); ! } else{ ! callback.addMapNamesToOutline(names); } } catch (Exception e){ *************** *** 202,226 **** } } ! // /* (non-Javadoc) ! // * @see net.sf.magicmap.client.controller.ServerManager#loadMap(net.sf.magicmap.client.meta.MapInfo) ! // */ ! // @Override ! // public void loadMap(final MapInfo info) { ! // if (isConnected()){ ! // Thread loadMapThread = new Thread() { ! // ! // public void run() { ! // synchronized (mutex) { ! // try { ! // MainGUI.getInstance().loadMap(info); ! // } catch (Exception e){ ! // e.printStackTrace(); ! // } ! // } ! // } ! // }; ! // loadMapThread.start(); ! // } ! // } /** --- 202,227 ---- } } ! ! // /* (non-Javadoc) ! // * @see net.sf.magicmap.client.controller.ServerManager#loadMap(net.sf.magicmap.client.meta.MapInfo) ! // */ ! // @Override ! // public void loadMap(final MapInfo info) { ! // if (isConnected()){ ! // Thread loadMapThread = new Thread() { ! // ! // public void run() { ! // synchronized (mutex) { ! // try { ! // MainGUI.getInstance().loadMap(info); ! // } catch (Exception e){ ! // e.printStackTrace(); ! // } ! // } ! // } ! // }; ! // loadMapThread.start(); ! // } ! // } /** *************** *** 254,337 **** } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createGeoPos(int, int, boolean, net.sf.magicmap.client.model.node.GeoPos, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! public void createGeoPos(final int x, final int y, final boolean fixed, ! final GeoPos geoPos, final String mapName, final CreatePositionCallback callback) { ! ! if (isConnected()) { ! // final SignalCharacterDTO signalCharacter = currentSignalCharacter(); ! // final GeoPointDTO geoPoint = ! // new GeoPointDTO(geoPos.getAltitude(), geoPos.getLatitude(), geoPos.getLongitude(), x, y, (long) -1); ! Thread createGeoPosThread = new Thread() { ! public void run(){ ! synchronized (mutex){ ! try { ! SOAPServerManager.this.mapDelegate.createGeoPoint( ! sessionId, mapName, x, y, geoPos.getLongitude(), ! geoPos.getLatitude(), geoPos.getAltitude()); ! // TODO: Zusätzliche Parameter zur Position ! callback.positionCreated(); ! } catch (Exception e){ ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createGeoPosThread.start(); ! } ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createInfoObject(int, int, boolean, net.sf.magicmap.client.model.node.InfoObject, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createInfoObject(final int x, final int y, final boolean fixed, final InfoObject infoObject, final String mapName, final CreatePositionCallback callback) { ! ! if (isConnected()) { ! ! Thread createInfoObjectThread = new Thread() { ! public void run() { ! synchronized(mutex) { ! try { ! SOAPServerManager.this.mapDelegate.createInfoObject ( ! sessionId, mapName, x, y, infoObject.getUrl(), infoObject.getType()); ! } catch (Exception e) { ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createInfoObjectThread.start(); ! } ! ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createRFIDAntenna(int, int, boolean, net.sf.magicmap.client.model.node.RFIDAntenna, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createRFIDAntenna(final int x, final int y, boolean fixed, final RFIDAntenna antenna, final String mapName, final CreatePositionCallback callback) { ! ! if (isConnected()) { ! Thread createRFIDAntennaThread = new Thread() { ! public void run() { ! synchronized(mutex) { ! try { ! SOAPServerManager.this.mapDelegate.createRFIDAntenna( ! sessionId, mapName, x, y, antenna.getURL()); ! } catch (Exception e) { ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createRFIDAntennaThread.start(); ! } ! } ! /** --- 255,338 ---- } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createGeoPos(int, int, boolean, net.sf.magicmap.client.model.node.GeoPos, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! public void createGeoPos(final int x, final int y, final boolean fixed, final GeoPos geoPos, final String mapName, ! final CreatePositionCallback callback){ ! if (isConnected()){ ! // final SignalCharacterDTO signalCharacter = currentSignalCharacter(); ! // final GeoPointDTO geoPoint = ! // new GeoPointDTO(geoPos.getAltitude(), geoPos.getLatitude(), geoPos.getLongitude(), x, y, (long) -1); ! Thread createGeoPosThread = new Thread() { ! public void run(){ ! synchronized (mutex){ ! try{ ! SOAPServerManager.this.mapDelegate.createGeoPoint(sessionId, mapName, x, y, geoPos.getLongitude(), geoPos ! .getLatitude(), geoPos.getAltitude()); ! // TODO: Zusätzliche Parameter zur Position ! callback.positionCreated(); ! } catch (Exception e){ ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createGeoPosThread.start(); ! } ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createInfoObject(int, int, boolean, net.sf.magicmap.client.model.node.InfoObject, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createInfoObject(final int x, final int y, final boolean fixed, final InfoObject infoObject, ! final String mapName, final CreatePositionCallback callback){ ! ! if (isConnected()){ ! ! Thread createInfoObjectThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! SOAPServerManager.this.mapDelegate.createInfoObject(sessionId, mapName, x, y, infoObject.getUrl(), ! infoObject.getType()); ! } catch (Exception e){ ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createInfoObjectThread.start(); ! } ! ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createRFIDAntenna(int, int, boolean, net.sf.magicmap.client.model.node.RFIDAntenna, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createRFIDAntenna(final int x, final int y, boolean fixed, final RFIDAntenna antenna, ! final String mapName, final CreatePositionCallback callback){ ! ! if (isConnected()){ ! Thread createRFIDAntennaThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! SOAPServerManager.this.mapDelegate.createRFIDAntenna(sessionId, mapName, x, y, antenna.getURL()); ! } catch (Exception e){ ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createRFIDAntennaThread.start(); ! } ! } /** *************** *** 368,372 **** * @param callback */ ! public void movePosition(final long positionId,final String mapname, final int x, final int y, final boolean fixed, final MovePositionCallback callback){ if (isConnected()){ --- 369,373 ---- * @param callback */ ! public void movePosition(final long positionId, final String mapname, final int x, final int y, final boolean fixed, final MovePositionCallback callback){ if (isConnected()){ *************** *** 456,541 **** } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#fetchPositionsFromServer(net.sf.magicmap.client.interfaces.FetchPositionsCallback) ! */ ! public void fetchPositionsFromServer(final FetchPositionsCallback callback) { ! if (isConnected()) { ! Thread fetchPositionsThread = new Thread() { ! public void run() { ! synchronized (mutex) { ! // retrieve and communicate common positions (WLAN, i.e. APs, clients,...) ! try { ! ! PositionDTO[] positions = SOAPServerManager.this.positionDelgate.getPositionsForMapSince( ! SOAPServerManager.this.sessionId, controller.getCurrentMap().name, SOAPServerManager.this.timestamp); // korrigierter fehler? SOAPServerManager.this.timestamp anstatt timestamp ! for (int i = 0; i < positions.length; i++){ ! if (positions[i].getLastModified().longValue() > SOAPServerManager.this.timestamp){ ! SOAPServerManager.this.timestamp = positions[i].getLastModified().longValue(); ! } ! } ! 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) { ! callback.positionFetchError(e); ! } ! } ! } ! }; ! fetchPositionsThread.start(); ! } ! } ! /* (non-Javadoc) --- 457,564 ---- } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#setAccessPointHiddenStatus(long, java.lang.String, java.lang.String, boolean, net.sf.magicmap.client.interfaces.PositionCallback) ! */ ! @Override ! public void setAccessPointHiddenStatus(final String accessPointMac, final boolean hidden, ! final PositionCallback callback){ ! if (isConnected()){ ! Thread positionThread = new Thread() { ! public void run(){ ! synchronized (mutex){ ! try{ ! SOAPServerManager.this.positionDelgate.setAccessPointHiddenStatus(sessionId, ! controller.getCurrentMap().name, accessPointMac, hidden); ! callback.positionUpdated(accessPointMac); ! } catch (Exception e){ ! callback.positionError(e); ! } ! } ! } ! }; ! positionThread.start(); ! } ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#fetchPositionsFromServer(net.sf.magicmap.client.interfaces.FetchPositionsCallback) ! */ ! public void fetchPositionsFromServer(final FetchPositionsCallback callback){ ! if (isConnected()){ ! Thread fetchPositionsThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! // retrieve and communicate common positions (WLAN, i.e. APs, clients,...) ! try{ ! ! PositionDTO[] positions = SOAPServerManager.this.positionDelgate.getPositionsForMapSince( ! SOAPServerManager.this.sessionId, controller.getCurrentMap().name, SOAPServerManager.this.timestamp); // korrigierter fehler? SOAPServerManager.this.timestamp anstatt timestamp ! for (int i = 0; i < positions.length; i++){ ! if (positions[i].getLastModified().longValue() > SOAPServerManager.this.timestamp){ ! SOAPServerManager.this.timestamp = positions[i].getLastModified().longValue(); ! } ! } ! ! 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){ ! callback.positionFetchError(e); ! } ! } ! } ! }; ! fetchPositionsThread.start(); ! } ! } /* (non-Javadoc) *************** *** 607,611 **** } - - } \ No newline at end of file --- 630,632 ---- |
|
From: Florian L. <fle...@us...> - 2006-03-02 11:06:46
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7673/src/net/sf/magicmap/client/model/node Modified Files: AccessPointNode.java Log Message: Accesspoint brechnung Index: AccessPointNode.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/AccessPointNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AccessPointNode.java 16 Jan 2005 16:01:26 -0000 1.1 --- AccessPointNode.java 2 Mar 2006 11:06:41 -0000 1.2 *************** *** 16,19 **** --- 16,22 ---- * @param model */ + private boolean hiddenStatus; + + public AccessPointNode(NodeModel model) { super(model); *************** *** 48,50 **** --- 51,69 ---- } + + /** + * @return Returns the hiddenStatus. + */ + public boolean isHidden(){ + return hiddenStatus; + } + + + /** + * @param hiddenStatus The hiddenStatus to set. + */ + public void setHiddenStatus(boolean hiddenStatus){ + this.hiddenStatus = hiddenStatus; + } + } \ No newline at end of file |
|
From: Florian L. <fle...@us...> - 2006-03-02 11:06:45
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7673/src/net/sf/magicmap/client/delegate Modified Files: PositionDelegate.java Log Message: Accesspoint brechnung Index: PositionDelegate.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/PositionDelegate.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PositionDelegate.java 28 Feb 2006 17:25:36 -0000 1.10 --- PositionDelegate.java 2 Mar 2006 11:06:39 -0000 1.11 *************** *** 6,10 **** import java.rmi.RemoteException; - import localhost.magicmap.services.PositionFacade.PositionFacade; import localhost.magicmap.services.PositionFacade.PositionFacadeServiceLocator; --- 6,9 ---- *************** *** 19,23 **** /** ! * @author Martin */ public class PositionDelegate implements PositionFacadeInterface { --- 18,22 ---- /** ! * @author Martin */ public class PositionDelegate implements PositionFacadeInterface { *************** *** 49,54 **** } ! /* (non-Javadoc) ! * @see com.saugstation.pacw.generated.PositionFacade#createPosition(long, java.lang.String, int, int, com.saugstation.pacw.generated.SignalCharacter, java.lang.String) */ public void createOrUpdatePosition(long sessionId, String mapName, int positionX, int positionY, --- 48,57 ---- } ! /* ! * (non-Javadoc) ! * ! * @see com.saugstation.pacw.generated.PositionFacade#createPosition(long, ! * java.lang.String, int, int, ! * com.saugstation.pacw.generated.SignalCharacter, java.lang.String) */ public void createOrUpdatePosition(long sessionId, String mapName, int positionX, int positionY, *************** *** 56,63 **** SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.createOrUpdatePosition(sessionId, mapName, positionX, positionY, character, positionName, fixed); ! long timeB = System.currentTimeMillis(); ! System.out.println("createOrUpdatePosition brauchte: " + (timeB-timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); --- 59,66 ---- SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.createOrUpdatePosition(sessionId, mapName, positionX, positionY, character, positionName, fixed); ! long timeB = System.currentTimeMillis(); ! System.out.println("createOrUpdatePosition brauchte: " + (timeB - timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); *************** *** 65,70 **** } ! /* (non-Javadoc) ! * @see com.saugstation.pacw.generated.PositionFacade#createOrUpdateClientPosition(long, java.lang.String, int, int, com.saugstation.pacw.generated.SignalCharacter, java.lang.String) */ public void createOrUpdateClientPosition(long sessionId, String mapName, int positionX, int positionY, --- 68,77 ---- } ! /* ! * (non-Javadoc) ! * ! * @see com.saugstation.pacw.generated.PositionFacade#createOrUpdateClientPosition(long, ! * java.lang.String, int, int, ! * com.saugstation.pacw.generated.SignalCharacter, java.lang.String) */ public void createOrUpdateClientPosition(long sessionId, String mapName, int positionX, int positionY, *************** *** 72,79 **** SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.createOrUpdateClientPosition(sessionId, mapName, positionX, positionY, character, clientMac, fixed); ! long timeB = System.currentTimeMillis(); ! System.out.println("createOrUpdateClientPosition brauchte: " + (timeB-timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); --- 79,86 ---- SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.createOrUpdateClientPosition(sessionId, mapName, positionX, positionY, character, clientMac, fixed); ! long timeB = System.currentTimeMillis(); ! System.out.println("createOrUpdateClientPosition brauchte: " + (timeB - timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); *************** *** 81,94 **** } ! /* (non-Javadoc) ! * @see com.saugstation.pacw.generated.PositionFacade#createOrUpdateAccessPosition(long, java.lang.String, int, int, com.saugstation.pacw.generated.SignalCharacter, java.lang.String) */ public void createOrUpdateAccessPosition(long sessionId, String mapName, int positionX, int positionY, String accessPointMac, boolean fixed) throws RemoteException, MapException, SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.createOrUpdateAccessPosition(sessionId, mapName, positionX, positionY, accessPointMac, fixed); ! long timeB = System.currentTimeMillis(); ! System.out.println("createOrUpdateAccessPosition brauchte: " + (timeB-timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); --- 88,105 ---- } ! /* ! * (non-Javadoc) ! * ! * @see com.saugstation.pacw.generated.PositionFacade#createOrUpdateAccessPosition(long, ! * java.lang.String, int, int, ! * com.saugstation.pacw.generated.SignalCharacter, java.lang.String) */ public void createOrUpdateAccessPosition(long sessionId, String mapName, int positionX, int positionY, String accessPointMac, boolean fixed) throws RemoteException, MapException, SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.createOrUpdateAccessPosition(sessionId, mapName, positionX, positionY, accessPointMac, fixed); ! long timeB = System.currentTimeMillis(); ! System.out.println("createOrUpdateAccessPosition brauchte: " + (timeB - timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); *************** *** 96,109 **** } ! /* (non-Javadoc) ! * @see com.saugstation.pacw.generated.PositionFacade#movePosition(long, long, int, int) */ ! public void movePosition(long sessionId, String mapname, long positionId, int newPositionX, int newPositionY, boolean fixed) ! throws RemoteException, MapException, SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.movePosition(sessionId, mapname, positionId, newPositionX, newPositionY, fixed); ! long timeB = System.currentTimeMillis(); ! System.out.println("movePosition brauchte: " + (timeB-timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); --- 107,123 ---- } ! /* ! * (non-Javadoc) ! * ! * @see com.saugstation.pacw.generated.PositionFacade#movePosition(long, ! * long, int, int) */ ! public void movePosition(long sessionId, String mapname, long positionId, int newPositionX, int newPositionY, ! boolean fixed) throws RemoteException, MapException, SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.movePosition(sessionId, mapname, positionId, newPositionX, newPositionY, fixed); ! long timeB = System.currentTimeMillis(); ! System.out.println("movePosition brauchte: " + (timeB - timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); *************** *** 111,123 **** } ! /* (non-Javadoc) ! * @see com.saugstation.pacw.generated.PositionFacade#deletePosition(long, long) */ ! public void deletePosition(long sessionId, String mapname, long positionId) throws RemoteException, MapException, SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.deletePosition(sessionId, mapname, positionId); ! long timeB = System.currentTimeMillis(); ! System.out.println("deletePosition brauchte: " + (timeB-timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); --- 125,141 ---- } ! /* ! * (non-Javadoc) ! * ! * @see com.saugstation.pacw.generated.PositionFacade#deletePosition(long, ! * long) */ ! public void deletePosition(long sessionId, String mapname, long positionId) throws RemoteException, MapException, ! SessionException{ try{ ! long timeA = System.currentTimeMillis(); this.binding.deletePosition(sessionId, mapname, positionId); ! long timeB = System.currentTimeMillis(); ! System.out.println("deletePosition brauchte: " + (timeB - timeA) + "ms"); } catch (Exception e){ throw ExceptionHandler.checkException(e); *************** *** 125,146 **** } ! /* (non-Javadoc) ! * @see com.saugstation.pacw.generated.PositionFacade#getPositionsForMapSince(long, java.lang.String, long) */ public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws RemoteException, ! MapException, SessionException{ return this.binding.getPositionsForMapSince(sessionId, mapName, timeStamp); } ! /* (non-Javadoc) * @see java.io.Closeable#close() */ public void close(){ ! // nichts zu tun hier } ! public void setAccessPointHiddenStatus(long sessionId, String mapName, String accessPointMac, boolean hidden) throws RemoteException, MapException, SessionException{ ! // TODO Auto-generated method stub ! } --- 143,176 ---- } ! /* ! * (non-Javadoc) ! * ! * @see com.saugstation.pacw.generated.PositionFacade#getPositionsForMapSince(long, ! * java.lang.String, long) */ public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws RemoteException, ! MapException, SessionException{ return this.binding.getPositionsForMapSince(sessionId, mapName, timeStamp); } ! /* ! * (non-Javadoc) ! * * @see java.io.Closeable#close() */ public void close(){ ! // nichts zu tun hier } ! public void setAccessPointHiddenStatus(long sessionId, String mapName, String accessPointMac, boolean hidden) ! throws RemoteException, MapException, SessionException{ ! try{ ! long timeA = System.currentTimeMillis(); ! this.binding.setAccessPointHiddenStatus(sessionId, mapName, accessPointMac, hidden); ! long timeB = System.currentTimeMillis(); ! System.out.println("setAccessPointHiddenStatus brauchte: " + (timeB - timeA) + "ms"); ! } catch (Exception e){ ! throw ExceptionHandler.checkException(e); ! } } |
|
From: Johannes Z. <jza...@us...> - 2006-03-02 10:39:48
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24492/src/net/sf/magicmap/client/views Modified Files: OutlineView.java Log Message: measurement view now updated when node selected in outline view Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** OutlineView.java 1 Mar 2006 21:04:17 -0000 1.9 --- OutlineView.java 2 Mar 2006 10:39:37 -0000 1.10 *************** *** 271,275 **** } } else { ! Controller.getInstance().getMapView().getPACWGraphDraw().setSelected(Controller.getInstance().getMapView().findVertex(node)); } } else { --- 271,276 ---- } } else { ! // Controller.getInstance().getMapView().getPACWGraphDraw().setSelected(Controller.getInstance().getMapView().findVertex(node)); ! Controller.getInstance().getMapView().vertexSelected(Controller.getInstance().getMapView().findVertex(node)); } } else { |
|
From: Johannes Z. <jza...@us...> - 2006-03-01 21:06:40
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23826/src/net/sf/magicmap/client/gui/dialogs Modified Files: LoadMapDialog.java Log Message: added busy cursor while loading Index: LoadMapDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LoadMapDialog.java 26 Feb 2006 10:20:57 -0000 1.4 --- LoadMapDialog.java 1 Mar 2006 21:06:32 -0000 1.5 *************** *** 5,8 **** --- 5,9 ---- package net.sf.magicmap.client.gui.dialogs; + import java.awt.Cursor; import java.awt.Frame; import java.awt.event.ActionEvent; *************** *** 35,38 **** --- 36,42 ---- * Ein Dialog zum Laden einer vorhandenen Karte * @author thuebner + * + * Refactored on 1.3.2006 + * @author Johannes Zapotoczky <joh...@za...> */ public class LoadMapDialog extends JDialog implements ActionListener, MapCallback, ListSelectionListener { *************** *** 43,183 **** private static final long serialVersionUID = -2877958199332251412L; ! ! private MapInfo info; ! private JPanel mainPanel; ! private JList list; ! private ImagePreview preview; ! private String[] maps; ! private LoadMapDialogListener listener; ! ! public static MapInfo showDialog(Frame owner, String[] maps, LoadMapDialogListener listener){ ! LoadMapDialog d = new LoadMapDialog(owner, maps); ! GUIUtils.locateOnScreen(d); ! d.setModal(false); ! d.setVisible(true); ! d.listener = listener; ! return d.getMapInfo(); ! } ! ! public LoadMapDialog(Frame owner, String[] maps) { ! super(owner, GUIUtils.i18n("loadmap", false)); ! setSize(500, 500); ! this.maps = maps; ! ! RelativeLayout layout = new RelativeLayout(); ! RelativePanelBuilder builder = new RelativePanelBuilder(layout); ! // OK / Abbrechen ! JButton ok = builder.createButton(GUIUtils.i18n("ok"), "OK", this); ! JButton cancel = builder.createButton(GUIUtils.i18n("cancel"), "CANCEL", this); ! builder.addOKCancelButtonBar(ok, cancel, "okcancel"); ! builder.setLeftLeftDistance("okcancel", null, 10); ! builder.setRightRightDistance("okcancel", null, -10); ! builder.setBottomBottomDistance("okcancel", null, -10); ! builder.addLabel(GUIUtils.i18n("maps"), "mapslabel"); ! builder.setLeft("mapslabel", 10); ! builder.setTop("mapslabel", 10); ! list = new JList(maps); ! JScrollPane pane = new JScrollPane(list); ! builder.add(pane, "list"); ! builder.setLeft("list", 10); ! builder.setTopBottomDistance("list", "mapslabel", 5); ! builder.setRightRightDistance("list", null, -10); ! builder.setHeight("list", 100); ! preview = new ImagePreview(); ! preview.setBorder(new EtchedBorder()); ! builder.add(preview, "preview"); ! builder.setLeft("preview", 10); ! builder.setTopBottomDistance("preview", "list", 10); ! builder.setRightRightDistance("preview", null, -10); ! builder.setBottomTopDistance("preview", "okcancel", -10); ! list.addListSelectionListener(this); ! mainPanel = builder.getPanel(); ! setContentPane(mainPanel); ! mainPanel.getRootPane().setDefaultButton(ok); ! } ! /** ! * @return ! */ ! private MapInfo getMapInfo(){ ! return this.info; ! } ! /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) ! */ ! public void actionPerformed(ActionEvent e){ ! if (e.getActionCommand().equals("OK")){ ! if (info != null){ ! try{ ! listener.loadMap(info); ! } catch (Exception ex){ ! ex.printStackTrace(); ! } ! setVisible(false); ! } ! } else if (e.getActionCommand().equals("CANCEL")){ ! info = null; ! setVisible(false); ! } ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.MapCallback#mapReceived(net.sf.magicmap.client.delegate.dto.MapDTO) ! */ ! public void mapReceived(final MapDTO mapDTO){ ! try{ ! // Mit SWING synchronisieren.... ! SwingUtilities.invokeAndWait(new Runnable() { ! public void run(){ ! try{ ! info = new MapInfo(); ! info.height = mapDTO.getImageHeight().intValue(); ! info.width = mapDTO.getImageWidth().intValue(); ! info.name = mapDTO.getName(); ! info.imageURL = mapDTO.getImageURL().toString(); ! preview.loadImage(info.imageURL); ! } catch (MalformedURLException e){ ! // TODO Auto-generated catch block ! e.printStackTrace(); ! } ! } ! }); ! } catch (InterruptedException e){ ! // TODO Auto-generated catch block ! e.printStackTrace(); ! } catch (InvocationTargetException e){ ! // TODO Auto-generated catch block ! e.printStackTrace(); ! } ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.MapCallback#getMapError(java.lang.Exception) ! */ ! public void getMapError(Exception e){ ! e.printStackTrace(); ! info = null; ! } ! /* (non-Javadoc) ! * @see javax.swing.event.ListSelectionListener#valueChanged(javax.swing.event.ListSelectionEvent) ! */ ! public void valueChanged(ListSelectionEvent e){ ! if (!e.getValueIsAdjusting()){ ! String map = (String) list.getSelectedValue(); ! Controller.getInstance().retrieveMap(map, this); ! } ! } ! } \ No newline at end of file --- 47,185 ---- private static final long serialVersionUID = -2877958199332251412L; ! private MapInfo info; ! private JPanel mainPanel; ! private JList list; ! private ImagePreview preview; ! private LoadMapDialogListener listener; ! private Cursor cursor; ! public static MapInfo showDialog(Frame owner, String[] maps, LoadMapDialogListener listener) { ! LoadMapDialog d = new LoadMapDialog(owner, maps); ! GUIUtils.locateOnScreen(d); ! d.setModal(false); ! d.setVisible(true); ! d.listener = listener; ! return d.getMapInfo(); ! } ! public LoadMapDialog(Frame owner, String[] maps) { ! super(owner, GUIUtils.i18n("loadmap", false)); ! setSize(500, 500); ! RelativeLayout layout = new RelativeLayout(); ! RelativePanelBuilder builder = new RelativePanelBuilder(layout); ! // OK / Abbrechen ! JButton ok = builder.createButton(GUIUtils.i18n("ok"), "OK", this); ! JButton cancel = builder.createButton(GUIUtils.i18n("cancel"), "CANCEL", this); ! builder.addOKCancelButtonBar(ok, cancel, "okcancel"); ! builder.setLeftLeftDistance("okcancel", null, 10); ! builder.setRightRightDistance("okcancel", null, -10); ! builder.setBottomBottomDistance("okcancel", null, -10); ! builder.addLabel(GUIUtils.i18n("maps"), "mapslabel"); ! builder.setLeft("mapslabel", 10); ! builder.setTop("mapslabel", 10); ! list = new JList(maps); ! JScrollPane pane = new JScrollPane(list); ! builder.add(pane, "list"); ! builder.setLeft("list", 10); ! builder.setTopBottomDistance("list", "mapslabel", 5); ! builder.setRightRightDistance("list", null, -10); ! builder.setHeight("list", 100); ! preview = new ImagePreview(); ! preview.setBorder(new EtchedBorder()); ! builder.add(preview, "preview"); ! builder.setLeft("preview", 10); ! builder.setTopBottomDistance("preview", "list", 10); ! builder.setRightRightDistance("preview", null, -10); ! builder.setBottomTopDistance("preview", "okcancel", -10); ! list.addListSelectionListener(this); ! mainPanel = builder.getPanel(); ! setContentPane(mainPanel); ! mainPanel.getRootPane().setDefaultButton(ok); ! } ! /** ! * @return ! */ ! private MapInfo getMapInfo() { ! return this.info; ! } ! /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) ! */ ! public void actionPerformed(ActionEvent e) { ! if (e.getActionCommand().equals("OK")) { ! if (info != null) { ! try { ! cursor = getCursor(); ! setCursor(new Cursor(Cursor.WAIT_CURSOR)); ! listener.loadMap(info); ! } catch (Exception ex){ ! ex.printStackTrace(); ! } ! setVisible(false); ! } ! } else if (e.getActionCommand().equals("CANCEL")){ ! info = null; ! setVisible(false); ! } ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.MapCallback#mapReceived(net.sf.magicmap.client.delegate.dto.MapDTO) ! */ ! public void mapReceived(final MapDTO mapDTO){ ! try { ! // Mit SWING synchronisieren.... ! SwingUtilities.invokeAndWait(new Runnable() { ! public void run() { ! try { ! info = new MapInfo(); ! info.height = mapDTO.getImageHeight().intValue(); ! info.width = mapDTO.getImageWidth().intValue(); ! info.name = mapDTO.getName(); ! info.imageURL = mapDTO.getImageURL().toString(); ! preview.loadImage(info.imageURL); ! setCursor(cursor); ! } catch (MalformedURLException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); ! } ! } ! }); ! } catch (InterruptedException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); ! } catch (InvocationTargetException e){ ! // TODO Auto-generated catch block ! e.printStackTrace(); ! } ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.MapCallback#getMapError(java.lang.Exception) ! */ ! public void getMapError(Exception e) { ! e.printStackTrace(); ! info = null; ! } ! /* (non-Javadoc) ! * @see javax.swing.event.ListSelectionListener#valueChanged(javax.swing.event.ListSelectionEvent) ! */ ! public void valueChanged(ListSelectionEvent e) { ! if (!e.getValueIsAdjusting()) { ! String map = (String) list.getSelectedValue(); ! Controller.getInstance().retrieveMap(map, this); ! } ! } ! } |
|
From: Johannes Z. <jza...@us...> - 2006-03-01 21:06:06
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23141/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: added busy cursor while connecting Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** MainGUI.java 26 Feb 2006 10:20:57 -0000 1.15 --- MainGUI.java 1 Mar 2006 21:05:48 -0000 1.16 *************** *** 7,10 **** --- 7,11 ---- import java.awt.Container; + import java.awt.Cursor; import java.awt.Dimension; import java.awt.event.ActionEvent; *************** *** 123,126 **** --- 124,128 ---- private MagicAction[] dataInvocationRateAction; + private Cursor cursor; /** *************** *** 219,222 **** --- 221,225 ---- info = ConnectServerDialog.showDialog(MainGUI.this, info); if (info != null) { + Settings.setClientName(info.name); Settings.setClientPassword(info.password); *************** *** 674,677 **** --- 677,681 ---- */ public void connected(long sesssionId) { + statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_CONNECTED)); statusBar.setInvisible(Controller.getInstance().isInvisible()); *************** *** 680,683 **** --- 684,688 ---- newMapAction.setEnabled(true); loadMapAction.setEnabled(true); + setCursor(cursor); // Controller.getInstance().retrieveMapNames(MainGUI.this, false); *************** *** 810,813 **** --- 815,820 ---- */ protected void connect() { + cursor = getCursor(); + setCursor(new Cursor(Cursor.WAIT_CURSOR)); statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_CONNECTING)); statusBar.setInvisible(Controller.getInstance().isInvisible()); |
|
From: Johannes Z. <jza...@us...> - 2006-03-01 21:04:37
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22037/src/net/sf/magicmap/client/views Modified Files: OutlineView.java Log Message: removed comment Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** OutlineView.java 28 Feb 2006 11:23:16 -0000 1.8 --- OutlineView.java 1 Mar 2006 21:04:17 -0000 1.9 *************** *** 268,274 **** MapNode mapNode = (MapNode) node; if (mapNode.getMapInfo() != null) { ! // if (!Controller.getInstance().getCurrentMap().equals(mapNode.getMapInfo())) { ! Controller.getInstance().retrieveMap(mapNode.getMapInfo().name, mapNode); ! // } } } else { --- 268,272 ---- MapNode mapNode = (MapNode) node; if (mapNode.getMapInfo() != null) { ! Controller.getInstance().retrieveMap(mapNode.getMapInfo().name, mapNode); } } else { |
|
From: Andreas W. <an...@us...> - 2006-02-28 17:26:06
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25222/src/net/sf/magicmap/client/delegate/interfaces Modified Files: PositionFacadeInterface.java Log Message: Vorbereitung um Accesspoints auszublenden. Index: PositionFacadeInterface.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/PositionFacadeInterface.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PositionFacadeInterface.java 8 Nov 2005 11:24:19 -0000 1.5 --- PositionFacadeInterface.java 28 Feb 2006 17:25:36 -0000 1.6 *************** *** 77,82 **** * @throws MapException Fehlende Karte, inkosistente Positionsangaben */ ! public abstract void movePosition(long sessionId, String mapname,long positionId, int newPositionX, int newPositionY, boolean fixed) ! throws SessionException, MapException, RemoteException; /** --- 77,82 ---- * @throws MapException Fehlende Karte, inkosistente Positionsangaben */ ! public abstract void movePosition(long sessionId, String mapname, long positionId, int newPositionX, ! int newPositionY, boolean fixed) throws SessionException, MapException, RemoteException; /** *************** *** 89,94 **** * @throws MapException Fehlende Karte */ ! public abstract void deletePosition(long sessionId, String mapname,long positionId) throws SessionException, MapException, ! RemoteException; /** --- 89,94 ---- * @throws MapException Fehlende Karte */ ! public abstract void deletePosition(long sessionId, String mapname, long positionId) throws SessionException, ! MapException, RemoteException; /** *************** *** 104,107 **** --- 104,119 ---- public abstract PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws MapException, SessionException, RemoteException; + + /** + * @param sessionId + * @param mapName + * @param accessPointMac + * @param hidden + * @throws RemoteException + * @throws MapException + * @throws SessionException + */ + public abstract void setAccessPointHiddenStatus(long sessionId, String mapName, String accessPointMac, boolean hidden) + throws RemoteException, MapException, SessionException; } \ No newline at end of file |
|
From: Andreas W. <an...@us...> - 2006-02-28 17:26:01
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25222/src/net/sf/magicmap/client/delegate Modified Files: PositionDelegate.java Log Message: Vorbereitung um Accesspoints auszublenden. Index: PositionDelegate.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/PositionDelegate.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PositionDelegate.java 25 Nov 2005 14:32:12 -0000 1.9 --- PositionDelegate.java 28 Feb 2006 17:25:36 -0000 1.10 *************** *** 140,142 **** --- 140,147 ---- } + public void setAccessPointHiddenStatus(long sessionId, String mapName, String accessPointMac, boolean hidden) throws RemoteException, MapException, SessionException{ + // TODO Auto-generated method stub + + } + } \ No newline at end of file |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 12:40:36
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6671/src/net/sf/magicmap/client/gui/dialogs Modified Files: InfoObjectDialog.java RFIDAntennaDialog.java Log Message: Index: RFIDAntennaDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/RFIDAntennaDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RFIDAntennaDialog.java 28 Feb 2006 11:23:16 -0000 1.1 --- RFIDAntennaDialog.java 28 Feb 2006 12:40:29 -0000 1.2 *************** *** 4,10 **** package net.sf.magicmap.client.gui.dialogs; - import java.awt.Dialog; import java.awt.Frame; - import java.awt.GraphicsConfiguration; import java.awt.HeadlessException; import java.awt.event.ActionEvent; --- 4,8 ---- *************** *** 16,27 **** import javax.swing.JTextField; - import com.brunchboy.util.swing.relativelayout.RelativeLayout; - import net.sf.magicmap.client.gui.utils.GUIConstants; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; - import net.sf.magicmap.client.model.node.InfoObject; import net.sf.magicmap.client.model.node.RFIDAntenna; /** * @author Johannes Zapotoczky (joh...@za...) --- 14,24 ---- import javax.swing.JTextField; import net.sf.magicmap.client.gui.utils.GUIConstants; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; import net.sf.magicmap.client.model.node.RFIDAntenna; + import com.brunchboy.util.swing.relativelayout.RelativeLayout; + /** * @author Johannes Zapotoczky (joh...@za...) *************** *** 30,33 **** --- 27,35 ---- public class RFIDAntennaDialog extends JDialog implements ActionListener { + /** + * serial version id + */ + private static final long serialVersionUID = -1805244476536023692L; + private RFIDAntenna antenna; *************** *** 51,56 **** */ public RFIDAntennaDialog(Frame owner) { ! super(owner, GUIUtils.i18n("geopos")); ! this.setSize(300, 300); this.setResizable(false); --- 53,58 ---- */ public RFIDAntennaDialog(Frame owner) { ! super(owner, GUIUtils.i18n("rfidantenna")); ! this.setSize(250, 165); this.setResizable(false); *************** *** 68,73 **** // Kopf ! builder.addDialogHeader("<html><b>" + GUIUtils.i18n("setgeopos") + "</b><br>" ! + GUIUtils.i18n("setgeoposhint") + "</html>", GUIConstants.ICON_GEOPOS_BIG, "header"); builder.setTop("header", 0); builder.setLeft("header", 0); --- 70,75 ---- // Kopf ! builder.addDialogHeader("<html><b>" + GUIUtils.i18n("setrfidantenna") + "</b><br>" ! + GUIUtils.i18n("setrfidantennahint") + "</html>", GUIConstants.ICON_RFID_ANTENNA, "header"); builder.setTop("header", 0); builder.setLeft("header", 0); *************** *** 79,88 **** //id ! id = builder.addTextField("longitude"); ! builder.addLabel("Longitude", "longitudelabel", id); ! builder.setLeft("longitudelabel", 20); ! builder.setRightRightDistance("longitude", null, -20); ! builder.setTopBottomDistance("longitudelabel", "header", 20); ! builder.setTopBottomDistance("longitude", "header", 20); } --- 81,90 ---- //id ! id = builder.addTextField("id"); ! builder.addLabel("ID", "idlabel", id); ! builder.setLeft("idlabel", 20); ! builder.setRightRightDistance("id", null, -20); ! builder.setTopBottomDistance("idlabel", "header", 20); ! builder.setTopBottomDistance("id", "header", 20); } Index: InfoObjectDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/InfoObjectDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InfoObjectDialog.java 28 Feb 2006 11:23:16 -0000 1.1 --- InfoObjectDialog.java 28 Feb 2006 12:40:29 -0000 1.2 *************** *** 57,62 **** public InfoObjectDialog(JFrame owner) { ! super(owner, GUIUtils.i18n("geopos")); ! this.setSize(300, 300); this.setResizable(false); --- 57,62 ---- public InfoObjectDialog(JFrame owner) { ! super(owner, GUIUtils.i18n("infoobject")); ! this.setSize(250, 165); this.setResizable(false); *************** *** 74,79 **** // Kopf ! builder.addDialogHeader("<html><b>" + GUIUtils.i18n("setgeopos") + "</b><br>" ! + GUIUtils.i18n("setgeoposhint") + "</html>", GUIConstants.ICON_GEOPOS_BIG, "header"); builder.setTop("header", 0); builder.setLeft("header", 0); --- 74,79 ---- // Kopf ! builder.addDialogHeader("<html><b>" + GUIUtils.i18n("setinfoobject") + "</b><br>" ! + GUIUtils.i18n("setinfoobjecthint") + "</html>", GUIConstants.ICON_INFO, "header"); builder.setTop("header", 0); builder.setLeft("header", 0); *************** *** 85,94 **** //url ! url = builder.addTextField("longitude"); ! builder.addLabel("Longitude", "longitudelabel", url); ! builder.setLeft("longitudelabel", 20); ! builder.setRightRightDistance("longitude", null, -20); ! builder.setTopBottomDistance("longitudelabel", "header", 20); ! builder.setTopBottomDistance("longitude", "header", 20); } --- 85,94 ---- //url ! url = builder.addTextField("url"); ! builder.addLabel("URL", "urllabel", url); ! builder.setLeft("urllabel", 20); ! builder.setRightRightDistance("url", null, -20); ! builder.setTopBottomDistance("urllabel", "header", 20); ! builder.setTopBottomDistance("url", "header", 20); } |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 12:40:24
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6535/res Modified Files: screentext_en_US.properties screentext_de_DE.properties Log Message: changed dialogs Index: screentext_de_DE.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_de_DE.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** screentext_de_DE.properties 23 Feb 2006 18:33:28 -0000 1.9 --- screentext_de_DE.properties 28 Feb 2006 12:40:13 -0000 1.10 *************** *** 105,108 **** --- 105,114 ---- setgeopos=Eine Geokoordinate setzen setgeoposhint=Geben Sie bitte eine Geokoordinate an + infoobject=Infoobjekt setzen + setinfoobject=Ein Infoobjekt setzen + setinfoobjecthint=Geben Sie bitte eine URL an + rfidantenna=RFID-Antenne setzen + setrfidantenna=Eine RFID-Antenne positionieren + setrfidantennahint=Geben Sie bitte einen Identifikator an nonserverconnect=Kein Server (Standalone) showedgesforselectednode=Zeige nur die Kanten für den selektierten Knoten Index: screentext_en_US.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_en_US.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** screentext_en_US.properties 23 Feb 2006 18:33:28 -0000 1.3 --- screentext_en_US.properties 28 Feb 2006 12:40:13 -0000 1.4 *************** *** 16,19 **** --- 16,25 ---- setgeopos=Set a geo position setgeoposhint=Please enter a geo position + infoobject=Set an info object + setinfoobject=Set an info object + setinfoobjecthint=Please enter a URL for the info object + rfidantenna=Set an RFID antenna + setrfidantenna=Set an RFID antenna + setrfidantennahint=Please enter an identificator scanlocation=Scan location namelocation=Name location |
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/controller Modified Files: PollHandler.java Controller.java VirtualServerManager.java ServerManager.java SOAPServerManager.java ServerPoller.java Log Message: added support for info objects and rfid antennas and tags Index: VirtualServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** VirtualServerManager.java 23 Feb 2006 18:34:38 -0000 1.6 --- VirtualServerManager.java 28 Feb 2006 11:23:16 -0000 1.7 *************** *** 20,23 **** --- 20,25 ---- import net.sf.magicmap.client.meta.MapInfo; import net.sf.magicmap.client.model.node.GeoPos; + import net.sf.magicmap.client.model.node.InfoObject; + import net.sf.magicmap.client.model.node.RFIDAntenna; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.utils.Version; *************** *** 474,476 **** --- 476,496 ---- } + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#createInfoObject(int, int, boolean, net.sf.magicmap.client.model.node.InfoObject, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) + */ + @Override + public void createInfoObject(int x, int y, boolean fixed, InfoObject infoObject, String mapName, CreatePositionCallback callback) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#createRFIDAntenna(int, int, boolean, net.sf.magicmap.client.model.node.RFIDAntenna, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) + */ + @Override + public void createRFIDAntenna(int x, int y, boolean fixed, RFIDAntenna antenna, String mapName, CreatePositionCallback callback) { + // 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.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Controller.java 26 Feb 2006 10:20:56 -0000 1.10 --- Controller.java 28 Feb 2006 11:23:16 -0000 1.11 *************** *** 10,14 **** --- 10,16 ---- import java.net.UnknownHostException; import java.util.ArrayList; + import java.util.Collection; + import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.interfaces.CreateNewMapCallback; import net.sf.magicmap.client.interfaces.CreatePositionCallback; *************** *** 32,37 **** --- 34,42 ---- import net.sf.magicmap.client.model.node.ClientNode; import net.sf.magicmap.client.model.node.GeoPos; + import net.sf.magicmap.client.model.node.InfoObject; import net.sf.magicmap.client.model.node.Node; import net.sf.magicmap.client.model.node.NodeModel; + import net.sf.magicmap.client.model.node.RFIDAntenna; + import net.sf.magicmap.client.model.node.RFIDTag; import net.sf.magicmap.client.net.NetworkInfo; import net.sf.magicmap.client.utils.Settings; *************** *** 70,73 **** --- 75,83 ---- private boolean invisble; // Invisible-Modus (keine Daten an Server) + + // pseudo server items + private Collection infoObjects; + private Collection rfidAntennas; + private ArrayList rfidTags; /** *************** *** 105,108 **** --- 115,124 ---- Settings.setClientMAC(clientMac); buildViews(); + + //pseudo server items + infoObjects = new ArrayList(); + rfidAntennas = new ArrayList(); + rfidTags = new ArrayList(); + initializeScanner(); } *************** *** 463,466 **** --- 479,518 ---- } + + /** + * Creates an InfoObject on the current map with the supplied parameters + * @param lastX + * @param lastY + * @param infoObject + * @param string + * @param b + * @param panel + */ + public void createInfoObject(int x, int y, InfoObject infoObject, String mapName, boolean fixed, CreatePositionCallback callback) { + if (!isConnected() || !isMapLoaded()) { + callback.positionCreationError(new Exception("Nicht verbunden oder keine Karte geladen.")); + } else{ + serverManager.createInfoObject(x, y, fixed, infoObject, mapName, callback); + } + } + + + /** + * @param lastX + * @param lastY + * @param antenna + * @param string + * @param b + * @param panel + */ + public void createRFIDAntenna(int x, int y, RFIDAntenna antenna, String mapName, boolean fixed, CreatePositionCallback callback) { + if (!isConnected() || !isMapLoaded()) { + callback.positionCreationError(new Exception("Nicht verbunden oder keine Karte geladen.")); + } else { + serverManager.createRFIDAntenna(x, y, fixed, antenna, mapName, callback); + } + + } + /** *************** *** 509,512 **** --- 561,565 ---- public void retrieveMap(String name, MapCallback callback) { serverManager.retrieveMap(name, callback); + getMapView().setTitle(GUIUtils.i18n("map", false) + " - " + name); } *************** *** 523,525 **** --- 576,605 ---- } + + public Collection getInfoObjects() { + return infoObjects; + } + + + public Collection getRfidAntennas() { + return rfidAntennas; + } + + + public Collection getRfidTags() { + return rfidTags; + } + + + public void addRfidTag(String id) { + long timestamp = System.currentTimeMillis(); + if (rfidTags.contains(id)) { + int index = rfidTags.indexOf(id); + ((RFIDTag) rfidTags.get(index)).setTimestamp(timestamp); + } else { + rfidTags.add(new RFIDTag(id, timestamp)); + } + } + + } Index: PollHandler.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PollHandler.java 26 Feb 2006 10:20:56 -0000 1.6 --- PollHandler.java 28 Feb 2006 11:23:16 -0000 1.7 *************** *** 15,22 **** --- 15,28 ---- import net.sf.magicmap.client.model.node.GeoPos; import net.sf.magicmap.client.model.node.GeoPosNode; + import net.sf.magicmap.client.model.node.InfoObject; + import net.sf.magicmap.client.model.node.InfoObjectNode; import net.sf.magicmap.client.model.node.LocationNode; import net.sf.magicmap.client.model.node.MapNode; import net.sf.magicmap.client.model.node.Node; import net.sf.magicmap.client.model.node.NodeModel; + import net.sf.magicmap.client.model.node.RFIDAntenna; + import net.sf.magicmap.client.model.node.RFIDAntennaNode; + import net.sf.magicmap.client.model.node.RFIDTag; + import net.sf.magicmap.client.model.node.RFIDTagNode; import net.sf.magicmap.server.dto.AccessPointDTO; import net.sf.magicmap.server.dto.ClientDTO; *************** *** 76,80 **** } if (position.getClient() != null){ ! Node client = nodeModel.findNode(position.getClient().getName()); /* if (client != null) { --- 82,86 ---- } if (position.getClient() != null){ ! // Node client = nodeModel.findNode(position.getClient().getName()); /* if (client != null) { *************** *** 404,407 **** --- 410,526 ---- } + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.ServerPollerListener#infoObjectCreatedorUpdatedOrDeleted(net.sf.magicmap.client.model.node.InfoObject) + */ + public void infoObjectCreatedorUpdatedOrDeleted(final InfoObject infoObject) { + + try { + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + try { + NodeModel nodeModel = controller.getNodeModel(); + Node node = nodeModel.findNode(infoObject.getUrl()); + + if (node == null) { + InfoObjectNode infoNode = new InfoObjectNode(nodeModel); + infoNode.setName(infoObject.getUrl()); + infoNode.setId(infoObject.hashCode()); + if (infoObject.getMap().equals(Controller.getInstance().getCurrentMap().name)) { + nodeModel.addNode(infoNode); + infoNode.setFix(true); + infoNode.setPosition(infoObject.getX(), infoObject.getY()); + } + } + + } catch (Exception e){ + e.printStackTrace(); + } + } + }); + } catch (InterruptedException e){ + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InvocationTargetException e){ + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.ServerPollerListener#rfidAntennaCreatedOrUpdatedOrDeleted(net.sf.magicmap.client.model.node.RFIDAntenna) + */ + public void rfidAntennaCreatedOrUpdatedOrDeleted(final RFIDAntenna antenna) { + try { + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + try { + NodeModel nodeModel = controller.getNodeModel(); + Node node = nodeModel.findNode(antenna.getURL()); + + if (node == null) { + RFIDAntennaNode antennaNode = new RFIDAntennaNode(nodeModel); + antennaNode.setName(antenna.getURL()); + antennaNode.setId(antenna.hashCode()); + if (antenna.getMap().equals(Controller.getInstance().getCurrentMap().name)) { + nodeModel.addNode(antennaNode); + antennaNode.setFix(true); + antennaNode.setPosition(antenna.getX(), antenna.getY()); + } + } + + } catch (Exception e){ + e.printStackTrace(); + } + } + }); + } catch (InterruptedException e){ + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InvocationTargetException e){ + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.ServerPollerListener#rfidTagCreatedOrUpdatedOrDeleted(net.sf.magicmap.client.model.node.RFIDTag) + */ + public void rfidTagCreatedOrUpdatedOrDeleted(final RFIDTag tag) { + try { + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + try { + NodeModel nodeModel = controller.getNodeModel(); + Node node = nodeModel.findNode(tag.getUrl()); + + if (node == null) { + RFIDTagNode rfidTagNode = new RFIDTagNode(nodeModel); + rfidTagNode.setName(tag.getUrl()); + rfidTagNode.setId(tag.hashCode()); + if (tag.getMap().equals(Controller.getInstance().getCurrentMap().name)) { + nodeModel.addNode(rfidTagNode); + rfidTagNode.setFix(true); + rfidTagNode.setPosition(tag.getX(), tag.getY()); + } + } + + } catch (Exception e){ + e.printStackTrace(); + } + } + }); + } catch (InterruptedException e){ + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InvocationTargetException e){ + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } } Index: SOAPServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SOAPServerManager.java 26 Feb 2006 10:20:57 -0000 1.7 --- SOAPServerManager.java 28 Feb 2006 11:23:16 -0000 1.8 *************** *** 7,10 **** --- 7,11 ---- import java.io.IOException; import java.rmi.RemoteException; + import java.util.Collection; import net.sf.magicmap.client.delegate.MapDelegate; *************** *** 26,29 **** --- 27,32 ---- import net.sf.magicmap.client.meta.MapInfo; import net.sf.magicmap.client.model.node.GeoPos; + import net.sf.magicmap.client.model.node.InfoObject; + import net.sf.magicmap.client.model.node.RFIDAntenna; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.utils.Version; *************** *** 262,266 **** // new GeoPointDTO(geoPos.getAltitude(), geoPos.getLatitude(), geoPos.getLongitude(), x, y, (long) -1); ! Thread createPositionThread = new Thread() { public void run(){ --- 265,269 ---- // new GeoPointDTO(geoPos.getAltitude(), geoPos.getLatitude(), geoPos.getLongitude(), x, y, (long) -1); ! Thread createGeoPosThread = new Thread() { public void run(){ *************** *** 278,284 **** } }; ! createPositionThread.start(); } } /** --- 281,337 ---- } }; ! createGeoPosThread.start(); ! } ! } ! ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createInfoObject(int, int, boolean, net.sf.magicmap.client.model.node.InfoObject, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createInfoObject(final int x, final int y, final boolean fixed, final InfoObject infoObject, final String mapName, final CreatePositionCallback callback) { ! ! if (isConnected()) { ! ! Thread createInfoObjectThread = new Thread() { ! public void run() { ! synchronized(mutex) { ! try { ! SOAPServerManager.this.mapDelegate.createInfoObject ( ! sessionId, mapName, x, y, infoObject.getUrl(), infoObject.getType()); ! } catch (Exception e) { ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createInfoObjectThread.start(); ! } ! ! } ! ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.controller.ServerManager#createRFIDAntenna(int, int, boolean, net.sf.magicmap.client.model.node.RFIDAntenna, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) ! */ ! @Override ! public void createRFIDAntenna(final int x, final int y, boolean fixed, final RFIDAntenna antenna, final String mapName, final CreatePositionCallback callback) { ! ! if (isConnected()) { ! Thread createRFIDAntennaThread = new Thread() { ! public void run() { ! synchronized(mutex) { ! try { ! SOAPServerManager.this.mapDelegate.createRFIDAntenna( ! sessionId, mapName, x, y, antenna.getURL()); ! } catch (Exception e) { ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createRFIDAntennaThread.start(); } } + /** *************** *** 456,459 **** --- 509,531 ---- } + // 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) { callback.positionFetchError(e); Index: ServerPoller.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServerPoller.java 26 Feb 2006 10:20:57 -0000 1.5 --- ServerPoller.java 28 Feb 2006 11:23:16 -0000 1.6 *************** *** 5,8 **** --- 5,10 ---- package net.sf.magicmap.client.controller; + import java.util.Collection; + import java.util.Iterator; import java.util.Timer; import java.util.TimerTask; *************** *** 10,13 **** --- 12,18 ---- import net.sf.magicmap.client.interfaces.FetchPositionsCallback; import net.sf.magicmap.client.interfaces.ServerPollerListener; + import net.sf.magicmap.client.model.node.InfoObject; + import net.sf.magicmap.client.model.node.RFIDAntenna; + import net.sf.magicmap.client.model.node.RFIDTag; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.server.dto.GeoPointDTO; *************** *** 103,106 **** --- 108,153 ---- } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#infoPointsFetched(java.util.Collection) + */ + public void infoPointsFetched(Collection infoObjects) { + + Iterator infoIterator = infoObjects.iterator(); + while (infoIterator.hasNext()) { + listener.infoObjectCreatedorUpdatedOrDeleted((InfoObject)infoIterator.next()); + } + synchronized (syncObj) { + isFetching = false; + } + + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#rfidAntennasFetched(java.util.Collection) + */ + public void rfidAntennasFetched(Collection rfidAntennas) { + + Iterator antennaIterator = rfidAntennas.iterator(); + while (antennaIterator.hasNext()) { + listener.rfidAntennaCreatedOrUpdatedOrDeleted((RFIDAntenna)antennaIterator.next()); + } + synchronized (syncObj) { + isFetching = false; + } + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#rfidTagsFetched(java.util.Collection) + */ + public void rfidTagsFetched(Collection rfidTags) { + Iterator tagInterator = rfidTags.iterator(); + while (tagInterator.hasNext()) { + listener.rfidTagCreatedOrUpdatedOrDeleted((RFIDTag)tagInterator.next()); + } + synchronized (syncObj) { + isFetching = false; + } + } *************** *** 115,117 **** --- 162,166 ---- } } + + } Index: ServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ServerManager.java 26 Feb 2006 10:20:57 -0000 1.11 --- ServerManager.java 28 Feb 2006 11:23:16 -0000 1.12 *************** *** 27,30 **** --- 27,32 ---- import net.sf.magicmap.client.model.measurement.SeenAccessPoint; import net.sf.magicmap.client.model.node.GeoPos; + import net.sf.magicmap.client.model.node.InfoObject; + import net.sf.magicmap.client.model.node.RFIDAntenna; import net.sf.magicmap.server.dto.PositionDTO; import net.sf.magicmap.server.dto.SignalCharacterDTO; *************** *** 150,155 **** --- 152,180 ---- public abstract void createGeoPos(final int x, final int y, final boolean fixed, final GeoPos geoPos, final String name, final CreatePositionCallback callback); + + /** + * @param x + * @param y + * @param fixed + * @param infoObject + * @param mapName + * @param callback + */ + public abstract void createInfoObject(final int x, final int y, final boolean fixed, final InfoObject infoObject, + final String mapName, final CreatePositionCallback callback); /** + * @param x + * @param y + * @param fixed + * @param antenna + * @param mapName + * @param callback + */ + public abstract void createRFIDAntenna(final int x, final int y, final boolean fixed, final RFIDAntenna antenna, + final String mapName, final CreatePositionCallback callback); + + + /** * Entfernt einen Referenzpunkt oder die Positionierung eines * AccessPoints oder Clients mit gegebener Id vom Server *************** *** 198,201 **** --- 223,227 ---- public abstract void submitClientInfo(); + // /** // * Load new map |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 11:23:25
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/views Modified Files: MapView.java OutlineView.java Log Message: added support for info objects and rfid antennas and tags Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** OutlineView.java 26 Feb 2006 10:20:57 -0000 1.7 --- OutlineView.java 28 Feb 2006 11:23:16 -0000 1.8 *************** *** 60,63 **** --- 60,66 ---- private OutlineNode nodeLocations; private OutlineNode nodeGeoPoints; + private OutlineNode nodeInfoObjects; + private OutlineNode nodeRFIDAntennas; + private OutlineNode nodeRFIDTags; *************** *** 87,90 **** --- 90,96 ---- //TODO internationalize nodeGeoPoints = new OutlineNode("Geokoordinaten"); + nodeInfoObjects = new OutlineNode("Infoobjekte"); + nodeRFIDAntennas = new OutlineNode("RFID Antennen"); + nodeRFIDTags = new OutlineNode("RFID Tags"); treeroot.add(nodeMaps); *************** *** 93,96 **** --- 99,105 ---- treeroot.add(nodeLocations); treeroot.add(nodeGeoPoints); + treeroot.add(nodeInfoObjects); + treeroot.add(nodeRFIDAntennas); + treeroot.add(nodeRFIDTags); tree = new JTree(treemodel); *************** *** 172,175 **** --- 181,197 ---- index = getAlphabeticalIndex(nodeGeoPoints, on); treemodel.insertNodeInto(on, nodeGeoPoints, index); + break; + case NodeModel.NODETYPE_INFO: + index = getAlphabeticalIndex(nodeInfoObjects, on); + treemodel.insertNodeInto(on, nodeInfoObjects, index); + break; + case NodeModel.NODETYPE_RFID_ANTENNA: + index = getAlphabeticalIndex(nodeRFIDAntennas, on); + treemodel.insertNodeInto(on, nodeRFIDAntennas, index); + break; + case NodeModel.NODETYPE_RFID_TAG: + index = getAlphabeticalIndex(nodeRFIDTags, on); + treemodel.insertNodeInto(on, nodeRFIDTags, index); + break; } *************** *** 214,217 **** --- 236,242 ---- this.nodeLocations.removeAllChildren(); this.nodeGeoPoints.removeAllChildren(); + this.nodeInfoObjects.removeAllChildren(); + this.nodeRFIDAntennas.removeAllChildren(); + this.nodeRFIDTags.removeAllChildren(); treemodel.reload(); } *************** *** 295,298 **** --- 320,329 ---- case NodeModel.NODETYPE_GEOPOS : return findOutlineNode(nodeGeoPoints, node); + case NodeModel.NODETYPE_INFO: + return findOutlineNode(nodeInfoObjects, node); + case NodeModel.NODETYPE_RFID_ANTENNA: + return findOutlineNode(nodeRFIDAntennas, node); + case NodeModel.NODETYPE_RFID_TAG: + return findOutlineNode(nodeRFIDTags, node); default : return null; *************** *** 351,354 **** --- 382,391 ---- case NodeModel.NODETYPE_GEOPOS : return getOutlineNodePath(nodeGeoPoints, node); + case NodeModel.NODETYPE_INFO: + return getOutlineNodePath(nodeInfoObjects, node); + case NodeModel.NODETYPE_RFID_ANTENNA: + return getOutlineNodePath(nodeRFIDAntennas, node); + case NodeModel.NODETYPE_RFID_TAG: + return getOutlineNodePath(nodeRFIDTags, node); default : return null; Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MapView.java 26 Feb 2006 10:20:57 -0000 1.16 --- MapView.java 28 Feb 2006 11:23:16 -0000 1.17 *************** *** 79,83 **** --- 79,86 ---- private Icon accessPointIcon; private Icon geoPosIcon; + private Icon infoIcon; private Icon locationIcon; + private Icon rfidAntennaIcon; + private Icon rfidTagIcon; private Icon clientAnchorIcon; private Icon accessPointAnchorIcon; *************** *** 136,140 **** --- 139,146 ---- this.accessPointIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_ACCESSPOINT); this.geoPosIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_GEOPOS); + this.infoIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_INFO); this.locationIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_LOCATION); + this.rfidAntennaIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_RFID_ANTENNA); + this.rfidTagIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_RFID_TAG); this.clientAnchorIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_CLIENT_ANCHOR); this.accessPointAnchorIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_ACCESSPOINT_ANCHOR); *************** *** 147,151 **** */ public String getName(){ ! return GUIUtils.i18n("map", false); } --- 153,157 ---- */ public String getName(){ ! return GUIUtils.i18n("map", false); // + " - " + Controller.getInstance().getCurrentMap().name; } *************** *** 175,178 **** --- 181,190 ---- case NodeModel.NODETYPE_GEOPOS : return geoPosIcon; + case NodeModel.NODETYPE_INFO : + return infoIcon; + case NodeModel.NODETYPE_RFID_ANTENNA: + return rfidAntennaIcon; + case NodeModel.NODETYPE_RFID_TAG: + return rfidTagIcon; case NodeModel.NODETYPE_LOCATION : if (!showLocations){ *************** *** 770,774 **** v = addVertex(node); // Mehr ist nicht zuu tun, die Katen gehen vom Client aus. ! } if (v != null){ if (node.isFix()){ --- 782,793 ---- v = addVertex(node); // Mehr ist nicht zuu tun, die Katen gehen vom Client aus. ! } else if (node.getType() == NodeModel.NODETYPE_INFO) { ! v = addVertex(node); ! // Mehr ist nicht zuu tun, die Katen gehen vom Client aus. ! } else if (node.getType() == NodeModel.NODETYPE_RFID_ANTENNA) { ! v = addVertex(node); ! } else if (node.getType() == NodeModel.NODETYPE_RFID_TAG) { ! v = addVertex(node); ! } if (v != null){ if (node.isFix()){ |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 11:23:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/delegate/interfaces Modified Files: MapFacadeInterface.java Log Message: added support for info objects and rfid antennas and tags Index: MapFacadeInterface.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/MapFacadeInterface.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MapFacadeInterface.java 20 Feb 2006 15:18:29 -0000 1.3 --- MapFacadeInterface.java 28 Feb 2006 11:23:16 -0000 1.4 *************** *** 96,98 **** --- 96,117 ---- public abstract void deleteGeoPoint(long sessionId, long id) throws MapException, SessionException, RemoteException; + /** + * @param sessionId + * @param mapName + * @param x + * @param y + * @param url + * @param type + */ + public abstract void createInfoObject(long sessionId, String mapName, int x, int y, String url, int type); + + /** + * @param sessionId + * @param mapName + * @param x + * @param y + * @param url + */ + public abstract void createRFIDAntenna(long sessionId, String mapName, int x, int y, String url); + } \ No newline at end of file |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 11:23:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/model/node Modified Files: InfoObject.java NodeModel.java InfoObjectNode.java Added Files: RFIDTagNode.java RFIDTag.java RFIDAntenna.java RFIDAntennaNode.java Log Message: added support for info objects and rfid antennas and tags --- NEW FILE: RFIDAntenna.java --- /** * */ package net.sf.magicmap.client.model.node; /** * @author Johannes Zapotoczky (joh...@za...) * */ public class RFIDAntenna { private String url; private int x; private int y; private String map; /** * */ public RFIDAntenna(String url, int x, int y, String mapName) { this.url = url; this.x = x; this.y = y; this.map = mapName; } public String getURL() { return url; } public String getMap() { return map; } public void setMap(String map) { this.map = map; } public int getX() { return x; } public int getY() { return y; } } --- NEW FILE: RFIDAntennaNode.java --- /** * */ package net.sf.magicmap.client.model.node; import java.util.ArrayList; /** * @author Johannes Zapotoczky (joh...@za...) * */ public class RFIDAntennaNode extends Node { /** * @param model */ public RFIDAntennaNode(NodeModel model) { super(model); } /* (non-Javadoc) * @see net.sf.magicmap.client.model.node.Node#getNeighbors() */ @Override public ArrayList getNeighbors() { return null; } /* (non-Javadoc) * @see net.sf.magicmap.client.model.node.Node#getType() */ @Override public int getType() { return NodeModel.NODETYPE_RFID_ANTENNA; } } Index: NodeModel.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NodeModel.java 26 Feb 2006 10:20:57 -0000 1.4 --- NodeModel.java 28 Feb 2006 11:23:16 -0000 1.5 *************** *** 40,43 **** --- 40,46 ---- public static final int NODETYPE_MAP = 4; public static final int NODETYPE_GEOPOS = 5; + public static final int NODETYPE_INFO = 6; + public static final int NODETYPE_RFID_ANTENNA = 7; + public static final int NODETYPE_RFID_TAG = 8; private HashMap nodes; --- NEW FILE: RFIDTagNode.java --- /** * */ package net.sf.magicmap.client.model.node; import java.util.ArrayList; /** * @author Johannes Zapotoczky (joh...@za...) * */ public class RFIDTagNode extends Node { /** * @param model */ public RFIDTagNode(NodeModel model) { super(model); } /* (non-Javadoc) * @see net.sf.magicmap.client.model.node.Node#getNeighbors() */ @Override public ArrayList getNeighbors() { return null; } /* (non-Javadoc) * @see net.sf.magicmap.client.model.node.Node#getType() */ @Override public int getType() { return NodeModel.NODETYPE_RFID_TAG; } } Index: InfoObjectNode.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObjectNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InfoObjectNode.java 23 Feb 2006 18:34:38 -0000 1.1 --- InfoObjectNode.java 28 Feb 2006 11:23:16 -0000 1.2 *************** *** 33,38 **** @Override public int getType() { ! // TODO Auto-generated method stub ! return 0; } --- 33,37 ---- @Override public int getType() { ! return NodeModel.NODETYPE_INFO; } --- NEW FILE: RFIDTag.java --- /** * */ package net.sf.magicmap.client.model.node; /** * @author Johannes Zapotoczky (joh...@za...) * */ public class RFIDTag { private String url; private int x; private int y; private String map; private long timestamp; /** * */ public RFIDTag(String id, long timestamp) { this.url = id; this.timestamp = timestamp; } public String getMap() { return map; } public String getUrl() { return url; } public int getX() { return x; } public int getY() { return y; } public boolean equals(RFIDTag tag2) { return url.equals(tag2.getUrl()); } public long getTimestamp() { return timestamp; } public void setTimestamp(long timestamp) { this.timestamp = timestamp; } } Index: InfoObject.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InfoObject.java 23 Feb 2006 18:34:38 -0000 1.1 --- InfoObject.java 28 Feb 2006 11:23:16 -0000 1.2 *************** *** 4,12 **** package net.sf.magicmap.client.model.node; /** * @author Johannes Zapotoczky (joh...@za...) * */ ! public class InfoObject { } --- 4,83 ---- package net.sf.magicmap.client.model.node; + import java.io.Serializable; + /** * @author Johannes Zapotoczky (joh...@za...) * */ ! public class InfoObject implements Serializable { ! ! public static final int TYPE_INFO = 1; ! public static final int TYPE_PHOTO = 2; ! ! /** ! * serial version id ! */ ! private static final long serialVersionUID = -1574621314942885814L; ! ! ! private int x; ! private int y; ! private String map; ! ! private int type; ! ! private String url; ! ! /** ! * Constructor, none of the parameters may be null ! * @param url ! * @param type ! */ ! public InfoObject (String url, int type) { ! this(url, type, -1, -1, ""); ! } ! ! /** ! * Constructor, none of the parameters may be null ! * @param url ! * @param type ! */ ! public InfoObject (String url, int type, int x, int y, String map) { ! this.url = url; ! this.type = type; ! this.x = x; ! this.y = y; ! this.map = map; ! } ! ! public int getType() { ! return type; ! } ! ! public void setType(int type) { ! this.type = type; ! } ! ! public String getUrl() { ! return url; ! } ! ! public void setUrl(String url) { ! this.url = url; ! } ! ! public String getMap() { ! return map; ! } ! ! public int getX() { ! return x; ! } ! ! public int getY() { ! return y; ! } ! ! } |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 11:23:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/gui/dialogs Added Files: InfoObjectDialog.java RFIDAntennaDialog.java Log Message: added support for info objects and rfid antennas and tags --- NEW FILE: RFIDAntennaDialog.java --- /** * */ package net.sf.magicmap.client.gui.dialogs; import java.awt.Dialog; import java.awt.Frame; import java.awt.GraphicsConfiguration; import java.awt.HeadlessException; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JTextField; import com.brunchboy.util.swing.relativelayout.RelativeLayout; import net.sf.magicmap.client.gui.utils.GUIConstants; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; import net.sf.magicmap.client.model.node.InfoObject; import net.sf.magicmap.client.model.node.RFIDAntenna; /** * @author Johannes Zapotoczky (joh...@za...) * */ public class RFIDAntennaDialog extends JDialog implements ActionListener { private RFIDAntenna antenna; private JTextField id; public static RFIDAntenna showDialog(JFrame owner) { RFIDAntennaDialog dialog = new RFIDAntennaDialog(owner); GUIUtils.locateOnScreen(dialog); dialog.setModal(true); dialog.setVisible(true); return dialog.getValues(); } private RFIDAntenna getValues() { return antenna; } /** * @param owner * @throws HeadlessException */ public RFIDAntennaDialog(Frame owner) { super(owner, GUIUtils.i18n("geopos")); this.setSize(300, 300); this.setResizable(false); RelativeLayout layout = new RelativeLayout(); RelativePanelBuilder builder = new RelativePanelBuilder(layout); JButton okButton = builder.createButton(GUIUtils.i18n("set"), "OK", this); JButton cancelButton = builder.createButton(GUIUtils.i18n("cancel"), "CANCEL", this); // ok/cancel area builder.addOKCancelButtonBar(okButton, cancelButton, "okcancel"); builder.setLeftLeftDistance("okcancel", null, 10); builder.setRightRightDistance("okcancel", null, -10); builder.setBottomBottomDistance("okcancel", null, -10); // Kopf builder.addDialogHeader("<html><b>" + GUIUtils.i18n("setgeopos") + "</b><br>" + GUIUtils.i18n("setgeoposhint") + "</html>", GUIConstants.ICON_GEOPOS_BIG, "header"); builder.setTop("header", 0); builder.setLeft("header", 0); builder.setRightRightDistance("header", null, 0); setContentPane(builder.getPanel()); getRootPane().setDefaultButton(okButton); //id id = builder.addTextField("longitude"); builder.addLabel("Longitude", "longitudelabel", id); builder.setLeft("longitudelabel", 20); builder.setRightRightDistance("longitude", null, -20); builder.setTopBottomDistance("longitudelabel", "header", 20); builder.setTopBottomDistance("longitude", "header", 20); } /* (non-Javadoc) * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { if ("OK".equals(e.getActionCommand())) { this.antenna = new RFIDAntenna(id.getText(), -1, -1, ""); this.setVisible(false); } else if ("CANCEL".equals(e.getActionCommand())){ this.setVisible(false); } } } --- NEW FILE: InfoObjectDialog.java --- /** * */ package net.sf.magicmap.client.gui.dialogs; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JTextField; import net.sf.magicmap.client.gui.utils.GUIConstants; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; import net.sf.magicmap.client.model.node.InfoObject; import com.brunchboy.util.swing.relativelayout.RelativeLayout; /** * @author Johannes Zapotoczky (joh...@za...) * */ public class InfoObjectDialog extends JDialog implements ActionListener { /** * serial version id */ private static final long serialVersionUID = 2254415271972084477L; /** * the currently set geopos */ private InfoObject infoObject; /** * simple parameters */ private JTextField url; public static InfoObject showDialog(JFrame owner) { InfoObjectDialog dialog = new InfoObjectDialog(owner); GUIUtils.locateOnScreen(dialog); dialog.setModal(true); dialog.setVisible(true); return dialog.getValues(); } /** * @return */ private InfoObject getValues() { return infoObject; } public InfoObjectDialog(JFrame owner) { super(owner, GUIUtils.i18n("geopos")); this.setSize(300, 300); this.setResizable(false); RelativeLayout layout = new RelativeLayout(); RelativePanelBuilder builder = new RelativePanelBuilder(layout); JButton okButton = builder.createButton(GUIUtils.i18n("set"), "OK", this); JButton cancelButton = builder.createButton(GUIUtils.i18n("cancel"), "CANCEL", this); // ok/cancel area builder.addOKCancelButtonBar(okButton, cancelButton, "okcancel"); builder.setLeftLeftDistance("okcancel", null, 10); builder.setRightRightDistance("okcancel", null, -10); builder.setBottomBottomDistance("okcancel", null, -10); // Kopf builder.addDialogHeader("<html><b>" + GUIUtils.i18n("setgeopos") + "</b><br>" + GUIUtils.i18n("setgeoposhint") + "</html>", GUIConstants.ICON_GEOPOS_BIG, "header"); builder.setTop("header", 0); builder.setLeft("header", 0); builder.setRightRightDistance("header", null, 0); setContentPane(builder.getPanel()); getRootPane().setDefaultButton(okButton); //url url = builder.addTextField("longitude"); builder.addLabel("Longitude", "longitudelabel", url); builder.setLeft("longitudelabel", 20); builder.setRightRightDistance("longitude", null, -20); builder.setTopBottomDistance("longitudelabel", "header", 20); builder.setTopBottomDistance("longitude", "header", 20); } /* (non-Javadoc) * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { if ("OK".equals(e.getActionCommand())) { this.infoObject = new InfoObject(url.getText(), InfoObject.TYPE_INFO); this.setVisible(false); } else if ("CANCEL".equals(e.getActionCommand())){ this.setVisible(false); } } } |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 11:23:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/gui/utils Modified Files: GUIConstants.java Log Message: added support for info objects and rfid antennas and tags Index: GUIConstants.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIConstants.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GUIConstants.java 23 Feb 2006 18:34:39 -0000 1.4 --- GUIConstants.java 28 Feb 2006 11:23:16 -0000 1.5 *************** *** 48,51 **** --- 48,54 ---- public static final String ICON_GEOPOS = "custom/geopos.png"; public static final String ICON_GEOPOS_BIG = "custom/geopos_big.png"; + public static final String ICON_INFO = "custom/info.png"; + public static final String ICON_RFID_ANTENNA = "custom/rfid_antenna.png"; + public static final String ICON_RFID_TAG = "custom/rfid_tag.png"; public static final String ICON_LOCATION = "custom/location.png"; public static final String ICON_CLIENT_ANCHOR = "custom/client_anchor.png"; |
1 message has been excluded from this view by a project administrator.
