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: Florian L. <fle...@us...> - 2005-11-02 14:42:44
|
Update of /cvsroot/magicmap/magicmapserver/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18723/.settings Log Message: Directory /cvsroot/magicmap/magicmapserver/.settings added to the repository |
|
From: Florian L. <fle...@us...> - 2005-11-01 15:55:37
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12505/src/net/sf/magicmap/server/facade Removed Files: PositionFacade2.java Log Message: entfernen von PositionFacade2 --- PositionFacade2.java DELETED --- |
|
From: Florian L. <fle...@us...> - 2005-11-01 15:53:16
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12089/src/net/sf/magicmap/server/cache Added Files: PositionCache.java Log Message: Implementation des Positioning-Caches --- NEW FILE: PositionCache.java --- package net.sf.magicmap.server.cache; import java.util.Collection; import java.util.Hashtable; import java.util.Iterator; import java.util.SortedMap; import java.util.TreeMap; import net.sf.magicmap.db.Map; import net.sf.magicmap.server.dto.PositionDTO; public class PositionCache extends Hashtable<Map,PositionCacheEntry>{ private static SortedMap timeMap; // Sigleton Hashtable private static PositionCache single_positionCache = null; public static PositionCache getPositionCache(){ if (single_positionCache == null) single_positionCache = new PositionCache(); return single_positionCache; } private PositionCache (){ //TODO: hohle daten aus der Datenbank } private void addMapHashtable(Map map) { this.put(map,new PositionCacheEntry()); } private boolean existsMapHashtable(Map map){ return this.containsKey(map); } private PositionCacheEntry getMapHashtable(Map map){ return this.get(map); } public void createOrUpdatePosition(Map map, PositionDTO position){ if(!existsMapHashtable(map)) addMapHashtable(map); if(getMapHashtable(map).existsPosition(position.getName())){ getMapHashtable(map).removePosition(position.getName()); } getMapHashtable(map).addPosition(position); } public PositionDTO[] getPositionsForMapSince(Map map,Long time){ if(!existsMapHashtable(map)) return new PositionDTO[0]; return getMapHashtable(map).getPositionsSince(time); } public PositionDTO getPositionForClientOnMap(Map map, String name){ if(!existsMapHashtable(map)) return null; return getMapHashtable(map).getPosition(name); } } class PositionCacheEntry { private Hashtable<String,PositionDTO> positionHash; private TreeMap<Long ,String> timeMap; protected PositionCacheEntry (){ positionHash = new Hashtable<String,PositionDTO>(40); timeMap = new TreeMap<Long ,String>(); } protected void addPosition(PositionDTO position){ positionHash.put(position.getName(),position); timeMap.put(position.getLastModified(),position.getName()); } protected boolean existsPosition(String name){ return positionHash.containsKey(name); } protected PositionDTO getPosition(String name){ return positionHash.get(name); } protected void removePosition(String name){ timeMap.remove(positionHash.get(name).getLastModified()); positionHash.remove(name); } protected PositionDTO[] getPositionsSince(Long time){ Collection<String> newPositions = timeMap.tailMap(time).values(); PositionDTO [] positions = new PositionDTO[newPositions.size()]; Iterator it = newPositions.iterator(); int i = 0; while(it.hasNext()){ positions[i++] = getPosition((String)it.next()); } return positions; } } |
|
From: Florian L. <fle...@us...> - 2005-11-01 15:53:11
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12057/src/net/sf/magicmap/server/cache Log Message: Directory /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/cache added to the repository |
|
From: Florian L. <fle...@us...> - 2005-10-21 11:09:39
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5446/src/net/sf/magicmap/server/facade Added Files: PositionFacade2.java Log Message: new Positionfacade for hashing positions --- NEW FILE: PositionFacade2.java --- package net.sf.magicmap.server.facade; import java.rmi.RemoteException; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.Iterator; import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; import net.sf.magicmap.db.AccessPoint; import net.sf.magicmap.db.Client; import net.sf.magicmap.db.Map; import net.sf.magicmap.db.Position; import net.sf.magicmap.db.ScanResult; import net.sf.magicmap.db.Session; import net.sf.magicmap.server.dto.AccessPointDTO; import net.sf.magicmap.server.dto.ClientDTO; import net.sf.magicmap.server.dto.PositionDTO; import net.sf.magicmap.server.dto.SignalCharacterDTO; import net.sf.magicmap.server.dto.SimpleScanResultDTO; import net.sf.magicmap.server.exception.MapException; import net.sf.magicmap.server.exception.SessionException; import net.sf.magicmap.server.interfaces.PositionFacadeInterface; import net.sf.magicmap.server.utils.JDOUtil; import org.apache.log4j.Category; /** * author schweige * date 03.12.2004 * copyright (C) 2004 Martin Schweigert, Tobias Hübner * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ public class PositionFacade2 implements PositionFacadeInterface { protected transient Category logger = Category.getInstance(this.getClass()); /* (non-Javadoc) * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#createPosition(long, java.lang.String, int, int, net.sf.magicmap.server.facade.dto.SignalCharacter, java.lang.String) */ public void createOrUpdatePosition(long sessionId, String mapName, int positionX, int positionY, SignalCharacterDTO character, String positionName, boolean fixed) throws SessionException, MapException{ this.logger.info("createOrUpdatePosition()"); createOrUpdatePositionInternal(sessionId, mapName, positionX, positionY, character, positionName, fixed); this.logger.info("createOrUpdatePosition() - done"); } /** * @param sessionId * @param mapName * @param positionX * @param positionY * @param character * @param positionName * @param pm * @param tx * @throws SessionException * @throws MapException */ private void createOrUpdatePositionInternal(long sessionId, String mapName, int positionX, int positionY, SignalCharacterDTO character, String positionName, boolean fixed) throws SessionException, MapException{ Session session = checkSession(sessionId, JDOUtil.pmfactory.getPersistenceManager()); Client client = session.getClient(); if (client == null){ throw new SessionException("Ungültige Session"); return; } if (character == null || character.getSimpleScanResults() == null || character.getSimpleScanResults().length == 0){ throw new MapException("Signalcharacter enthält keine Daten"); return; } if (positionName == null || "".equals(positionName)){ throw new MapException("Name der Position darf nicht leer sein"); return; } Map map = checkMap(mapName, positionX, positionY, JDOUtil.pmfactory.getPersistenceManager()); Position pos = checkPosition(positionName, map, pm); if (pos == null){ pos = new Position(map, positionX, positionY, positionName); pm.makePersistent(pos); } pos.setDeleted(false); pos.setPosX(positionX); pos.setPosY(positionY); pos.setFixed(fixed); //pos.setClient(client); setNewSignalCharacter(character, pm, client, pos); } /** * @param character * @param pm * @param client * @param pos * @throws MapException */ private void setNewSignalCharacter(SignalCharacterDTO character, PersistenceManager pm, Client client, Position pos) throws MapException{ // alle Scanresults dieser Position löschen pm.deletePersistentAll(pos.getScanResults()); SimpleScanResultDTO[] dtos = character.getSimpleScanResults(); if (dtos != null){ for (int i = 0; i < dtos.length; i++){ AccessPoint ap = findOrCreateAccessPoint(dtos[i].getMacAP(), pm); //@TODO think about? ap.setSsid(dtos[i].getSsid()); ScanResult sr = new ScanResult(client, ap, dtos[i].getSignalLevel(), dtos[i].getNoise(), new Timestamp(System .currentTimeMillis())); //@TODO use lastSeen pm.makePersistent(sr); sr.setPosition(pos); } } } /** * @param macAP * @param pm * @return * @throws MapException * @throws s */ private AccessPoint findOrCreateAccessPoint(String macAP, PersistenceManager pm) throws MapException{ try{ AccessPoint result = null; Collection results; Extent e = pm.getExtent(AccessPoint.class, true); Query query = pm.newQuery(e, "mac == myMac"); query.declareParameters("java.lang.String myMac"); query.declareImports("import java.lang.String;"); results = (Collection) query.execute(macAP); if (results != null && !results.isEmpty()){ result = (AccessPoint) results.iterator().next(); } else{ result = new AccessPoint(macAP); pm.makePersistent(result); } return result; } catch (Exception e){ pm.currentTransaction().rollback(); throw new MapException("", e); } } /** * @param positionName * @param map * @param pm * @return */ private Position checkPosition(String positionName, Map map, PersistenceManager pm){ Position result = null; Collection results; Extent e = pm.getExtent(Position.class, true); Query query = pm.newQuery(e, "name == myName && map == myMap"); query.declareParameters("java.lang.String myName, net.sf.magicmap.db.Map myMap"); query.declareImports("import java.lang.String; import net.sf.magicmap.db.Map;"); results = (Collection) query.execute(positionName, map); if (results != null && !results.isEmpty()){ result = (Position) results.iterator().next(); } return result; } /** * @param mapName * @param positionX * @param positionY * @param pm * @return * @throws MapException */ private Map checkMap(String mapName, int positionX, int positionY, PersistenceManager pm) throws MapException{ Map result = checkMap(mapName, pm); if (positionX < 0 || positionY < 0 || positionX > (result.getImageWidth().intValue() - 1) || positionY > (result.getImageHeight().intValue() - 1)){ throw new MapException("Position ist nicht auf der Karte"); return null; } return result; } /** * @param mapName * @param pm * @return * @throws MapException */ private Map checkMap(String mapName, PersistenceManager pm) throws MapException{ Map result = null; Collection results; Extent e = pm.getExtent(Map.class, true); Query query = pm.newQuery(e, "name == myName"); query.declareParameters("java.lang.String myName"); results = (Collection) query.execute(mapName); if (results != null && !results.isEmpty()){ result = (Map) results.iterator().next(); } else{ pm.currentTransaction().rollback(); throw new MapException("Karte mit dem namen:" + mapName + " existiert nicht"); } return result; } /** * @param sessionId * @param tx * @throws SessionException */ private Session checkSession(long sessionId, PersistenceManager pm) throws SessionException{ Session result = null; Collection results; Extent e = pm.getExtent(Session.class, true); Query query = pm.newQuery(e, "id == myId"); query.declareParameters("java.lang.Long myId"); results = (Collection) query.execute(new Long(sessionId)); if (results != null && !results.isEmpty()){ result = (Session) results.iterator().next(); } else{ pm.currentTransaction().rollback(); throw new SessionException("Session mit der id:" + sessionId + " existiert nicht"); } return result; } /** * @param sessionId * @param tx * @throws SessionException */ private Position checkPosition(long positionId, PersistenceManager pm) throws MapException{ Position result = null; Collection results; Extent e = pm.getExtent(Position.class, true); Query query = pm.newQuery(e, "id == myId"); query.declareParameters("java.lang.Long myId"); results = (Collection) query.execute(new Long(positionId)); if (results != null && !results.isEmpty()){ result = (Position) results.iterator().next(); } else{ pm.currentTransaction().rollback(); throw new MapException("Position mit der id:" + positionId + " existiert nicht"); } return result; } /** * @param client * @param map * @return */ private Position getPositionForClientAndMap(Client client, Map map, PersistenceManager pm){ Position result = null; Collection results; Extent e = pm.getExtent(Position.class, true); Query query = pm.newQuery(e, "client == myClient && map == myMap"); query.declareParameters("net.sf.magicmap.db.Client myClient, net.sf.magicmap.db.Map myMap"); query.declareImports("import net.sf.magicmap.db.Client; import net.sf.magicmap.db.Map;"); results = (Collection) query.execute(client, map); if (results != null && !results.isEmpty()){ result = (Position) results.iterator().next(); } return result; } /** * @param client * @param map * @return */ private Position getPositionForApAndMap(AccessPoint ap, Map map, PersistenceManager pm){ Position result = null; Collection results; Extent e = pm.getExtent(Position.class, true); Query query = pm.newQuery(e, "accessPoint == myAp && map == myMap"); query.declareParameters("net.sf.magicmap.db.AccessPoint myAp, net.sf.magicmap.db.Map myMap"); query.declareImports("import net.sf.magicmap.db.AccessPoint; import net.sf.magicmap.db.Map;"); results = (Collection) query.execute(ap, map); if (results != null && !results.isEmpty()){ result = (Position) results.iterator().next(); } return result; } /** * @param sessionId * @param tx * @throws SessionException */ private Client checkClient(String mac, PersistenceManager pm) throws MapException{ if (mac == null || "".equals(mac)){ pm.currentTransaction().rollback(); throw new MapException("Client mac darf nicht leer sein"); } Client result = null; Collection results; Extent e = pm.getExtent(Client.class, true); Query query = pm.newQuery(e, "mac == myMac"); query.declareParameters("java.lang.String myMac"); results = (Collection) query.execute(mac); if (results != null && !results.isEmpty()){ result = (Client) results.iterator().next(); } else{ pm.currentTransaction().rollback(); throw new MapException("Client mit der mac-adresse:" + mac + " existiert nicht"); } return result; } /* (non-Javadoc) * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#createOrUpdateClientPosition(long, java.lang.String, int, int, net.sf.magicmap.server.facade.dto.SignalCharacter, java.lang.String) */ public void createOrUpdateClientPosition(long sessionId, String mapName, int positionX, int positionY, SignalCharacterDTO character, String clientMac, boolean fixed) throws SessionException, MapException{ this.logger.info("createOrUpdateClientPosition()"); PersistenceManager pm = null; Transaction tx = null; try{ pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); tx.begin(); int count = 0; while (count < 3){ try{ createOrUpdateClientPositionInternal(sessionId, mapName, positionX, positionY, character, clientMac, fixed, pm); break; } catch (javax.jdo.JDODataStoreException jdoEx){ if (tx.isActive()){ tx.rollback(); } count++; tx.begin(); } } if (count == 3){ if (tx.isActive()){ tx.rollback(); } System.out.println("createOrUpdateClientPosition - GAVE UP - repeated 3 times"); } if (tx.isActive()){ tx.commit(); } } catch (Exception e){ e.printStackTrace(); if (e instanceof MapException){ throw (MapException) e; } if (e instanceof SessionException){ throw (SessionException) e; } } finally{ if (tx.isActive()){ tx.rollback(); } JDOUtil.closePM(pm); } this.logger.info("createOrUpdateClientPosition() - done"); } /** * @param sessionId * @param mapName * @param positionX * @param positionY * @param character * @param clientMac * @param pm * @throws SessionException * @throws MapException */ private void createOrUpdateClientPositionInternal(long sessionId, String mapName, int positionX, int positionY, SignalCharacterDTO character, String clientMac, boolean fixed, PersistenceManager pm) throws SessionException, MapException{ checkSession(sessionId, pm); Map map = checkMap(mapName, positionX, positionY, pm); Client client = checkClient(clientMac, pm); Position pos = getPositionForClientAndMap(client, map, pm); if (pos == null){ pos = new Position(map, positionX, positionY, client.getMac()); pm.makePersistent(pos); } pos.setClient(client); pos.setDeleted(false); pos.setName(client.getMac()); pos.setPosX(positionX); pos.setPosY(positionY); pos.setFixed(fixed); setNewSignalCharacter(character, pm, client, pos); } /* (non-Javadoc) * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#createOrUpdateAccessPosition(long, java.lang.String, int, int, net.sf.magicmap.server.facade.dto.SignalCharacter, java.lang.String) */ public void createOrUpdateAccessPosition(long sessionId, String mapName, int positionX, int positionY, String accessPointMac, boolean fixed) throws SessionException, MapException{ this.logger.info("createOrUpdateAccessPosition()"); PersistenceManager pm = null; Transaction tx = null; try{ pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); tx.begin(); checkSession(sessionId, pm); Map map = checkMap(mapName, positionX, positionY, pm); AccessPoint ap = findOrCreateAccessPoint(accessPointMac, pm); Position pos = getPositionForApAndMap(ap, map, pm); if (pos == null){ pos = new Position(map, positionX, positionY, ap.getMac()); pm.makePersistent(pos); } pos.setAccessPoint(ap); pos.setDeleted(false); pos.setName(ap.getMac()); pos.setPosX(positionX); pos.setPosY(positionY); pos.setFixed(fixed); tx.commit(); } catch (Exception e){ e.printStackTrace(); if (e instanceof MapException){ throw (MapException) e; } if (e instanceof SessionException){ throw (SessionException) e; } } finally{ if (tx.isActive()){ tx.rollback(); } JDOUtil.closePM(pm); } this.logger.info("createOrUpdateAccessPosition() - done"); } /* (non-Javadoc) * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#movePosition(long, long, int, int) */ public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY, boolean fixed) throws SessionException, MapException{ this.logger.info("movePosition()"); PersistenceManager pm = null; Transaction tx = null; try{ pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); tx.begin(); checkSession(sessionId, pm); Position pos = checkPosition(positionId, pm); Map map = pos.getMap(); if (newPositionX < 0 || newPositionY < 0 || newPositionX > (map.getImageWidth().intValue() - 1) || newPositionY > (map.getImageHeight().intValue() - 1)){ pm.currentTransaction().rollback(); throw new MapException("Position ist nicht auf der Karte"); } pos.setPosX(newPositionX); pos.setPosY(newPositionY); pos.setFixed(fixed); tx.commit(); } catch (Exception e){ e.printStackTrace(); if (e instanceof MapException){ throw (MapException) e; } if (e instanceof SessionException){ throw (SessionException) e; } } finally{ if (tx.isActive()){ tx.rollback(); } JDOUtil.closePM(pm); } this.logger.info("movePosition() - done"); } /* (non-Javadoc) * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#deletePosition(long, long) */ public void deletePosition(long sessionId, long positionId) throws SessionException, MapException{ this.logger.info("deletePosition()"); PersistenceManager pm = null; Transaction tx = null; try{ pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); tx.begin(); checkSession(sessionId, pm); Position pos = checkPosition(positionId, pm); pos.setDeleted(true); tx.commit(); } catch (Exception e){ e.printStackTrace(); if (e instanceof MapException){ throw (MapException) e; } if (e instanceof SessionException){ throw (SessionException) e; } } finally{ if (tx.isActive()){ tx.rollback(); } JDOUtil.closePM(pm); } this.logger.info("deletePosition() - done"); } /* (non-Javadoc) * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#getPositionsForMapSince(long, java.lang.String, long) */ public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws MapException, SessionException{ this.logger.info("getPositionsForMapSince() " + timeStamp); PersistenceManager pm = null; Transaction tx = null; ArrayList result = new ArrayList(); try{ pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); tx.begin(); checkSession(sessionId, pm); Map map = checkMap(mapName, pm); Extent e = pm.getExtent(Position.class, true); String filter = "map == myMap && lastModified > myLastModified"; if (timeStamp == -1){ filter += " && deleted == 0"; } Query query = pm.newQuery(e, filter); query.declareParameters("net.sf.magicmap.db.Map myMap, java.lang.Long myLastModified"); query.declareImports("import net.sf.magicmap.db.Map; import java.lang.Long;"); Collection results = null; results = (Collection) query.execute(map, new Long(timeStamp)); if (results != null){ Iterator it = results.iterator(); while (it.hasNext()){ Position pos = (Position) it.next(); // bei Timestamp -1 nur nicht gelöschte Positionen zurückliefern PositionDTO dto = new PositionDTO(); AccessPoint ap = pos.getAccessPoint(); if (ap != null){ AccessPointDTO apDTO = new AccessPointDTO(); apDTO.setMac(ap.getMac()); apDTO.setId(new Long(ap.getId())); apDTO.setSsid(ap.getSsid()); dto.setAccessPoint(apDTO); } Client client = pos.getClient(); if (client != null){ ClientDTO clientDTO = new ClientDTO(); clientDTO.setMac(client.getMac()); clientDTO.setId(new Long(client.getId())); clientDTO.setName(client.getName()); dto.setClient(clientDTO); } dto.setId(new Long(pos.getId())); dto.setDeleted(pos.isDeleted()); dto.setLastModified(new Long(pos.getLastModified())); dto.setPosX(new Integer(pos.getPosX())); dto.setPosY(new Integer(pos.getPosY())); dto.setFixed(pos.isFixed()); dto.setName(pos.getName()); dto.setCharacter(new SignalCharacterDTO()); // Scanresults holen Collection scanResults = pos.getScanResults(); if (scanResults != null){ Iterator scanIt = scanResults.iterator(); while (scanIt.hasNext()){ ScanResult sr = (ScanResult) scanIt.next(); Date lastSeen = null; if (sr.getScantime() != null){ lastSeen = new Date(sr.getScantime().getTime()); } SimpleScanResultDTO ssr = new SimpleScanResultDTO(); //ssr.setLastSeen(lastSeen); //TODO: last seen benutzen ssr.setMacAP(sr.getAccessPoint().getMac()); ssr.setNoise(sr.getNoiseLevel()); ssr.setSignalLevel(sr.getSignalLevel()); ssr.setSsid(sr.getAccessPoint().getSsid()); ArrayList list; if (dto.getCharacter().getSimpleScanResults() == null){ list = new ArrayList(); } else{ list = new ArrayList(Arrays.asList(dto.getCharacter().getSimpleScanResults())); } list.add(ssr); dto.getCharacter().setSimpleScanResults((SimpleScanResultDTO[]) list.toArray(new SimpleScanResultDTO[0])); } } result.add(dto); } } tx.commit(); } catch (Exception e){ e.printStackTrace(); if (e instanceof MapException){ throw (MapException) e; } if (e instanceof SessionException){ throw (SessionException) e; } } finally{ if (tx.isActive()){ tx.rollback(); } JDOUtil.closePM(pm); } this.logger.info("getPositionsForMapSince() - done "); return (PositionDTO[]) result.toArray(new PositionDTO[0]); } /* (non-Javadoc) * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#getPositionsForClientOnMap(long, java.lang.String, java.lang.String) */ public String getPositionForClientOnMap(long sessionId, String mapName, String clientMac) throws MapException, SessionException, RemoteException { this.logger.info("getPositionsForClientOnMap() "); PersistenceManager pm = null; String positionResult = null; Transaction tx = null; try{ pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); tx.begin(); checkSession(sessionId, pm); Map map = checkMap(mapName, pm); checkClient(clientMac, pm); Extent e = pm.getExtent(Position.class, true); String filter = "map == myMap && name == myName"; Query query = pm.newQuery(e, filter); query.declareParameters("net.sf.magicmap.db.Map myMap, java.lang.String myName"); query.declareImports("import net.sf.magicmap.db.Map; import java.lang.String;"); Collection results = null; results = (Collection) query.execute(map, clientMac); if (results != null){ Iterator it = results.iterator(); if(it.hasNext()){ Position pos = (Position) it.next(); positionResult = String.valueOf(pos.getPosX())+ "#" + String.valueOf(pos.getPosY()) + "#" + String.valueOf(pos.isFixed()); } } tx.commit(); } catch (Exception e){ e.printStackTrace(); if (e instanceof MapException){ throw (MapException) e; } if (e instanceof SessionException){ throw (SessionException) e; } } finally{ if (tx.isActive()){ tx.rollback(); } JDOUtil.closePM(pm); } this.logger.info("getPositionsForClientOnMap() - done "); return positionResult; } } |
|
From: Florian L. <fle...@us...> - 2005-10-12 21:50:14
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21044/src/net/sf/magicmap/client/utils Modified Files: Tag: MagicMap_Daedalus Version.java Log Message: Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** Version.java 9 Jun 2005 15:19:29 -0000 1.12 --- Version.java 12 Oct 2005 21:50:05 -0000 1.12.2.1 *************** *** 14,19 **** public static final String PROTOCOL_VERSION = net.sf.magicmap.server.utils.Version.PROTOCOL_VERSION; public static final int VERSION_MAJOR = 0; ! public static final int VERSION_MINOR = 7; ! public static final String VERSION_FLAVOR = ""; public static String getVersion(){ --- 14,19 ---- public static final String PROTOCOL_VERSION = net.sf.magicmap.server.utils.Version.PROTOCOL_VERSION; public static final int VERSION_MAJOR = 0; ! public static final int VERSION_MINOR = 1; ! public static final String VERSION_FLAVOR = ".0-DAEDALUS"; public static String getVersion(){ |
|
From: Florian L. <fle...@us...> - 2005-10-12 21:44:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19902/src/net/sf/magicmap/client/views Modified Files: MapView.java OutlineView.java Log Message: Interaktivität zwischen Treeview und Mapview unvollständig Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OutlineView.java 29 Sep 2005 14:48:19 -0000 1.4 --- OutlineView.java 12 Oct 2005 21:44:17 -0000 1.5 *************** *** 16,22 **** --- 16,25 ---- import javax.swing.JTree; import javax.swing.border.EmptyBorder; + import javax.swing.event.TreeSelectionEvent; + import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; + import javax.swing.tree.TreePath; import net.sf.magicmap.client.controller.Controller; *************** *** 34,38 **** * @author thuebner */ ! public class OutlineView extends View implements NodeModelListener { private NodeModel model; --- 37,41 ---- * @author thuebner */ ! public class OutlineView extends View implements NodeModelListener, TreeSelectionListener{ private NodeModel model; *************** *** 70,78 **** nodeClients = new OutlineNode(GUIUtils.i18n("clients")); nodeLocations = new OutlineNode(GUIUtils.i18n("locations")); ! treeroot.add(nodeAccessPoints); treeroot.add(nodeClients); treeroot.add(nodeLocations); ! tree = new JTree(treemodel); tree.setRootVisible(false); --- 73,81 ---- nodeClients = new OutlineNode(GUIUtils.i18n("clients")); nodeLocations = new OutlineNode(GUIUtils.i18n("locations")); ! treeroot.add(nodeAccessPoints); treeroot.add(nodeClients); treeroot.add(nodeLocations); ! tree = new JTree(treemodel); tree.setRootVisible(false); *************** *** 80,83 **** --- 83,88 ---- tree.setBorder(new EmptyBorder(new Insets(3, 3, 3, 3))); + tree.addTreeSelectionListener(this); + JComponent pane = new JScrollPane(tree,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); pane.setBorder(new EmptyBorder(new Insets(0, 0, 0, 0))); *************** *** 137,142 **** private class OutlineRenderer extends DefaultTreeCellRenderer { - private Node node; - /* (non-Javadoc) * @see javax.swing.tree.TreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean) --- 142,145 ---- *************** *** 168,171 **** --- 171,200 ---- } + + private TreePath getOutlineNodePath(OutlineNode root, Node node){ + int size = root.getChildCount(); + for (int i = 0; i < size; i++){ + OutlineNode on = (OutlineNode) root.getChildAt(i); + if (on.getNode() == node){ + return new TreePath((Object[])on.getPath()); + } + } + return null; + } + + private TreePath getOutlineNodePath(Node node){ + switch (node.getType()) { + case NodeModel.NODETYPE_ACCESSPOINT : + return getOutlineNodePath(nodeAccessPoints, node); + case NodeModel.NODETYPE_CLIENT : + return getOutlineNodePath(nodeClients, node); + case NodeModel.NODETYPE_LOCATION : + return getOutlineNodePath(nodeLocations, node); + default : + return null; + } + } + + private OutlineNode findOutlineNode(OutlineNode root, Node node){ int size = root.getChildCount(); *************** *** 177,182 **** } return null; ! } ! private OutlineNode findOutlineNode(Node node){ switch (node.getType()) { --- 206,211 ---- } return null; ! } ! private OutlineNode findOutlineNode(Node node){ switch (node.getType()) { *************** *** 197,200 **** --- 226,230 ---- public void nodeAddedEvent(Node node){ OutlineNode on = new OutlineNode(node); + on.setAllowsChildren(false); int index = 0; switch (node.getType()) { *************** *** 249,253 **** private int getAlphabeticalIndex(OutlineNode parent,OutlineNode node){ int index=0; ! while((parent.getChildCount() > index) && (((OutlineNode)(node)).getNode().getDisplayName().compareToIgnoreCase(((OutlineNode)(parent.getChildAt(index))).getNode().getDisplayName()) > 0)){ ++index; } --- 279,283 ---- private int getAlphabeticalIndex(OutlineNode parent,OutlineNode node){ int index=0; ! while((parent.getChildCount() > index) && (node.getNode().getDisplayName().compareToIgnoreCase(((OutlineNode)(parent.getChildAt(index))).getNode().getDisplayName()) > 0)){ ++index; } *************** *** 255,257 **** --- 285,310 ---- } + public void setSelected(Node node){ + setSelected(getOutlineNodePath(node)); + } + + private void setSelected(TreePath outlineNodePath) { + tree.setSelectionPath(outlineNodePath); + } + + + public void clearSelection(){ + tree.clearSelection(); + } + + public void valueChanged(TreeSelectionEvent e) { + if(!((OutlineNode)e.getPath().getLastPathComponent()).getAllowsChildren()){ + Node node = ((OutlineNode)e.getPath().getLastPathComponent()).getNode(); + Controller.getInstance().getMapView().getPACWGraphDraw().setSelected(Controller.getInstance().getMapView().findVertex(node)); + } else { + Controller.getInstance().getMapView().getPACWGraphDraw().setSelected(null); + } + } + + } \ No newline at end of file Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MapView.java 4 Oct 2005 13:12:24 -0000 1.13 --- MapView.java 12 Oct 2005 21:44:17 -0000 1.14 *************** *** 1092,1095 **** --- 1092,1096 ---- Controller.getInstance().getMeasurementView().setTitle( GUIUtils.i18n("measurement") + " " + Controller.getInstance().getClient().getDisplayName()); + Controller.getInstance().getOutlineView().clearSelection(); return; } *************** *** 1160,1162 **** --- 1161,1167 ---- } + public PACWGraphDraw getPACWGraphDraw(){ + return graphdraw; + } + } \ No newline at end of file |
|
From: Florian L. <fle...@us...> - 2005-10-12 21:42:57
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19622/src/net/sf/magicmap/client/utils Modified Files: Version.java Log Message: Change to Version 0.7.1 Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Version.java 9 Jun 2005 15:19:29 -0000 1.12 --- Version.java 12 Oct 2005 21:42:49 -0000 1.13 *************** *** 15,19 **** public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 7; ! public static final String VERSION_FLAVOR = ""; public static String getVersion(){ --- 15,19 ---- public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 7; ! public static final String VERSION_FLAVOR = ".1"; public static String getVersion(){ |
|
From: Martin S. <sch...@us...> - 2005-10-11 16:11:09
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4307 Added Files: MagicMap.launch Log Message: Eclipse launch file --- NEW FILE: MagicMap.launch --- <?xml version="1.0" encoding="UTF-8"?> <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sf.magicmap.client.gui.MainGUI"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="magicmapclient"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> </launchConfiguration> |
|
From: Florian L. <fle...@us...> - 2005-10-08 23:18:18
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16995/res Modified Files: screentext.properties screentext_de_DE.properties Log Message: Variables Empfangsinterval für Daten vom Server Index: screentext_de_DE.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_de_DE.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** screentext_de_DE.properties 4 Oct 2005 12:04:24 -0000 1.6 --- screentext_de_DE.properties 8 Oct 2005 23:18:09 -0000 1.7 *************** *** 99,101 **** setproxytooltip=Proxy-Server einstellen nonserverconnect=Kein Server (Standalone) ! showedgesforselectednode=Zeige nur die Kanten /nfür den selektierten Knoten --- 99,113 ---- setproxytooltip=Proxy-Server einstellen nonserverconnect=Kein Server (Standalone) ! showedgesforselectednode=Zeige nur die Kanten für den selektierten Knoten ! datainvocationrate=Updaterate ! datainvocationratetooltip=Stellt ein wie oft die Daten vom Server abgerufen werden ! dataInvocationRate1=1 Sek ! dataInvocationRate2=2 Sek ! dataInvocationRate3=3 Sek ! dataInvocationRate4=4 Sek ! dataInvocationRate5=5 Sek ! dataInvocationRate6=6 Sek ! dataInvocationRate7=7 Sek ! dataInvocationRate8=8 Sek ! dataInvocationRate9=9 Sek ! dataInvocationRate10=10 Sek Index: screentext.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** screentext.properties 4 Oct 2005 12:04:24 -0000 1.5 --- screentext.properties 8 Oct 2005 23:18:09 -0000 1.6 *************** *** 100,102 **** --- 100,114 ---- nonserverconnect=Use local connection only showedgesforselectednode=Show only edges for the selected node + datainvocationrate=Updaterate + datainvocationratetooltip=Sets the rate for getting data from the server + dataInvocationRate1=1 sec + dataInvocationRate2=2 sec + dataInvocationRate3=3 sec + dataInvocationRate4=4 sec + dataInvocationRate5=5 sec + dataInvocationRate6=6 sec + dataInvocationRate7=7 sec + dataInvocationRate8=8 sec + dataInvocationRate9=9 sec + dataInvocationRate10=10 sec |
|
From: Florian L. <fle...@us...> - 2005-10-08 23:18:17
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16995/src/net/sf/magicmap/client/controller Modified Files: Controller.java ServerPoller.java Log Message: Variables Empfangsinterval für Daten vom Server Index: Controller.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Controller.java 15 Jul 2005 16:40:04 -0000 1.4 --- Controller.java 8 Oct 2005 23:18:09 -0000 1.5 *************** *** 247,250 **** --- 247,257 ---- } } + + public void restartServerPoller(){ + if (isMapLoaded() && isConnected()){ + poller.stop(); + poller.start(); + } + } public boolean isMapLoaded(){ Index: ServerPoller.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ServerPoller.java 11 May 2005 10:51:27 -0000 1.3 --- ServerPoller.java 8 Oct 2005 23:18:09 -0000 1.4 *************** *** 37,41 **** public void start(){ ! this.timer.schedule(builderTimerTask(), Settings.POLL_DELAY, Settings.POLL_INTERVAL); } --- 37,41 ---- public void start(){ ! this.timer.schedule(builderTimerTask(), Settings.POLL_DELAY, Settings.getPollIntevall()); } |
|
From: Florian L. <fle...@us...> - 2005-10-08 23:18:17
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16995/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: Variables Empfangsinterval für Daten vom Server Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MainGUI.java 4 Oct 2005 13:12:23 -0000 1.10 --- MainGUI.java 8 Oct 2005 23:18:09 -0000 1.11 *************** *** 24,27 **** --- 24,28 ---- import javax.swing.JMenuBar; import javax.swing.JOptionPane; + import javax.swing.JPopupMenu; import javax.swing.JSplitPane; import javax.swing.JToolBar; *************** *** 104,107 **** --- 105,118 ---- private MagicAction expertView; private MagicAction userDefinedView; + private MagicAction dataInvocationRate1Action; + private MagicAction dataInvocationRate2Action; + private MagicAction dataInvocationRate3Action; + private MagicAction dataInvocationRate4Action; + private MagicAction dataInvocationRate5Action; + private MagicAction dataInvocationRate6Action; + private MagicAction dataInvocationRate7Action; + private MagicAction dataInvocationRate8Action; + private MagicAction dataInvocationRate9Action; + private MagicAction dataInvocationRate10Action; /** * Erzeugt Hauptfenster der Anwendung. *************** *** 319,323 **** mapView.setShowAccessPoints(true); mapView.setShowClients(true); ! mapView.setShowEdges(false); mapView.setShowEdgesBetweenLocations(false); mapView.setShowLocations(true); --- 330,334 ---- mapView.setShowAccessPoints(true); mapView.setShowClients(true); ! mapView.setShowEdges(true); mapView.setShowEdgesBetweenLocations(false); mapView.setShowLocations(true); *************** *** 339,343 **** mapView.setShowEdgesBetweenLocations(true); mapView.setShowLocations(true); ! mapView.setShowEdgesForSelectedNode(true); simpleView.setSelected(false); --- 350,354 ---- mapView.setShowEdgesBetweenLocations(true); mapView.setShowLocations(true); ! mapView.setShowEdgesForSelectedNode(false); simpleView.setSelected(false); *************** *** 356,359 **** --- 367,541 ---- } }; + + dataInvocationRate1Action = new MagicAction("dataInvocationRate1"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(true); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(1000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate2Action = new MagicAction("dataInvocationRate2"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(true); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(2000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate3Action = new MagicAction("dataInvocationRate3"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(true); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(3000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate4Action = new MagicAction("dataInvocationRate4"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(true); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(4000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate5Action = new MagicAction("dataInvocationRate5"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(true); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(5000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate6Action = new MagicAction("dataInvocationRate6"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(true); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(6000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate7Action = new MagicAction("dataInvocationRate7"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(true); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(7000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate8Action = new MagicAction("dataInvocationRate8"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(true); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(8000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate9Action = new MagicAction("dataInvocationRate9"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(true); + dataInvocationRate10Action.setSelected(false); + Settings.setPollIntevall(9000); + Controller.getInstance().restartServerPoller(); + } + }; + + dataInvocationRate10Action = new MagicAction("dataInvocationRate10"){ + public void actionPerformed(ActionEvent e) { + dataInvocationRate1Action.setSelected(false); + dataInvocationRate2Action.setSelected(false); + dataInvocationRate3Action.setSelected(false); + dataInvocationRate4Action.setSelected(false); + dataInvocationRate5Action.setSelected(false); + dataInvocationRate6Action.setSelected(false); + dataInvocationRate7Action.setSelected(false); + dataInvocationRate8Action.setSelected(false); + dataInvocationRate9Action.setSelected(false); + dataInvocationRate10Action.setSelected(true); + Settings.setPollIntevall(10000); + Controller.getInstance().restartServerPoller(); + } + }; + invisibleAction.setEnabled(false); *************** *** 448,451 **** --- 630,646 ---- menu.add(GUIBuilder.createCheckBoxMenuItem(invisibleAction, Controller.getInstance().isInvisible())); menu.add(GUIBuilder.createMenuItem(setProxyAction)); + JMenu dataInvocationRate = GUIBuilder.createMenu("datainvocationrate"); + menu.add(dataInvocationRate); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate1Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate2Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate3Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate4Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate5Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate6Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate7Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate8Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate9Action, false)); + dataInvocationRate.add(GUIBuilder.createCheckBoxMenuItem(dataInvocationRate10Action, false)); + dataInvocationRate5Action.setSelected(true); return menu; } |
|
From: Florian L. <fle...@us...> - 2005-10-08 23:18:17
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16995/src/net/sf/magicmap/client/utils Modified Files: Settings.java Log Message: Variables Empfangsinterval für Daten vom Server Index: Settings.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Settings.java 12 Jun 2005 12:23:46 -0000 1.6 --- Settings.java 8 Oct 2005 23:18:09 -0000 1.7 *************** *** 13,17 **** public static final int TIMEOUT = 15000; ! public static final int POLL_INTERVAL = 5000; public static final long POLL_DELAY = 500; public static String WEBSERVICE_PATH = "/magicmap/services/"; --- 13,17 ---- public static final int TIMEOUT = 15000; ! private static int pollIntevall = 5000; public static final long POLL_DELAY = 500; public static String WEBSERVICE_PATH = "/magicmap/services/"; *************** *** 37,40 **** --- 37,48 ---- } + public static int getPollIntevall(){ + return pollIntevall; + } + + public static void setPollIntevall(int pollIntevall){ + Settings.pollIntevall = pollIntevall; + } + public static String getClientName(){ return clientName; |
|
From: Florian L. <fle...@us...> - 2005-10-04 13:12:50
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14848/src/net/sf/magicmap/client/views Modified Files: MapView.java Log Message: Nur Kanten für Selektierten Knoten Option eingefügt Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MapView.java 29 Sep 2005 14:48:19 -0000 1.12 --- MapView.java 4 Oct 2005 13:12:24 -0000 1.13 *************** *** 91,94 **** --- 91,95 ---- private HashMap locationLocationMap; + private Node selectedNode; private NodeModelMetric metric; *************** *** 100,108 **** private boolean showEdgesBetweenLocations = false; ! private boolean showEdges = false; private boolean showAccessPoints = true; private boolean showLocations = true; private boolean showClients = true; ! /** --- 101,110 ---- private boolean showEdgesBetweenLocations = false; ! private boolean showEdges = true; private boolean showAccessPoints = true; private boolean showLocations = true; private boolean showClients = true; ! private boolean showEdgesForSelectedNode = true; ! /** *************** *** 490,494 **** if (t1 == NodeModel.NODETYPE_LOCATION && t2 == NodeModel.NODETYPE_LOCATION){ ! if (!showEdgesBetweenLocations) return result = null; } --- 492,500 ---- if (t1 == NodeModel.NODETYPE_LOCATION && t2 == NodeModel.NODETYPE_LOCATION){ ! if (!showEdgesBetweenLocations) return result = null; ! } ! ! if (showEdgesForSelectedNode){ ! if (selectedNode == null || !selectedNode.equals(node1) && !selectedNode.equals(node2)) return result = null; } *************** *** 1082,1085 **** --- 1088,1092 ---- public void vertexSelected(Vertex v){ if (v == null){ + selectedNode = null; Controller.getInstance().setMeasurementViewLocal(true); Controller.getInstance().getMeasurementView().setTitle( *************** *** 1087,1100 **** return; } ! Node node = findNode(v); ! if (node != null && (node.getType() == NodeModel.NODETYPE_LOCATION || node.getType() == NodeModel.NODETYPE_CLIENT)){ ! if (node != Controller.getInstance().getClient()){ Controller.getInstance().setMeasurementViewLocal(false); ! Controller.getInstance().buildOtherMeasurement((AccessPointSeerNode) node); } else { Controller.getInstance().setMeasurementViewLocal(true); } Controller.getInstance().getMeasurementView().setTitle( ! GUIUtils.i18n("measurement") + " " + node.getDisplayName()); } else{ --- 1094,1107 ---- return; } ! selectedNode = findNode(v); ! if (selectedNode != null && (selectedNode.getType() == NodeModel.NODETYPE_LOCATION || selectedNode.getType() == NodeModel.NODETYPE_CLIENT)){ ! if (selectedNode != Controller.getInstance().getClient()){ Controller.getInstance().setMeasurementViewLocal(false); ! Controller.getInstance().buildOtherMeasurement((AccessPointSeerNode) selectedNode); } else { Controller.getInstance().setMeasurementViewLocal(true); } Controller.getInstance().getMeasurementView().setTitle( ! GUIUtils.i18n("measurement") + " " + selectedNode.getDisplayName()); } else{ *************** *** 1133,1144 **** public boolean isShowClients(){ return showClients; ! } ! /** ! * @param b ! */ ! public void setShowClients(boolean b){ ! this.showClients = b; ! } } \ No newline at end of file --- 1140,1162 ---- public boolean isShowClients(){ return showClients; ! } ! /** ! * @param b ! */ ! public void setShowClients(boolean b){ ! this.showClients = b; ! } ! ! public boolean isShowEdgesForSelectedNode(){ ! return showEdgesForSelectedNode; ! } ! /** ! * @param b ! */ ! public void setShowEdgesForSelectedNode(boolean b){ ! this.showEdgesForSelectedNode = b; ! ! } } \ No newline at end of file |
|
From: Florian L. <fle...@us...> - 2005-10-04 13:12:34
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14848/src/net/sf/magicmap/client/gui/dialogs Modified Files: ViewOptionsDialog.java Log Message: Nur Kanten für Selektierten Knoten Option eingefügt Index: ViewOptionsDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ViewOptionsDialog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ViewOptionsDialog.java 29 Sep 2005 14:48:19 -0000 1.2 --- ViewOptionsDialog.java 4 Oct 2005 13:12:24 -0000 1.3 *************** *** 28,31 **** --- 28,32 ---- private JCheckBox showEdgesBetweenLocations; private JCheckBox showEdges; + private JCheckBox showEdgesForSelectedNode; public static void showDialog(Frame owner){ *************** *** 39,43 **** private ViewOptionsDialog(Frame owner) { super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("viewoptions"))); ! setSize(256, 260); this.setResizable(false); --- 40,44 ---- private ViewOptionsDialog(Frame owner) { super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("viewoptions"))); ! setSize(306, 280); this.setResizable(false); *************** *** 76,81 **** builder.setRightRightDistance("showedgesbetweenlocations","showaccesspoints",0); showEdges = builder.addCheckBox(GUIUtils.i18n("showedges",false),"showedges",mapView.isShowEdges()); ! builder.setTopBottomDistance("showedges","showedgesbetweenlocations",10); builder.setLeftLeftDistance("showedges","showaccesspoints",0); builder.setRightRightDistance("showedges","showaccesspoints",0); --- 77,87 ---- builder.setRightRightDistance("showedgesbetweenlocations","showaccesspoints",0); + showEdgesForSelectedNode = builder.addCheckBox(GUIUtils.i18n("showedgesforselectednode",false),"showedgesforselectednode",mapView.isShowEdgesForSelectedNode()); + builder.setTopBottomDistance("showedgesforselectednode","showedgesbetweenlocations",10); + builder.setLeftLeftDistance("showedgesforselectednode","showaccesspoints",0); + builder.setRightRightDistance("showedgesforselectednode","showaccesspoints",0); + showEdges = builder.addCheckBox(GUIUtils.i18n("showedges",false),"showedges",mapView.isShowEdges()); ! builder.setTopBottomDistance("showedges","showedgesforselectednode",10); builder.setLeftLeftDistance("showedges","showaccesspoints",0); builder.setRightRightDistance("showedges","showaccesspoints",0); *************** *** 97,100 **** --- 103,107 ---- mapView.setShowEdges(showEdges.isSelected()); mapView.setShowEdgesBetweenLocations(showEdgesBetweenLocations.isSelected()); + mapView.setShowEdgesForSelectedNode(showEdgesForSelectedNode.isSelected()); mapView.setShowLocations(showLocations.isSelected()); MainGUI.getInstance().setUserDefinedView(); *************** *** 104,107 **** --- 111,115 ---- } else if ("SHOWEDGES".equals(e.getActionCommand()) && !showEdges.isSelected()){ showEdgesBetweenLocations.setSelected(false); + showEdgesForSelectedNode.setSelected(false); } |
|
From: Florian L. <fle...@us...> - 2005-10-04 13:12:34
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14848/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: Nur Kanten für Selektierten Knoten Option eingefügt Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MainGUI.java 29 Sep 2005 14:48:19 -0000 1.9 --- MainGUI.java 4 Oct 2005 13:12:23 -0000 1.10 *************** *** 100,113 **** MapView mapView; private MagicAction invisibleAction; - private MagicAction showAccessPoints; - private MagicAction showLocations; - private MagicAction showClients; private MagicAction simpleView; private MagicAction normalView; private MagicAction expertView; private MagicAction userDefinedView; - MagicAction showEdgesBetweenLocations; - MagicAction showEdges; - /** * Erzeugt Hauptfenster der Anwendung. --- 100,107 ---- *************** *** 310,313 **** --- 304,308 ---- mapView.setShowEdgesBetweenLocations(false); mapView.setShowLocations(false); + mapView.setShowEdgesForSelectedNode(false); simpleView.setSelected(true); *************** *** 327,330 **** --- 322,326 ---- mapView.setShowEdgesBetweenLocations(false); mapView.setShowLocations(true); + mapView.setShowEdgesForSelectedNode(true); simpleView.setSelected(false); *************** *** 343,346 **** --- 339,343 ---- mapView.setShowEdgesBetweenLocations(true); mapView.setShowLocations(true); + mapView.setShowEdgesForSelectedNode(true); simpleView.setSelected(false); |
|
From: Andreas W. <an...@us...> - 2005-10-04 12:04:32
|
Update of /cvsroot/magicmap//magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32119/res Modified Files: screentext.properties screentext_de_DE.properties Log Message: showedgesforselectednode Properties eingefügt Index: screentext_de_DE.properties =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/res/screentext_de_DE.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** screentext_de_DE.properties 29 Sep 2005 14:48:19 -0000 1.5 --- screentext_de_DE.properties 4 Oct 2005 12:04:24 -0000 1.6 *************** *** 99,100 **** --- 99,101 ---- setproxytooltip=Proxy-Server einstellen nonserverconnect=Kein Server (Standalone) + showedgesforselectednode=Zeige nur die Kanten /nfür den selektierten Knoten Index: screentext.properties =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/res/screentext.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** screentext.properties 29 Sep 2005 14:48:19 -0000 1.4 --- screentext.properties 4 Oct 2005 12:04:24 -0000 1.5 *************** *** 99,102 **** setproxytooltip=Set Proxy-server nonserverconnect=Use local connection only ! --- 99,102 ---- setproxytooltip=Set Proxy-server nonserverconnect=Use local connection only ! showedgesforselectednode=Show only edges for the selected node |
|
From: Florian L. <fle...@us...> - 2005-09-29 14:48:37
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20554/res Modified Files: screentext.properties screentext_de_DE.properties Log Message: komplette umstruckturierung der Anzeige optionen Index: screentext_de_DE.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_de_DE.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** screentext_de_DE.properties 28 Sep 2005 15:53:04 -0000 1.4 --- screentext_de_DE.properties 29 Sep 2005 14:48:19 -0000 1.5 *************** *** 8,11 **** --- 8,13 ---- about=&Info über... help=&Hilfe + onlinehelp=Online Hilfe + onlinehelptooltip=Hilfe im MagicMap Wiki simpleview=Anfänger normalview=Fortgeschritten *************** *** 81,86 **** newmaptooltip=Neue Karte auf Server anlegen loadmaptooltip=Bestehende Karte vom Server laden showlocations=Zeige Referenzpunkte ! showclients=Zeige Clients showaccesspoints=Zeige Access Points showedges=Zeige Kanten --- 83,89 ---- newmaptooltip=Neue Karte auf Server anlegen loadmaptooltip=Bestehende Karte vom Server laden + viewoptions=Anzeige Optionen showlocations=Zeige Referenzpunkte ! showclients=Zeige Clienten showaccesspoints=Zeige Access Points showedges=Zeige Kanten Index: screentext.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** screentext.properties 28 Sep 2005 15:53:04 -0000 1.3 --- screentext.properties 29 Sep 2005 14:48:19 -0000 1.4 *************** *** 8,11 **** --- 8,13 ---- about=&About... help=&Help + onlinehelp=Online help + onlinehelptooltip=Help at MagicMap wiki simpleview=Beginner normalview=Advanced *************** *** 81,84 **** --- 83,87 ---- newmaptooltip=Creates new map on server loadmaptooltip=Loads existing map from server + viewoptions=View options showlocations=Show locations showclients=Show clients |
|
From: Florian L. <fle...@us...> - 2005-09-29 14:48:36
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20554/src/net/sf/magicmap/client/gui/dialogs Modified Files: ViewOptionsDialog.java AboutDialog.java Log Message: komplette umstruckturierung der Anzeige optionen Index: ViewOptionsDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ViewOptionsDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ViewOptionsDialog.java 28 Sep 2005 15:53:04 -0000 1.1 --- ViewOptionsDialog.java 29 Sep 2005 14:48:19 -0000 1.2 *************** *** 4,19 **** import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - import java.io.IOException; - import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JDialog; - import javax.swing.JEditorPane; - import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; import com.Ostermiller.util.Browser; --- 4,19 ---- import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JButton; + import javax.swing.JCheckBox; import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.JTextField; + import net.sf.magicmap.client.controller.Controller; + import net.sf.magicmap.client.gui.MainGUI; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; + import net.sf.magicmap.client.views.MapView; import com.Ostermiller.util.Browser; *************** *** 21,26 **** public class ViewOptionsDialog extends JDialog implements ActionListener{ ! private JPanel mainPanel; ! private JTextField text; public static void showDialog(Frame owner){ --- 21,31 ---- public class ViewOptionsDialog extends JDialog implements ActionListener{ ! private JPanel mainPanel; ! private MapView mapView; ! private JCheckBox showAccessPoints; ! private JCheckBox showLocations; ! private JCheckBox showClients; ! private JCheckBox showEdgesBetweenLocations; ! private JCheckBox showEdges; public static void showDialog(Frame owner){ *************** *** 33,38 **** private ViewOptionsDialog(Frame owner) { ! super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("about"))); ! setSize(406, 430); this.setResizable(false); --- 38,43 ---- private ViewOptionsDialog(Frame owner) { ! super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("viewoptions"))); ! setSize(256, 260); this.setResizable(false); *************** *** 40,43 **** --- 45,49 ---- RelativePanelBuilder builder = new RelativePanelBuilder(layout); + mapView = Controller.getInstance().getMapView(); // OK / Abbrechen *************** *** 49,52 **** --- 55,85 ---- builder.setRightRightDistance("okcancel", null, -10); builder.setBottomBottomDistance("okcancel", null, -10); + + showAccessPoints = builder.addCheckBox(GUIUtils.i18n("showaccesspoints",false),"showaccesspoints",mapView.isShowAccessPoints()); + builder.setTop("showaccesspoints",20); + builder.setLeft("showaccesspoints",20); + builder.setWidth("showaccesspoints",this.getWidth()-40); + + showLocations = builder.addCheckBox(GUIUtils.i18n("showlocations",false),"showlocations",mapView.isShowLocations()); + builder.setTopBottomDistance("showlocations","showaccesspoints",10); + builder.setLeftLeftDistance("showlocations","showaccesspoints",0); + builder.setRightRightDistance("showlocations","showaccesspoints",0); + + showClients = builder.addCheckBox(GUIUtils.i18n("showclients",false),"showclients",mapView.isShowClients()); + builder.setTopBottomDistance("showclients","showlocations",10); + builder.setLeftLeftDistance("showclients","showaccesspoints",0); + builder.setRightRightDistance("showclients","showaccesspoints",0); + + showEdgesBetweenLocations = builder.addCheckBox(GUIUtils.i18n("showedgesbetweenlocations",false),"showedgesbetweenlocations",mapView.isShowEdgesBetweenLocations()); + builder.setTopBottomDistance("showedgesbetweenlocations","showclients",10); + builder.setLeftLeftDistance("showedgesbetweenlocations","showaccesspoints",0); + builder.setRightRightDistance("showedgesbetweenlocations","showaccesspoints",0); + + showEdges = builder.addCheckBox(GUIUtils.i18n("showedges",false),"showedges",mapView.isShowEdges()); + builder.setTopBottomDistance("showedges","showedgesbetweenlocations",10); + builder.setLeftLeftDistance("showedges","showaccesspoints",0); + builder.setRightRightDistance("showedges","showaccesspoints",0); + showEdges.setActionCommand("SHOWEDGES"); + showEdges.addActionListener(this); mainPanel = builder.getPanel(); *************** *** 59,64 **** public void actionPerformed(ActionEvent e){ if ("OK".equals(e.getActionCommand())){ ! this.setVisible(false); } } } --- 92,109 ---- public void actionPerformed(ActionEvent e){ if ("OK".equals(e.getActionCommand())){ ! ! mapView.setShowAccessPoints(showAccessPoints.isSelected()); ! mapView.setShowClients(showClients.isSelected()); ! mapView.setShowEdges(showEdges.isSelected()); ! mapView.setShowEdgesBetweenLocations(showEdgesBetweenLocations.isSelected()); ! mapView.setShowLocations(showLocations.isSelected()); ! MainGUI.getInstance().setUserDefinedView(); ! this.setVisible(false); ! } else if ("CANCEL".equals(e.getActionCommand())){ ! this.setVisible(false); ! } else if ("SHOWEDGES".equals(e.getActionCommand()) && !showEdges.isSelected()){ ! showEdgesBetweenLocations.setSelected(false); } + } } Index: AboutDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AboutDialog.java 28 Sep 2005 13:33:35 -0000 1.3 --- AboutDialog.java 29 Sep 2005 14:48:19 -0000 1.4 *************** *** 30,34 **** AboutDialog d = new AboutDialog(owner); GUIUtils.locateOnScreen(d); - Browser.init(); d.setModal(true); d.setVisible(true); --- 30,33 ---- |
|
From: Florian L. <fle...@us...> - 2005-09-29 14:48:36
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20554/src/net/sf/magicmap/client/views Modified Files: MapView.java OutlineView.java Log Message: komplette umstruckturierung der Anzeige optionen Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OutlineView.java 21 Jun 2005 23:38:18 -0000 1.3 --- OutlineView.java 29 Sep 2005 14:48:19 -0000 1.4 *************** *** 224,228 **** OutlineNode on = findOutlineNode(node); if (on != null){ ! treemodel.nodeChanged(on); } else{ System.out.println("Node not found in tree view: " + node); --- 224,228 ---- OutlineNode on = findOutlineNode(node); if (on != null){ ! treemodel.reload(on); } else{ System.out.println("Node not found in tree view: " + node); Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MapView.java 31 Aug 2005 11:59:16 -0000 1.11 --- MapView.java 29 Sep 2005 14:48:19 -0000 1.12 *************** *** 93,97 **** private NodeModelMetric metric; - private boolean showEdgesBetweenLocations = true; double CALIBRATION_FACTOR_AP = 1.0; // Kanten zu APs kalibrieren --- 93,96 ---- *************** *** 100,109 **** int lcc = 0; ! boolean showEdges = true; ! private boolean showAccessPoints = true; - private boolean showLocations = true; - private boolean showClients = true; --- 99,106 ---- int lcc = 0; ! private boolean showEdgesBetweenLocations = false; ! private boolean showEdges = false; private boolean showAccessPoints = true; private boolean showLocations = true; private boolean showClients = true; *************** *** 1067,1070 **** --- 1064,1070 ---- } + public boolean isShowEdges(){ + return showEdges; + } /** * @param showEdges *************** *** 1106,1109 **** --- 1106,1114 ---- } + + public boolean isShowAccessPoints(){ + return showAccessPoints; + } + /** * @param b *************** *** 1113,1117 **** } ! /** * @param b --- 1118,1126 ---- } ! ! public boolean isShowLocations(){ ! return showLocations; ! } ! /** * @param b *************** *** 1122,1125 **** --- 1131,1137 ---- } + public boolean isShowClients(){ + return showClients; + } /** * @param b |
|
From: Florian L. <fle...@us...> - 2005-09-29 14:48:36
|
Update of /cvsroot/magicmap/magicmapclient/res/toolBarButtonGraphics/eclipse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20554/res/toolBarButtonGraphics/eclipse Added Files: helpicon.gif Log Message: komplette umstruckturierung der Anzeige optionen --- NEW FILE: helpicon.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Florian L. <fle...@us...> - 2005-09-29 14:48:36
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20554/src/net/sf/magicmap/client/gui/utils Modified Files: MagicAction.java GUIConstants.java Log Message: komplette umstruckturierung der Anzeige optionen Index: GUIConstants.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIConstants.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GUIConstants.java 8 Jul 2005 15:47:32 -0000 1.2 --- GUIConstants.java 29 Sep 2005 14:48:19 -0000 1.3 *************** *** 51,54 **** --- 51,55 ---- public static final String ICON_LOCATION_ANCHOR = "custom/location_anchor.png"; public static final String ICON_LOCATION_RESCAN = "custom/location_rescan.png"; + public static final String ICON_HELP = "eclipse/helpicon.gif"; } \ No newline at end of file Index: MagicAction.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils/MagicAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MagicAction.java 16 Jan 2005 16:01:29 -0000 1.1 --- MagicAction.java 29 Sep 2005 14:48:19 -0000 1.2 *************** *** 43,47 **** public MagicAction(String i18n, String icon, String i18ntoolTip) { this(i18n, icon); ! this.putValue(AbstractAction.SHORT_DESCRIPTION, GUIUtils.i18n(i18ntoolTip)); } --- 43,47 ---- public MagicAction(String i18n, String icon, String i18ntoolTip) { this(i18n, icon); ! this.putValue(AbstractAction.SHORT_DESCRIPTION, GUIUtils.i18n(i18ntoolTip,false)); } |
|
From: Florian L. <fle...@us...> - 2005-09-29 14:48:36
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20554/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: komplette umstruckturierung der Anzeige optionen Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MainGUI.java 28 Sep 2005 15:53:04 -0000 1.8 --- MainGUI.java 29 Sep 2005 14:48:19 -0000 1.9 *************** *** 8,11 **** --- 8,12 ---- import java.awt.Dimension; import java.awt.event.ActionEvent; + import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; *************** *** 53,56 **** --- 54,58 ---- import org.apache.axis.AxisFault; + import com.Ostermiller.util.Browser; import com.brunchboy.util.swing.relativelayout.AttributeConstraint; import com.brunchboy.util.swing.relativelayout.AttributeType; *************** *** 95,99 **** private AbstractAction exitAction; private AbstractAction aboutAction; ! private AbstractAction viewAction; MapView mapView; private MagicAction invisibleAction; --- 97,101 ---- private AbstractAction exitAction; private AbstractAction aboutAction; ! private AbstractAction onlineHelp; MapView mapView; private MagicAction invisibleAction; *************** *** 104,107 **** --- 106,110 ---- private MagicAction normalView; private MagicAction expertView; + private MagicAction userDefinedView; MagicAction showEdgesBetweenLocations; MagicAction showEdges; *************** *** 231,234 **** --- 234,250 ---- } }; + + onlineHelp = new MagicAction("onlinehelp",GUIConstants.ICON_HELP, "onlinehelptooltip"){ + + public void actionPerformed(ActionEvent e) { + try { + Browser.displayURL("http://vierzig4.ath.cx/NOMADS/Wiki.jsp?page=MagicMapHelp"); + } catch (IOException e1) { + //TODO + } + } + + }; + aboutAction = new MagicAction("about") { *************** *** 237,247 **** } }; - - viewAction = new MagicAction("userdefinedview") { - - public void actionPerformed(ActionEvent e){ - ViewOptionsDialog.showDialog(MainGUI.this); - } - }; invisibleAction = new MagicAction("invisible", GUIConstants.ICON_INVISIBLE, "invisibletooltip") { --- 253,256 ---- *************** *** 252,298 **** }; ! showAccessPoints = new MagicAction("showaccesspoints") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowAccessPoints(showAccessPoints.isSelected()); ! } ! }; ! ! showLocations = new MagicAction("showlocations") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowLocations(showLocations.isSelected()); ! } ! }; ! ! showClients = new MagicAction("showclients") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowClients(showClients.isSelected()); ! } ! }; ! ! showEdgesBetweenLocations = new MagicAction("showedgesbetweenlocations") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowEdgesBetweenLocations(showEdgesBetweenLocations.isSelected()); ! ! } ! }; ! ! showEdges = new MagicAction("showedges") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowEdges(showEdges.isSelected()); ! ! } ! }; simpleView = new MagicAction("simpleview") { public void actionPerformed(ActionEvent e){ ! ((JCheckBoxMenuItem)e.getSource()).setSelected(true); ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(1)).setSelected(false); ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(2)).setSelected(false); } }; --- 261,318 ---- }; ! // showAccessPoints = new MagicAction("showaccesspoints") { ! // ! // public void actionPerformed(ActionEvent e){ ! // mapView.setShowAccessPoints(showAccessPoints.isSelected()); ! // } ! // }; ! // ! // showLocations = new MagicAction("showlocations") { ! // ! // public void actionPerformed(ActionEvent e){ ! // mapView.setShowLocations(showLocations.isSelected()); ! // } ! // }; ! // ! // showClients = new MagicAction("showclients") { ! // ! // public void actionPerformed(ActionEvent e){ ! // mapView.setShowClients(showClients.isSelected()); ! // } ! // }; ! // ! // showEdgesBetweenLocations = new MagicAction("showedgesbetweenlocations") { ! // ! // public void actionPerformed(ActionEvent e){ ! // mapView.setShowEdgesBetweenLocations(showEdgesBetweenLocations.isSelected()); ! // ! // } ! // }; ! // ! // showEdges = new MagicAction("showedges") { ! // ! // public void actionPerformed(ActionEvent e){ ! // mapView.setShowEdges(showEdges.isSelected()); ! // ! // } ! // }; simpleView = new MagicAction("simpleview") { public void actionPerformed(ActionEvent e){ ! /*((JCheckBoxMenuItem)e.getSource()).setSelected(true); ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(1)).setSelected(false); ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(2)).setSelected(false); + */ + mapView.setShowAccessPoints(false); + mapView.setShowClients(true); + mapView.setShowEdges(false); + mapView.setShowEdgesBetweenLocations(false); + mapView.setShowLocations(false); + + simpleView.setSelected(true); + normalView.setSelected(false); + expertView.setSelected(false); + userDefinedView.setSelected(false); } }; *************** *** 301,308 **** public void actionPerformed(ActionEvent e){ - ((JCheckBoxMenuItem)e.getSource()).setSelected(true); - ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(0)).setSelected(false); - ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(2)).setSelected(false); } }; --- 321,335 ---- public void actionPerformed(ActionEvent e){ + mapView.setShowAccessPoints(true); + mapView.setShowClients(true); + mapView.setShowEdges(false); + mapView.setShowEdgesBetweenLocations(false); + mapView.setShowLocations(true); + + simpleView.setSelected(false); + normalView.setSelected(true); + expertView.setSelected(false); + userDefinedView.setSelected(false); } }; *************** *** 311,320 **** public void actionPerformed(ActionEvent e){ ! ((JCheckBoxMenuItem)e.getSource()).setSelected(true); ! ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(0)).setSelected(false); ! ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(1)).setSelected(false); ! } }; invisibleAction.setEnabled(false); --- 338,362 ---- public void actionPerformed(ActionEvent e){ ! mapView.setShowAccessPoints(true); ! mapView.setShowClients(true); ! mapView.setShowEdges(true); ! mapView.setShowEdgesBetweenLocations(true); ! mapView.setShowLocations(true); ! ! simpleView.setSelected(false); ! normalView.setSelected(false); ! expertView.setSelected(true); ! userDefinedView.setSelected(false); } }; + + userDefinedView = new MagicAction("userdefinedview") { + + public void actionPerformed(ActionEvent e){ + + userDefinedView.setSelected(!userDefinedView.isSelected()); + ViewOptionsDialog.showDialog(MainGUI.this); + } + }; invisibleAction.setEnabled(false); *************** *** 322,330 **** newMapAction.setEnabled(false); loadMapAction.setEnabled(false); ! showClients.setEnabled(false); ! showAccessPoints.setEnabled(false); ! showLocations.setEnabled(false); ! showEdgesBetweenLocations.setEnabled(false); ! showEdges.setEnabled(false); } --- 364,383 ---- newMapAction.setEnabled(false); loadMapAction.setEnabled(false); ! // showClients.setEnabled(false); ! // showAccessPoints.setEnabled(false); ! // showLocations.setEnabled(false); ! // showEdgesBetweenLocations.setEnabled(false); ! // showEdges.setEnabled(false); ! simpleView.setEnabled(false); ! normalView.setEnabled(false); ! expertView.setEnabled(false); ! userDefinedView.setEnabled(false); ! } ! ! public void setUserDefinedView(){ ! simpleView.setSelected(false); ! normalView.setSelected(false); ! expertView.setSelected(false); ! userDefinedView.setSelected(true); } *************** *** 347,351 **** this.bottomRightTabPanel.addView(consoleView); this.bottomRightTabPanel.selectView(measurementView); ! UIFSplitPane pane = UIFSplitPane.createStrippedSplitPane(JSplitPane.HORIZONTAL_SPLIT, outlineView, (pane2 = UIFSplitPane.createStrippedSplitPane(JSplitPane.VERTICAL_SPLIT, mapPanel, bottomRightTabPanel))); --- 400,404 ---- this.bottomRightTabPanel.addView(consoleView); this.bottomRightTabPanel.selectView(measurementView); ! UIFSplitPane pane = UIFSplitPane.createStrippedSplitPane(JSplitPane.HORIZONTAL_SPLIT, outlineView, (pane2 = UIFSplitPane.createStrippedSplitPane(JSplitPane.VERTICAL_SPLIT, mapPanel, bottomRightTabPanel))); *************** *** 386,393 **** menu.add(GUIBuilder.createCheckBoxMenuItem(simpleView, false)); ! menu.add(GUIBuilder.createCheckBoxMenuItem(normalView, true)); menu.add(GUIBuilder.createCheckBoxMenuItem(expertView, false)); menu.addSeparator(); ! menu.add(GUIBuilder.createMenuItem(viewAction)); return menu; } --- 439,447 ---- menu.add(GUIBuilder.createCheckBoxMenuItem(simpleView, false)); ! menu.add(GUIBuilder.createCheckBoxMenuItem(normalView, false)); menu.add(GUIBuilder.createCheckBoxMenuItem(expertView, false)); menu.addSeparator(); ! menu.add(GUIBuilder.createCheckBoxMenuItem(userDefinedView, false)); ! normalView.setSelected(true); return menu; } *************** *** 401,405 **** --- 455,462 ---- public JMenu buildHelpMenu(){ + Browser.init(); JMenu menu = GUIBuilder.createMenu("help"); + menu.add(GUIBuilder.createMenuItem(onlineHelp)); + menu.addSeparator(); menu.add(GUIBuilder.createMenuItem(aboutAction)); return menu; *************** *** 530,538 **** statusBar.setInvisible(Controller.getInstance().isInvisible()); invisibleAction.setEnabled(true); ! showClients.setEnabled(true); ! showAccessPoints.setEnabled(true); ! showLocations.setEnabled(true); ! showEdgesBetweenLocations.setEnabled(true); ! showEdges.setEnabled(true); } --- 587,594 ---- statusBar.setInvisible(Controller.getInstance().isInvisible()); invisibleAction.setEnabled(true); ! simpleView.setEnabled(true); ! normalView.setEnabled(true); ! expertView.setEnabled(true); ! userDefinedView.setEnabled(true); } |
|
From: Florian L. <fle...@us...> - 2005-09-28 15:53:12
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11202/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: view options menu started Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MainGUI.java 27 Sep 2005 15:52:30 -0000 1.7 --- MainGUI.java 28 Sep 2005 15:53:04 -0000 1.8 *************** *** 17,20 **** --- 17,21 ---- import javax.swing.ImageIcon; import javax.swing.JButton; + import javax.swing.JCheckBoxMenuItem; import javax.swing.JComponent; import javax.swing.JFrame; *************** *** 31,34 **** --- 32,36 ---- import net.sf.magicmap.client.gui.dialogs.NewMapDialog; import net.sf.magicmap.client.gui.dialogs.SetProxyDialog; + import net.sf.magicmap.client.gui.dialogs.ViewOptionsDialog; import net.sf.magicmap.client.gui.utils.GUIBuilder; import net.sf.magicmap.client.gui.utils.GUIConstants; *************** *** 93,96 **** --- 95,99 ---- private AbstractAction exitAction; private AbstractAction aboutAction; + private AbstractAction viewAction; MapView mapView; private MagicAction invisibleAction; *************** *** 98,101 **** --- 101,107 ---- private MagicAction showLocations; private MagicAction showClients; + private MagicAction simpleView; + private MagicAction normalView; + private MagicAction expertView; MagicAction showEdgesBetweenLocations; MagicAction showEdges; *************** *** 120,123 **** --- 126,130 ---- this.setJMenuBar(menuBar); menuBar.add(buildFileMenu()); + menuBar.add(buildViewMenu()); menuBar.add(buildOptionsMenu()); menuBar.add(buildHelpMenu()); *************** *** 230,233 **** --- 237,247 ---- } }; + + viewAction = new MagicAction("userdefinedview") { + + public void actionPerformed(ActionEvent e){ + ViewOptionsDialog.showDialog(MainGUI.this); + } + }; invisibleAction = new MagicAction("invisible", GUIConstants.ICON_INVISIBLE, "invisibletooltip") { *************** *** 269,278 **** showEdges = new MagicAction("showedges") { ! public void actionPerformed(ActionEvent e){ ! mapView.setShowEdges(showEdges.isSelected()); ! } }; invisibleAction.setEnabled(false); disconnectAction.setEnabled(false); --- 283,321 ---- showEdges = new MagicAction("showedges") { ! public void actionPerformed(ActionEvent e){ ! mapView.setShowEdges(showEdges.isSelected()); ! } ! }; ! ! simpleView = new MagicAction("simpleview") { ! ! public void actionPerformed(ActionEvent e){ ! ((JCheckBoxMenuItem)e.getSource()).setSelected(true); ! ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(1)).setSelected(false); ! ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(2)).setSelected(false); ! } ! }; ! ! normalView = new MagicAction("normalview") { ! ! public void actionPerformed(ActionEvent e){ ! ((JCheckBoxMenuItem)e.getSource()).setSelected(true); ! ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(0)).setSelected(false); ! ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(2)).setSelected(false); ! ! } }; + + expertView = new MagicAction("expertview") { + + public void actionPerformed(ActionEvent e){ + ((JCheckBoxMenuItem)e.getSource()).setSelected(true); + ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(0)).setSelected(false); + ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(1)).setSelected(false); + } + }; + invisibleAction.setEnabled(false); disconnectAction.setEnabled(false); *************** *** 332,349 **** return menu; } public JMenu buildOptionsMenu(){ JMenu menu = GUIBuilder.createMenu("options"); menu.add(GUIBuilder.createCheckBoxMenuItem(invisibleAction, Controller.getInstance().isInvisible())); - menu.addSeparator(); - menu.add(GUIBuilder.createCheckBoxMenuItem(showAccessPoints, true)); - menu.add(GUIBuilder.createCheckBoxMenuItem(showClients, true)); - menu.add(GUIBuilder.createCheckBoxMenuItem(showLocations, true)); - menu.add(GUIBuilder.createCheckBoxMenuItem(showEdges, true)); - menu.add(GUIBuilder.createCheckBoxMenuItem(showEdgesBetweenLocations, true)); - menu.addSeparator(); menu.add(GUIBuilder.createMenuItem(setProxyAction)); return menu; - } --- 375,401 ---- return menu; } + + public JMenu buildViewMenu(){ + JMenu menu = GUIBuilder.createMenu("view"); + /* menu.add(GUIBuilder.createCheckBoxMenuItem(showAccessPoints, true)); + menu.add(GUIBuilder.createCheckBoxMenuItem(showClients, true)); + menu.add(GUIBuilder.createCheckBoxMenuItem(showLocations, true)); + menu.add(GUIBuilder.createCheckBoxMenuItem(showEdges, true)); + menu.add(GUIBuilder.createCheckBoxMenuItem(showEdgesBetweenLocations, true)); + */ + + menu.add(GUIBuilder.createCheckBoxMenuItem(simpleView, false)); + menu.add(GUIBuilder.createCheckBoxMenuItem(normalView, true)); + menu.add(GUIBuilder.createCheckBoxMenuItem(expertView, false)); + menu.addSeparator(); + menu.add(GUIBuilder.createMenuItem(viewAction)); + return menu; + } public JMenu buildOptionsMenu(){ JMenu menu = GUIBuilder.createMenu("options"); menu.add(GUIBuilder.createCheckBoxMenuItem(invisibleAction, Controller.getInstance().isInvisible())); menu.add(GUIBuilder.createMenuItem(setProxyAction)); return menu; } |
|
From: Florian L. <fle...@us...> - 2005-09-28 15:53:12
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11202/src/net/sf/magicmap/client/gui/dialogs Added Files: ViewOptionsDialog.java Log Message: view options menu started --- NEW FILE: ViewOptionsDialog.java --- package net.sf.magicmap.client.gui.dialogs; import java.awt.Frame; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JEditorPane; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; import com.Ostermiller.util.Browser; import com.brunchboy.util.swing.relativelayout.RelativeLayout; public class ViewOptionsDialog extends JDialog implements ActionListener{ private JPanel mainPanel; private JTextField text; public static void showDialog(Frame owner){ ViewOptionsDialog d = new ViewOptionsDialog(owner); GUIUtils.locateOnScreen(d); Browser.init(); d.setModal(true); d.setVisible(true); } private ViewOptionsDialog(Frame owner) { super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("about"))); setSize(406, 430); this.setResizable(false); 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); mainPanel = builder.getPanel(); setContentPane(mainPanel); getRootPane().setDefaultButton(ok); } /** */ public void actionPerformed(ActionEvent e){ if ("OK".equals(e.getActionCommand())){ this.setVisible(false); } } } |
1 message has been excluded from this view by a project administrator.
