Menu
▾
▴
magicmap-commits
|
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 ja...
[truncated message content] |
|
From: <jan...@us...> - 2006-11-29 09:34:17
|
Revision: 486
http://svn.sourceforge.net/magicmap/?rev=486&view=rev
Author: jan_fride
Date: 2006-11-29 01:33:47 -0800 (Wed, 29 Nov 2006)
Log Message:
-----------
gui zum instalieren von plugins
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/IArtifact.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/IVendor.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.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/TabForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/AbstractPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/IPluginDescriptor.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/PluginRepository.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/SimplePluginDescriptor.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/forms/PluginsForm.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/util/PluginComparator.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/util/PluginDescriptorReader.java
Added Paths:
-----------
trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactTools.java
trunk/magicmapclient/src/net/sf/magicmap/artifact/Version.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/
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/utils/table/NotFilter.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/action/
trunk/magicmapclient/src/net/sf/magicmap/plugin/action/InstallPluginAction.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/action/LoadPluginsAction.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/action/ShowPluginsAction.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginDescriptorModel.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginTableRenderer.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/util/DirWalker.java
Removed Paths:
-------------
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginDescriptorView.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/ui/PluginTableModel.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/Artifact.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/Artifact.java 2006-11-17 11:02:55 UTC (rev 485)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/Artifact.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -5,16 +5,16 @@
private final String groupid;
private final String artifactid;
- private final String version;
+ private final Version version;
private static final ArtifactComparator cmp = new ArtifactComparator();
public Artifact(String groupid, String artifactid, String version) {
this.groupid = groupid;
this.artifactid = artifactid;
- this.version = version;
+ this.version = new Version(version);
}
- public String getVersion(){
+ public Version getVersion(){
return this.version;
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java 2006-11-17 11:02:55 UTC (rev 485)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -2,6 +2,7 @@
package net.sf.magicmap.artifact;
import java.util.Comparator;
+import java.util.StringTokenizer;
public class ArtifactComparator implements Comparator<IArtifact> {
Added: trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactTools.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactTools.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactTools.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -0,0 +1,26 @@
+package net.sf.magicmap.artifact;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Jan
+ * Date: 09.11.2006
+ * Time: 19:36:25
+ * To change this template use File | Settings | File Templates.
+ */
+public class ArtifactTools {
+
+ public String getPath(IArtifact artifact){
+ return artifact.getGroupId() + "/" + artifact.getArtifactId() + "/"+artifact.getVersion();
+ }
+
+ public IArtifact fromString(String str){
+ String[] tokens = str.split("/");
+ if (tokens == null || tokens.length != 3) return new Artifact("","","");
+ else return new Artifact(tokens[0], tokens[1], tokens[2]);
+ }
+
+ public String getFileName(IArtifact artifact){
+ return artifact.getArtifactId() + "-" + artifact.getVersion()+".jar";
+ }
+
+}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/IArtifact.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/IArtifact.java 2006-11-17 11:02:55 UTC (rev 485)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/IArtifact.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -3,6 +3,6 @@
public interface IArtifact extends IUniqueIdentity<IArtifact> {
- public String getVersion();
+ public Version getVersion();
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/IVendor.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/IVendor.java 2006-11-17 11:02:55 UTC (rev 485)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/IVendor.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -3,10 +3,24 @@
/**
* Beschreibt einen Hersteller.
- *
+ *
*/
public interface IVendor {
+ IVendor EMPTY = new IVendor(){
+ public String getName() {
+ return "";
+ }
+
+ public String getEmail() {
+ return "";
+ }
+
+ public String getHomePage() {
+ return "";
+ }
+ };
+
public String getName();
public String getEmail();
Added: trunk/magicmapclient/src/net/sf/magicmap/artifact/Version.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/Version.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/Version.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -0,0 +1,58 @@
+package net.sf.magicmap.artifact;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: jan
+ * Date: 11.11.2006
+ * Time: 16:48:25
+ * To change this template use File | Settings | File Templates.
+ */
+public class Version implements Comparable<Version> {
+
+ private final String versionString;
+ private final long version;
+ private final long snapShot;
+
+ public Version(String versionStr){
+ this.versionString = versionStr;
+
+ String[] tokens = versionStr.split("-");
+ if (tokens.length != 0){
+ version = parseVersion(versionStr.split("\\."));
+ snapShot = 0;
+ }else{
+ version = parseVersion(tokens[0].split("\\."));
+ snapShot = parseSnaphsot(tokens[1]);
+ }
+
+ }
+
+ private long parseVersion(String[] str) {
+ int pow = str.length * 100;
+ long result = 0;
+ for (String s: str){
+ result += Integer.parseInt(s) * pow;
+ pow = pow / 100;
+ }
+ return result;
+ }
+ private long parseSnaphsot(String snap){
+ long result = 0;
+ if("SNAPSHOT".equals(snap)) return 1;
+ return Long.parseLong(snap);
+ }
+
+
+ public int compareTo(Version o) {
+ int comp = version == o.version ? 0 :
+ version < o.version ? -1 : 1;
+ if (comp != 0) return comp;
+ return snapShot == o.snapShot ? 0 :
+ snapShot < o.snapShot ? -1 : 1;
+ }
+ @Override
+ public String toString(){
+ return versionString;
+ }
+
+}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2006-11-17 11:02:55 UTC (rev 485)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -45,6 +45,8 @@
import org.apache.log4j.xml.DOMConfigurator;
+import javax.swing.*;
+
/**
* Kann \xC4nderungen an View und am Modell vornehmen und zieht alle F\xE4den
* der Anwendung.
@@ -136,7 +138,7 @@
//TODO
try {
this.pluginManager = new PluginManager(new Settings(), this);
- } catch (MalformedURLException e) {
+ } catch (MalformedURLException e) {
throw new RuntimeException(e.getMessage());
}
}
@@ -162,7 +164,7 @@
setMeasurementViewLocal(true);
this.nodeModel.addNodeModelListener(this.mapView);
//registerNodeModelListener(outlineView);
- }
+ }
/**
* Getter for the map view
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2006-11-17 11:02:55 UTC (rev 485)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -243,7 +243,7 @@
// if (position.getGeoPoint() != null) {
// GeoPointDTO gpdto = position.getGeoPoint();
// GeoPosNode geoNode = (GeoPosNode)
- // nodeModel.findNode(gpdto.toString());
+ // nodeModel.findNode(gpdto.getPath());
// if (geoNode == null) {
// geoNode.setPosition(position.getPosX(),
// position.getPosY());
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java 2006-11-17 11:02:55 UTC (rev 485)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java 2006-11-29 09:33:47 UTC (rev 486)
@@ -51,6 +51,7 @@
import net.sf.magicmap.client.model.node.NodeModel;
import net.sf.magicmap.client.utils.Settings;
import net.sf.magicmap.client.utils.Version;
+import net.sf.magicmap.plugin.action.ShowPluginsAction;
import org.apache.axis.AxisFault;
@@ -65,795 +66,797 @@
* The main GUI window
* @author thuebner
*/
+@SuppressWarnings({"JavadocReference"})
public class MainGUI extends JFrame
- implements
- ServerConnectCallback,
- ServerDisconnectCallback,
- CreateNewMapCallback,
- MapNamesCallback,
- LoadMapDialogListener {
+ implements
+ ServerConnectCallback,
+ ServerDisconnectCallback,
+ CreateNewMapCallback,
+ MapNamesCallback,
+ LoadMapDialogListener {
- /**
- * serial version id
- */
- private static final long serialVersionUID = -3842976532877305041L;
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = -3842976532877305041L;
- /**
- * singleton instance of the main GUI
- */
- private static MainGUI mainGUI = null;
+ /**
+ * singleton instance of the main GUI
+ */
+ private static MainGUI mainGUI = null;
- /**
- * Getter for the singleton instance of the main GUI
- * @return the main GUI (creates a new one if none exists)
- */
- public static MainGUI getInstance(){
- if (MainGUI.mainGUI == null) MainGUI.mainGUI = new MainGUI();
- return MainGUI.mainGUI;
- }
+ /**
+ * Getter for the singleton instance of the main GUI
+ * @return the main GUI (creates a new one if none exists)
+ */
+ public static MainGUI getInstance(){
+ if (MainGUI.mainGUI == null) MainGUI.mainGUI = new MainGUI();
+ return MainGUI.mainGUI;
+ }
- private JMenuBar menuBar;
- private JToolBar toolBar;
- private StatusPanel statusBar;
- private OutlineView outlineView;
- private MapPanel mapPanel;
- private ConsoleView consoleView;
- private MeasurementView measurementView;
- private ViewTabPanel bottomRightTabPanel;
- private RelativeLayout layout;
- private AbstractAction connectAction;
- private AbstractAction setProxyAction;
- private AbstractAction disconnectAction;
- private AbstractAction newMapAction;
- private AbstractAction loadMapAction;
- private AbstractAction exitAction;
- private AbstractAction aboutAction;
- private AbstractAction onlineHelp;
- MapView mapView;
- private MagicAction invisibleAction;
- private MagicAction simpleView;
- private MagicAction normalView;
- private MagicAction expertView;
- private MagicAction userDefinedView;
+ private JMenuBar menuBar;
+ private JToolBar toolBar;
+ private StatusPanel statusBar;
+ private OutlineView outlineView;
+ private MapPanel mapPanel;
+ private ConsoleView consoleView;
+ private MeasurementView measurementView;
+ private ViewTabPanel bottomRightTabPanel;
+ private RelativeLayout layout;
+ private AbstractAction connectAction;
+ private AbstractAction setProxyAction;
+ private AbstractAction disconnectAction;
+ private AbstractAction newMapAction;
+ private AbstractAction loadMapAction;
+ private AbstractAction exitAction;
+ private AbstractAction aboutAction;
+ private AbstractAction onlineHelp;
+ MapView mapView;
+ private MagicAction invisibleAction;
+ private MagicAction simpleView;
+ private MagicAction normalView;
+ private MagicAction expertView;
+ private MagicAction userDefinedView;
- private static final int numberOfdataInvocationRateAction = 10;
- private MagicAction[] dataInvocationRateAction;
+ private static final int numberOfdataInvocationRateAction = 10;
+ private MagicAction[] dataInvocationRateAction;
- /**
- * Erzeugt Hauptfenster der Anwendung.
- * Private constructor, only used by getInstance() to fulfill singleton pattern
- */
- private MainGUI() {
+ /**
+ * Erzeugt Hauptfenster der Anwendung.
+ * Private constructor, only used by getInstance() to fulfill singleton pattern
+ */
+ private MainGUI() {
- // Aktionen erstellen
- buildActions();
+ // Aktionen erstellen
+ buildActions();
- // Layout vorbereiten
- this.layout = new RelativeLayout();
- Container pane = this.getContentPane();
- pane.setLayout(this.layout);
+ // Layout vorbereiten
+ this.layout = new RelativeLayout();
+ Container pane = this.getContentPane();
+ pane.setLayout(this.layout);
- // Hauptfenstereigenschaften setzen
- this.setSize(new Dimension(1024, 768));
- this.setTitle("MagicMap - Version " + Version.getVersion());
- this.setIconImage(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMap.png")).getImage());
+ // Hauptfenstereigenschaften setzen
+ this.setSize(new Dimension(1024, 768));
+ this.setTitle("MagicMap - Version " + Version.getVersion());
+ this.setIconImage(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMap.png")).getImage());
- //Menu erstellen
- this.menuBar = new JMenuBar();
- this.setJMenuBar(this.menuBar);
- this.menuBar.add(buildFileMenu());
- this.menuBar.add(buildViewMenu());
- this.menuBar.add(buildOptionsMenu());
- this.menuBar.add(buildHelpMenu());
+ //Menu erstellen
+ this.menuBar = new JMenuBar();
+ this.setJMenuBar(this.menuBar);
+ this.menuBar.add(buildFileMenu());
+ this.menuBar.add(buildViewMenu());
+ this.menuBar.add(buildOptionsMenu());
+ this.menuBar.add(buildHelpMenu());
- // Statusleiste erstelelen
- this.statusBar = new StatusPanel();
- this.statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_DISCONNECTED));
+ // Statusleiste erstelelen
+ this.statusBar = new StatusPanel();
+ this.statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_DISCONNECTED));
- // ToolBar erstellen
- this.toolBar = new JToolBar();
- this.toolBar.setRollover(true);
- // toolBar.putClientProperty(com.jgoodies.plaf.plastic.PlasticLookAndFeel.IS_3D_KEY, Boolean.TRUE);
- // menuBar.putClientProperty(com.jgoodies.plaf.plastic.PlasticLookAndFeel.IS_3D_KEY, Boolean.TRUE);
- addMainToolBarButtons(this.toolBar);
+ // ToolBar erstellen
+ this.toolBar = new JToolBar();
+ this.toolBar.setRollover(true);
+ // toolBar.putClientProperty(com.jgoodies.plaf.plastic.PlasticLookAndFeel.IS_3D_KEY, Boolean.TRUE);
+ // menuBar.putClientProperty(com.jgoodies.plaf.plastic.PlasticLookAndFeel.IS_3D_KEY, Boolean.TRUE);
+ addMainToolBarButtons(this.toolBar);
- // Komponenten einf\xFCgen in das ContentPane
- pane.add(this.toolBar, "toolbar");
- pane.add(buildMainPane(), "mainpane");
- pane.add(this.statusBar, "status");
+ // Komponenten einf\xFCgen in das ContentPane
+ pane.add(this.toolBar, "toolbar");
+ pane.add(buildMainPane(), "mainpane");
+ pane.add(this.statusBar, "status");
- // Einige Constrains bzgl. Layout definieren:
+ // Einige Constrains bzgl. Layout definieren:
- // ToolBar ganz oben
- this.layout.addConstraint("toolbar", AttributeType.RIGHT, new AttributeConstraint(DependencyManager.ROOT_NAME,
- AttributeType.RIGHT, 0));
- this.layout.addConstraint("toolbar", AttributeType.LEFT, new AttributeConstraint(DependencyManager.ROOT_NAME,
- AttributeType.LEFT, 0));
- this.layout.addConstraint("toolbar", AttributeType.TOP, new AttributeConstraint(DependencyManager.ROOT_NAME,
- AttributeType.TOP, 0));
+ // ToolBar ganz oben
+ this.layout.addConstraint("toolbar", AttributeType.RIGHT, new AttributeConstraint(DependencyManager.ROOT_NAME,
+ AttributeType.RIGHT, 0));
+ this.layout.addConstraint("toolbar", AttributeType.LEFT, new AttributeConstraint(DependencyManager.ROOT_NAME,
+ AttributeType.LEFT, 0));
+ this.layout.addConstraint("toolbar", AttributeType.TOP, new AttributeConstraint(DependencyManager.ROOT_NAME,
+ AttributeType.TOP, 0));
- // StatusBar ganz unten
- this.layout.addConstraint("status", AttributeType.RIGHT, new AttributeConstraint(DependencyManager.ROOT_NAME,
- AttributeType.RIGHT, -2));
- this.layout.addConstraint("status", AttributeType.LEFT, new AttributeConstraint(DependencyManager.ROOT_NAME,
- AttributeType.LEFT, 2));
- this.layout.addConstraint("status", AttributeType.BOTTOM, new AttributeConstraint(DependencyManager.ROOT_NAME,
- AttributeType.BOTTOM, -2));
+ // StatusBar ganz unten
+ this.layout.addConstraint("status", AttributeType.RIGHT, new AttributeConstraint(DependencyManager.ROOT_NAME,
+ AttributeType.RIGHT, -2));
+ this.layout.addConstraint("status", AttributeType.LEFT, new AttributeConstraint(DependencyManager.ROOT_NAME,
+ AttributeType.LEFT, 2));
+ this.layout.addConstraint("status", AttributeType.BOTTOM, new AttributeConstraint(DependencyManager.ROOT_NAME,
+ AttributeType.BOTTOM, -2));
- // Hauptpanel dazwischen mit gewissem Abstand zum ToolBar
- this.layout.addConstraint("mainpane", AttributeType.RIGHT, new AttributeConstraint(DependencyManager.ROOT_NAME,
- AttributeType.RIGHT, -GUIConstants.WINDOW_MARGIN));
- this.layout.addConstraint("mainpane", AttributeType.LEFT, new AttributeConstraint(DependencyManager.ROOT_NAME,
- AttributeType.LEFT, GUIConstants.WINDOW_MARGIN));
- this.layout.addConstraint("mainpane", AttributeType.BOTTOM, new AttributeConstraint("status",
- AttributeType.TOP, -5));
- this.layout.addConstraint("mainpane", AttributeType.TOP, new AttributeConstraint("toolbar",
- AttributeType.BOTTOM, GUIConstants.DIVIDER_SIZE));
- }
+ // Hauptpanel dazwischen mit gewissem Abstand zum ToolBar
+ this.layout.addConstraint("mainpane", AttributeType.RIGHT, new AttributeConstraint(DependencyManager.ROOT_NAME,
+ AttributeType.RIGHT, -GUIConstants.WINDOW_MARGIN));
+ this.layout.addConstraint("mainpane", AttributeType.LEFT, new AttributeConstraint(DependencyManager.ROOT_NAME,
+ AttributeType.LEFT, GUIConstants.WINDOW_MARGIN));
+ this.layout.addConstraint("mainpane", AttributeType.BOTTOM, new AttributeConstraint("status",
+ AttributeType.TOP, -5));
+ this.layout.addConstraint("mainpane", AttributeType.TOP, new AttributeConstraint("toolbar",
+ AttributeType.BOTTOM, GUIConstants.DIVIDER_SIZE));
+ }
- /**
- * Action builder for the action of the GUI
- *
- */
- public void buildActions(){
+ /**
+ * Action builder for the action of the GUI
+ *
+ */
+ public void buildActions(){
- this.connectAction = new MagicAction("connect", GUIConstants.ICON_CONNECT, "connecttooltip") {
+ this.connectAction = new MagicAction("connect", GUIConstants.ICON_CONNECT, "connecttooltip") {
- /**
- * serial version id
- */
- private static final long serialVersionUID = 8256739041910656216L;
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = 8256739041910656216L;
- /* (non-Javadoc)
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
- */
- @Override
- public void actionPerformed(ActionEvent e){
- ServerConnectionInfo info = new ServerConnectionInfo();
- info.hostname = Settings.getHostname();
- info.port = Settings.getPort();
- info.name = Settings.getClientName();
- info.password = Settings.getClientPassword();
- info.useNoServer = Settings.isStandAlone();
- info = ConnectServerDialog.showDialog(MainGUI.this, info);
- if (info != null) {
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ ServerConnectionInfo info = new ServerConnectionInfo();
+ info.hostname = Settings.getHostname();
+ info.port = Settings.getPort();
+ info.name = Settings.getClientName();
+ info.password = Settings.getClientPassword();
+ info.useNoServer = Settings.isStandAlone();
+ info = ConnectServerDialog.showDialog(MainGUI.this, info);
+ if (info != null) {
- Settings.setClientName(info.name);
- Settings.setClientPassword(info.password);
- Settings.setServerURL(info.hostname, info.port);
- Settings.setStandAlone(info.useNoServer);
- connect();
- }
- //TODO: hier die Mapnamen einlesen und im Tree
- }
- };
+ Settings.setClientName(info.name);
+ Settings.setClientPassword(info.password);
+ Settings.setServerURL(info.hostname, info.port);
+ Settings.setStandAlone(info.useNoServer);
+ connect();
+ }
+ //TODO: hier die Mapnamen einlesen und im Tree
+ }
+ };
- this.setProxyAction = new MagicAction("setproxy", GUIConstants.ICON_CONNECT, "setproxytooltip") {
+ this.setProxyAction = new MagicAction("setproxy", GUIConstants.ICON_CONNECT, "setproxytooltip") {
- /**
- * serial version id
- */
- private static final long serialVersionUID = 8620117054998094069L;
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = 8620117054998094069L;
- /* (non-Javadoc)
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
- */
- @Override
- public void actionPerformed(ActionEvent e){
- SetProxyDialog.showDialog(MainGUI.this);
- }
- };
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ SetProxyDialog.showDialog(MainGUI.this);
+ }
+ };
- this.disconnectAction = new MagicAction("disconnect", GUIConstants.ICON_DISCONNECT, "disconnecttooltip") {
+ this.disconnectAction = new MagicAction("disconnect", GUIConstants.ICON_DISCONNECT, "disconnecttooltip") {
- /**
- * serial version id
- */
- private static final long serialVersionUID = 6776875394862327956L;
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = 6776875394862327956L;
- /* (non-Javadoc)
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
- */
- @Override
- public void actionPerformed(ActionEvent e){
- Controller.getInstance().disconnect(MainGUI.this);
- }
- };
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ Controller.getInstance().disconnect(MainGUI.this);
+ }
+ };
- this.newMapAction = new MagicAction("newmap", GUIConstants.ICON_NEWMAP, "newmaptooltip") {
+ this.newMapAction = new MagicAction("newmap", GUIConstants.ICON_NEWMAP, "newmaptooltip") {
- /**
- * serial version id
- */
- private static final long serialVersionUID = 1585869732523539705L;
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = 1585869732523539705L;
- /* (non-Javadoc)
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
- */
- @Override
- public void actionPerformed(ActionEvent e){
- MapInfo info = NewMapDialog.showDialog(MainGUI.this);
- if (info != null)
- Controller.getInstance().createNewMap(info.name, info.imageURL, info.width, info.height,
- info.realwidth, info.realheight, MainGUI.this);
- }
- };
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ MapInfo info = NewMapDialog.showDialog(MainGUI.this);
+ if (info != null)
+ Controller.getInstance().createNewMap(info.name, info.imageURL, info.width, info.height,
+ info.realwidth, info.realheight, MainGUI.this);
+ }
+ };
- this.loadMapAction = new MagicAction("loadmap", GUIConstants.ICON_LOADMAP, "loadmaptooltip") {
+ this.loadMapAction = new MagicAction("loadmap", GUIConstants.ICON_LOADMAP, "loadmaptooltip") {
- /**
- * serial version id
- */
- private static final long serialVersionUID = -4200327439722944761L;
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = -4200327439722944761L;
- /* (non-Javadoc)
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
- */
- @Override
- public void actionPerformed(ActionEvent e){
- Controller.getInstance().retrieveMapNames(MainGUI.this, true);
- }
- };
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ Controller.getInstance().retrieveMapNames(MainGUI.this, true);
+ }
+ };
- this.exitAction = new MagicAction("exit", GUIConstants.ICON_EXIT, "exit") {
+ this.exitAction = new MagicAction("exit", GUIConstants.ICON_EXIT, "exit") {
- /**
- * serial version id
- */
- private static final long serialVersionUID = -381509553122027326L;
+ /**
+ * serial version id
+ */
+ private static final long serialVersionUID = -381509553122027326L;
- /* (non-Javadoc)
- * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
- */
- @Override
- public void actionPerformed(ActionEvent e){
- MainGUI.this.setVisible(false);
- System.exit(0);
- }
- };
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ @Override
+ public void actionPerformed(ActionEvent e){
+ MainGUI.this.setVisible(false);
+ System.exit(0);
+ }
+ };
- this.onlineHelp = new MagicAction("onlinehelp", GUIConstants.ICON_HELP, "onlinehelptooltip") {
+ this.onlineHelp = new MagicAction("onlinehelp", GUIConstants.ICON_HELP, "onlinehelptooltip") {
- /**
- * serial version id
- ...
[truncated message content] |
|
From: <jan...@us...> - 2006-11-30 20:24:48
|
Revision: 487
http://svn.sourceforge.net/magicmap/?rev=487&view=rev
Author: jan_fride
Date: 2006-11-30 12:24:22 -0800 (Thu, 30 Nov 2006)
Log Message:
-----------
missing classes
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/NewMapDialog.java
Added Paths:
-----------
trunk/magicmapclient/src/net/sf/magicmap/plugin/action/UninstallPluginAction.java
trunk/magicmapclient/src/net/sf/magicmap/plugin/util/OperatingSystemInfo.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/NewMapDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/NewMapDialog.java 2006-11-29 09:33:47 UTC (rev 486)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/NewMapDialog.java 2006-11-30 20:24:22 UTC (rev 487)
@@ -235,7 +235,7 @@
// w = Long.parseLong(width.getText());
// h = Long.parseLong(height.getText());
if (newvalue > 0 && w > 0 && h > 0) {
- // rHeight.setText(Long.toString((h * newvalue) / w));
+ // rHeight.setText(Long.getPath((h * newvalue) / w));
}
} catch (NumberFormatException e1) {
// rHeight.setText("");
@@ -251,7 +251,7 @@
// w = Long.parseLong(width.getText());
// h = Long.parseLong(height.getText());
if (newvalue > 0 && w > 0 && h > 0) {
- // rWidth.setText(Long.toString((w * newvalue) / h));
+ // rWidth.setText(Long.getPath((w * newvalue) / h));
}
} catch (NumberFormatException e1) {
// rWidth.setText("");
Added: trunk/magicmapclient/src/net/sf/magicmap/plugin/action/UninstallPluginAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/plugin/action/UninstallPluginAction.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/plugin/action/UninstallPluginAction.java 2006-11-30 20:24:22 UTC (rev 487)
@@ -0,0 +1,48 @@
+package net.sf.magicmap.plugin.action;
+
+import net.sf.magicmap.client.gui.utils.MagicAction;
+import net.sf.magicmap.client.gui.utils.GUIConstants;
+import net.sf.magicmap.plugin.PluginManager;
+import net.sf.magicmap.plugin.IPluginDescriptor;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ItemEvent;
+import java.io.IOException;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Jan
+ * Date: 12.11.2006
+ * Time: 18:55:24
+ * To change this template use File | Settings | File Templates.
+ */
+public class UninstallPluginAction extends MagicAction {
+
+ private final PluginManager manager;
+ private IPluginDescriptor descriptor;
+
+ public UninstallPluginAction(PluginManager manager){
+ super ("Plugin deinstallieren", GUIConstants.ICON_DELETE,"Plugin deinstalieren");
+ this.manager = manager;
+ manager.addItemListener(this);
+ setEnabled(false);
+ }
+ public void actionPerformed(ActionEvent e) {
+ try {
+ manager.uninstallPlugin(descriptor);
+ } catch (IOException e1) {
+ e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ }
+
+ public void itemStateChanged(ItemEvent e) {
+ if (ItemEvent.SELECTED == e.getStateChange()){
+ setDescriptor((IPluginDescriptor) e.getItem());
+ }
+ }
+
+ public void setDescriptor(IPluginDescriptor descriptor) {
+ this.descriptor = descriptor;
+ setEnabled(descriptor != null && manager.isInstalled(descriptor));
+ }
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/plugin/util/OperatingSystemInfo.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/plugin/util/OperatingSystemInfo.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/plugin/util/OperatingSystemInfo.java 2006-11-30 20:24:22 UTC (rev 487)
@@ -0,0 +1,54 @@
+package net.sf.magicmap.plugin.util;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Jan
+ * Date: 09.11.2006
+ * Time: 17:45:46
+ * To change this template use File | Settings | File Templates.
+ */
+public final class OperatingSystemInfo {
+ public final String name;
+ public final String arch;
+ public final String version;
+
+ public OperatingSystemInfo(String name, String arch, String version){
+ this.name = name;
+ this.arch = arch;
+ this.version = version;
+ }
+ public boolean isCurrentOsSupported(){
+ return (name.equals(System.getProperty("os.system")) &&
+ arch.equals(System.getProperty("os.arch")));
+ }
+
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ OperatingSystemInfo that = (OperatingSystemInfo) o;
+
+ if (!arch.equals(that.arch)) return false;
+ if (!name.equals(that.name)) return false;
+ if (!version.equals(that.version)) return false;
+
+ return true;
+ }
+
+ public int hashCode() {
+ int result;
+ result = name.hashCode();
+ result = 31 * result + arch.hashCode();
+ result = 31 * result + version.hashCode();
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return "OperatingSystemInfo{" +
+ "name='" + name + '\'' +
+ ", arch='" + arch + '\'' +
+ ", version='" + version + '\'' +
+ '}';
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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 {
- ...
[truncated message content] |
|
From: <jan...@us...> - 2008-01-21 23:00:33
|
Revision: 715
http://magicmap.svn.sourceforge.net/magicmap/?rev=715&view=rev
Author: jan_fride
Date: 2008-01-21 14:01:28 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Added IMagicNode and IMagicNodeModel.
The Controller will return an instance of MagicNodeModel.
Worked with first tests. Index not tested yet ;-)
Modified Paths:
--------------
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/model/node/NodeModel.java
Added Paths:
-----------
trunk/magicmapclient/src/net/sf/magicmap/core/
trunk/magicmapclient/src/net/sf/magicmap/core/model/
trunk/magicmapclient/src/net/sf/magicmap/core/model/URI.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/UnsupportedUriException.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/impl/
trunk/magicmapclient/src/net/sf/magicmap/core/model/impl/URIImpl.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/IMagicNode.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/IMagicNodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/INodeIndex.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/NodeKeyFunction.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNode.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/NodeIndex.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2008-01-13 23:10:04 UTC (rev 714)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -4,41 +4,29 @@
package net.sf.magicmap.client.controller;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.views.MapView;
-import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
-import net.sf.magicmap.client.interfaces.CreatePositionCallback;
-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.MovePositionCallback;
-import net.sf.magicmap.client.interfaces.PositionCallback;
-import net.sf.magicmap.client.interfaces.ServerConnectCallback;
-import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
+import net.sf.magicmap.client.interfaces.*;
import net.sf.magicmap.client.measurement.ScannerAllocator;
import net.sf.magicmap.client.measurement.interfaces.AbstractScanResult;
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.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.MapNode;
-import net.sf.magicmap.client.model.node.Node;
-import net.sf.magicmap.client.model.node.NodeModel;
+import net.sf.magicmap.client.model.node.*;
import net.sf.magicmap.client.plugin.PluginManager;
import net.sf.magicmap.client.utils.Settings;
+import net.sf.magicmap.core.model.node.IMagicNodeModel;
+import net.sf.magicmap.core.model.node.impl.MagicNodeModel;
import net.sf.magicmap.server.dto.MapDTO;
import net.sf.magicmap.server.exception.SessionException;
-
import org.apache.log4j.xml.DOMConfigurator;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+
/**
* Kann \xC4nderungen an View und am Modell vornehmen und zieht alle F\xE4den
* der Anwendung.
@@ -65,7 +53,7 @@
/**
* Das Knotenmodel.
*/
- private INodeModel nodeModel; // Model f\xFCr Graphen
+ private IMagicNodeModel nodeModel; // Model f\xFCr Graphen
private ClientNode client; // Ausgezeichneter Knoten
@@ -93,7 +81,7 @@
//
// Das Model der Knoten.
//
- this.nodeModel = new NodeModel();
+ this.nodeModel = new MagicNodeModel(new NodeModel());
this.scannerAllocator = new ScannerAllocator();
this.currentMap = null;
this.serverManager = null;
@@ -129,7 +117,7 @@
*
* @return the node model
*/
- public INodeModel getNodeModel(){
+ public IMagicNodeModel getNodeModel(){
return this.nodeModel;
}
@@ -306,6 +294,7 @@
this.poller = new ServerPoller(this.serverManager, this.pollhandler);
this.serverManager.connect(callback);
+ this.getNodeModel().setServerID(Settings.getServerURL());
this.pluginManager.connect();
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2008-01-13 23:10:04 UTC (rev 714)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -1,22 +1,14 @@
package net.sf.magicmap.client.controller;
-import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
-import net.sf.magicmap.client.interfaces.CreatePositionCallback;
-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.MovePositionCallback;
-import net.sf.magicmap.client.interfaces.PositionCallback;
-import net.sf.magicmap.client.interfaces.ServerConnectCallback;
-import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
+import net.sf.magicmap.client.interfaces.*;
import net.sf.magicmap.client.measurement.interfaces.AbstractScanResult;
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.node.ClientNode;
import net.sf.magicmap.client.model.node.GeoPos;
-import net.sf.magicmap.client.model.node.INodeModel;
+import net.sf.magicmap.core.model.node.IMagicNodeModel;
/**
* @author Jan Friderici (ja...@fr...)
@@ -35,7 +27,7 @@
*
* @return the node model
*/
- INodeModel getNodeModel();
+ IMagicNodeModel getNodeModel();
/**
* Gibt an ob verbunden oder nicht verbunden
@@ -150,14 +142,18 @@
/**
* Entfernt einen
*
- * @param node
+ * @param name
+ * @param mapname
+ * @param mapname
+ * @param mapname
+ * @param callback
*/
void deletePosition(String name, String mapname, DeletePositionCallback callback);
/**
* @param name
* @param string
- * @param panel
+ * @param callback
*/
void deleteGeoPoint(String name, String string, DeletePositionCallback callback);
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java 2008-01-13 23:10:04 UTC (rev 714)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -1,24 +1,16 @@
package net.sf.magicmap.client.model.node;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.interfaces.NodeModelListener;
import net.sf.magicmap.client.meta.MapInfo;
import net.sf.magicmap.client.model.location.INodePlacer;
import net.sf.magicmap.client.model.location.jung.JungNodePlacer;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.*;
+
/**
* Model zur Beschreibung des aktuellen Zustands in der
* Welt der Clients und AccessPoints. Es k\xF6nnen Anfragen
@@ -90,8 +82,7 @@
log.info("Map has Children: " + currentMap.getChildren().size());
}
for (NodeModelListener listener : this.listeners) {
- NodeModelListener l = (NodeModelListener) listener;
- l.nodeAddedEvent(node);
+ listener.nodeAddedEvent(node);
}
}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/URI.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/URI.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/URI.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,42 @@
+package net.sf.magicmap.core.model;
+
+import java.net.URL;
+
+/**
+ * <p>
+ * Class URI ZUSAMMENFASSUNG
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 21.01.2008
+ * Time: 21:52:54
+ */
+public interface URI {
+ /**
+ * Get the protocol.
+ * @return
+ */
+ String getProtocol();
+
+ /**
+ * Return the uri as string....
+ * @return
+ */
+ String toString();
+
+ /**
+ *
+ * @return
+ */
+ java.net.URI toJavaURI();
+
+ /**
+ *
+ * @return
+ * @throws UnsupportedUriException
+ */
+ URL toJavaURL() throws UnsupportedUriException;
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/UnsupportedUriException.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/UnsupportedUriException.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/UnsupportedUriException.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,28 @@
+package net.sf.magicmap.core.model;
+
+/**
+ * <p>
+ * Class UnsupportedUriException ZUSAMMENFASSUNG
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 21.01.2008
+ * Time: 21:53:51
+ */
+public class UnsupportedUriException extends RuntimeException {
+
+ public UnsupportedUriException(String s) {
+ super(s);
+ }
+
+ public UnsupportedUriException(String s, Throwable throwable) {
+ super(s, throwable);
+ }
+
+ public UnsupportedUriException(Throwable throwable) {
+ super(throwable);
+ }
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/impl/URIImpl.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/impl/URIImpl.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/impl/URIImpl.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,67 @@
+package net.sf.magicmap.core.model.impl;
+
+import net.sf.magicmap.core.model.URI;
+import net.sf.magicmap.core.model.UnsupportedUriException;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+/**
+ * <p>
+ * Class URIImpl ZUSAMMENFASSUNG
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 13.01.2008
+ * Time: 11:35:41
+ */
+public class URIImpl implements URI {
+ private final String uri;
+
+
+ public URIImpl(String uri) {
+ this.uri = uri;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public String getProtocol() {
+ return uri.substring(0, uri.indexOf(":"));
+ }
+
+ public String toString() {
+ return uri;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public java.net.URI toJavaURI() {
+ try {
+ return new java.net.URI(uri);
+ } catch (URISyntaxException e) {
+ throw new UnsupportedUriException(e);
+ }
+ }
+
+ /**
+ *
+ * @return
+ * @throws UnsupportedUriException
+ */
+ public URL toJavaURL() throws UnsupportedUriException {
+ try {
+ return new java.net.URL(uri);
+ } catch (MalformedURLException e) {
+ throw new UnsupportedUriException(e);
+ }
+ }
+
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/node/IMagicNode.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/node/IMagicNode.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/node/IMagicNode.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,38 @@
+package net.sf.magicmap.core.model.node;
+
+import net.sf.magicmap.client.model.node.INode;
+import net.sf.magicmap.client.model.node.Node;
+import net.sf.magicmap.core.model.URI;
+
+/**
+ * <p>
+ * Class IMagicNode ZUSAMMENFASSUNG
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 21.01.2008
+ * Time: 21:51:20
+ */
+public interface IMagicNode extends INode {
+
+ /**
+ * <p>Get the server the nodes is stored.</p>
+ * @return the server id the node is stored with.
+ */
+ URI getServerID();
+
+ /**
+ * <p>The nodes id. This ID will vary depending....</p>
+ * @return a unique id for this node.
+ */
+ URI getNodeID();
+
+ /**
+ * <p>For objects that need the old class.</p>
+ * @return
+ */
+ Node asNode();
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/node/IMagicNodeModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/node/IMagicNodeModel.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/node/IMagicNodeModel.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,68 @@
+package net.sf.magicmap.core.model.node;
+
+import net.sf.magicmap.client.model.node.INode;
+import net.sf.magicmap.client.model.node.INodeModel;
+import net.sf.magicmap.core.model.URI;
+
+import java.util.List;
+
+/**
+ * <p>
+ * This interface adds several methods to the old INodeModel.
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 15.01.2008
+ * Time: 22:39:45
+ */
+public interface IMagicNodeModel extends INodeModel {
+
+ /**
+ * <p>return the server this node model is connected with - if any.</p>
+ * @return the uri for the connected server.
+ */
+ URI getServerID();
+
+ /**
+ *
+ * @return the target.
+ */
+ INodeModel getNodeModel();
+
+
+ /**
+ * get an magic node.
+ * @param node the magic node to get.
+ * @return
+ */
+ IMagicNode getMagicNode(INode node);
+
+ /**
+ * <p>Create an index with the given key generating function.</p>
+ * @param function the function to generate the keys.
+ * @return the index
+ */
+ <K, N extends INode>INodeIndex<K,N> createIndex(NodeKeyFunction<K,N> function);
+
+ /**
+ * Remove the index.
+ * @param index
+ * @return
+ */
+ boolean removeIndex(INodeIndex index);
+
+ /**
+ *
+ * @return
+ */
+ List<? extends INodeIndex> getNodeIndexList();
+
+ /**
+ *
+ * @param serverURL
+ */
+ void setServerID(String serverURL);
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/node/INodeIndex.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/node/INodeIndex.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/node/INodeIndex.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,43 @@
+package net.sf.magicmap.core.model.node;
+
+import net.sf.magicmap.client.model.node.INode;
+
+import java.util.Collection;
+
+/**
+ * <p>
+ * Class INodeIndex ZUSAMMENFASSUNG
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 21.01.2008
+ * Time: 21:55:44
+ */
+public interface INodeIndex <K, N extends INode> {
+
+
+ /**
+ *
+ * @param key
+ * @return
+ */
+ N getUnique(K key);
+
+ /**
+ *
+ * @param key
+ * @return
+ */
+ Collection<N> get(K key);
+
+ /**
+ *
+ * @param n
+ * @return
+ */
+ K getKey(N n);
+
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/node/NodeKeyFunction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/node/NodeKeyFunction.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/node/NodeKeyFunction.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,29 @@
+package net.sf.magicmap.core.model.node;
+
+import net.sf.magicmap.client.model.node.INode;
+
+/**
+ * <p>
+ * Class NodeKeyFunction ZUSAMMENFASSUNG
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 21.01.2008
+ * Time: 22:11:43
+ */
+public interface NodeKeyFunction<K, N extends INode> {
+
+ Class<K> getKeyClass();
+
+ Class<N> getNodeClass();
+
+ /**
+ * Calculate a key for the given node.
+ * @param node the node to create a key for.
+ * @return
+ */
+ K key(INode node);
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNode.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNode.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNode.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,154 @@
+package net.sf.magicmap.core.model.node.impl;
+
+import net.sf.magicmap.client.model.node.Node;
+import net.sf.magicmap.client.model.node.NodeContainer;
+import net.sf.magicmap.core.model.URI;
+import net.sf.magicmap.core.model.impl.URIImpl;
+import net.sf.magicmap.core.model.node.IMagicNode;
+import net.sf.magicmap.core.model.node.IMagicNodeModel;
+
+import java.util.ArrayList;
+
+/**
+ * <p>
+ * Decorates the old nodes.
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 19.01.2008
+ * Time: 14:12:54
+ */
+public class MagicNode implements IMagicNode {
+ private final Node delegate;
+ private final IMagicNodeModel magicNodeModel;
+ private final URI nodeURI;
+
+ public MagicNode(Node delegate, IMagicNodeModel magicNodeModel) {
+ this.delegate = delegate;
+ this.magicNodeModel = magicNodeModel;
+ nodeURI = new URIImpl(
+ magicNodeModel.getServerID().toString()
+ + "/" + delegate.getType()
+ + " /" + delegate.getId());
+ }
+
+
+ public String getDisplayName() {
+ return delegate.getDisplayName();
+ }
+
+ public void setDisplayName(String s) {
+ delegate.setDisplayName(s);
+ }
+
+ public boolean isUpdate() {
+ return delegate.isUpdate();
+ }
+
+ public void setUpdate(boolean b) {
+ delegate.setUpdate(b);
+ }
+
+ public boolean isFix() {
+ return delegate.isFix();
+ }
+
+ public void setFix(boolean b) {
+ delegate.setFix(b);
+ }
+
+ public String getName() {
+ return delegate.getName();
+ }
+
+ public void setName(String s) {
+ delegate.setName(s);
+ }
+
+ public int getX() {
+ return delegate.getX();
+ }
+
+ public int getY() {
+ return delegate.getY();
+ }
+
+ public void setPositionSilent(int i, int i1, int i2) {
+ delegate.setPositionSilent(i, i1, i2);
+ }
+
+ public void setPosition(int i, int i1, int i2) {
+ delegate.setPosition(i, i1, i2);
+ }
+
+ public ArrayList<? extends Node> getNeighbors() {
+ return delegate.getNeighbors();
+ }
+
+ public IMagicNodeModel getModel() {
+ return magicNodeModel;
+ }
+
+ public int getType() {
+ return delegate.getType();
+ }
+
+ public int hashCode() {
+ return delegate.hashCode();
+ }
+
+ public String toString() {
+ return delegate.toString();
+ }
+
+ public long getId() {
+ return delegate.getId();
+ }
+
+ public void setId(long l) {
+ delegate.setId(l);
+ }
+
+ public int getZ() {
+ return delegate.getZ();
+ }
+
+ public void setZ(int i) {
+ delegate.setZ(i);
+ }
+
+ public Node getParentNode() {
+ return delegate.getParentNode();
+ }
+
+ public void setParentNode(Node node) {
+ delegate.setParentNode(node);
+ }
+
+ public boolean isPhysical() {
+ return delegate.isPhysical();
+ }
+
+ public void setPhysical(boolean b) {
+ delegate.setPhysical(b);
+ }
+
+ public NodeContainer getNodeContainer() {
+ return delegate.getNodeContainer();
+ }
+
+ public URI getServerID() {
+ return getModel().getServerID();
+ }
+
+ public URI getNodeID() {
+ return nodeURI;
+ }
+
+ public Node asNode() {
+ return delegate;
+ }
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNodeModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNodeModel.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNodeModel.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,236 @@
+package net.sf.magicmap.core.model.node.impl;
+
+import net.sf.magicmap.client.interfaces.NodeModelListener;
+import net.sf.magicmap.client.meta.MapInfo;
+import net.sf.magicmap.client.model.location.INodePlacer;
+import net.sf.magicmap.client.model.node.*;
+import net.sf.magicmap.core.model.URI;
+import net.sf.magicmap.core.model.impl.URIImpl;
+import net.sf.magicmap.core.model.node.IMagicNode;
+import net.sf.magicmap.core.model.node.IMagicNodeModel;
+import net.sf.magicmap.core.model.node.INodeIndex;
+import net.sf.magicmap.core.model.node.NodeKeyFunction;
+
+import java.util.*;
+
+/**
+ * <p>
+ * Uses a decorator pattern to enhance to old information model.
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 18.01.2008
+ * Time: 18:51:39
+ */
+public class MagicNodeModel implements IMagicNodeModel {
+ private final INodeModel delegate;
+ private URI serverID;
+
+ private final WeakHashMap<Node, IMagicNode> nodeMap = new WeakHashMap<Node, IMagicNode>();
+
+ private final List<NodeIndex> nodeInedexList = new LinkedList<NodeIndex>();
+
+ /**
+ * <p>...</p>
+ * @param delegate the old model to use.
+ */
+ public MagicNodeModel(INodeModel delegate) {
+ this.delegate = delegate;
+ }
+
+
+ public void setServerID(String serverURL) {
+ serverID = new URIImpl(serverURL);
+ }
+
+ /**
+ * <p>Create an index to find nodes with a quicknesssssss..</\x9F>
+ * @param function the function to use.
+ * @return
+ */
+ public <K, N extends INode> INodeIndex<K, N> createIndex(NodeKeyFunction<K, N> function) {
+ NodeIndex<K,N> index = new NodeIndex<K,N>(this, function, function.getNodeClass());
+ nodeInedexList.add(index);
+ return index;
+ }
+
+ /**
+ *
+ * @param index
+ * @return
+ */
+ public boolean removeIndex(INodeIndex index) {
+ return nodeInedexList.remove(index);
+ }
+
+
+ public IMagicNode getMagicNode(INode node) {
+ return nodeMap.get(node);
+ }
+
+ /**
+ *
+ * @return
+ */
+ public List<? extends INodeIndex> getNodeIndexList() {
+ return nodeInedexList;
+ }
+
+ /**
+ *
+ * @param node
+ */
+ public void addNode(Node node) {
+ delegate.addNode(node);
+ if (!(node instanceof IMagicNode)) {
+ nodeMap.put(node, new MagicNode(node, this));
+ }
+ }
+
+ /**
+ *
+ * @param node
+ */
+ public void removeNode(Node node) {
+ delegate.removeNode(node);
+ if (!(node instanceof IMagicNode)) {
+ nodeMap.remove(node);
+ }
+ }
+
+ /**
+ *
+ * @return get the id of the server....
+ */
+ public URI getServerID() {
+ return serverID;
+ }
+
+ /**
+ *
+ * @param serverID
+ */
+ public void setServerID(URI serverID) {
+ this.serverID = serverID;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public INodeModel getNodeModel() {
+ return delegate;
+ }
+
+
+ public IMagicNode getMagicNode(Node node) {
+ return nodeMap.get(node);
+ }
+
+
+
+
+
+ public void updateNode(Node node, int i, Object o) {
+ delegate.updateNode(node, i, o);
+ }
+
+ public void rehashNode(Node node, String s) {
+ delegate.rehashNode(node, s);
+ }
+
+ public ArrayList<? extends Node> findNeighbors(Node node) {
+ return delegate.findNeighbors(node);
+ }
+
+ public ArrayList<? extends Node> findNonNeighbors(Node node) {
+ return delegate.findNonNeighbors(node);
+ }
+
+ public void addNodeModelListener(NodeModelListener nodeModelListener) {
+ delegate.addNodeModelListener(nodeModelListener);
+ }
+
+ public void removeNodeModelListener(NodeModelListener nodeModelListener) {
+ delegate.removeNodeModelListener(nodeModelListener);
+ }
+
+ public NodeModelListener[] nodeModelListeners() {
+ return delegate.nodeModelListeners();
+ }
+
+ public Set<AccessPointSeerNode> getAccessPointSeerNodes() {
+ return delegate.getAccessPointSeerNodes();
+ }
+
+ public ArrayList<LocationNode> getLocationsWithAtLeastOneAccessPoint(ArrayList<AccessPointNode> accessPointNodes) {
+ return delegate.getLocationsWithAtLeastOneAccessPoint(accessPointNodes);
+ }
+
+ public ArrayList<LocationNode> getLocationsWithAtLeastOneAccessPoint(ArrayList<AccessPointNode> accessPointNodes, Node node) {
+ return delegate.getLocationsWithAtLeastOneAccessPoint(accessPointNodes, node);
+ }
+
+ public Node findNode(String s) {
+ return delegate.findNode(s);
+ }
+
+ public boolean nodeExists(String s) {
+ return delegate.nodeExists(s);
+ }
+
+ public AccessPointNode findAccessPoint(String s) {
+ return delegate.findAccessPoint(s);
+ }
+
+ public boolean accessPointExists(String s) {
+ return delegate.accessPointExists(s);
+ }
+
+ public ClientNode findClient(String s) {
+ return delegate.findClient(s);
+ }
+
+ public boolean clientExists(String s) {
+ return delegate.clientExists(s);
+ }
+
+ public Collection<Node> getNodes() {
+ return delegate.getNodes();
+ }
+
+ public void clear() {
+ delegate.clear();
+ nodeMap.clear();
+
+ }
+
+ /**
+ *
+ * @param iNodePlacer
+ */
+ public void setNodePlacer(INodePlacer iNodePlacer) {
+ delegate.setNodePlacer(iNodePlacer);
+ }
+
+ /**
+ * Returns the rotigionals node placer.
+ * @return
+ */
+ public INodePlacer getNodePlacer() {
+ return delegate.getNodePlacer();
+ }
+
+ public void setCurrentMap(MapInfo mapInfo) {
+ delegate.setCurrentMap(mapInfo);
+ }
+
+ public MapNode getCurrentMap() {
+ return delegate.getCurrentMap();
+ }
+
+
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/NodeIndex.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/NodeIndex.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/NodeIndex.java 2008-01-21 22:01:28 UTC (rev 715)
@@ -0,0 +1,121 @@
+package net.sf.magicmap.core.model.node.impl;
+
+import net.sf.magicmap.client.interfaces.NodeModelListener;
+import net.sf.magicmap.client.model.node.INode;
+import net.sf.magicmap.client.model.node.Node;
+import net.sf.magicmap.core.model.node.IMagicNodeModel;
+import net.sf.magicmap.core.model.node.INodeIndex;
+import net.sf.magicmap.core.model.node.NodeKeyFunction;
+import org.apache.commons.collections15.MultiMap;
+import org.apache.commons.collections15.multimap.MultiHashMap;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * Class NodeIndex ZUSAMMENFASSUNG
+ * </p>
+ * <p>
+ * DETAILS
+ * </p>
+ *
+ * @author Jan Friderici
+ * Date: 21.01.2008
+ * Time: 22:16:28
+ */
+public class NodeIndex<K, N extends INode> implements INodeIndex<K,N> {
+ private final MultiMap<K,N> nodes = new MultiHashMap<K,N>();
+ private final Map<N,K> keyMap = new HashMap<N,K>();
+ private final NodeKeyFunction<K,N> keyFunction;
+ private final Class<N> nodeClass;
+
+ /**
+ *
+ */
+ private NodeModelListener nodeModelListener = new NodeModelListener() {
+ public void nodeAddedEvent(Node node) {
+ if (nodeClass.isAssignableFrom(node.getClass())) {
+ indexNode((N)node);
+ }
+ }
+
+ public void nodeUpdatedEvent(Node node, int type, Object data) {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void nodeRemovedEvent(Node node) {
+ removeNode(node);
+ }
+ };
+
+
+ /**
+ *
+ * @param node
+ */
+ private void removeNode(Node node) {
+ final K key = keyMap.remove(node);
+ if (key != null) {
+ nodes.get(key).remove((N)node);
+ }
+ }
+
+
+ /**
+ ...
[truncated message content] |
|
From: <an...@us...> - 2008-02-01 13:41:10
|
Revision: 728
http://magicmap.svn.sourceforge.net/magicmap/?rev=728&view=rev
Author: anweiss
Date: 2008-02-01 05:41:00 -0800 (Fri, 01 Feb 2008)
Log Message:
-----------
added interface functions to edit the attributes hashmap for every node
Modified Paths:
--------------
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/core/model/node/impl/MagicNode.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2008-02-01 13:35:17 UTC (rev 727)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2008-02-01 13:41:00 UTC (rev 728)
@@ -4,7 +4,6 @@
package net.sf.magicmap.client.controller;
-
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
@@ -14,7 +13,15 @@
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.views.MapView;
-import net.sf.magicmap.client.interfaces.*;
+import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
+import net.sf.magicmap.client.interfaces.CreatePositionCallback;
+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.MovePositionCallback;
+import net.sf.magicmap.client.interfaces.PositionCallback;
+import net.sf.magicmap.client.interfaces.ServerConnectCallback;
+import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
import net.sf.magicmap.client.measurement.ScannerAllocator;
import net.sf.magicmap.client.measurement.interfaces.AbstractScanResult;
import net.sf.magicmap.client.measurement.interfaces.AbstractScanner;
@@ -63,23 +70,23 @@
* Das Knotenmodel.
*/
- private IMagicNodeModel nodeModel; // Model f\xFCr Graphen
+ private IMagicNodeModel nodeModel; // Model f\xFCr Graphen
- private ClientNode client; // Ausgezeichneter Knoten
+ private ClientNode client; // Ausgezeichneter Knoten
- private HashMap<String, String> ClientAttributes = new HashMap<String,String>(); // zus\xE4tzliche Attribute f\xFCr den Clienten
+ private HashMap<String, String> ClientAttributes = new HashMap<String, String>(); // zus\xE4tzliche Attribute f\xFCr den Clienten
- 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 MapInfo currentMap;
- private boolean invisble; // Invisible-Modus (keine Daten an Server)
+ private boolean invisble; // Invisible-Modus (keine Daten an Server)
private ScannerAllocator scannerAllocator;
private PluginManager pluginManager;
@@ -541,20 +548,44 @@
} catch (MalformedURLException e) {} catch (IOException e) {}
}
+ /*
+ * (non-Javadoc)
+ * @see net.sf.magicmap.client.controller.IController#getClientAttributes()
+ */
public HashMap<String, String> getClientAttributes(){
return ClientAttributes;
}
- public void setClientAttributes(HashMap<String, String> clientAttributes){
+ /*
+ * (non-Javadoc)
+ * @see net.sf.magicmap.client.controller.IController#setClientInterfaceAttributes(java.util.HashMap)
+ */
+ public void setClientInterfaceAttributes(HashMap<String, String> clientAttributes){
ClientAttributes = clientAttributes;
}
- public void addInterface(HashMap<String, String> intorface){
-// int count = Integer.parseInt(this.getClientAttributes().get(DriverInformations.NUMBEROFINTERFACES));
+ /*
+ * (non-Javadoc)
+ * @see net.sf.magicmap.client.controller.IController#addClientInterface(java.util.HashMap)
+ */
+ public void addClientInterface(HashMap<String, String> intorface){
+ // int count = Integer.parseInt(this.getClientAttributes().get(DriverInformations.NUMBEROFINTERFACES));
if (!(this.getClientAttributes().containsValue(intorface.get(DriverInformations.DEVICENAME)))) {
-// count++;
-// this.ClientAttributes.put(DriverInformations.NUMBEROFINTERFACES, String.valueOf(count));
+ // count++;
+ // this.ClientAttributes.put(DriverInformations.NUMBEROFINTERFACES, String.valueOf(count));
this.ClientAttributes.putAll(intorface);
}
}
+
+ /*
+ * (non-Javadoc)
+ * @see net.sf.magicmap.client.controller.IController#addAttributeForSelected(java.lang.String, java.lang.String)
+ */
+ public void addAttributeForSelected(String key, String value){
+ MainGUI.getInstance().getNodeSelectionModel().getSelectedNode().addAttribute(key, value);
+ }
+
+ public void removeAttributeForSelected(String key){
+ MainGUI.getInstance().getNodeSelectionModel().getSelectedNode().removeAttribute(key);
+ }
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2008-02-01 13:35:17 UTC (rev 727)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2008-02-01 13:41:00 UTC (rev 728)
@@ -2,7 +2,15 @@
package net.sf.magicmap.client.controller;
import java.util.HashMap;
-import net.sf.magicmap.client.interfaces.*;
+
+import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
+import net.sf.magicmap.client.interfaces.CreatePositionCallback;
+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.MovePositionCallback;
+import net.sf.magicmap.client.interfaces.PositionCallback;
+import net.sf.magicmap.client.interfaces.ServerConnectCallback;
import net.sf.magicmap.client.measurement.interfaces.AbstractScanResult;
import net.sf.magicmap.client.measurement.interfaces.AbstractScanner;
import net.sf.magicmap.client.measurement.interfaces.AbstractScannerHandler;
@@ -190,4 +198,18 @@
*
*/
void initializePlugins();
+
+ HashMap<String, String> getClientAttributes();
+
+ /*
+ * Fills a hashmap with informations about the clients interface.
+ *
+ */
+ void setClientInterfaceAttributes(HashMap<String, String> clientAttributes);
+
+ void addClientInterface(HashMap<String, String> intorface);
+
+ void addAttributeForSelected(String key, String value);
+
+ void removeAttributeForSelected(String key);
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNode.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNode.java 2008-02-01 13:35:17 UTC (rev 727)
+++ trunk/magicmapclient/src/net/sf/magicmap/core/model/node/impl/MagicNode.java 2008-02-01 13:41:00 UTC (rev 728)
@@ -8,6 +8,7 @@
import net.sf.magicmap.core.model.node.IMagicNodeModel;
import java.util.ArrayList;
+import java.util.HashMap;
/**
* <p>
@@ -151,4 +152,28 @@
public Node asNode() {
return delegate;
}
+
+
+ public void addAttribute(String key, String value){
+ this.delegate.addAttribute(key, value);
+
+ }
+
+
+ public HashMap<String, String> getAttributes(){
+ return this.delegate.getAttributes();
+ }
+
+
+ public void removeAttribute(String key){
+ this.delegate.removeAttribute(key);
+
+ }
+
+
+ public void setAttributes(HashMap<String, String> newAttributes){
+ this.delegate.setAttributes(newAttributes);
+
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X