Menu
▾
▴
[Magicmap-commits] SF.net SVN: magicmap: [475] trunk/magicmapclient/src/net/sf/magicmap
|
From: <fle...@us...> - 2006-10-31 15:20:42
|
Revision: 475
http://svn.sourceforge.net/magicmap/?rev=475&view=rev
Author: flederohr
Date: 2006-10-31 07:16:30 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
code formatting, organize imports and cleanup
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/artifact/Artifact.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactRepository.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactResolver.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/IArtifact.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/IConfigureable.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/IUniqueIdentity.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/IVendor.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/UniqeIdComparator.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/InfoNodeMetric.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/DistanceAlgorithm.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/MagicDistanceAlgorithm.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/core/MagicMapApplication.java
trunk/magicmapclient/src/net/sf/magicmap/client/delegate/MapDelegate.java
trunk/magicmapclient/src/net/sf/magicmap/client/delegate/PositionDelegate.java
trunk/magicmapclient/src/net/sf/magicmap/client/delegate/SessionDelegate.java
trunk/magicmapclient/src/net/sf/magicmap/client/delegate/exception/ExceptionHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/Closeable.java
trunk/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/MapFacadeInterface.java
trunk/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/PositionFacadeInterface.java
trunk/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/SessionFacadeInterface.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/IMapPanel.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/ISortableTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/PACWGraphDraw.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/StatusPanel.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/ViewTabPanel.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/GeoPosDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/InfoObjectDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/NewMapDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/SetProxyDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ViewOptionsDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/Attribute.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/CreateInfoObjectForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/Form.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/SimpleInfoObjectForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/CallbackHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIConstants.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/ImagePreview.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/MagicAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/NodeIcons.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/RelativePanelBuilder.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/ShadowBorder.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/AbstractMapView.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/ConsoleView.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MapView.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/OutlineTree.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/OutlineView.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/ViewHeader.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/CreateNewMapCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/CreatePositionCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/DeletePositionCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/FetchGeoPointsCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/FetchInfoPointsCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/FetchMapsCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/FetchPositionsCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/LoadMapDialogListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MapCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MapNamesCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MapViewListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MovePositionCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/NodeModelListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/PositionCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerConnectCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerDisconnectCallback.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/measurement/Constants.java
trunk/magicmapclient/src/net/sf/magicmap/client/measurement/MeasurementUtils.java
trunk/magicmapclient/src/net/sf/magicmap/client/measurement/ScannerAllocator.java
trunk/magicmapclient/src/net/sf/magicmap/client/measurement/WTScanner.java
trunk/magicmapclient/src/net/sf/magicmap/client/measurement/interfaces/AbstractScanResult.java
trunk/magicmapclient/src/net/sf/magicmap/client/measurement/interfaces/AbstractScanner.java
trunk/magicmapclient/src/net/sf/magicmap/client/measurement/interfaces/AbstractScannerHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/meta/MapInfo.java
trunk/magicmapclient/src/net/sf/magicmap/client/meta/ServerConnectionInfo.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/HTMLParser.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/InfoObjectBuilder.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/InfoObjectProvider.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/InfoObjectProviderRegistry.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/InfoObjectSupport.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/InfoTagFactory.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/InfoTagHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/LoadTask.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/LoadThread.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/SimpleInfoObjectProvider.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/info/TagHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/NodeUpdateHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/LayoutSettings.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/LayoutWorker.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicForceFunction.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLayout.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicRepulsionFunction.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/handler/AccessPointHiddenStateHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/handler/FixStateHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/handler/InfoNodeHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/handler/LabelChangeHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/handler/NodeWithLocationHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/handler/NotSeeAccessPointHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/handler/PositionUpdateHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/handler/SeeAccessPointHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/SeenAccessPoint.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/AccessPointEdge.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/AccessPointNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/AccessPointSeerNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ClientNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/GeoPos.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/GeoPosNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObjectNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObjectTag.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/LocationNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/MapNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModelConstants.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModelSelectionEvent.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModelSelectionListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/SimpleInfoObject.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/outline/OutlineModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/outline/OutlineTreeNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/net/LinuxNetworkInfo.java
trunk/magicmapclient/src/net/sf/magicmap/client/net/NetworkInfo.java
trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IClientPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/InfoPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/udpscanner/UDPScanner.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/udpscanner/UDPScannerPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/udpscanner/WifiHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/udpscanner/WifiScanResult.java
trunk/magicmapclient/src/net/sf/magicmap/client/utils/AncestorAdaptor.java
trunk/magicmapclient/src/net/sf/magicmap/client/utils/ComponentFinder.java
trunk/magicmapclient/src/net/sf/magicmap/client/utils/HtmlSaxParser.java
trunk/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java
trunk/magicmapclient/src/net/sf/magicmap/client/utils/Version.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/AbstractPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/IPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/IPluginDescriptor.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/InvalidPluginDescriptorException.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/PluginDescriptorReader.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/PluginException.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/PluginLoader.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/PluginManager.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/SimplePluginDescriptor.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/SimpleVendor.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/ArtifactRepositoryTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginDescriptorView.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginDialog.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginListView.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginTreeModel.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/util/IPluginVF.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/util/PluginDescriptorConverter.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/Artifact.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/Artifact.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/Artifact.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,33 +1,34 @@
+
package net.sf.magicmap.artifact;
-
-
public class Artifact implements IArtifact {
- private final String groupid;
- private final String artifactid;
- private final String version;
+ private final String groupid;
+ private final String artifactid;
+ private final String version;
private static final ArtifactComparator cmp = new ArtifactComparator();
- public Artifact(String groupid, String artifactid, String version){
+
+ public Artifact(String groupid, String artifactid, String version) {
this.groupid = groupid;
this.artifactid = artifactid;
this.version = version;
-
+
}
+
public String getVersion(){
- return version;
+ return this.version;
}
public String getArtifactId(){
- return artifactid;
+ return this.artifactid;
}
public String getGroupId(){
- return groupid;
+ return this.groupid;
}
public int compareTo(IArtifact o){
- return cmp.compare(this, o);
+ return Artifact.cmp.compare(this, o);
}
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.artifact;
import java.util.Comparator;
@@ -2,13 +3,9 @@
+public class ArtifactComparator implements Comparator<IArtifact> {
-
-public class ArtifactComparator implements Comparator<IArtifact>{
-
public int compare(IArtifact o1, IArtifact o2){
int i = o1.getGroupId().compareTo(o2.getGroupId());
if (i == 0) {
i = o1.getArtifactId().compareTo(o2.getArtifactId());
- if (i == 0){
- return o1.getVersion().compareTo(o2.getVersion());
- }
+ if (i == 0) return o1.getVersion().compareTo(o2.getVersion());
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactRepository.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactRepository.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactRepository.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,22 +1,16 @@
+
package net.sf.magicmap.artifact;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import java.util.jar.JarFile;
-
import org.apache.log4j.Logger;
-
/**
* Eins zu eins von Maven geklaut.
* @author Jan
@@ -25,66 +19,68 @@
public class ArtifactRepository {
private final IArtifactResolver resolver;
- private final Logger log = Logger.getLogger(ArtifactRepository.class);
- private final URL baseUrl;
- private List<IArtifact> artifacts = new LinkedList<IArtifact>();
-
+ private final Logger log = Logger.getLogger(ArtifactRepository.class);
+ private final URL baseUrl;
+ private List<IArtifact> artifacts = new LinkedList<IArtifact>();
+
/**
*
* @param baseUrl
*/
- public ArtifactRepository (URL baseUrl){
+ public ArtifactRepository(URL baseUrl) {
this.baseUrl = baseUrl;
resolver = new ArtifactResolver(baseUrl.toString());
}
-
+
/**
*
* @param artifact
* @return
*/
public InputStream getArtifactJar(IArtifact artifact) throws IOException{
- URL artifactUrl = new URL(baseUrl,
- resolver.resolvePath(artifact) + resolver.resolveFile(artifact));
+ URL artifactUrl = new URL(baseUrl, resolver.resolvePath(artifact) + resolver.resolveFile(artifact));
return artifactUrl.openStream();
}
-
+
/**
*
*
*/
public void loadRepository() throws IOException{
ArtifactLoader loader = new ArtifactLoader();
- artifacts.addAll (loader.getArtifact(baseUrl));
+ artifacts.addAll(loader.getArtifact(baseUrl));
for (IArtifact artifact : artifacts) {
log.info(resolver.resolvePath(artifact) + resolver.resolveFile(artifact));
}
}
+
public int size(){
return artifacts.size();
}
-
+
public IArtifact get(int index){
return artifacts.get(index);
}
+
/**
*
* @param args
* @throws IOException
*/
public static void main(String[] args) throws IOException{
- new ArtifactRepository(new File("C:/Dokumente und Einstellungen/Jan/.m2/repository/").toURL()).loadRepository();
+ new ArtifactRepository(new File("C:/Dokumente und Einstellungen/Jan/.m2/repository/").toURL()).loadRepository();
}
+
/**
*
* @author Jan
*
*/
- public class ArtifactLoader{
-
- public Collection<IArtifact> getArtifact(URL url)throws IOException{
- Collection<IArtifact> artifacts =new LinkedList<IArtifact>();
- for(String dir : new File(url.getFile()).list()){
+ public class ArtifactLoader {
+
+ public Collection<IArtifact> getArtifact(URL url) throws IOException{
+ Collection<IArtifact> artifacts = new LinkedList<IArtifact>();
+ for (String dir : new File(url.getFile()).list()) {
getArtifact(new URL(baseUrl + dir), artifacts, 1);
}
return artifacts;
@@ -98,15 +94,14 @@
* @throws IOException
*/
private void getArtifact(URL url, Collection<IArtifact> artifacts, int depth) throws IOException{
- for(String dir : new File(url.getFile()).list()){
- File currentFile = new File(url.getFile() +"/" + dir);
- if (currentFile.isFile() && dir.endsWith(".jar")){
+ for (String dir : new File(url.getFile()).list()) {
+ File currentFile = new File(url.getFile() + "/" + dir);
+ if (currentFile.isFile() && dir.endsWith(".jar")) {
final String[] temp = url.getPath().split("/");
artifacts.add(resolver.getArtifact(new URL(url.toString() + "/" + dir)));
+ } else if (currentFile.isDirectory()) {
+ getArtifact(new URL(url + "/" + dir), artifacts, depth + 1);
}
- else if (currentFile.isDirectory()){
- getArtifact(new URL(url + "/" + dir), artifacts, depth+1);
- }
}
}
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactResolver.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactResolver.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactResolver.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,42 +1,40 @@
+
package net.sf.magicmap.artifact;
import java.net.URL;
-import java.util.regex.Pattern;
-
import org.apache.log4j.Logger;
-
/**
*
* @author Jan_fride
*
*/
public class ArtifactResolver implements IArtifactResolver {
-
+
private static final Logger log = Logger.getLogger(ArtifactResolver.class);
- private final int prefix;
+ private final int prefix;
-
/**
*
* @param repositories
*/
- public ArtifactResolver(String url){
- prefix = url.length();
+ public ArtifactResolver(String url) {
+ this.prefix = url.length();
}
+
/* (non-Javadoc)
* @see net.sf.magicmap.artifact.IArtifactResolver#resolvePath(net.sf.magicmap.artifact.IArtifact)
*/
public String resolvePath(IArtifact artifact){
- StringBuilder builder = new StringBuilder(artifact.getGroupId().replace(".", "/"));
- builder.append("/");
- builder.append(artifact.getArtifactId());
- builder.append("/").append(artifact.getVersion());
- builder.append("/");
- return builder.toString();
+ StringBuilder builder = new StringBuilder(artifact.getGroupId().replace(".", "/"));
+ builder.append("/");
+ builder.append(artifact.getArtifactId());
+ builder.append("/").append(artifact.getVersion());
+ builder.append("/");
+ return builder.toString();
}
-
+
/* (non-Javadoc)
* @see net.sf.magicmap.artifact.IArtifactResolver#resolveFile(net.sf.magicmap.artifact.IArtifact)
*/
@@ -46,34 +44,31 @@
builder.append(".jar");
return builder.toString();
}
-
+
/* (non-Javadoc)
* @see net.sf.magicmap.artifact.IArtifactResolver#getArtifact(java.net.URL)
*/
public Artifact getArtifact(URL url){
- log.info(url.toString());
- String urlStr = url.toString().substring(prefix);
- if (!urlStr.endsWith(".jar")){
- throw new IllegalArgumentException("No path to an artifact: " + url);
- }
- log.info(urlStr);
- String[] path = urlStr.split("/");
- if (path.length < 3) throw new IllegalArgumentException("No path to an artifact: " + url);
- int i = path.length-2;
- String version = path[i--];
- String artiact = path [i--];
-
- StringBuilder b = new StringBuilder();
- boolean first = true;
- for (int j =0; j <= i; ++j){
- if (first){
- first = false;
- b.append(path[j]);
- }
- else b.append(".").append(path[j]);
- }
-
- return new Artifact(b.toString(), artiact, version);
-
+ ArtifactResolver.log.info(url.toString());
+ String urlStr = url.toString().substring(this.prefix);
+ if (!urlStr.endsWith(".jar")) throw new IllegalArgumentException("No path to an artifact: " + url);
+ ArtifactResolver.log.info(urlStr);
+ String[] path = urlStr.split("/");
+ if (path.length < 3) throw new IllegalArgumentException("No path to an artifact: " + url);
+ int i = path.length - 2;
+ String version = path[i--];
+ String artiact = path[i--];
+
+ StringBuilder b = new StringBuilder();
+ boolean first = true;
+ for (int j = 0; j <= i; ++j)
+ if (first) {
+ first = false;
+ b.append(path[j]);
+ } else
+ b.append(".").append(path[j]);
+
+ return new Artifact(b.toString(), artiact, version);
+
}
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/IArtifact.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/IArtifact.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/IArtifact.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,12 +1,8 @@
+
package net.sf.magicmap.artifact;
-import java.util.Comparator;
-
-
-
-
public interface IArtifact extends IUniqueIdentity<IArtifact> {
public String getVersion();
-
+
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/IConfigureable.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/IConfigureable.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/IConfigureable.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.artifact;
import net.sf.magicmap.client.utils.Settings;
@@ -6,5 +7,5 @@
*/
public interface IConfigureable {
- public void setup(Settings settings);
+ public void setup(Settings settings);
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/IUniqueIdentity.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/IUniqueIdentity.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/IUniqueIdentity.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,25 +1,24 @@
+
package net.sf.magicmap.artifact;
-import java.util.Comparator;
-
/**
* A unique identity consists of a group and an artifact id.
* Its more or less the same as a java class - it has a package and
* a unique name inside thus package.
*
*/
-public interface IUniqueIdentity<T extends IUniqueIdentity> extends Comparable<T>{
+public interface IUniqueIdentity<T extends IUniqueIdentity> extends Comparable<T> {
- /**
- * The group this artfact belongs to
- * @return die Gruppe des Plugins.
- */
- public String getArtifactId();
+ /**
+ * The group this artfact belongs to
+ * @return die Gruppe des Plugins.
+ */
+ public String getArtifactId();
- /**
- *
- * @return id des Plugins in seiner Gruppe.
- */
- public String getGroupId();
+ /**
+ *
+ * @return id des Plugins in seiner Gruppe.
+ */
+ public String getGroupId();
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/IVendor.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/IVendor.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/IVendor.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.artifact;
/**
@@ -3,8 +4,11 @@
* Beschreibt einen Hersteller.
*
-*/
+ */
public interface IVendor {
- public String getName();
- public String getEmail();
- public String getHomePage();
+
+ public String getName();
+
+ public String getEmail();
+
+ public String getHomePage();
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/UniqeIdComparator.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/UniqeIdComparator.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/UniqeIdComparator.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.artifact;
import java.util.Comparator;
@@ -2,7 +3,5 @@
+public class UniqeIdComparator implements Comparator<IUniqueIdentity> {
-
-public class UniqeIdComparator implements Comparator<IUniqueIdentity>{
-
- public int compare(IUniqueIdentity o1, IUniqueIdentity o2) {
+ public int compare(IUniqueIdentity o1, IUniqueIdentity o2){
final int i = o1.getGroupId().compareTo(o2.getGroupId());
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/InfoNodeMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/InfoNodeMetric.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/InfoNodeMetric.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -9,31 +9,28 @@
public class InfoNodeMetric implements NodeModelMetric {
- public InfoNodeMetric() {
+ public InfoNodeMetric() {
- }
+ }
- public double metric(Node node1, Node node2){
- if (node1 == node2) throw new IllegalArgumentException("Keine Verbindung zwischen dem selben Knoten!");
- if (node1 instanceof InfoObjectNode && node2 instanceof InfoObjectNode){
- InfoObjectNode iNode1 = (InfoObjectNode) node1;
- InfoObjectNode iNode2 = (InfoObjectNode) node2;
- Set<InfoObjectTag> tagset = iNode2.getTags();
- int commonTags = 0;
- double tagCount = (iNode1.getTags().size() + 1) / 2;
- for (InfoObjectTag tag : iNode1){
- if (tagset.contains(tag)){
- commonTags++;
- } else{
+ public double metric(Node node1, Node node2){
+ if (node1 == node2) throw new IllegalArgumentException("Keine Verbindung zwischen dem selben Knoten!");
+ if (node1 instanceof InfoObjectNode && node2 instanceof InfoObjectNode) {
+ InfoObjectNode iNode1 = (InfoObjectNode) node1;
+ InfoObjectNode iNode2 = (InfoObjectNode) node2;
+ Set<InfoObjectTag> tagset = iNode2.getTags();
+ int commonTags = 0;
+ double tagCount = (iNode1.getTags().size() + 1) / 2;
+ for (InfoObjectTag tag : iNode1)
+ if (tagset.contains(tag))
+ commonTags++;
+ else {
+ }
+ if (commonTags == 0) return 220.0;
+ return 120.0 * (tagCount / commonTags);
}
- }
- if (commonTags == 0){
- return 220.0;
- }
- return 120.0 * (tagCount / (double) commonTags);
+ return Double.POSITIVE_INFINITY;
}
- return Double.POSITIVE_INFINITY;
- }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -9,16 +9,16 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.log4j.Logger;
-
import net.sf.magicmap.client.algorithms.distance.MagicDistanceAlgorithm;
import net.sf.magicmap.client.measurement.Constants;
import net.sf.magicmap.client.measurement.MeasurementUtils;
import net.sf.magicmap.client.model.node.AccessPointNode;
import net.sf.magicmap.client.model.node.AccessPointSeerNode;
import net.sf.magicmap.client.model.node.Node;
-import net.sf.magicmap.client.model.node.NodeModel;
+import net.sf.magicmap.client.model.node.NodeModelConstants;
+import org.apache.log4j.Logger;
+
/**
* Die originale Metrik aus dem Proof-Of-Concept
* Tool aus dem NOMANDS-Seminar angepasst auf die
@@ -26,7 +26,8 @@
* @author thuebner
*/
public class MagicMetric implements NodeModelMetric {
- private static Logger log = Logger.getLogger(MagicMetric.class);
+
+ private static Logger log = Logger.getLogger(MagicMetric.class);
static MagicDistanceAlgorithm mda = new MagicDistanceAlgorithm();
/**
@@ -41,12 +42,12 @@
ArrayList aps1 = node1.getSeenAccessPoints();
ArrayList aps2 = node2.getSeenAccessPoints();
-// String aps = "";
-// for (Object apn : aps1){
-// aps += ((AccessPointNode) apn).getMacAddress() + "###";
-// }
-// log.warn(aps);
-
+ // String aps = "";
+ // for (Object apn : aps1){
+ // aps += ((AccessPointNode) apn).getMacAddress() + "###";
+ // }
+ // log.warn(aps);
+
// F\xFCr alle AccessPoints von Knoten 1 ....
for (int i = 0; i < aps1.size(); i++) {
AccessPointNode ap1 = (AccessPointNode) aps1.get(i);
@@ -61,10 +62,8 @@
break; // Raus...
}
}
- if (!found) {
- // For AcesssPoint ap1 aus node1 gab es keine Entsprechung in node2
+ if (!found) // For AcesssPoint ap1 aus node1 gab es keine Entsprechung in node2
diff.add(ap1);
- }
}
// In same sind nun alle gemeinsam gesehen APs
// In diff sind alle APs die zwar AP1 aber nicht AP2 sieht
@@ -88,19 +87,17 @@
*/
public double metric(Node node1, Node node2){
- boolean a1 = (node1.getType() == NodeModel.NODETYPE_ACCESSPOINT);
- boolean a2 = (node2.getType() == NodeModel.NODETYPE_ACCESSPOINT);
- boolean c1 = (node1.getType() == NodeModel.NODETYPE_CLIENT);
- boolean c2 = (node2.getType() == NodeModel.NODETYPE_CLIENT);
- boolean r1 = (node1.getType() == NodeModel.NODETYPE_LOCATION);
- boolean r2 = (node2.getType() == NodeModel.NODETYPE_LOCATION);
+ boolean a1 = (node1.getType() == NodeModelConstants.NODETYPE_ACCESSPOINT);
+ boolean a2 = (node2.getType() == NodeModelConstants.NODETYPE_ACCESSPOINT);
+ boolean c1 = (node1.getType() == NodeModelConstants.NODETYPE_CLIENT);
+ boolean c2 = (node2.getType() == NodeModelConstants.NODETYPE_CLIENT);
+ boolean r1 = (node1.getType() == NodeModelConstants.NODETYPE_LOCATION);
+ boolean r2 = (node2.getType() == NodeModelConstants.NODETYPE_LOCATION);
boolean rc1 = (c1 || r1);
boolean rc2 = (c2 || r2);
- if (a1 && a2) {
- // Zwei AccessPoints
+ if (a1 && a2) // Zwei AccessPoints
return Double.POSITIVE_INFINITY;
- }
if (rc1 && rc2) {
// Zwischen zwei Orten/Clients
@@ -114,9 +111,7 @@
if (same.size() == 0) return 1000.0;
if (same.size() == 1) {
- if (diff.size() == 0) {
- return 0.0;
- }
+ if (diff.size() == 0) return 0.0;
return 1000.0;
}
@@ -138,7 +133,7 @@
double[] v2 = new double[m];
c = 0;
// Verh\xE4ltnisse pro Vektor berechnen
- for (int i = 0; i < a.length - 1; ++i) {
+ for (int i = 0; i < a.length - 1; ++i)
for (int j = i + 1; j < a.length; ++j) {
v1[c] = a[i] / a[j];
v2[c] = b[i] / b[j];
@@ -147,10 +142,9 @@
v2[c] = b[j] / b[i];
c++;
}
- }
// v1 enth\xE4lt nun Signalverh\xE4ltnisse von ap1
// v2 enth\xE4lt nun Signalverh\xE4ltnisse von ap2
- double distance = mda.distance(v1, v2);
+ double distance = MagicMetric.mda.distance(v1, v2);
// Bestrafung nicht gemeinsam gesehener AccessPoints
it = diff.iterator();
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -15,38 +15,38 @@
*/
public class NodeMetricManager implements NodeModelMetric {
- private NodeModelMetric defaultMetric;
- private final MultiKeyMap metricMap = new MultiKeyMap();
+ private NodeModelMetric defaultMetric;
+ private final MultiKeyMap metricMap = new MultiKeyMap();
- public NodeMetricManager(NodeModelMetric defaultMetric) {
- this.defaultMetric = defaultMetric;
- }
+ public NodeMetricManager(NodeModelMetric defaultMetric) {
+ this.defaultMetric = defaultMetric;
+ }
- /**
- * F\xFCgt eine Metric zu einem Tupel von Knoten hinzu.
- *
- * @param clazz1 der 1. Knotentyp
- * @param clazz2 der 2. Knotentyp
- * @param metric die Metric die auf die beiden Knotentypen angewant werden soll.
- */
- public final void addMetric(Class clazz1, Class clazz2, NodeModelMetric metric){
- if (metricMap.containsKey(clazz1, clazz2)){
- throw new IllegalArgumentException("Mapping for " + clazz1 + "," + clazz2 + " exists");
+ /**
+ * F\xFCgt eine Metric zu einem Tupel von Knoten hinzu.
+ *
+ * @param clazz1 der 1. Knotentyp
+ * @param clazz2 der 2. Knotentyp
+ * @param metric die Metric die auf die beiden Knotentypen angewant werden soll.
+ */
+ public final void addMetric(Class clazz1, Class clazz2, NodeModelMetric metric){
+ if (metricMap.containsKey(clazz1, clazz2)) {
+ throw new IllegalArgumentException("Mapping for " + clazz1 + "," + clazz2 + " exists");
+ }
+ metricMap.put(clazz1, clazz2, metric);
}
- metricMap.put(clazz1, clazz2, metric);
- }
- public final void removeMetric(Class clazz1, Class clazz2){
- metricMap.remove(clazz1, clazz2);
- }
+ public final void removeMetric(Class clazz1, Class clazz2){
+ metricMap.remove(clazz1, clazz2);
+ }
- /**
- *
- */
- public double metric(Node node1, Node node2){
- NodeModelMetric delegate = (NodeModelMetric) metricMap.get(node1.getClass(), node2.getClass());
- if (delegate == null) return defaultMetric.metric(node1, node2);
- return delegate.metric(node1, node2);
- }
+ /**
+ *
+ */
+ public double metric(Node node1, Node node2){
+ NodeModelMetric delegate = (NodeModelMetric) metricMap.get(node1.getClass(), node2.getClass());
+ if (delegate == null) return defaultMetric.metric(node1, node2);
+ return delegate.metric(node1, node2);
+ }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -21,6 +21,6 @@
* @param node2 zweiter Knoten.
* @return den Abstand zwischen den beiden Knoten.
*/
- public abstract double metric(Node node1, Node node2);
+ public abstract double metric(Node node1, Node node2);
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/DistanceAlgorithm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/DistanceAlgorithm.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/DistanceAlgorithm.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -11,6 +11,6 @@
*/
public interface DistanceAlgorithm {
- public double distance(double[] a, double[] b);
+ public double distance(double[] a, double[] b);
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/MagicDistanceAlgorithm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/MagicDistanceAlgorithm.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/MagicDistanceAlgorithm.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -9,18 +9,16 @@
*/
public class MagicDistanceAlgorithm implements DistanceAlgorithm {
- /* (non-Javadoc)
- * @see net.sf.magicmap.client.algorithms.distance.DistanceAlgorithm#distance(double[], double[])
- */
- public double distance(double[] a, double[] b){
- double result = 0;
- for (int i = 0; i < a.length; i++){
- result += Math.abs(a[i] - b[i]);// ?Distanz der einzelnen Arraywerte, aufaddiert und durch die Anzahl dividiert
- // -> wahrscheinlich durchschnittliche Entfernung der einzelnen Positionen
-
+ /* (non-Javadoc)
+ * @see net.sf.magicmap.client.algorithms.distance.DistanceAlgorithm#distance(double[], double[])
+ */
+ public double distance(double[] a, double[] b){
+ double result = 0;
+ for (int i = 0; i < a.length; i++)
+ result += Math.abs(a[i] - b[i]);// ?Distanz der einzelnen Arraywerte, aufaddiert und durch die Anzahl dividiert
+ // -> wahrscheinlich durchschnittliche Entfernung der einzelnen Positionen
+ result = result / a.length;
+ return result;
}
- result = result / (double) a.length;
- return result;
- }
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2006-10-29 11:34:35 UTC (rev 474)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2006-10-31 15:16:30 UTC (rev 475)
@@ -4,17 +4,10 @@
package net.sf.magicmap.client.controller;
-import java.io.IOException;
-import java.net.InetAddress;
import java.net.MalformedURLException;
-import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.views.ConsoleView;
import net.sf.magicmap.client.gui.views.MapView;
@@ -25,9 +18,7 @@
import net.sf.magicmap.client.interfaces.DeletePositionCallback;
import net.sf.magicmap.client.interfaces.MapCallback;
import net.sf.magicmap.client.interfaces.MapNamesCallback;
-import net.sf.magicmap.client.interfaces.MeasurementModelListener;
import net.sf.magicmap.client.interfaces.MovePositionCallback;
-import net.sf.magicmap.client.interfaces.NodeModelListener;
import net.sf.magicmap.client.interfaces.PositionCallback;
import net.sf.magicmap.client.interfaces.ServerConnectCallback;
import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
@@ -36,6 +27,7 @@
import net.sf.magicmap.client.measurement.interfaces.AbstractScanner;
import net.sf.magicmap.client.measurement.interfaces.AbstractScannerHandler;
import net.sf.magicmap.client.meta.MapInfo;
+import net.sf.magicmap.client.model.info.InfoObjectProviderRegistry;
import net.sf.magicmap.client.model.measurement.MeasurementModel;
import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
import net.sf.magicmap.client.model.node.AccessPointEdge;
@@ -47,12 +39,9 @@
import net.sf.magicmap.client.model.node.InfoObjectNode;
import net.sf.magicmap.client.model.node.Node;
import net.sf.magicmap.client.model.node.NodeModel;
-import net.sf.magicmap.client.model.info.InfoObjectProviderRegistry;
-import net.sf.magicmap.client.net.NetworkInfo;
import net.sf.magicmap.client.plugin.PluginHandler;
import net.sf.magicmap.client.utils.Settings;
import net.sf.magicmap.plugin.PluginManager;
-import net.sf.magicmap.plugin.ui.PluginTableModel;
import org.apache.log4j.xml.DOMConfigurator;
@@ -64,547 +53,533 @@
*/
public class Controller implements IController {
- private static int numCalled = 0;
+ private static int numCalled = 0;
- /**
- * Die Instanz.
- */
- private static Controller controller = null;
+ /**
+ * Die Instanz.
+ */
+ private static Controller controller = null;
- /**
- * Das Knotenmodel.
- */
- private INodeModel nodeModel; // Model f\xFCr Graphen
+ /**
+ * Das Knotenmodel.
+ */
+ private INodeModel nodeModel; // Model f\xFCr Graphen
- private MeasurementModel measurementModel; // Model f\xFCr Messungen
+ private MeasurementModel measurementModel; // Model f\xFCr Messungen
- private MeasurementModel measurementModelOther; // Messungen anderen Clients / Orte
+ private MeasurementModel measurementModelOther; // Messungen anderen Clients / Orte
- private ClientNode client; // Ausgezeichneter Knoten
+ private ClientNode client; // Ausgezeichneter Knoten
- private ServerPoller poller; // Server st\xE4ndig nach \xC4nderungen fragen
+ private ServerPoller poller; // Server st\xE4ndig nach \xC4nderungen fragen
- private PollHandler pollhandler; // Klasse zur Verarbeitung der Pollergebnisse
+ private PollHandler pollhandler; // Klasse zur Verarbeitung der Pollergebnisse
- private ServerManager serverManager; // Manager f\xFCr die Verbindung zum Server
+ private ServerManager serverManager; // Manager f\xFCr die Verbindung zum Server
- // private CallbackHandler callbackHandler; // S\xE4mtliche callbacks werden dort behandelt
+ // private CallbackHandler callbackHandler; // S\xE4mtliche callbacks werden dort behandelt
- private MapInfo currentMap;
+ private MapInfo currentMap;
- private OutlineView outlineView;
+ private OutlineView outlineView;
- private ConsoleView consoleView;
+ private ConsoleView consoleView;
- private MapView mapView;
+ private MapView mapView;
- private MeasurementView measurementView;
+ private MeasurementView measurementView;
- private boolean invisble; // Invisible-Modus (keine Daten an Server)
+ private boolean invisble; // Invisible-Modus (keine Daten an Server)
- // pseudo server items
- private Collection<InfoObject> infoObjects;
+ // pseudo server items
+ private Collection<InfoObject> infoObjects;
- private ScannerAllocator scannerAllocator;
- private final InfoObjectProviderRegistry infoServiceRegistry;
- private final PluginManager pluginManager;
+ private ScannerAllocator scannerAllocator;
+ private final InfoObjectProviderRegistry infoServiceRegistry;
+ private final PluginManager pluginManager;
- /**
- * Private constructor for singleton instance
- */
- private Controller() {
- DOMConfigurator.configureAndWatch("log4j.xml");
+ /**
+ * Private constructor for singleton instance
+ */
+ private Controller() {
+ DOMConfigurator.configureAndWatch("log4j.xml");
- //
- // Das Model der Knoten.
- //
- this.nodeModel = new NodeModel();
+ //
+ // Das Model der Knoten.
+ //
+ this.nodeModel = new NodeModel();
/**
* Messungen f\xFCr den eigenen clienten
*/
- this.measurementModel = new MeasurementModel();
+ this.measurementModel = new MeasurementModel();
/**
* Messungen f\xFCr alle anderen?
*/
- this.measurementModelOther = new MeasurementModel();
+ this.measurementModelOther = new MeasurementModel();
+ this.scannerAllocator = new ScannerAllocator();
+ this.currentMap = null;
+ this.serverManager = null;
- this.scannerAllocator = new ScannerAllocator();
- this.currentMap = null;
- this.serverManager = null;
+ this.pollhandler = new PollHandler(this);
- this.pollhandler = new PollHandler(this);
+ buildViews();
- buildViews();
+ // pseudo server items
+ this.infoObjects = new ArrayList<InfoObject>();
+ // initializeScanner();
+ this.infoServiceRegistry = new InfoObjectProviderRegistry(this.nodeModel);
+ PluginHandler.getInstance();
- // pseudo server items
- infoObjects = new ArrayList<InfoObject>();
- // initializeScanner();
- infoServiceRegistry = new InfoObjectProviderRegistry(nodeModel);
- PluginHandler.getInstance();
+ this.pluginManager = new PluginManager(new Settings(), this);
+ }
- pluginManager = new PluginManager(new Settings(), this);
-
- }
+ /**
+ * Getter for client node
+ *
+ * @return the client node
+ */
+ public ClientNode getClient(){
+ return this.client;
+ }
- /**
- * Getter for client node
- *
- * @return the client node
- */
- public ClientNode getClient(){
- return this.client;
- }
+ /**
+ * Erzeugt die Hauptviews der Anwendung
+ */
+ private void buildViews(){
+ this.outlineView = new OutlineView(this.nodeModel);
+ this.consoleView = new ConsoleView();
+ this.mapView = new MapView(this.nodeModel, null);
+ this.measurementView = new MeasurementView(getMeasurementModel(), this.nodeModel);
+ // registerMeasurementModelListener(measurementView);
+ setMeasurementViewLocal(true);
+ this.nodeModel.addNodeModelListener(this.mapView);
+ //registerNodeModelListener(outlineView);
+ }
- /**
- * Erzeugt die Hauptviews der Anwendung
- */
- private void buildViews(){
- this.outlineView = new OutlineView(nodeModel);
- this.consoleView = new ConsoleView();
- this.mapView = new MapView(nodeModel, null);
- this.measurementView = new MeasurementView(getMeasurementModel(), nodeModel);
- // registerMeasurementModelListener(measurementView);
- setMeasurementViewLocal(true);
- nodeModel.addNodeModelListener(mapView);
- //registerNodeModelListener(outlineView);
- }
+ /**
+ * Getter for the map view
+ *
+ * @return the map view
+ */
+ public MapView getMapView(){
+ return this.mapView;
+ }
- /**
- * Getter for the map view
- *
- * @return the map view
- */
- public MapView getMapView(){
- return this.mapView;
- }
+ /**
+ * Getter for the outline view
+ *
+ * @return the outline view
+ */
+ public OutlineView getOutlineView(){
+ return this.outlineView;
+ }
- /**
- * Getter for the outline view
- *
- * @return the outline view
- */
- public OutlineView getOutlineView(){
- return this.outlineView;
- }
+ /**
+ * Getter for the console view
+ *
+ * @return the console view
+ */
+ public ConsoleView getConsoleView(){
+ return this.consoleView;
+ }
- /**
- * Getter for the console view
- *
- * @return the console view
- */
- public ConsoleView getConsoleView(){
- return this.consoleView;
- }
+ /**
+ * Getter for the measurement view
+ *
+ * @return the measurement view
+ */
+ public MeasurementView getMeasurementView(){
+ return this.measurementView;
+ }
- /**
- * Getter for the measurement view
- *
- * @return the measurement view
- */
- public MeasurementView getMeasurementView(){
- return this.measurementView;
- }
+ /**
+ * Provides the singleton controller instance (creates a new one if null)
+ *
+ * @return the singleton controller instance
+ */
+ public static Controller getInstance(){
+ if (Controller.controller == null) {
+ ++Controller.numCalled;
+ Controller.controller = new Controller();
+ }
+ return Controller.controller;
+ }
- /**
- * Provides the singleton controller instance (creates a new one if null)
- *
- * @return the singleton controller instance
- */
- public static Controller getInstance(){
- if (controller == null){
- ++numCalled;
- controller = new Controller();
- }
- return controller;
- }
+ /**
+ * Getter for the node model
+ *
+ * @return the node model
+ */
+ public INodeModel getNodeModel(){
+ return this.nodeModel;
+ }
- /**
- * Getter for the node model
- *
- * @return the node model
- */
- public INodeModel getNodeModel(){
- return nodeModel;
- }
+ /**
+ * Baut das MeasurementModelOther neu auf.
+ *
+ * @param ap -
+ * the access point seer node
+ */
+ public void buildOtherMeasurement(AccessPointSeerNode ap){
+ System.out.println("Building measurement model...");
+ this.measurementModelOther.clear();
+ ArrayList aes = ap.getApEdges();
+ for (int i = 0; i < aes.size(); i++) {
+ AccessPointEdge ae = (AccessPointEdge) aes.get(i);
+ SeenAccessPoint sp = new SeenAccessPoint(ae.getAccessPoint().getMacAddress(), ae.getSignalLevel());
+ this.measurementModelOther.addAccessPoint(sp);
+ }
+ }
- /**
- * Baut das MeasurementModelOther neu auf.
- *
- * @param ap -
- * the access point seer node
- */
- public void buildOtherMeasurement(AccessPointSeerNode ap){
- System.out.println("Building measurement model...");
- this.measurementModelOther.clear();
- ArrayList aes = ap.getApEdges();
- for (int i = 0; i < aes.size(); i++){
- AccessPointEdge ae = (AccessPointEdge) aes.get(i);
- SeenAccessPoint sp = new SeenAccessPoint(ae.getAccessPoint().getMacAddress(), ae.getSignalLevel());
- this.measurementModelOther.addAccessPoint(sp);
- }
- }
+ /**
+ * \xC4nndert die Anzeige des Measurement-Views
+ *
+ * @param local
+ * true, wenn lokale St\xE4rken angezeigt werden sollen
+ */
+ public void setMeasurementViewLocal(boolean local){
+ if (local) {
+ // measurementModelOther.removeMeasurementModelListener(measurementView);
+ // measurementModel.addMeasurementModelListener(measurementView);
+ //measurementModel.clear();
+ } else {
+ // measurementModel.removeMeasurementModelListener(measurementView);
+ // measurementModelOther.addMeasurementModelListener(measurementView);
+ //measurementModelOther.clear();
+ }
+ }
- /**
- * \xC4nndert die Anzeige des Measurement-Views
- *
- * @param local
- * true, wenn lokale St\xE4rken angezeigt werden sollen
- */
- public void setMeasurementViewLocal(boolean local){
- if (local){
-// measurementModelOther.removeMeasurementModelListener(measurementView);
-// measurementModel.addMeasurementModelListener(measurementView);
- //measurementModel.clear();
- } else{
-// measurementModel.removeMeasurementModelListener(measurementView);
-// measurementModelOther.addMeasurementModelListener(measurementView);
- //measurementModelOther.clear();
- }
- }
+ /**
+ * Getter for measurement model
+ *
+ * @return the measurement model
+ */
+ public MeasurementModel getMeasurementModel(){
+ return this.measurementModel;
+ }
- /**
- * Getter for measurement model
- *
- * @return the measurement model
- */
- public MeasurementModel getMeasurementModel(){
- return measurementModel;
- }
+ /**
+ * Gibt an ob verbunden oder nicht verbunden
+ *
+ * @return true wenn ja, false sonst
+ */
+ public boolean isConnected(){
+ return (this.serverManager != null && this.serverManager.isConnected());
+ }
- /**
- * Gibt an ob verbunden oder nicht verbunden
- *
- * @return true wenn ja, false sonst
- */
- public boolean isConnected(){
- return (serverManager != null && serverManager.isConnected());
- }
+ /**
+ * Liefert Kartenbeschreibung der aktuell geladenen Karte
+ *
+ * @return Kartenbeschreibung (MapInfo) oder null, wenn keine Karte aktiv
+ */
+ public MapInfo getCurrentMap(){
+ return this.currentMap;
+ }
- /**
- * Liefert Kartenbeschreibung der aktuell geladenen Karte
- *
- * @return Kartenbeschreibung (MapInfo) oder null, wenn keine Karte aktiv
- */
- public MapInfo getCurrentMap(){
- return this.currentMap;
- }
+ /**
+ * Setzt aktuelle Karte und startet dabei das ServerPolling
+ *
+ * @param map
+ */
+ public void setCurrentMap(MapInfo map){
+ if (isMapLoaded()) closeMap();
+ this.currentMap = map;
+ try {
+ this.serverManager.reloadMap();
+ this.nodeModel.addNode(this.client);
+ this.mapView.loadMap(map);
+ } catch (MalformedURLException e) {
+ System.out.println("Map loading failed." + e.getMessage());
+ closeMap();
+ }
+ if (isMapLoaded() && isConnected()) {
+ this.nodeModel.addNodeModelListener(this.mapView);
+ this.serverManager.resetTimestamp();
+ setMeasurementViewLocal(true);
+ this.poller.start();
+ // initializeScanner(); // Scanner neu initialisieren
+ this.scannerAllocator.startAllScanner();
+ PluginHandler.getInstance().loadMap();
+ this.pluginManager.loadMap();
+ if (this.currentMap.realheight > 0 && this.currentMap.realwidth > 0)
+ getMapView().setTitle(
+ GUIUtils.i18n("map", false) + " - " + this.currentMap.name + " Gr\xF6\xDFe: "
+ + this.currentMap.realwidth + " X " + this.currentMap.realheight + " cm");
+ }
+ }
- /**
- * Setzt aktuelle Karte und startet dabei das ServerPolling
- *
- * @param map
- */
- public void setCurrentMap(MapInfo map){
- if (isMapLoaded()){
- closeMap();
- }
- this.currentMap = map;
- try{
- serverManager.reloadMap();
- nodeModel.addNode(client);
- this.mapView.loadMap(map);
- } catch (MalformedURLException e){
- System.out.println("Map loading failed." + e.getMessage());
- closeMap();
- }
- if (isMapLoaded() && isConnected()){
- nodeModel.a...
[truncated message content] |
