Menu
▾
▴
[Magicmap-commits] SF.net SVN: magicmap: [597] trunk/magicmapclient/src/net/sf/magicmap
|
From: <Jan...@us...> - 2007-03-09 14:04:54
|
Revision: 597
http://svn.sourceforge.net/magicmap/?rev=597&view=rev
Author: Jan_fride
Date: 2007-03-09 06:04:52 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
Removed InfoObjects
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutReader.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/TabForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuContainer.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuItem.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/AndFilter.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/FilteredTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ContainerNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeContainer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/AbstractPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IPluginDescriptor.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginLoader.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginRepository.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/SimplePluginDescriptor.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/LoadPluginsAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/UninstallPluginAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/ArtifactRepositoryTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginDescriptorModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginTableRenderer.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/util/DirWalker.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/util/IPluginVF.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/util/PluginDescriptorReader.java
Removed Paths:
-------------
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -2,7 +2,6 @@
package net.sf.magicmap.artifact;
import java.util.Comparator;
-import java.util.StringTokenizer;
public class ArtifactComparator implements Comparator<IArtifact> {
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -30,7 +30,6 @@
import net.sf.magicmap.client.model.node.ClientNode;
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.INodeModel;
-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.plugin.PluginManager;
@@ -39,7 +38,7 @@
import org.apache.log4j.xml.DOMConfigurator;
/**
- * Kann \xC4nderungen an View und am Modell vornehmen und zieht alle F\xE4den
+ * Kann \xC4nderungen an View und am Modell vornehmen und zieht alle F\xE4den
* der Anwendung.
*
* @author thuebner
@@ -74,8 +73,6 @@
private boolean invisble; // Invisible-Modus (keine Daten an Server)
- // pseudo server items
- private Collection<InfoObject> infoObjects;
private ScannerAllocator scannerAllocator;
private PluginManager pluginManager;
@@ -102,9 +99,6 @@
this.pollhandler = new PollHandler(this);
- // pseudo server items
- this.infoObjects = new ArrayList<InfoObject>();
- // initializeScanner();
}
/**
@@ -453,10 +447,6 @@
this.serverManager.createNewMap(name, URL, imageWidth, imageHeight, width, height, callback);
}
- public Collection<InfoObject> getInfoObjects(){
- return this.infoObjects;
- }
-
public void handleRoundComplete(AbstractScanner scanner){
this.scannerAllocator.handleRoundComplete(scanner);
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -3,10 +3,6 @@
import java.util.Collection;
-import net.sf.magicmap.client.gui.views.ConsoleView;
-import net.sf.magicmap.client.gui.views.MapView;
-import net.sf.magicmap.client.gui.views.MeasurementView;
-import net.sf.magicmap.client.gui.views.OutlineView;
import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
import net.sf.magicmap.client.interfaces.CreatePositionCallback;
import net.sf.magicmap.client.interfaces.DeletePositionCallback;
@@ -24,7 +20,6 @@
import net.sf.magicmap.client.model.node.ClientNode;
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.INodeModel;
-import net.sf.magicmap.client.model.node.InfoObject;
/**
* @author Jan Friderici (ja...@fr...)
@@ -197,14 +192,12 @@
void createNewMap(String name, String URL, int imageWidth, int imageHeight, int width, int height,
CreateNewMapCallback callback);
- Collection<InfoObject> getInfoObjects();
-
void handleRoundComplete(AbstractScanner scanner);
void handleScanResult(AbstractScanResult scanResult, AbstractScanner scanner);
void addScannerHandler(AbstractScannerHandler handler);
-
+
/**
* Initialisiert die Plugins
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -16,7 +16,6 @@
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.GeoPosNode;
import net.sf.magicmap.client.model.node.INodeModel;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.client.model.node.LocationNode;
import net.sf.magicmap.client.model.node.MapNode;
import net.sf.magicmap.client.model.node.Node;
@@ -126,7 +125,7 @@
}
/**
- *
+ *
* @param node a node
* @param nodeModel the model
* @param position the position data
@@ -407,52 +406,4 @@
e.printStackTrace();
}
}
-
- /*
- * (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 {
- // INodeModel nodeModel = controller.getNodeModel();
- // Node node = nodeModel.findNode(infoObject.getUrl());
- //
- // if (node == null) {
- // InfoObjectNode infoNode = new InfoObjectNode(nodeModel);
- // infoNode.setName(infoObject.getUrl());
- // infoNode.setDisplayName(infoObject.getName());
- // infoNode.setId(infoObject.hashCode());
- // String[] tags = infoObject.getUrl().split(",");
- // for (String string : tags) {
- // infoNode.addTag(string);
- // }
- // if
- // (infoObject.getMap().equals(Controller.getInstance().getCurrentMap().name))
- // {
- // nodeModel.addNode(infoNode);
- // infoNode.setFix(true);
- // infoNode.setPosition(infoObject.getX(),
- // infoObject.getY(), 0);
- // }
- // }
- //
- // } 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();
- }
- }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -29,7 +29,6 @@
import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
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.utils.Settings;
import net.sf.magicmap.client.utils.Version;
import net.sf.magicmap.server.dto.GeoPointDTO;
@@ -319,48 +318,8 @@
}
}
- /*
- * (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 int z, final boolean fixed,
- final InfoObject infoObject, final String mapName, final CreatePositionCallback callback){
- if (isConnected()) {
- Thread createInfoObjectThread = new Thread() {
-
- @Override
- public void run(){
- synchronized (SOAPServerManager.mutex) {
- try {
- // SOAPServerManager.this.mapDelegate.createInfoObject(
- // sessionId,
- // mapName,
- // x,
- // y,
- // z,
- // infoObject.getName(),
- // infoObject.getUrl(),
- // infoObject.getType()
- // );
- Controller.getInstance().getInfoObjects().add(infoObject);
- } catch (Exception e) {
- callback.positionCreationError(e);
- }
- }
- }
- };
- createInfoObjectThread.start();
- }
-
- }
-
/**
* Entfernt einen Referenzpunkt oder die Positionierung eines AccessPoints
* oder Clients mit gegebener Id vom Server
@@ -764,31 +723,5 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see net.sf.magicmap.client.controller.ServerManager#fetchInfoPointsFromServer(net.sf.magicmap.client.interfaces.FetchInfoPointsCallback)
- */
- @Override
- public void fetchInfoPointsFromServer(final FetchInfoPointsCallback callback){
- if (isConnected()) {
- Thread fetchInfoPointsThread = new Thread() {
- @Override
- public void run(){
- synchronized (SOAPServerManager.mutex) {
- try {
- // retrieve info points
- Collection infoObjects = Controller.getInstance().getInfoObjects();
- if (infoObjects != null && infoObjects.size() > 0) callback.infoPointsFetched(infoObjects);
- } catch (Exception e) {
- callback.infoPointFetchError(e);
- }
- }
- }
- };
- fetchInfoPointsThread.start();
- }
- }
-
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -28,9 +28,8 @@
import net.sf.magicmap.client.interfaces.ServerConnectCallback;
import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
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.ClientNode;
+import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.server.dto.PositionDTO;
import net.sf.magicmap.server.dto.SignalCharacterDTO;
import net.sf.magicmap.server.dto.SimpleScanResultDTO;
@@ -109,13 +108,13 @@
public abstract void connect(final ServerConnectCallback callback);
/**
- *
+ *
* @param callback
*/
public abstract void disconnect(final ServerDisconnectCallback callback);
/**
- *
+ *
* @param name
* @param URL
* @param width
@@ -126,10 +125,10 @@
final int width, final int height, final CreateNewMapCallback callback);
/**
- * Liefert die eindeutigen Namen der auf dem Server angelegten Karten
+ * Liefert die eindeutigen Namen der auf dem Server angelegten Karten
* zur\xFCck.
* @param callback MapNamesCallback Objekt welches das MapNamesCallback implementiert
- * um die Kartennamen bzw. die
+ * um die Kartennamen bzw. die
*/
public abstract void retrieveMapNames(final MapNamesCallback callback, boolean openDialog);
@@ -157,19 +156,9 @@
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 int z, final boolean fixed,
- final InfoObject infoObject, final String mapName, final CreatePositionCallback callback);
/**
- * Entfernt einen Referenzpunkt oder die Positionierung eines
+ * Entfernt einen Referenzpunkt oder die Positionierung eines
* AccessPoints oder Clients mit gegebener Id vom Server
* @param node
* @param callback
@@ -178,7 +167,7 @@
final DeletePositionCallback callback);
/**
- * Bewegt einen Referenzpunkt oder die Positionierung eines
+ * Bewegt einen Referenzpunkt oder die Positionierung eines
* AccessPoints oder Clients mit gegebener Id vom Server
* @param node
* @param callback
@@ -206,7 +195,7 @@
final String accessPointMac, final PositionCallback callback);
/**
- * Setzt den Berechnungsstatus des Accesspoint
+ * Setzt den Berechnungsstatus des Accesspoint
* @param sessionId
* @param mapName
* @param accessPointMac
@@ -222,7 +211,6 @@
public abstract void fetchMapsFromServer(final FetchMapsCallback callback);
- public abstract void fetchInfoPointsFromServer(final FetchInfoPointsCallback poller);
/* (non-Javadoc)
* @see net.sf.magicmap.client.interfaces.ServerPollerListener#positionCreatedOrUpdatedOrDeleted(java.lang.String, long, net.sf.magicmap.client.delegate.dto.PositionDTO)
@@ -241,7 +229,7 @@
public abstract void deleteGeoPoint(long id, String string, DeletePositionCallback callback);
// /**
- // * Load new map
+ // * Load new map
// * @param info
// */
// public abstract void loadMap(MapInfo info);
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -13,7 +13,6 @@
import net.sf.magicmap.client.interfaces.FetchInfoPointsCallback;
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.utils.Settings;
import net.sf.magicmap.server.dto.GeoPointDTO;
import net.sf.magicmap.server.dto.MapDTO;
@@ -25,7 +24,7 @@
* oder vom Anwender erzeugte Referenzpunkte.
* @author thuebner
*/
-public class ServerPoller implements FetchPositionsCallback, FetchGeoPointsCallback, FetchInfoPointsCallback {
+public class ServerPoller implements FetchPositionsCallback, FetchGeoPointsCallback {
private static String syncObj = "TEST";
@@ -66,7 +65,6 @@
ServerPoller.this.serverManager.fetchPositionsFromServer(ServerPoller.this);
// ServerPoller.this.serverManager.fetchGeoPointsFromServer(ServerPoller.this);
// ServerPoller.this.serverManager.fetchMapsFromServer(ServerPoller.this);
- ServerPoller.this.serverManager.fetchInfoPointsFromServer(ServerPoller.this);
ServerPoller.this.serverManager.submitClientInfo();
}
}
@@ -125,20 +123,8 @@
}
- /* (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())
- this.listener.infoObjectCreatedorUpdatedOrDeleted((InfoObject) infoIterator.next());
- synchronized (ServerPoller.syncObj) {
- this.isFetching = false;
- }
- }
-
/**
* Wird aufgerufen wenn beim \xDCbermitteln der Position irgendwelche Fehler auftreten.
* @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#positionFetchError(java.lang.Exception)
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -23,7 +23,6 @@
import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
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.utils.Settings;
import net.sf.magicmap.client.utils.Version;
import net.sf.magicmap.server.Init;
@@ -39,7 +38,7 @@
/**
* @author thuebner
- *
+ *
*/
public class VirtualServerManager extends ServerManager {
@@ -69,7 +68,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#resetTimestamp()
*/
public void resetTimestamp(){
@@ -78,7 +77,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#isConnected()
*/
public boolean isConnected(){
@@ -87,7 +86,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#connect(net.sf.magicmap.client.interfaces.ServerConnectCallback)
*/
public void connect(ServerConnectCallback callback){
@@ -116,7 +115,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#disconnect(net.sf.magicmap.client.interfaces.ServerDisconnectCallback)
*/
public void disconnect(ServerDisconnectCallback callback){
@@ -128,7 +127,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#createNewMap(java.lang.String,
* java.lang.String, int, int,
* net.sf.magicmap.client.interfaces.CreateNewMapCallback)
@@ -163,7 +162,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#retrieveMapNames(net.sf.magicmap.client.interfaces.MapNamesCallback)
*/
public void retrieveMapNames(final MapNamesCallback callback, final boolean openDialog){
@@ -199,7 +198,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#retrieveMap(java.lang.String,
* net.sf.magicmap.client.interfaces.MapCallback)
*/
@@ -223,7 +222,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#createLocation(int,
* int, boolean, java.lang.String,
* net.sf.magicmap.client.interfaces.CreatePositionCallback)
@@ -253,7 +252,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#createGeoPos(int,
* int, boolean, net.sf.magicmap.client.model.node.GeoPos,
* java.lang.String,
@@ -285,7 +284,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#deletePosition(long,
* net.sf.magicmap.client.interfaces.DeletePositionCallback)
*/
@@ -312,7 +311,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#movePosition(long,
* int, int, boolean,
* net.sf.magicmap.client.interfaces.MovePositionCallback)
@@ -340,7 +339,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#setClientPosition(int,
* int, boolean, java.lang.String,
* net.sf.magicmap.client.interfaces.PositionCallback)
@@ -370,7 +369,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#setAccessPointPosition(int,
* int, boolean, java.lang.String,
* net.sf.magicmap.client.interfaces.PositionCallback)
@@ -399,7 +398,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#setAccessPointHiddenStatus(long,
* java.lang.String, java.lang.String, boolean,
* net.sf.magicmap.client.interfaces.PositionCallback)
@@ -428,7 +427,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#fetchPositionsFromServer(net.sf.magicmap.client.interfaces.FetchPositionsCallback)
*/
public void fetchPositionsFromServer(final FetchPositionsCallback callback){
@@ -463,7 +462,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#positionCreatedOrUpdatedOrDeleted(java.lang.String,
* long, net.sf.magicmap.server.dto.PositionDTO)
*/
@@ -474,7 +473,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#submitClientInfo()
*/
public void submitClientInfo(){
@@ -516,7 +515,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#reloadMap()
*/
public void reloadMap(){
@@ -530,7 +529,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#closeMap()
*/
public void closeMap(){
@@ -540,39 +539,7 @@
/*
* (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 int z, boolean fixed, final InfoObject infoObject,
- final String mapName, final CreatePositionCallback callback){
- if (isConnected()) {
-
- Thread createInfoObjectThread = new Thread() {
-
- public void run(){
- // synchronized (mutex){
- // try{
- // Controller.getInstance().getInfoObjects().add(new InfoObject(infoObject.getName(), infoObject.getUrl(), infoObject.getType(), x, y, mapName));
- // //TODO: Infoobjecte im Server implementieren
- // mapFacade.createInfoObject(sessionId, mapName, x, y, z, infoObject.getName(), infoObject.getUrl(),
- // infoObject.getType());
- // } catch (Exception e){
- // callback.positionCreationError(e);
- // }
- // }
- }
- };
- createInfoObjectThread.start();
- }
- }
-
- /*
- * (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#deleteGeoPoint(long,
* java.lang.String,
* net.sf.magicmap.client.interfaces.DeletePositionCallback)
@@ -600,7 +567,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#fetchGeoPointsFromServer(net.sf.magicmap.client.interfaces.FetchGeoPointsCallback)
*/
@Override
@@ -630,7 +597,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#fetchMapsFromServer(net.sf.magicmap.client.interfaces.FetchMapsCallback)
*/
@Override
@@ -658,32 +625,4 @@
fetchMapsThread.start();
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see net.sf.magicmap.client.controller.ServerManager#fetchInfoPointsFromServer(net.sf.magicmap.client.interfaces.FetchInfoPointsCallback)
- */
- @Override
- public void fetchInfoPointsFromServer(final FetchInfoPointsCallback callback){
- if (isConnected()) {
- Thread fetchInfoPointsThread = new Thread() {
-
- public void run(){
- synchronized (mutex) {
- try {
- // retrieve info points
- Collection infoObjects = Controller.getInstance().getInfoObjects();
- if (infoObjects != null && infoObjects.size() > 0) {
- callback.infoPointsFetched(infoObjects);
- }
- } catch (Exception e) {
- callback.infoPointFetchError(e);
- }
- }
- }
- };
- fetchInfoPointsThread.start();
- }
- }
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -15,7 +15,6 @@
import java.util.Comparator;
import java.util.Vector;
-import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JButton;
@@ -27,7 +26,6 @@
import javax.swing.border.EtchedBorder;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.tree.DefaultMutableTreeNode;
import net.sf.magicmap.client.controller.Controller;
import net.sf.magicmap.client.gui.utils.GUIUtils;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,8 +1,6 @@
package net.sf.magicmap.client.gui.forms;
import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
import javax.swing.JComponent;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractForm.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractForm.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,8 +1,11 @@
package net.sf.magicmap.client.gui.forms;
-import javax.swing.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import javax.swing.JComponent;
+
/**
* Created by IntelliJ IDEA.
* User: Jan
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutForm.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutForm.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,8 +1,6 @@
package net.sf.magicmap.client.gui.forms;
-import javax.swing.*;
-
import javax.swing.JComponent;
import javax.swing.border.Border;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutReader.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutReader.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutReader.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,19 +1,21 @@
package net.sf.magicmap.client.gui.forms;
-import com.jgoodies.forms.layout.CellConstraints;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.Node;
-import org.dom4j.io.SAXReader;
-
-import javax.swing.*;
import java.beans.Statement;
import java.net.URL;
import java.util.Enumeration;
import java.util.List;
import java.util.ResourceBundle;
+import javax.swing.JComponent;
+
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.Node;
+import org.dom4j.io.SAXReader;
+
+import com.jgoodies.forms.layout.CellConstraints;
+
/**
*/
public class FormLayoutReader {
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/TabForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/TabForm.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/TabForm.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,9 +1,9 @@
package net.sf.magicmap.client.gui.forms;
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JTabbedPane;
import javax.swing.border.Border;
-import java.util.TreeSet;
-import java.util.Collection;
/**
* Created by IntelliJ IDEA.
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -2,9 +2,6 @@
package net.sf.magicmap.client.gui.forms;
import javax.swing.JComponent;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.PlainDocument;
-import javax.swing.text.SimpleAttributeSet;
/**
* A userinterface is an object that can display its attributes.
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,7 +1,7 @@
package net.sf.magicmap.client.gui.utils;
+import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
-import javax.swing.text.BadLocationException;
/**
* Created by IntelliJ IDEA.
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -5,7 +5,6 @@
package net.sf.magicmap.client.gui.utils;
import java.awt.Dimension;
-import java.awt.MediaTracker;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.io.IOException;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -8,8 +8,6 @@
import javax.swing.Icon;
import javax.swing.ImageIcon;
-import net.sf.magicmap.client.gui.MainGUI;
-import net.sf.magicmap.client.gui.views.MapView;
import net.sf.magicmap.client.model.node.INodeModel;
import net.sf.magicmap.client.model.node.LocationNode;
import net.sf.magicmap.client.model.node.Node;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,20 +1,29 @@
package net.sf.magicmap.client.gui.utils;
-import net.sf.magicmap.client.gui.forms.UserInterface;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
-import javax.swing.*;
-import javax.swing.event.ListDataListener;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.ListModel;
import javax.swing.event.EventListenerList;
import javax.swing.event.ListDataEvent;
-import java.util.*;
-import java.util.List;
-import java.awt.*;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
+import javax.swing.event.ListDataListener;
+import net.sf.magicmap.client.gui.forms.UserInterface;
+
import com.jgoodies.forms.builder.PanelBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
-import com.jgoodies.forms.layout.CellConstraints;
/**
* Created by IntelliJ IDEA.
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuContainer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuContainer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuContainer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,14 @@
package net.sf.magicmap.client.gui.utils.menu;
-import net.sf.magicmap.client.model.node.Node;
-
-import javax.swing.*;
+import java.util.HashSet;
+import java.util.LinkedList;
import java.util.List;
-import java.util.LinkedList;
import java.util.Set;
-import java.util.HashSet;
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+
/**
* Class ${class}
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuItem.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuItem.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuItem.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,6 +1,6 @@
package net.sf.magicmap.client.gui.utils.menu;
-import javax.swing.*;
+import javax.swing.JMenuItem;
/**
* Class ${class}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/AndFilter.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/AndFilter.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/AndFilter.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,6 +1,8 @@
package net.sf.magicmap.client.gui.utils.table;
-import java.util.*;
+import java.util.Collections;
+import java.util.Set;
+import java.util.TreeSet;
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/FilteredTableModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/FilteredTableModel.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/FilteredTableModel.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,15 +1,19 @@
package net.sf.magicmap.client.gui.utils.table;
-import javax.swing.table.TableModel;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.event.TableModelListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.*;
import java.util.LinkedList;
import java.util.Set;
import java.util.TreeSet;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTable;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableModel;
+
/**
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,21 @@
package net.sf.magicmap.client.gui.views;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.GradientPaint;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.UIManager;
+import javax.swing.table.TableCellRenderer;
+
import net.sf.magicmap.client.measurement.Constants;
import net.sf.magicmap.client.measurement.MeasurementUtils;
import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
-import javax.swing.*;
-import javax.swing.table.TableCellRenderer;
-import java.awt.*;
-
/**
*
* @author Jan Friderici, thuebner
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,13 @@
package net.sf.magicmap.client.gui.views;
+import javax.swing.JTable;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+
import net.sf.magicmap.client.model.measurement.IMeasurementModel;
import net.sf.magicmap.client.model.measurement.MeasurementTableModel;
-import javax.swing.*;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableModel;
-
public class MeasurementTable extends JTable {
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -4,6 +4,13 @@
package net.sf.magicmap.client.gui.views;
+import java.awt.Insets;
+
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.border.EmptyBorder;
+
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIBuilder;
import net.sf.magicmap.client.gui.utils.GUIConstants;
@@ -11,12 +18,12 @@
import net.sf.magicmap.client.model.measurement.IMeasurementModel;
import net.sf.magicmap.client.model.measurement.MeasurementTableModel;
import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
-import net.sf.magicmap.client.model.node.*;
+import net.sf.magicmap.client.model.node.AccessPointSeerNode;
+import net.sf.magicmap.client.model.node.INodeModel;
+import net.sf.magicmap.client.model.node.INodeModelSelectionListener;
+import net.sf.magicmap.client.model.node.Node;
+import net.sf.magicmap.client.model.node.NodeModelSelectionEvent;
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
-
/**
* @author thuebner
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -6,9 +6,10 @@
import javax.swing.JComponent;
-import com.jgoodies.uif_lite.panel.SimpleInternalFrame;
import net.sf.magicmap.client.gui.utils.menu.NodeMenuContainer;
+import com.jgoodies.uif_lite.panel.SimpleInternalFrame;
+
/**
* Beliebiger View im PACW Client. Ein View greift auf ein Modell
* zu und stellt es dar. Benutzerinteraktionen werden \xFCber einen
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -4,11 +4,11 @@
package net.sf.magicmap.client.interfaces;
+import java.util.EventListener;
+
import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
import net.sf.magicmap.client.model.node.AccessPointSeerNode;
-import java.util.EventListener;
-
/**
* @author thuebner
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -4,7 +4,6 @@
package net.sf.magicmap.client.interfaces;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.server.dto.GeoPointDTO;
import net.sf.magicmap.server.dto.MapDTO;
import net.sf.magicmap.server.dto.PositionDTO;
@@ -28,14 +27,14 @@
MapException, SessionException;
public void deletePosition(long sessionId, long positionId) throws RemoteException, MapException, SessionException;
-
+
public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws RemoteException;
*/
public void positionCreatedOrUpdatedOrDeleted(PositionDTO position);
/**
- *
+ *
* @param mapDTO
*/
public void mapCreatedOrUpdatedOrDeleted(MapDTO mapDTO);
@@ -45,9 +44,4 @@
*/
public void geoPosCreatedOrUpdatedOrDeleted(GeoPointDTO pointDTO);
- /**
- * @param infoObject
- */
- public void infoObjectCreatedorUpdatedOrDeleted(InfoObject infoObject);
-
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,12 +1,12 @@
package net.sf.magicmap.client.model.location;
+import java.util.HashMap;
+
import net.sf.magicmap.client.algorithms.NodeMetricManager;
import net.sf.magicmap.client.model.node.IMagicEdge;
import net.sf.magicmap.client.model.node.Node;
-import java.util.HashMap;
-
/**
* Berechnet die Orte von Knoten. Um einem Model ein INodePlacer hinzuzfügen
* muss man nur
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,9 +1,9 @@
package net.sf.magicmap.client.model.location.jung;
+import net.sf.magicmap.client.model.node.IMagicEdge;
+import net.sf.magicmap.client.model.node.Node;
import edu.uci.ics.jung.graph.Vertex;
import edu.uci.ics.jung.graph.impl.DirectedSparseEdge;
-import net.sf.magicmap.client.model.node.IMagicEdge;
-import net.sf.magicmap.client.model.node.Node;
public class JungEdge extends DirectedSparseEdge implements IMagicEdge{
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,4 +1,4 @@
-
+
package net.sf.magicmap.client.model.location.jung;
import java.awt.Dimension;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ContainerNode.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ContainerNode.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ContainerNode.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,12 +1,9 @@
package net.sf.magicmap.client.model.node;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import net.sf.magicmap.client.model.node.NodeContainer.Impl;
-
public abstract class ContainerNode extends Node implements NodeContainer {
private final NodeContainer.Impl container;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,13 @@
package net.sf.magicmap.client.model.node;
+import java.util.ArrayList;
+import java.util.Collection;
+
import net.sf.magicmap.client.interfaces.NodeModelListener;
import net.sf.magicmap.client.meta.MapInfo;
import net.sf.magicmap.client.model.location.INodePlacer;
-import java.util.ArrayList;
-import java.util.Collection;
-
/**
* Das NodeModel enth\xE4lt eine Menge von Knoten. Die Bestimmung der Position
* wird von einem anderen Objekt \xFCbernommen. Die Standart Positionsbestimmung
Deleted: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,78 +0,0 @@
-/**
- *
- */
-
-package net.sf.magicmap.client.model.node;
-
-
-/**
- *
- * @author Johannes Zapotoczky (joh...@za...)
- * @author Jan Friderici
- *
- */
-public interface InfoObject {
-
- /**
- * the url this info points to.
- * @return
- */
- String getInfoUrl();
-
- /**
- *
- * @return an url to an webservice.
- */
- String getServiceUrl();
-
- /**
- * The infoobjects type.
- * text/html
- * @return
- */
- String getInfoType();
-
- /**
- * usually the shortcut icon.
- *
- * @return the url to a smale image.
- */
- String getDepiction();
-
- /**
- * a Description of the info.
- *
- * @return
- */
- String getDescription();
-
- /**
- * the title of the infoobject.
- *
- * @return a title or "<notitle>"
- */
- String getInfoTitle();
-
- /**
- * the last update of this object
- *
- * @return the milliseconds
- */
- long getLastUpdate();
-
- /**
- *
- * @return
- */
- long getCreationTime();
-
- /**
- *
- * @return
- */
- State getState();
-
- public enum State{
- CREATED, LOADED, INVALID;
- }
-}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeContainer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeContainer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeContainer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -6,7 +6,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
-import java.util.TreeSet;
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -6,7 +6,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/AbstractPlugin.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/AbstractPlugin.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/AbstractPlugin.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,14 +1,15 @@
package net.sf.magicmap.client.plugin;
+import java.awt.Component;
+
+import javax.swing.JFrame;
+
import net.sf.magicmap.artifact.ArtifactComparator;
import net.sf.magicmap.artifact.IArtifact;
import net.sf.magicmap.client.controller.IController;
import net.sf.magicmap.client.utils.Settings;
-import javax.swing.*;
-import java.awt.*;
-
/**
* Eine Klasse die das Implementieren von Plugins erleichtert.
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IPluginDescriptor.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IPluginDescriptor.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IPluginDescriptor.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,12 +1,12 @@
package net.sf.magicmap.client.plugin;
+import java.util.ArrayList;
+import java.util.Collection;
+
import net.sf.magicmap.artifact.IArtifact;
import net.sf.magicmap.artifact.IVendor;
-import java.util.ArrayList;
-import java.util.Collection;
-
/**
*
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginLoader.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginLoader.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginLoader.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,9 +1,6 @@
package net.sf.magicmap.client.plugin;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.lang.reflect.Constructor;
import java.net.JarURLConnection;
import java.net.URL;
@@ -12,6 +9,9 @@
import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Created by IntelliJ IDEA.
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginRepository.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginRepository.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginRepository.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,23 +1,24 @@
package net.sf.magicmap.client.plugin;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
import net.sf.magicmap.artifact.Artifact;
import net.sf.magicmap.artifact.ArtifactTools;
import net.sf.magicmap.artifact.IArtifact;
import net.sf.magicmap.client.plugin.util.PluginDescriptorReader;
import net.sf.magicmap.client.utils.HtmlSaxParser;
+
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Node;
import org.dom4j.io.SAXReader;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
/**
*
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/SimplePluginDescriptor.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/SimplePluginDescriptor.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/SimplePluginDescriptor.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,14 +1,18 @@
package net.sf.magicmap.client.plugin;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+
import net.sf.magicmap.artifact.ArtifactComparator;
import net.sf.magicmap.artifact.IArtifact;
import net.sf.magicmap.artifact.IVendor;
import net.sf.magicmap.artifact.Version;
import net.sf.magicmap.client.plugin.util.OperatingSystemInfo;
-import java.util.*;
-
/**
* Beschreibt ein Plugin. Eine immutable Klasse.
* @author jan_fride
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,13 @@
package net.sf.magicmap.client.plugin.action;
-import net.sf.magicmap.client.gui.utils.GUIConstants;
-import net.sf.magicmap.client.gui.utils.MagicAction;
-
import java.awt.event.ActionEvent;
import java.awt.event.I...
[truncated message content] |
