Menu
▾
▴
magicmap-commits — SVN commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(14) |
Mar
|
Apr
(4) |
May
(57) |
Jun
(14) |
Jul
(15) |
Aug
(5) |
Sep
(29) |
Oct
(13) |
Nov
(44) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(14) |
Feb
(78) |
Mar
(55) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(12) |
Dec
(9) |
| 2007 |
Jan
(21) |
Feb
(67) |
Mar
(39) |
Apr
(28) |
May
(7) |
Jun
|
Jul
(6) |
Aug
(2) |
Sep
(1) |
Oct
(18) |
Nov
(8) |
Dec
(11) |
| 2008 |
Jan
(16) |
Feb
(12) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fle...@us...> - 2007-03-23 12:03:37
|
Revision: 608
http://svn.sourceforge.net/magicmap/?rev=608&view=rev
Author: flederohr
Date: 2007-03-23 05:03:15 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
fixed behavior of connect button
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java 2007-03-21 15:49:57 UTC (rev 607)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java 2007-03-23 12:03:15 UTC (rev 608)
@@ -85,8 +85,11 @@
RelativeLayout layout = new RelativeLayout();
RelativePanelBuilder builder = new RelativePanelBuilder(layout);
- // OK / Abbrechen
- ok = builder.createButton(GUIUtils.i18n("connect"), "OK", this);
+ // OK / Abbrechen
+ if (info.useNoServer)
+ ok = builder.createButton(GUIUtils.i18n("continue"), "OK", this);
+ else
+ ok = builder.createButton(GUIUtils.i18n("connect"), "OK", this);
cancel = builder.createButton(GUIUtils.i18n("cancel"), "CANCEL", this);
builder.addOKCancelButtonBar(ok, cancel, "okcancel");
@@ -157,7 +160,6 @@
this.hostname.setSelectedItem(serverConnectionInfo.hostname);
this.port.setText("" + serverConnectionInfo.port);
if (info.useNoServer) {
- ok = builder.createButton(GUIUtils.i18n("continue"), "OK", this);
this.hostname.setEnabled(false);
this.port.setEnabled(false);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-21 15:50:33
|
Revision: 607
http://svn.sourceforge.net/magicmap/?rev=607&view=rev
Author: anweiss
Date: 2007-03-21 08:49:57 -0700 (Wed, 21 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/magicmapclient/res/screentext_de_DE.properties
Modified: trunk/magicmapclient/res/screentext_de_DE.properties
===================================================================
--- trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-21 15:41:27 UTC (rev 606)
+++ trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-21 15:49:57 UTC (rev 607)
@@ -104,7 +104,7 @@
showedgesforselectednode=Zeige nur die Kanten f\xFCr den selektierten Knoten
datainvocationrate=Updaterate
datainvocationratetooltip=Stellt ein wie oft die Daten vom Server abgerufen werden
-dataInvocationRate1=10 Sek
+dataInvocationRate1=1 Sek
dataInvocationRate2=2 Sek
dataInvocationRate3=3 Sek
dataInvocationRate4=4 Sek
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-21 15:50:00
|
Revision: 606
http://svn.sourceforge.net/magicmap/?rev=606&view=rev
Author: anweiss
Date: 2007-03-21 08:41:27 -0700 (Wed, 21 Mar 2007)
Log Message:
-----------
cleanup and enhancements
Modified Paths:
--------------
trunk/magicmapclient/res/screentext.properties
trunk/magicmapclient/res/screentext_de_DE.properties
Removed Paths:
-------------
trunk/magicmapclient/res/screentext_en_US.properties
Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties 2007-03-19 15:18:24 UTC (rev 605)
+++ trunk/magicmapclient/res/screentext.properties 2007-03-21 15:41:27 UTC (rev 606)
@@ -15,8 +15,8 @@
userdefinedview=&User-defined...
connect_to_server=Connect to server
disconnect_from_server=Disconnect from server
-createlocation=Create location
-namelocation=Name location
+createlocation=New Referencepoint
+creategeopos=New Geocoordinate
fetchlocations=Fetch all locations from server
rename=Rename
delete=Delete
@@ -35,10 +35,10 @@
addaccesspoint=Add access point
addlocation=Add location
seesaccesspoints=Sees Access Point
-notseesaccesspoints=Doesn't see Access Point
outline=Outline
console=Console
measurement=Measurement
+outline_maps=Maps
accesspoints=Access Points
locations=Locations
clients=Clients
@@ -97,6 +97,9 @@
setanhttpproxy=Set an HTTP-Proxy
setanhttpproxyhint=Please enter name and port of your proxy server
setproxytooltip=Set Proxy-server
+geopos=Set a geocoordinate
+setgeopos=Set a geocoordinate
+setgeoposhint=Please enter a geocoordonate
nonserverconnect=Use local connection only
showedgesforselectednode=Show only edges for the selected node
datainvocationrate=Updaterate
@@ -119,4 +122,5 @@
new.map.dialog.scale = scale factors
map.panel.context.hide.ap = hide accesspoint
map.panel.context.hide.ap.off = compute accesspoint
-node.accesspoint.is.hide = OFF
\ No newline at end of file
+node.accesspoint.is.hide = OFF
+continue=C&ontinue
\ No newline at end of file
Modified: trunk/magicmapclient/res/screentext_de_DE.properties
===================================================================
--- trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-19 15:18:24 UTC (rev 605)
+++ trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-21 15:41:27 UTC (rev 606)
@@ -17,8 +17,6 @@
disconnect_from_server=Vom Server trennen
createlocation=Neuer Referenzpunkt
creategeopos=Neue Geokoordinate
-createinfoobject=Neues Infoobjekt
-namelocation=Benenne Referenzpunkt
fetchlocations=Hole alle Orte vom Server
rename=Umbenennen
delete=Entfernen
@@ -37,7 +35,6 @@
addaccesspoint=Access Point hinzuf\xFCgen
addlocation=Referenzpunkt hinzuf\xFCgen
seesaccesspoints=Sieht Access Point
-notseesaccesspoints=Sieht nicht Access Point
outline=\xDCbersicht
console=Konsole
measurement=Messung
@@ -103,14 +100,11 @@
geopos=Geokoordinate setzen
setgeopos=Eine Geokoordinate setzen
setgeoposhint=Geben Sie bitte eine Geokoordinate an
-infoobject=Infoobjekt setzen
-setinfoobject=Ein Infoobjekt setzen
-setinfoobjecthint=Geben Sie bitte Name und URL ein
nonserverconnect=Kein Server (Standalone)
showedgesforselectednode=Zeige nur die Kanten f\xFCr den selektierten Knoten
datainvocationrate=Updaterate
datainvocationratetooltip=Stellt ein wie oft die Daten vom Server abgerufen werden
-dataInvocationRate1=1 Sek
+dataInvocationRate1=10 Sek
dataInvocationRate2=2 Sek
dataInvocationRate3=3 Sek
dataInvocationRate4=4 Sek
Deleted: trunk/magicmapclient/res/screentext_en_US.properties
===================================================================
--- trunk/magicmapclient/res/screentext_en_US.properties 2007-03-19 15:18:24 UTC (rev 605)
+++ trunk/magicmapclient/res/screentext_en_US.properties 2007-03-21 15:41:27 UTC (rev 606)
@@ -1,27 +0,0 @@
-file=File
-map=Map
-connect=Connect
-disconnect=Disconnect
-exit=Exit
-options=Options
-about=About...
-help=Help
-connect_to_server=Connect to server
-disconnect_from_server=Disconnect from server
-createlocation=New reference point
-creategeopos=New geo position
-createinfoobject=New info object
-geopos=Set a geo position
-setgeopos=Set a geo position
-setgeoposhint=Please enter a geo position
-infoobject=Set an info object
-setinfoobject=Set an info object
-setinfoobjecthint=Please enter name and URL
-scanlocation=Scan location
-namelocation=Name location
-fetchlocations=Fetch all locations from server
-rename=Rename
-delete=Delete
-properties=Properties...
-outline_maps=Maps
-continue=&Continue
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-19 15:34:54
|
Revision: 604
http://svn.sourceforge.net/magicmap/?rev=604&view=rev
Author: anweiss
Date: 2007-03-19 08:14:34 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
new logarithmic metric
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-03-15 10:50:51 UTC (rev 603)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-03-19 15:14:34 UTC (rev 604)
@@ -168,6 +168,7 @@
}
// TODO: Logarithmische Skalierung
return Math.abs(MeasurementUtils.signalLevelToStrength(seer.getSignalLevelForAccessPoint(ap)));
+ //return Math.abs(0.3 * Math.pow(10,(-0.026 * seer.getSignalLevelForAccessPoint(ap)))-0.5);
} else
//Wir berechnen nur Abst\xE4nde zwischen APs, Clients und Referenzpunkten
return Double.POSITIVE_INFINITY;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-19 15:34:45
|
Revision: 605
http://svn.sourceforge.net/magicmap/?rev=605&view=rev
Author: anweiss
Date: 2007-03-19 08:18:24 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
fixed bug 1683705 (exceptions on disconect) and moved all communication callbacks from the MainFrame to the controller
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/controller/PollHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.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/MainFrame.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-03-19 15:14:34 UTC (rev 604)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-03-19 15:18:24 UTC (rev 605)
@@ -5,6 +5,8 @@
package net.sf.magicmap.client.controller;
import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
+import java.rmi.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
@@ -42,36 +44,43 @@
*
* @author thuebner
*/
-public class Controller implements IController {
+public class Controller
+ implements
+ IController,
+ ServerDisconnectCallback,
+ ServerConnectCallback,
+ CreateNewMapCallback,
+ MapNamesCallback {
- private static int numCalled = 0;
+ private static int numCalled = 0;
+ private static int disconnectAttempts = 0;
/**
* Die Instanz.
*/
- private static Controller controller = null;
+ private static Controller controller = null;
/**
* Das Knotenmodel.
*/
- private INodeModel nodeModel; // Model f\xFCr Graphen
+ private INodeModel nodeModel; // Model f\xFCr Graphen
- private ClientNode client; // Ausgezeichneter Knoten
+ private ClientNode client; // Ausgezeichneter Knoten
- private ServerPoller poller; // Server st\xE4ndig nach \xC4nderungen fragen
+ private ServerPoller poller; // Server st\xE4ndig nach \xC4nderungen fragen
- private PollHandler pollhandler; // Klasse zur Verarbeitung der Pollergebnisse
+ private PollHandler pollhandler; // Klasse zur Verarbeitung der Pollergebnisse
- private ServerManager serverManager; // Manager f\xFCr die Verbindung zum Server
+ private ServerManager serverManager; // Manager f\xFCr die Verbindung zum Server
// private CallbackHandler callbackHandler; // S\xE4mtliche callbacks werden dort behandelt
- private MapInfo currentMap;
+ 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;
+ private ScannerAllocator scannerAllocator;
+ private PluginManager pluginManager;
/**
* Private constructor for singleton instance
@@ -169,8 +178,8 @@
if (this.currentMap.realheight > 0 && this.currentMap.realwidth > 0)
// TODO: Interface f\xFCr GUI mit methode setMapTitle()
- ((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false)
- + " - " + this.currentMap.name + " Gr\xF6\xDFe: " + this.currentMap.realwidth + " X "
+ ((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false) + " - "
+ + this.currentMap.name + " Gr\xF6\xDFe: " + this.currentMap.realwidth + " X "
+ this.currentMap.realheight + " cm");
}
}
@@ -288,12 +297,8 @@
this.pluginManager.connect();
}
- public void disconnect(ServerDisconnectCallback callback){
- this.pluginManager.dispose();
-
- if (isMapLoaded()) closeMap();
- this.serverManager.disconnect(callback);
- this.client = null;
+ public void disconnect(){
+ this.serverManager.disconnect(this);
}
/**
@@ -414,8 +419,7 @@
public void retrieveMap(String name, MapCallback callback){
this.serverManager.retrieveMap(name, callback);
// TODO: Interface f\xFCr GUI mit methode setMapTitle()
- ((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false) + " - "
- + name);
+ ((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false) + " - " + name);
}
public void retrieveMapNames(MapNamesCallback callback, boolean openMapDialog){
@@ -446,7 +450,52 @@
} catch (MalformedURLException e) {
throw new RuntimeException(e.getMessage());
}
+ }
+ public void disconnected(){
+ disconnectAttempts = 0;
+ if (isMapLoaded()) closeMap();
+ this.pluginManager.dispose();
+ this.client = null;
+ MainGUI.getInstance().getMainFrame().disconnected();
}
+ public void disconnectionError(Exception e){
+ if (++disconnectAttempts < 4) {
+ disconnect();
+ } else {
+ disconnectAttempts = 0;
+ if (isMapLoaded()) closeMap();
+ this.pluginManager.dispose();
+ this.client = null;
+ MainGUI.getInstance().getMainFrame().disconnectionError(e);
+ }
+ }
+
+ public void connected(long sesssionId){
+ MainGUI.getInstance().getMainFrame().connected(sesssionId);
+ }
+
+ public void connectionError(Exception e){
+ e.printStackTrace();
+ MainGUI.getInstance().getMainFrame().connectionError(e);
+ }
+
+ public void createNewMapError(Exception e){
+ e.printStackTrace();
+ MainGUI.getInstance().getMainFrame().createNewMapError(e);
+ }
+
+ public void newMapCreated(MapInfo map){
+ MainGUI.getInstance().getMainFrame().newMapCreated(map);
+ }
+
+ public void getMapNamesError(Exception e){
+ e.printStackTrace();
+ MainGUI.getInstance().getMainFrame().getMapNamesError(e);
+ }
+
+ public void openMapDialog(String[] names){
+ MainGUI.getInstance().getMainFrame().openMapDialog(names);
+ }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2007-03-19 15:14:34 UTC (rev 604)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2007-03-19 15:18:24 UTC (rev 605)
@@ -120,7 +120,7 @@
void connect(ServerConnectCallback callback);
- void disconnect(ServerDisconnectCallback callback);
+ void disconnect();
/**
* Erzeugt einen Referenzpunkt auf der aktuellen Karte mit den aktuellen
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2007-03-19 15:14:34 UTC (rev 604)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2007-03-19 15:18:24 UTC (rev 605)
@@ -58,6 +58,9 @@
public void run(){
try {
+ if (!controller.isConnected()){
+ return;
+ }
INodeModel nodeModel = PollHandler.this.controller.getNodeModel();
Node node = nodeModel.findNode(position.getName());
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java 2007-03-19 15:14:34 UTC (rev 604)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java 2007-03-19 15:18:24 UTC (rev 605)
@@ -103,6 +103,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.sessionDelegate.disconnect(Settings.getClientName(), Settings
.getClientMAC(), Settings.getClientPassword(), SOAPServerManager.this.sessionId);
@@ -110,10 +111,10 @@
SOAPServerManager.this.mapDelegate = null;
SOAPServerManager.this.sessionDelegate = null;
callback.disconnected();
+ SOAPServerManager.this.sessionId = -1;
} catch (Exception e) {
callback.disconnectionError(e);
}
- SOAPServerManager.this.sessionId = -1;
}
}
};
@@ -138,6 +139,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.mapDelegate.createNewMap(SOAPServerManager.this.sessionId, name,
URL, imageWidth, imageHeight, width, height);
@@ -178,6 +180,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
String[] names = SOAPServerManager.this.mapDelegate.getMapNames();
if (openDialog)
@@ -208,6 +211,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
MapDTO mapDTO = SOAPServerManager.this.mapDelegate.getMap(name);
callback.mapReceived(mapDTO);
@@ -262,6 +266,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.positionDelgate.createOrUpdatePosition(
SOAPServerManager.this.sessionId,
@@ -303,6 +308,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.mapDelegate.createGeoPoint(SOAPServerManager.this.sessionId,
mapName, x, y, geoPos.getLongitude(), geoPos.getLatitude(), geoPos.getAltitude());
@@ -335,6 +341,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.positionDelgate.deletePosition(SOAPServerManager.this.sessionId,
mapname, positionId);
@@ -366,6 +373,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.mapDelegate.deleteGeoPoint(SOAPServerManager.this.sessionId, id);
callback.positionDeleted(id);
@@ -396,6 +404,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.positionDelgate.movePosition(SOAPServerManager.this.sessionId,
mapname, positionId, x, y, z, fixed);
@@ -445,6 +454,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.positionDelgate.createOrUpdateClientPosition(
SOAPServerManager.this.sessionId,
@@ -485,6 +495,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.positionDelgate.createOrUpdateAccessPosition(
SOAPServerManager.this.sessionId,
@@ -518,6 +529,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
SOAPServerManager.this.positionDelgate.setAccessPointHiddenStatus(
SOAPServerManager.this.sessionId,
@@ -546,6 +558,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
// retrieve and communicate common positions (WLAN, i.e.
// APs,
// clients,...)
@@ -598,6 +611,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
int x = SOAPServerManager.this.controller.getClientPosX();
int y = SOAPServerManager.this.controller.getClientPosY();
@@ -675,6 +689,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
// retrieve geo points
GeoPointDTO[] geoPoses = SOAPServerManager.this.mapDelegate.getGeoPointsForMap(
@@ -706,6 +721,7 @@
@Override
public void run(){
synchronized (SOAPServerManager.mutex) {
+ if (!isConnected()) return;
try {
// retrieve maps
String[] names = SOAPServerManager.this.mapDelegate.getMapNames();
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java 2007-03-19 15:14:34 UTC (rev 604)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java 2007-03-19 15:18:24 UTC (rev 605)
@@ -123,8 +123,6 @@
}
-
-
/**
* Wird aufgerufen wenn beim \xDCbermitteln der Position irgendwelche Fehler auftreten.
* @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#positionFetchError(java.lang.Exception)
@@ -145,15 +143,4 @@
this.isFetching = false;
}
}
-
- /* (non-Javadoc)
- * @see net.sf.magicmap.client.interfaces.FetchInfoPointsCallback#infoPointFetchError(java.lang.Exception)
- */
- public void infoPointFetchError(Exception e){
- e.printStackTrace();
- synchronized (ServerPoller.syncObj) {
- this.isFetching = false;
- }
- }
-
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-03-19 15:14:34 UTC (rev 604)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-03-19 15:18:24 UTC (rev 605)
@@ -483,6 +483,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
int x = controller.getClientPosX();
int y = controller.getClientPosY();
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-03-19 15:14:34 UTC (rev 604)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-03-19 15:18:24 UTC (rev 605)
@@ -55,13 +55,7 @@
import com.brunchboy.util.swing.relativelayout.RelativeLayout;
import com.jgoodies.uif_lite.component.UIFSplitPane;
-public class MainFrame extends JFrame
- implements
- ServerConnectCallback,
- ServerDisconnectCallback,
- CreateNewMapCallback,
- MapNamesCallback,
- LoadMapDialogListener {
+public class MainFrame extends JFrame implements LoadMapDialogListener {
/**
* serial version id
@@ -285,8 +279,7 @@
this.outlineView = new OutlineView(Controller.getInstance().getNodeModel(), "outlineView");
this.consoleView = new ConsoleView("consoleView");
this.mapView = new MapView(Controller.getInstance().getNodeModel(), null, "mapView");
- this.measurementView = new MeasurementView(Controller
- .getInstance().getNodeModel(), "measurementView");
+ this.measurementView = new MeasurementView(Controller.getInstance().getNodeModel(), "measurementView");
this.mapPanel = new MapPanel("mapPanel");
this.mapPanel.setMapView(this.mapView);
}
@@ -366,10 +359,11 @@
*/
public void disconnectionError(Exception e){
this.connectAction.setEnabled(true);
- this.disconnectAction.setEnabled(false);
this.statusBar.setInvisible(Controller.getInstance().isInvisible());
+ this.disconnectAction.setEnabled(false);
+ this.newMapAction.setEnabled(false);
+ this.loadMapAction.setEnabled(false);
this.statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_DISCONNECTED));
- //JOptionPane.showMessageDialog(this, "Fehler beim Trennen der Verbindung:\n\n " + e.getMessage());
}
/* (non-Javadoc)
@@ -433,7 +427,7 @@
setCursor(new Cursor(Cursor.WAIT_CURSOR));
this.statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_CONNECTING));
this.statusBar.setInvisible(Controller.getInstance().isInvisible());
- Controller.getInstance().connect(this);
+ Controller.getInstance().connect(Controller.getInstance());
}
/**
@@ -501,7 +495,7 @@
*/
@Override
public void actionPerformed(ActionEvent e){
- Controller.getInstance().disconnect(MainFrame.this);
+ Controller.getInstance().disconnect();
}
};
@@ -520,7 +514,7 @@
MapInfo info = NewMapDialog.showDialog(MainFrame.this);
if (info != null)
Controller.getInstance().createNewMap(info.name, info.imageURL, info.width, info.height,
- info.realwidth, info.realheight, MainFrame.this);
+ info.realwidth, info.realheight, Controller.getInstance());
}
};
@@ -536,7 +530,7 @@
*/
@Override
public void actionPerformed(ActionEvent e){
- Controller.getInstance().retrieveMapNames(MainFrame.this, true);
+ Controller.getInstance().retrieveMapNames(Controller.getInstance(), true);
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jza...@us...> - 2007-03-15 10:50:55
|
Revision: 603
http://svn.sourceforge.net/magicmap/?rev=603&view=rev
Author: jzapotoc
Date: 2007-03-15 03:50:51 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
corrected typo
Modified Paths:
--------------
trunk/magicmapclient/MagicMapSetup.nsi
Modified: trunk/magicmapclient/MagicMapSetup.nsi
===================================================================
--- trunk/magicmapclient/MagicMapSetup.nsi 2007-03-14 21:17:39 UTC (rev 602)
+++ trunk/magicmapclient/MagicMapSetup.nsi 2007-03-15 10:50:51 UTC (rev 603)
@@ -8,7 +8,7 @@
# Defines
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.8.1
-!define COMPANY "Humbold Universit\xE4t zu Berlin"
+!define COMPANY "Humboldt Universit\xE4t zu Berlin"
!define URL http://www2.informatik.hu-berlin.de/rok/MagicMap
# MUI defines
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-14 21:17:48
|
Revision: 602
http://svn.sourceforge.net/magicmap/?rev=602&view=rev
Author: flederohr
Date: 2007-03-14 14:17:39 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
replace NSIS installer setup file for MagicMap
Added Paths:
-----------
trunk/magicmapclient/MagicMapSetup.nsi
Removed Paths:
-------------
trunk/magicmapclient/MagicMapSetup.nsi
Deleted: trunk/magicmapclient/MagicMapSetup.nsi
===================================================================
--- trunk/magicmapclient/MagicMapSetup.nsi 2007-03-14 21:15:10 UTC (rev 601)
+++ trunk/magicmapclient/MagicMapSetup.nsi 2007-03-14 21:17:39 UTC (rev 602)
@@ -1,234 +0,0 @@
-;NSIS Modern User Interface
-;Welcome/Finish Page Example Script
-;Written by Joost Verburg
-
-;--------------------------------
-;Include Modern UI
-
- !include "MUI.nsh"
-
-;--------------------------------
-;General
-
- ;Name and file
- Name "MagicMap"
- OutFile "MagicMapSetup.exe"
-
- ;Default installation folder
- InstallDir "$PROGRAMFILES\MagicMap"
-
- SetCompressor ZLIB
-
- ;Default icon for installer (does not work yet)
-; Icon "MagicMap2.ico"
-
- ;Get installation folder from registry if available
- InstallDirRegKey HKCU "Software\MagicMap" ""
-
-
-;--------------------------------
-;Variables
-
- Var MUI_TEMP
- Var STARTMENU_FOLDER
-
-;--------------------------------
-;Interface Settings
-
- !define MUI_HEADERIMAGE
- !define MUI_HEADERIMAGE_BITMAP "MagicMap_InstallHeader.bmp"
- !define MUI_ICON "MagicMap.ico"
- !define MUI_UNICON "MagicMap_Uninst.ico"
- !define MUI_ABORTWARNING
-
-
-;--------------------------------
-;Pages
-
- !insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
-; !insertmacro MUI_PAGE_COMPONENTS
- !insertmacro MUI_PAGE_DIRECTORY
-
- ;Start Menu Folder Page Configuration
- !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
- !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Modern UI Test"
- !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-
- !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
- !insertmacro MUI_PAGE_INSTFILES
- !insertmacro MUI_PAGE_FINISH
-
- !insertmacro MUI_UNPAGE_WELCOME
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
- !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
- !insertmacro MUI_LANGUAGE "German"
-
-;--------------------------------
-;Installer Sections
-
-Section "MagicMap Client" SecDummy
-
- SetOutPath "$INSTDIR"
-
-
- ;ADD YOUR OWN FILES HERE...
- File LICENSE.txt
- File magicmap.jar
- File MagicMap.ico
- File /r /x .svn lib
- File /oname=lib\magicmap-server.jar "..\magicmapserver\dist\magicmap-server.jar"
-
-; File /r $EXEDIR\*.ico $INSTDIR 4
-; CreateDirectory $INSTDIR\dist
-; File /r /FILESONLY $EXEDIR\dist\*.* $INSTDIR\dist 465
-; CreateDirectory $INSTDIR\lib
-; File /r /FILESONLY $EXEDIR\lib\*.* $INSTDIR\lib 9930
-
- ;Store installation folder
- WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
-
- ;Add uninstall to Software overview
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "DisplayName" "MagicMap Client"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "DisplayIcon" "$INSTDIR\MagicMap.ico"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "DisplayVersion" "0.8.1"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "HelpLink" "http://wiki.informatik.hu-berlin.de/nomads/index.php/MagicMapHelp"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "InstallLocation" "$INSTDIR"
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "NoModify" 0x00000001
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "NoRepair" 0x00000001
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "UninstallString" "$INSTDIR\Uninstall.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap" "URLInfoAbout" "http://www2.informatik.hu-berlin.de/rok/MagicMap"
-
- ;Create uninstaller
- WriteUninstaller "$INSTDIR\Uninstall.exe"
-
- !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-
- ;Create shortcuts
- CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\MagicMap Client.lnk" "$INSTDIR\magicmap.jar" "" "$INSTDIR\MagicMap.ico"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Lizenz.lnk" "$INSTDIR\LICENSE.txt"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-
- !insertmacro MUI_STARTMENU_WRITE_END
-
-SectionEnd
-
-;--------------------------------
-;Descriptions
-
- ;Language strings
-; LangString DESC_SecDummy ${LANG_ENGLISH} "Die MagicMap Clientkomponenten."
-
- ;Assign language strings to sections
-; !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-; !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
-; !insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
- ;ADD YOUR OWN FILES HERE...
-; Delete "$INSTDIR\dist\*.*"
- Delete "$INSTDIR\lib\*.*"
- Delete "$INSTDIR\MagicMap.ico"
- Delete "$INSTDIR\magicmap.jar"
-; Delete "$INSTDIR\start.bat"
-; Delete "$INSTDIR\start_nightly.bat"
- Delete "$INSTDIR\LICENSE.txt"
- Delete "$INSTDIR\Uninstall.exe"
-
- RMDir "$INSTDIR\dist"
- RMDir "$INSTDIR\lib"
- RMDir "$INSTDIR"
-
- !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-
- Delete "$SMPROGRAMS\$MUI_TEMP\MagicMap Client.lnk"
- Delete "$SMPROGRAMS\$MUI_TEMP\Lizenz.lnk"
- Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-
-
- ;Delete empty start menu parent diretories
- StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
-
- startMenuDeleteLoop:
- ClearErrors
- RMDir $MUI_TEMP
- GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-
- IfErrors startMenuDeleteLoopDone
-
- StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
- startMenuDeleteLoopDone:
-
- DeleteRegKey /ifempty HKCU "Software\Modern UI Test"
-
- ;Remove uninstall to Software overview
- DeleteRegKey /ifempty HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MagicMap"
-
-SectionEnd
-
-Function IsJava15Installed
- Push $R0
- ClearErrors
- ReadRegStr $R0 HKCR ".jar" ""
- IfErrors lbl_na
- StrCpy $R0 1
- Goto lbl_end
- lbl_na:
- StrCpy $R0 0
- lbl_end:
- Exch $R0
- FunctionEnd
-
-Function IsJarExecutable
- Push $R0
- ClearErrors
- ReadRegStr $R0 HKCR ".jar" ""
- IfErrors lbl_na
- StrCpy $R0 1
- Goto lbl_end
- lbl_na:
- StrCpy $R0 0
- lbl_end:
- Exch $R0
- FunctionEnd
-
- Function GetParent
-
- Exch $R0
- Push $R1
- Push $R2
- Push $R3
-
- StrCpy $R1 0
- StrLen $R2 $R0
-
- loop:
- IntOp $R1 $R1 + 1
- IntCmp $R1 $R2 get 0 get
- StrCpy $R3 $R0 1 -$R1
- StrCmp $R3 "\" get
- Goto loop
-
- get:
- StrCpy $R0 $R0 -$R1
-
- Pop $R3
- Pop $R2
- Pop $R1
- Exch $R0
-
- FunctionEnd
-
-
\ No newline at end of file
Added: trunk/magicmapclient/MagicMapSetup.nsi
===================================================================
--- trunk/magicmapclient/MagicMapSetup.nsi (rev 0)
+++ trunk/magicmapclient/MagicMapSetup.nsi 2007-03-14 21:17:39 UTC (rev 602)
@@ -0,0 +1,160 @@
+# Auto-generated by EclipseNSIS Script Wizard
+# 08-Mar-2007 01:26:38
+
+Name MagicMap
+
+SetCompressor /SOLID zlib
+
+# Defines
+!define REGKEY "SOFTWARE\$(^Name)"
+!define VERSION 0.8.1
+!define COMPANY "Humbold Universit\xE4t zu Berlin"
+!define URL http://www2.informatik.hu-berlin.de/rok/MagicMap
+
+# MUI defines
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "MagicMap_InstallHeader.bmp"
+!define MUI_ICON MagicMap.ico
+#!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
+!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER MagicMap
+!define MUI_UNICON MagicMap_Uninst.ico
+!define MUI_ABORTWARNING
+
+# Included files
+!include Sections.nsh
+!include MUI.nsh
+
+# Variables
+Var StartMenuGroup
+
+# Installer pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE LICENSE.txt
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+# Installer languages
+!insertmacro MUI_LANGUAGE German
+
+# Installer attributes
+OutFile MagicMapsetup.exe
+InstallDir $PROGRAMFILES\MagicMap
+CRCCheck on
+XPStyle on
+ShowInstDetails show
+#BGGradient 004080 000040 FFFFFF
+VIProductVersion ${VERSION}.0
+VIAddVersionKey /LANG=${LANG_GERMAN} ProductName MagicMap
+VIAddVersionKey ProductVersion "${VERSION}"
+VIAddVersionKey /LANG=${LANG_GERMAN} CompanyName "${COMPANY}"
+VIAddVersionKey /LANG=${LANG_GERMAN} CompanyWebsite "${URL}"
+VIAddVersionKey /LANG=${LANG_GERMAN} FileVersion ""
+VIAddVersionKey /LANG=${LANG_GERMAN} FileDescription ""
+VIAddVersionKey /LANG=${LANG_GERMAN} LegalCopyright ""
+InstallDirRegKey HKLM "${REGKEY}" Path
+ShowUninstDetails show
+
+# Installer sections
+Section -Main SEC0000
+ SetOutPath $INSTDIR
+ SetOverwrite on
+ File MagicMap.ico
+ File magicmap.jar
+ File LICENSE.txt
+ SetOutPath $INSTDIR\lib
+ File /r /x .svn lib\*
+ File ..\magicmapserver\dist\magicmap-server.jar
+ WriteRegStr HKLM "${REGKEY}\Components" Main 1
+SectionEnd
+
+Section -post SEC0001
+ WriteRegStr HKLM "${REGKEY}" Path $INSTDIR
+ SetOutPath $INSTDIR
+ WriteUninstaller $INSTDIR\uninstall.exe
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+ SetOutPath $INSTDIR
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\MagicMap Client.lnk" $INSTDIR\magicmap.jar "" $INSTDIR\MagicMap.ico
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\Lizenz.lnk" $INSTDIR\LICENSE.txt
+ CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^UninstallLink).lnk" $INSTDIR\uninstall.exe
+ !insertmacro MUI_STARTMENU_WRITE_END
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" HelpLink "http://wiki.informatik.hu-berlin.de/nomads/index.php/MagicMapHelp"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\MagicMap.ico
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
+SectionEnd
+
+# Macro for selecting uninstaller sections
+!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID
+ Push $R0
+ ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}"
+ StrCmp $R0 1 0 next${UNSECTION_ID}
+ !insertmacro SelectSection "${UNSECTION_ID}"
+ GoTo done${UNSECTION_ID}
+next${UNSECTION_ID}:
+ !insertmacro UnselectSection "${UNSECTION_ID}"
+done${UNSECTION_ID}:
+ Pop $R0
+!macroend
+
+# Uninstaller sections
+Section /o un.Main UNSEC0000
+ RmDir /r /REBOOTOK $INSTDIR\lib
+ Delete /REBOOTOK $INSTDIR\LICENSE.txt
+ Delete /REBOOTOK $INSTDIR\magicmap.jar
+ Delete /REBOOTOK $INSTDIR\MagicMap.ico
+ DeleteRegValue HKLM "${REGKEY}\Components" Main
+SectionEnd
+
+Section un.post UNSEC0001
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
+ Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\MagicMap Client.lnk"
+ Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Lizenz.lnk"
+ Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^UninstallLink).lnk"
+ Delete /REBOOTOK $INSTDIR\uninstall.exe
+ DeleteRegValue HKLM "${REGKEY}" StartMenuGroup
+ DeleteRegValue HKLM "${REGKEY}" Path
+ DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components"
+ DeleteRegKey /IfEmpty HKLM "${REGKEY}"
+ RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
+ RmDir /REBOOTOK $INSTDIR
+ Push $R0
+ StrCpy $R0 $StartMenuGroup 1
+ StrCmp $R0 ">" no_smgroup
+no_smgroup:
+ Pop $R0
+SectionEnd
+
+# Installer functions
+Function .onInit
+ InitPluginsDir
+FunctionEnd
+
+
+# Uninstaller functions
+Function un.onInit
+ SetAutoClose true
+ ReadRegStr $INSTDIR HKLM "${REGKEY}" Path
+ !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
+ !insertmacro SELECT_UNSECTION Main ${UNSEC0000}
+FunctionEnd
+
+
+
+# Installer Language Strings
+# TODO Update the Language Strings with the appropriate translations.
+
+LangString ^UninstallLink ${LANG_GERMAN} "Deinstalliere $(^Name)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-14 21:15:14
|
Revision: 601
http://svn.sourceforge.net/magicmap/?rev=601&view=rev
Author: flederohr
Date: 2007-03-14 14:15:10 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
changed plugin repository path
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java 2007-03-14 20:18:46 UTC (rev 600)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java 2007-03-14 21:15:10 UTC (rev 601)
@@ -165,7 +165,7 @@
}
});
- repository = new PluginRepository(new URL("http://vierzig4.dyndns.org/magicmap-plugins/"));
+ repository = new PluginRepository(new URL("http://phl.informatik.hu-berlin.de/magicmap-plugins/"));
tableModel = new DefaultTableModel();
tableModel.addColumn("Name");
tableModel.addColumn("Version");
@@ -297,7 +297,7 @@
net.sf.magicmap.client.plugin.forms.PluginsForm form = new PluginsForm(this);
proxy = form.attatch(this);
} else if (Attributes.PluginRepository.getName().equals(attributeName)) {
- JTextField tf = new JTextField("http://vierzig4.dyndns.org/magicmap-plugins/");
+ JTextField tf = new JTextField("http://phl.informatik.hu-berlin.de/magicmap-plugins/");
tf.setEditable(false);
proxy = tf;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rad...@us...> - 2007-03-14 20:18:50
|
Revision: 600
http://svn.sourceforge.net/magicmap/?rev=600&view=rev
Author: radetzki09
Date: 2007-03-14 13:18:46 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
The MeasureTableCellRenderer displays only SeenAccessPoints - why? Therefore the SeenAccessPoint implements now the ISeenNode.
Second Change is a getter-methode in the MeasurementView for the measurementTable. Now its possible to add new AbstractMeasurementTableModels for new Nodes.
Modified Paths:
--------------
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/model/measurement/SeenAccessPoint.java
Added Paths:
-----------
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/ISeenNode.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java 2007-03-14 19:39:17 UTC (rev 599)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java 2007-03-14 20:18:46 UTC (rev 600)
@@ -14,7 +14,7 @@
import net.sf.magicmap.client.measurement.Constants;
import net.sf.magicmap.client.measurement.MeasurementUtils;
-import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
+import net.sf.magicmap.client.model.measurement.ISeenNode;
/**
*
@@ -27,7 +27,7 @@
* serial version id
*/
private static final long serialVersionUID = 2446093942494182395L;
- private SeenAccessPoint ap;
+ private ISeenNode ap;
private boolean avg;
public MeasureTableCellRenderer(boolean avg) {
@@ -45,7 +45,7 @@
super.setForeground(table.getForeground());
super.setBackground(table.getBackground());
}
- this.ap = (SeenAccessPoint) value;
+ this.ap = (ISeenNode) value;
return this;
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java 2007-03-14 19:39:17 UTC (rev 599)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java 2007-03-14 20:18:46 UTC (rev 600)
@@ -5,30 +5,29 @@
import java.util.Map;
import javax.swing.JTable;
-import javax.swing.table.DefaultTableColumnModel;
-import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.model.measurement.AbstractMeasurementTableModel;
-import net.sf.magicmap.client.model.measurement.MeasurementTableModel;
-import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
-import net.sf.magicmap.client.model.node.AccessPointSeerNode;
import net.sf.magicmap.client.model.node.INodeModelSelectionListener;
import net.sf.magicmap.client.model.node.Node;
import net.sf.magicmap.client.model.node.NodeModelSelectionEvent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
public class MeasurementTable extends JTable implements INodeModelSelectionListener {
private final Map<Class, AbstractMeasurementTableModel> tableModelMap;
-
+
+ private static final Log log = LogFactory
+ .getLog(MeasurementTable.class);
+
/**
*
*/
- private static final long serialVersionUID = 1L;
- private static final AbstractMeasurementTableModel EMPTY_TABLE_MODEL = new EmptyTableModel();
+ private static final long serialVersionUID = 1L;
+ private static final AbstractMeasurementTableModel EMPTY_TABLE_MODEL = new EmptyTableModel();
private static class EmptyTableModel extends AbstractMeasurementTableModel {
@@ -45,14 +44,19 @@
}
public void addTableModelForNode(Class node, AbstractMeasurementTableModel model){
+ MeasurementTable.log.debug("addTableModelForNode: " + node.getSimpleName() + " "
+ + model.getClass().getSimpleName());
tableModelMap.put(node, model);
}
public AbstractMeasurementTableModel getTableModelForNode(Class node){
- if (tableModelMap.containsKey(node))
+ if (tableModelMap.containsKey(node)) {
+ MeasurementTable.log.debug("getTableModelForNode: found TableModel for " + node.getSimpleName());
return tableModelMap.get(node);
- else
+ } else {
+ MeasurementTable.log.debug("getTableModelForNode: empty TableModel for " + node.getSimpleName());
return EMPTY_TABLE_MODEL;
+ }
}
@Override
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java 2007-03-14 19:39:17 UTC (rev 599)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java 2007-03-14 20:18:46 UTC (rev 600)
@@ -10,16 +10,13 @@
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.border.EmptyBorder;
-import javax.swing.table.DefaultTableColumnModel;
-import javax.swing.table.TableColumnModel;
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIBuilder;
import net.sf.magicmap.client.gui.utils.GUIConstants;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.model.measurement.MeasurementTableModel;
-import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
-import net.sf.magicmap.client.model.node.AccessPointSeerNode;
+import net.sf.magicmap.client.model.measurement.ISeenNode;
import net.sf.magicmap.client.model.node.ClientNode;
import net.sf.magicmap.client.model.node.INodeModel;
import net.sf.magicmap.client.model.node.INodeModelSelectionListener;
@@ -37,18 +34,18 @@
*/
private static final long serialVersionUID = 7568742160250506631L;
- private MeasurementTable table;
+ private MeasurementTable measurementTable;
public MeasurementView(INodeModel nodeModel, String name) {
super(GUIUtils.i18n("measurement"));
this.setFrameIcon(GUIBuilder.getToolIcon(GUIConstants.ICON_MEASUREMENT));
- this.table = new MeasurementTable();
- this.table.setDefaultRenderer(SeenAccessPoint.class, new MeasureTableCellRenderer(true));
+ this.measurementTable = new MeasurementTable();
+ this.measurementTable.setDefaultRenderer(ISeenNode.class, new MeasureTableCellRenderer(true));
MeasurementTableModel tableModel = new MeasurementTableModel();
- this.table.addTableModelForNode(ClientNode.class, tableModel);
- this.table.addTableModelForNode(LocationNode.class, tableModel);
+ this.measurementTable.addTableModelForNode(ClientNode.class, tableModel);
+ this.measurementTable.addTableModelForNode(LocationNode.class, tableModel);
setContent(buildViewComponent());
@@ -69,10 +66,10 @@
*/
@Override
protected JComponent buildViewComponent(){
- this.table.setBorder(new EmptyBorder(new Insets(3, 3, 3, 3)));
- this.table.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
+ this.measurementTable.setBorder(new EmptyBorder(new Insets(3, 3, 3, 3)));
+ this.measurementTable.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
- JScrollPane pane = new JScrollPane(this.table);
+ JScrollPane pane = new JScrollPane(this.measurementTable);
return pane;
}
@@ -85,4 +82,9 @@
setTitle(getName());
}
}
+
+
+ public MeasurementTable getMeasurementTable(){
+ return measurementTable;
+ }
}
\ No newline at end of file
Added: trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/ISeenNode.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/ISeenNode.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/ISeenNode.java 2007-03-14 20:18:46 UTC (rev 600)
@@ -0,0 +1,27 @@
+
+package net.sf.magicmap.client.model.measurement;
+
+public interface ISeenNode {
+
+ public static final int SCAN_COUNT = 10;
+
+ public abstract String getMac();
+
+ /**
+ * Wenn AccessPoint nicht sichtbar. Ist ein starker AP nicht sichtbar wird
+ * dies verziehen, bei schwachen werden Nullwerte eingef\xFCgt.
+ *
+ */
+ public abstract void addDeadSignal();
+
+ public abstract void addSignalLevel(double signalLevel);
+
+ public abstract double getAverageSignalLevel();
+
+ public abstract boolean isDead();
+
+ public abstract boolean isTotallyDead();
+
+ public abstract double getLastSignalLevel();
+
+}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/SeenAccessPoint.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/SeenAccessPoint.java 2007-03-14 19:39:17 UTC (rev 599)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/SeenAccessPoint.java 2007-03-14 20:18:46 UTC (rev 600)
@@ -11,10 +11,8 @@
*
* @author thuebner
*/
-public class SeenAccessPoint {
+public class SeenAccessPoint implements ISeenNode {
- public static final int SCAN_COUNT = 10;
-
private double[] signalLevels; // Echter Signallevel (- xxx dB)
private double avgSignalLevel;
private String mac;
@@ -23,9 +21,9 @@
public SeenAccessPoint(String mac, double signalLevel) {
this.mac = mac;
this.deadCounter = 0;
- this.signalLevels = new double[SeenAccessPoint.SCAN_COUNT];
+ this.signalLevels = new double[ISeenNode.SCAN_COUNT];
// Beim initialisieren alle Felder vorbelegen
- for (int i = 0; i < SeenAccessPoint.SCAN_COUNT; i++)
+ for (int i = 0; i < ISeenNode.SCAN_COUNT; i++)
this.signalLevels[i] = signalLevel;
this.avgSignalLevel = signalLevel;
}
@@ -70,12 +68,12 @@
* @param signalLevel
*/
private void addSignalLevelIntern(double signalLevel){
- double[] n = new double[SeenAccessPoint.SCAN_COUNT];
- this.avgSignalLevel -= this.signalLevels[0] / SeenAccessPoint.SCAN_COUNT;
- System.arraycopy(this.signalLevels, 1, n, 0, SeenAccessPoint.SCAN_COUNT - 1);
+ double[] n = new double[ISeenNode.SCAN_COUNT];
+ this.avgSignalLevel -= this.signalLevels[0] / ISeenNode.SCAN_COUNT;
+ System.arraycopy(this.signalLevels, 1, n, 0, ISeenNode.SCAN_COUNT - 1);
this.signalLevels = n;
- this.signalLevels[SeenAccessPoint.SCAN_COUNT - 1] = signalLevel;
- this.avgSignalLevel += this.signalLevels[SeenAccessPoint.SCAN_COUNT - 1] / SeenAccessPoint.SCAN_COUNT;
+ this.signalLevels[ISeenNode.SCAN_COUNT - 1] = signalLevel;
+ this.avgSignalLevel += this.signalLevels[ISeenNode.SCAN_COUNT - 1] / ISeenNode.SCAN_COUNT;
}
public double getAverageSignalLevel(){
@@ -87,11 +85,11 @@
}
public boolean isTotallyDead(){
- return (this.deadCounter >= SeenAccessPoint.SCAN_COUNT);
+ return (this.deadCounter >= ISeenNode.SCAN_COUNT);
}
public double getLastSignalLevel(){
- return this.signalLevels[SeenAccessPoint.SCAN_COUNT - 1];
+ return this.signalLevels[ISeenNode.SCAN_COUNT - 1];
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rad...@us...> - 2007-03-14 19:42:35
|
Revision: 599
http://svn.sourceforge.net/magicmap/?rev=599&view=rev
Author: radetzki09
Date: 2007-03-14 12:39:17 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
corrected the parsing of the MAC-Address for the MacOS.
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/net/MacOSNetworkInfo.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/net/MacOSNetworkInfo.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/net/MacOSNetworkInfo.java 2007-03-09 15:00:34 UTC (rev 598)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/net/MacOSNetworkInfo.java 2007-03-14 19:39:17 UTC (rev 599)
@@ -39,6 +39,9 @@
if (line.startsWith("inet " + localHost)){
line = tokenizer.nextToken().trim();
+ while (!line.startsWith("ether")){
+ line = tokenizer.nextToken().trim();
+ }
String macAddressCandidate = line.substring(line.length() - 17).trim();
if (isMacAddress(macAddressCandidate)) {
lastMacAddress = macAddressCandidate.toUpperCase();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-09 15:00:39
|
Revision: 598
http://svn.sourceforge.net/magicmap/?rev=598&view=rev
Author: flederohr
Date: 2007-03-09 07:00:34 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
moved MeasurementModelClass to AccesssPoinSeerNode as inner class
modified MeasurementTable, make it possible to register TableModels for custom Nodes
updated udpplugin
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/controller/PollHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.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/model/measurement/IMeasurementModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementTableModel.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/INodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java
Added Paths:
-----------
trunk/magicmapclient/plugins/udpplugin-plugin.jar
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/AbstractMeasurementTableModel.java
Removed Paths:
-------------
trunk/magicmapclient/plugins/udpplugin-plugin.jar
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java
Deleted: trunk/magicmapclient/plugins/udpplugin-plugin.jar
===================================================================
(Binary files differ)
Added: trunk/magicmapclient/plugins/udpplugin-plugin.jar
===================================================================
--- trunk/magicmapclient/plugins/udpplugin-plugin.jar (rev 0)
+++ trunk/magicmapclient/plugins/udpplugin-plugin.jar 2007-03-09 15:00:34 UTC (rev 598)
@@ -0,0 +1,83 @@
+PK
+ |
|
From: <Jan...@us...> - 2007-03-09 14:04:54
|
Revision: 597
http://svn.sourceforge.net/magicmap/?rev=597&view=rev
Author: Jan_fride
Date: 2007-03-09 06:04:52 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
Removed InfoObjects
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java
trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutReader.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/TabForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuContainer.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuItem.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/AndFilter.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/FilteredTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ContainerNode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeContainer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/AbstractPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IPluginDescriptor.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginLoader.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginRepository.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/SimplePluginDescriptor.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/LoadPluginsAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/UninstallPluginAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/ArtifactRepositoryTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginDescriptorModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginDialog.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginTableRenderer.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/util/DirWalker.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/util/IPluginVF.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/util/PluginDescriptorReader.java
Removed Paths:
-------------
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/artifact/ArtifactComparator.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -2,7 +2,6 @@
package net.sf.magicmap.artifact;
import java.util.Comparator;
-import java.util.StringTokenizer;
public class ArtifactComparator implements Comparator<IArtifact> {
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -30,7 +30,6 @@
import net.sf.magicmap.client.model.node.ClientNode;
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.INodeModel;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.client.model.node.Node;
import net.sf.magicmap.client.model.node.NodeModel;
import net.sf.magicmap.client.plugin.PluginManager;
@@ -39,7 +38,7 @@
import org.apache.log4j.xml.DOMConfigurator;
/**
- * Kann \xC4nderungen an View und am Modell vornehmen und zieht alle F\xE4den
+ * Kann \xC4nderungen an View und am Modell vornehmen und zieht alle F\xE4den
* der Anwendung.
*
* @author thuebner
@@ -74,8 +73,6 @@
private boolean invisble; // Invisible-Modus (keine Daten an Server)
- // pseudo server items
- private Collection<InfoObject> infoObjects;
private ScannerAllocator scannerAllocator;
private PluginManager pluginManager;
@@ -102,9 +99,6 @@
this.pollhandler = new PollHandler(this);
- // pseudo server items
- this.infoObjects = new ArrayList<InfoObject>();
- // initializeScanner();
}
/**
@@ -453,10 +447,6 @@
this.serverManager.createNewMap(name, URL, imageWidth, imageHeight, width, height, callback);
}
- public Collection<InfoObject> getInfoObjects(){
- return this.infoObjects;
- }
-
public void handleRoundComplete(AbstractScanner scanner){
this.scannerAllocator.handleRoundComplete(scanner);
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -3,10 +3,6 @@
import java.util.Collection;
-import net.sf.magicmap.client.gui.views.ConsoleView;
-import net.sf.magicmap.client.gui.views.MapView;
-import net.sf.magicmap.client.gui.views.MeasurementView;
-import net.sf.magicmap.client.gui.views.OutlineView;
import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
import net.sf.magicmap.client.interfaces.CreatePositionCallback;
import net.sf.magicmap.client.interfaces.DeletePositionCallback;
@@ -24,7 +20,6 @@
import net.sf.magicmap.client.model.node.ClientNode;
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.INodeModel;
-import net.sf.magicmap.client.model.node.InfoObject;
/**
* @author Jan Friderici (ja...@fr...)
@@ -197,14 +192,12 @@
void createNewMap(String name, String URL, int imageWidth, int imageHeight, int width, int height,
CreateNewMapCallback callback);
- Collection<InfoObject> getInfoObjects();
-
void handleRoundComplete(AbstractScanner scanner);
void handleScanResult(AbstractScanResult scanResult, AbstractScanner scanner);
void addScannerHandler(AbstractScannerHandler handler);
-
+
/**
* Initialisiert die Plugins
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -16,7 +16,6 @@
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.GeoPosNode;
import net.sf.magicmap.client.model.node.INodeModel;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.client.model.node.LocationNode;
import net.sf.magicmap.client.model.node.MapNode;
import net.sf.magicmap.client.model.node.Node;
@@ -126,7 +125,7 @@
}
/**
- *
+ *
* @param node a node
* @param nodeModel the model
* @param position the position data
@@ -407,52 +406,4 @@
e.printStackTrace();
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see net.sf.magicmap.client.interfaces.ServerPollerListener#infoObjectCreatedorUpdatedOrDeleted(net.sf.magicmap.client.model.node.InfoObject)
- */
- public void infoObjectCreatedorUpdatedOrDeleted(final InfoObject infoObject){
-
- try {
- SwingUtilities.invokeAndWait(new Runnable() {
-
- public void run(){
- // try {
- // INodeModel nodeModel = controller.getNodeModel();
- // Node node = nodeModel.findNode(infoObject.getUrl());
- //
- // if (node == null) {
- // InfoObjectNode infoNode = new InfoObjectNode(nodeModel);
- // infoNode.setName(infoObject.getUrl());
- // infoNode.setDisplayName(infoObject.getName());
- // infoNode.setId(infoObject.hashCode());
- // String[] tags = infoObject.getUrl().split(",");
- // for (String string : tags) {
- // infoNode.addTag(string);
- // }
- // if
- // (infoObject.getMap().equals(Controller.getInstance().getCurrentMap().name))
- // {
- // nodeModel.addNode(infoNode);
- // infoNode.setFix(true);
- // infoNode.setPosition(infoObject.getX(),
- // infoObject.getY(), 0);
- // }
- // }
- //
- // } catch (Exception e){
- // e.printStackTrace();
- // }
- }
- });
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -29,7 +29,6 @@
import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
import net.sf.magicmap.client.meta.MapInfo;
import net.sf.magicmap.client.model.node.GeoPos;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.client.utils.Settings;
import net.sf.magicmap.client.utils.Version;
import net.sf.magicmap.server.dto.GeoPointDTO;
@@ -319,48 +318,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see net.sf.magicmap.client.controller.ServerManager#createInfoObject(int,
- * int, boolean, net.sf.magicmap.client.model.node.InfoObject,
- * java.lang.String,
- * net.sf.magicmap.client.interfaces.CreatePositionCallback)
- */
- @Override
- public void createInfoObject(final int x, final int y, final int z, final boolean fixed,
- final InfoObject infoObject, final String mapName, final CreatePositionCallback callback){
- if (isConnected()) {
- Thread createInfoObjectThread = new Thread() {
-
- @Override
- public void run(){
- synchronized (SOAPServerManager.mutex) {
- try {
- // SOAPServerManager.this.mapDelegate.createInfoObject(
- // sessionId,
- // mapName,
- // x,
- // y,
- // z,
- // infoObject.getName(),
- // infoObject.getUrl(),
- // infoObject.getType()
- // );
- Controller.getInstance().getInfoObjects().add(infoObject);
- } catch (Exception e) {
- callback.positionCreationError(e);
- }
- }
- }
- };
- createInfoObjectThread.start();
- }
-
- }
-
/**
* Entfernt einen Referenzpunkt oder die Positionierung eines AccessPoints
* oder Clients mit gegebener Id vom Server
@@ -764,31 +723,5 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see net.sf.magicmap.client.controller.ServerManager#fetchInfoPointsFromServer(net.sf.magicmap.client.interfaces.FetchInfoPointsCallback)
- */
- @Override
- public void fetchInfoPointsFromServer(final FetchInfoPointsCallback callback){
- if (isConnected()) {
- Thread fetchInfoPointsThread = new Thread() {
- @Override
- public void run(){
- synchronized (SOAPServerManager.mutex) {
- try {
- // retrieve info points
- Collection infoObjects = Controller.getInstance().getInfoObjects();
- if (infoObjects != null && infoObjects.size() > 0) callback.infoPointsFetched(infoObjects);
- } catch (Exception e) {
- callback.infoPointFetchError(e);
- }
- }
- }
- };
- fetchInfoPointsThread.start();
- }
- }
-
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -28,9 +28,8 @@
import net.sf.magicmap.client.interfaces.ServerConnectCallback;
import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
-import net.sf.magicmap.client.model.node.GeoPos;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.client.model.node.ClientNode;
+import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.server.dto.PositionDTO;
import net.sf.magicmap.server.dto.SignalCharacterDTO;
import net.sf.magicmap.server.dto.SimpleScanResultDTO;
@@ -109,13 +108,13 @@
public abstract void connect(final ServerConnectCallback callback);
/**
- *
+ *
* @param callback
*/
public abstract void disconnect(final ServerDisconnectCallback callback);
/**
- *
+ *
* @param name
* @param URL
* @param width
@@ -126,10 +125,10 @@
final int width, final int height, final CreateNewMapCallback callback);
/**
- * Liefert die eindeutigen Namen der auf dem Server angelegten Karten
+ * Liefert die eindeutigen Namen der auf dem Server angelegten Karten
* zur\xFCck.
* @param callback MapNamesCallback Objekt welches das MapNamesCallback implementiert
- * um die Kartennamen bzw. die
+ * um die Kartennamen bzw. die
*/
public abstract void retrieveMapNames(final MapNamesCallback callback, boolean openDialog);
@@ -157,19 +156,9 @@
public abstract void createGeoPos(final int x, final int y, final boolean fixed, final GeoPos geoPos,
final String name, final CreatePositionCallback callback);
- /**
- * @param x
- * @param y
- * @param fixed
- * @param infoObject
- * @param mapName
- * @param callback
- */
- public abstract void createInfoObject(final int x, final int y, final int z, final boolean fixed,
- final InfoObject infoObject, final String mapName, final CreatePositionCallback callback);
/**
- * Entfernt einen Referenzpunkt oder die Positionierung eines
+ * Entfernt einen Referenzpunkt oder die Positionierung eines
* AccessPoints oder Clients mit gegebener Id vom Server
* @param node
* @param callback
@@ -178,7 +167,7 @@
final DeletePositionCallback callback);
/**
- * Bewegt einen Referenzpunkt oder die Positionierung eines
+ * Bewegt einen Referenzpunkt oder die Positionierung eines
* AccessPoints oder Clients mit gegebener Id vom Server
* @param node
* @param callback
@@ -206,7 +195,7 @@
final String accessPointMac, final PositionCallback callback);
/**
- * Setzt den Berechnungsstatus des Accesspoint
+ * Setzt den Berechnungsstatus des Accesspoint
* @param sessionId
* @param mapName
* @param accessPointMac
@@ -222,7 +211,6 @@
public abstract void fetchMapsFromServer(final FetchMapsCallback callback);
- public abstract void fetchInfoPointsFromServer(final FetchInfoPointsCallback poller);
/* (non-Javadoc)
* @see net.sf.magicmap.client.interfaces.ServerPollerListener#positionCreatedOrUpdatedOrDeleted(java.lang.String, long, net.sf.magicmap.client.delegate.dto.PositionDTO)
@@ -241,7 +229,7 @@
public abstract void deleteGeoPoint(long id, String string, DeletePositionCallback callback);
// /**
- // * Load new map
+ // * Load new map
// * @param info
// */
// public abstract void loadMap(MapInfo info);
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -13,7 +13,6 @@
import net.sf.magicmap.client.interfaces.FetchInfoPointsCallback;
import net.sf.magicmap.client.interfaces.FetchPositionsCallback;
import net.sf.magicmap.client.interfaces.ServerPollerListener;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.client.utils.Settings;
import net.sf.magicmap.server.dto.GeoPointDTO;
import net.sf.magicmap.server.dto.MapDTO;
@@ -25,7 +24,7 @@
* oder vom Anwender erzeugte Referenzpunkte.
* @author thuebner
*/
-public class ServerPoller implements FetchPositionsCallback, FetchGeoPointsCallback, FetchInfoPointsCallback {
+public class ServerPoller implements FetchPositionsCallback, FetchGeoPointsCallback {
private static String syncObj = "TEST";
@@ -66,7 +65,6 @@
ServerPoller.this.serverManager.fetchPositionsFromServer(ServerPoller.this);
// ServerPoller.this.serverManager.fetchGeoPointsFromServer(ServerPoller.this);
// ServerPoller.this.serverManager.fetchMapsFromServer(ServerPoller.this);
- ServerPoller.this.serverManager.fetchInfoPointsFromServer(ServerPoller.this);
ServerPoller.this.serverManager.submitClientInfo();
}
}
@@ -125,20 +123,8 @@
}
- /* (non-Javadoc)
- * @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#infoPointsFetched(java.util.Collection)
- */
- public void infoPointsFetched(Collection infoObjects){
- Iterator infoIterator = infoObjects.iterator();
- while (infoIterator.hasNext())
- this.listener.infoObjectCreatedorUpdatedOrDeleted((InfoObject) infoIterator.next());
- synchronized (ServerPoller.syncObj) {
- this.isFetching = false;
- }
- }
-
/**
* Wird aufgerufen wenn beim \xDCbermitteln der Position irgendwelche Fehler auftreten.
* @see net.sf.magicmap.client.interfaces.FetchPositionsCallback#positionFetchError(java.lang.Exception)
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -23,7 +23,6 @@
import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
import net.sf.magicmap.client.meta.MapInfo;
import net.sf.magicmap.client.model.node.GeoPos;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.client.utils.Settings;
import net.sf.magicmap.client.utils.Version;
import net.sf.magicmap.server.Init;
@@ -39,7 +38,7 @@
/**
* @author thuebner
- *
+ *
*/
public class VirtualServerManager extends ServerManager {
@@ -69,7 +68,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#resetTimestamp()
*/
public void resetTimestamp(){
@@ -78,7 +77,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#isConnected()
*/
public boolean isConnected(){
@@ -87,7 +86,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#connect(net.sf.magicmap.client.interfaces.ServerConnectCallback)
*/
public void connect(ServerConnectCallback callback){
@@ -116,7 +115,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#disconnect(net.sf.magicmap.client.interfaces.ServerDisconnectCallback)
*/
public void disconnect(ServerDisconnectCallback callback){
@@ -128,7 +127,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#createNewMap(java.lang.String,
* java.lang.String, int, int,
* net.sf.magicmap.client.interfaces.CreateNewMapCallback)
@@ -163,7 +162,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#retrieveMapNames(net.sf.magicmap.client.interfaces.MapNamesCallback)
*/
public void retrieveMapNames(final MapNamesCallback callback, final boolean openDialog){
@@ -199,7 +198,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#retrieveMap(java.lang.String,
* net.sf.magicmap.client.interfaces.MapCallback)
*/
@@ -223,7 +222,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#createLocation(int,
* int, boolean, java.lang.String,
* net.sf.magicmap.client.interfaces.CreatePositionCallback)
@@ -253,7 +252,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#createGeoPos(int,
* int, boolean, net.sf.magicmap.client.model.node.GeoPos,
* java.lang.String,
@@ -285,7 +284,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#deletePosition(long,
* net.sf.magicmap.client.interfaces.DeletePositionCallback)
*/
@@ -312,7 +311,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#movePosition(long,
* int, int, boolean,
* net.sf.magicmap.client.interfaces.MovePositionCallback)
@@ -340,7 +339,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#setClientPosition(int,
* int, boolean, java.lang.String,
* net.sf.magicmap.client.interfaces.PositionCallback)
@@ -370,7 +369,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#setAccessPointPosition(int,
* int, boolean, java.lang.String,
* net.sf.magicmap.client.interfaces.PositionCallback)
@@ -399,7 +398,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#setAccessPointHiddenStatus(long,
* java.lang.String, java.lang.String, boolean,
* net.sf.magicmap.client.interfaces.PositionCallback)
@@ -428,7 +427,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#fetchPositionsFromServer(net.sf.magicmap.client.interfaces.FetchPositionsCallback)
*/
public void fetchPositionsFromServer(final FetchPositionsCallback callback){
@@ -463,7 +462,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#positionCreatedOrUpdatedOrDeleted(java.lang.String,
* long, net.sf.magicmap.server.dto.PositionDTO)
*/
@@ -474,7 +473,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#submitClientInfo()
*/
public void submitClientInfo(){
@@ -516,7 +515,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#reloadMap()
*/
public void reloadMap(){
@@ -530,7 +529,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#closeMap()
*/
public void closeMap(){
@@ -540,39 +539,7 @@
/*
* (non-Javadoc)
- *
- * @see net.sf.magicmap.client.controller.ServerManager#createInfoObject(int,
- * int, boolean, net.sf.magicmap.client.model.node.InfoObject,
- * java.lang.String,
- * net.sf.magicmap.client.interfaces.CreatePositionCallback)
- */
- @Override
- public void createInfoObject(final int x, final int y, final int z, boolean fixed, final InfoObject infoObject,
- final String mapName, final CreatePositionCallback callback){
- if (isConnected()) {
-
- Thread createInfoObjectThread = new Thread() {
-
- public void run(){
- // synchronized (mutex){
- // try{
- // Controller.getInstance().getInfoObjects().add(new InfoObject(infoObject.getName(), infoObject.getUrl(), infoObject.getType(), x, y, mapName));
- // //TODO: Infoobjecte im Server implementieren
- // mapFacade.createInfoObject(sessionId, mapName, x, y, z, infoObject.getName(), infoObject.getUrl(),
- // infoObject.getType());
- // } catch (Exception e){
- // callback.positionCreationError(e);
- // }
- // }
- }
- };
- createInfoObjectThread.start();
- }
- }
-
- /*
- * (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#deleteGeoPoint(long,
* java.lang.String,
* net.sf.magicmap.client.interfaces.DeletePositionCallback)
@@ -600,7 +567,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#fetchGeoPointsFromServer(net.sf.magicmap.client.interfaces.FetchGeoPointsCallback)
*/
@Override
@@ -630,7 +597,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see net.sf.magicmap.client.controller.ServerManager#fetchMapsFromServer(net.sf.magicmap.client.interfaces.FetchMapsCallback)
*/
@Override
@@ -658,32 +625,4 @@
fetchMapsThread.start();
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see net.sf.magicmap.client.controller.ServerManager#fetchInfoPointsFromServer(net.sf.magicmap.client.interfaces.FetchInfoPointsCallback)
- */
- @Override
- public void fetchInfoPointsFromServer(final FetchInfoPointsCallback callback){
- if (isConnected()) {
- Thread fetchInfoPointsThread = new Thread() {
-
- public void run(){
- synchronized (mutex) {
- try {
- // retrieve info points
- Collection infoObjects = Controller.getInstance().getInfoObjects();
- if (infoObjects != null && infoObjects.size() > 0) {
- callback.infoPointsFetched(infoObjects);
- }
- } catch (Exception e) {
- callback.infoPointFetchError(e);
- }
- }
- }
- };
- fetchInfoPointsThread.start();
- }
- }
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -15,7 +15,6 @@
import java.util.Comparator;
import java.util.Vector;
-import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JButton;
@@ -27,7 +26,6 @@
import javax.swing.border.EtchedBorder;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.tree.DefaultMutableTreeNode;
import net.sf.magicmap.client.controller.Controller;
import net.sf.magicmap.client.gui.utils.GUIUtils;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,8 +1,6 @@
package net.sf.magicmap.client.gui.forms;
import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
import javax.swing.JComponent;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractForm.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractForm.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,8 +1,11 @@
package net.sf.magicmap.client.gui.forms;
-import javax.swing.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import javax.swing.JComponent;
+
/**
* Created by IntelliJ IDEA.
* User: Jan
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutForm.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutForm.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,8 +1,6 @@
package net.sf.magicmap.client.gui.forms;
-import javax.swing.*;
-
import javax.swing.JComponent;
import javax.swing.border.Border;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutReader.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutReader.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/FormLayoutReader.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,19 +1,21 @@
package net.sf.magicmap.client.gui.forms;
-import com.jgoodies.forms.layout.CellConstraints;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.Node;
-import org.dom4j.io.SAXReader;
-
-import javax.swing.*;
import java.beans.Statement;
import java.net.URL;
import java.util.Enumeration;
import java.util.List;
import java.util.ResourceBundle;
+import javax.swing.JComponent;
+
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.Node;
+import org.dom4j.io.SAXReader;
+
+import com.jgoodies.forms.layout.CellConstraints;
+
/**
*/
public class FormLayoutReader {
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/TabForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/TabForm.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/TabForm.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,9 +1,9 @@
package net.sf.magicmap.client.gui.forms;
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JTabbedPane;
import javax.swing.border.Border;
-import java.util.TreeSet;
-import java.util.Collection;
/**
* Created by IntelliJ IDEA.
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -2,9 +2,6 @@
package net.sf.magicmap.client.gui.forms;
import javax.swing.JComponent;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.PlainDocument;
-import javax.swing.text.SimpleAttributeSet;
/**
* A userinterface is an object that can display its attributes.
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,7 +1,7 @@
package net.sf.magicmap.client.gui.utils;
+import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
-import javax.swing.text.BadLocationException;
/**
* Created by IntelliJ IDEA.
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIBuilder.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -5,7 +5,6 @@
package net.sf.magicmap.client.gui.utils;
import java.awt.Dimension;
-import java.awt.MediaTracker;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.io.IOException;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -8,8 +8,6 @@
import javax.swing.Icon;
import javax.swing.ImageIcon;
-import net.sf.magicmap.client.gui.MainGUI;
-import net.sf.magicmap.client.gui.views.MapView;
import net.sf.magicmap.client.model.node.INodeModel;
import net.sf.magicmap.client.model.node.LocationNode;
import net.sf.magicmap.client.model.node.Node;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/VisualList.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,20 +1,29 @@
package net.sf.magicmap.client.gui.utils;
-import net.sf.magicmap.client.gui.forms.UserInterface;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
-import javax.swing.*;
-import javax.swing.event.ListDataListener;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.ListModel;
import javax.swing.event.EventListenerList;
import javax.swing.event.ListDataEvent;
-import java.util.*;
-import java.util.List;
-import java.awt.*;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
+import javax.swing.event.ListDataListener;
+import net.sf.magicmap.client.gui.forms.UserInterface;
+
import com.jgoodies.forms.builder.PanelBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
-import com.jgoodies.forms.layout.CellConstraints;
/**
* Created by IntelliJ IDEA.
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuContainer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuContainer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuContainer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,14 @@
package net.sf.magicmap.client.gui.utils.menu;
-import net.sf.magicmap.client.model.node.Node;
-
-import javax.swing.*;
+import java.util.HashSet;
+import java.util.LinkedList;
import java.util.List;
-import java.util.LinkedList;
import java.util.Set;
-import java.util.HashSet;
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+
/**
* Class ${class}
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuItem.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuItem.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/menu/NodeMenuItem.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,6 +1,6 @@
package net.sf.magicmap.client.gui.utils.menu;
-import javax.swing.*;
+import javax.swing.JMenuItem;
/**
* Class ${class}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/AndFilter.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/AndFilter.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/AndFilter.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,6 +1,8 @@
package net.sf.magicmap.client.gui.utils.table;
-import java.util.*;
+import java.util.Collections;
+import java.util.Set;
+import java.util.TreeSet;
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/FilteredTableModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/FilteredTableModel.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/table/FilteredTableModel.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,15 +1,19 @@
package net.sf.magicmap.client.gui.utils.table;
-import javax.swing.table.TableModel;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.event.TableModelListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.*;
import java.util.LinkedList;
import java.util.Set;
import java.util.TreeSet;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTable;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableModel;
+
/**
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasureTableCellRenderer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,21 @@
package net.sf.magicmap.client.gui.views;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.GradientPaint;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.UIManager;
+import javax.swing.table.TableCellRenderer;
+
import net.sf.magicmap.client.measurement.Constants;
import net.sf.magicmap.client.measurement.MeasurementUtils;
import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
-import javax.swing.*;
-import javax.swing.table.TableCellRenderer;
-import java.awt.*;
-
/**
*
* @author Jan Friderici, thuebner
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementTable.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,13 @@
package net.sf.magicmap.client.gui.views;
+import javax.swing.JTable;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+
import net.sf.magicmap.client.model.measurement.IMeasurementModel;
import net.sf.magicmap.client.model.measurement.MeasurementTableModel;
-import javax.swing.*;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableModel;
-
public class MeasurementTable extends JTable {
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/MeasurementView.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -4,6 +4,13 @@
package net.sf.magicmap.client.gui.views;
+import java.awt.Insets;
+
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.border.EmptyBorder;
+
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIBuilder;
import net.sf.magicmap.client.gui.utils.GUIConstants;
@@ -11,12 +18,12 @@
import net.sf.magicmap.client.model.measurement.IMeasurementModel;
import net.sf.magicmap.client.model.measurement.MeasurementTableModel;
import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
-import net.sf.magicmap.client.model.node.*;
+import net.sf.magicmap.client.model.node.AccessPointSeerNode;
+import net.sf.magicmap.client.model.node.INodeModel;
+import net.sf.magicmap.client.model.node.INodeModelSelectionListener;
+import net.sf.magicmap.client.model.node.Node;
+import net.sf.magicmap.client.model.node.NodeModelSelectionEvent;
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
-
/**
* @author thuebner
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/View.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -6,9 +6,10 @@
import javax.swing.JComponent;
-import com.jgoodies.uif_lite.panel.SimpleInternalFrame;
import net.sf.magicmap.client.gui.utils.menu.NodeMenuContainer;
+import com.jgoodies.uif_lite.panel.SimpleInternalFrame;
+
/**
* Beliebiger View im PACW Client. Ein View greift auf ein Modell
* zu und stellt es dar. Benutzerinteraktionen werden \xFCber einen
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/MeasurementModelListener.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -4,11 +4,11 @@
package net.sf.magicmap.client.interfaces;
+import java.util.EventListener;
+
import net.sf.magicmap.client.model.measurement.SeenAccessPoint;
import net.sf.magicmap.client.model.node.AccessPointSeerNode;
-import java.util.EventListener;
-
/**
* @author thuebner
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -4,7 +4,6 @@
package net.sf.magicmap.client.interfaces;
-import net.sf.magicmap.client.model.node.InfoObject;
import net.sf.magicmap.server.dto.GeoPointDTO;
import net.sf.magicmap.server.dto.MapDTO;
import net.sf.magicmap.server.dto.PositionDTO;
@@ -28,14 +27,14 @@
MapException, SessionException;
public void deletePosition(long sessionId, long positionId) throws RemoteException, MapException, SessionException;
-
+
public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws RemoteException;
*/
public void positionCreatedOrUpdatedOrDeleted(PositionDTO position);
/**
- *
+ *
* @param mapDTO
*/
public void mapCreatedOrUpdatedOrDeleted(MapDTO mapDTO);
@@ -45,9 +44,4 @@
*/
public void geoPosCreatedOrUpdatedOrDeleted(GeoPointDTO pointDTO);
- /**
- * @param infoObject
- */
- public void infoObjectCreatedorUpdatedOrDeleted(InfoObject infoObject);
-
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/INodePlacer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,12 +1,12 @@
package net.sf.magicmap.client.model.location;
+import java.util.HashMap;
+
import net.sf.magicmap.client.algorithms.NodeMetricManager;
import net.sf.magicmap.client.model.node.IMagicEdge;
import net.sf.magicmap.client.model.node.Node;
-import java.util.HashMap;
-
/**
* Berechnet die Orte von Knoten. Um einem Model ein INodePlacer hinzuzfügen
* muss man nur
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,9 +1,9 @@
package net.sf.magicmap.client.model.location.jung;
+import net.sf.magicmap.client.model.node.IMagicEdge;
+import net.sf.magicmap.client.model.node.Node;
import edu.uci.ics.jung.graph.Vertex;
import edu.uci.ics.jung.graph.impl.DirectedSparseEdge;
-import net.sf.magicmap.client.model.node.IMagicEdge;
-import net.sf.magicmap.client.model.node.Node;
public class JungEdge extends DirectedSparseEdge implements IMagicEdge{
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,4 +1,4 @@
-
+
package net.sf.magicmap.client.model.location.jung;
import java.awt.Dimension;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ContainerNode.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ContainerNode.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/ContainerNode.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,12 +1,9 @@
package net.sf.magicmap.client.model.node;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import net.sf.magicmap.client.model.node.NodeContainer.Impl;
-
public abstract class ContainerNode extends Node implements NodeContainer {
private final NodeContainer.Impl container;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,13 @@
package net.sf.magicmap.client.model.node;
+import java.util.ArrayList;
+import java.util.Collection;
+
import net.sf.magicmap.client.interfaces.NodeModelListener;
import net.sf.magicmap.client.meta.MapInfo;
import net.sf.magicmap.client.model.location.INodePlacer;
-import java.util.ArrayList;
-import java.util.Collection;
-
/**
* Das NodeModel enth\xE4lt eine Menge von Knoten. Die Bestimmung der Position
* wird von einem anderen Objekt \xFCbernommen. Die Standart Positionsbestimmung
Deleted: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,78 +0,0 @@
-/**
- *
- */
-
-package net.sf.magicmap.client.model.node;
-
-
-/**
- *
- * @author Johannes Zapotoczky (joh...@za...)
- * @author Jan Friderici
- *
- */
-public interface InfoObject {
-
- /**
- * the url this info points to.
- * @return
- */
- String getInfoUrl();
-
- /**
- *
- * @return an url to an webservice.
- */
- String getServiceUrl();
-
- /**
- * The infoobjects type.
- * text/html
- * @return
- */
- String getInfoType();
-
- /**
- * usually the shortcut icon.
- *
- * @return the url to a smale image.
- */
- String getDepiction();
-
- /**
- * a Description of the info.
- *
- * @return
- */
- String getDescription();
-
- /**
- * the title of the infoobject.
- *
- * @return a title or "<notitle>"
- */
- String getInfoTitle();
-
- /**
- * the last update of this object
- *
- * @return the milliseconds
- */
- long getLastUpdate();
-
- /**
- *
- * @return
- */
- long getCreationTime();
-
- /**
- *
- * @return
- */
- State getState();
-
- public enum State{
- CREATED, LOADED, INVALID;
- }
-}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeContainer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeContainer.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeContainer.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -6,7 +6,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
-import java.util.TreeSet;
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -6,7 +6,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/AbstractPlugin.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/AbstractPlugin.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/AbstractPlugin.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,14 +1,15 @@
package net.sf.magicmap.client.plugin;
+import java.awt.Component;
+
+import javax.swing.JFrame;
+
import net.sf.magicmap.artifact.ArtifactComparator;
import net.sf.magicmap.artifact.IArtifact;
import net.sf.magicmap.client.controller.IController;
import net.sf.magicmap.client.utils.Settings;
-import javax.swing.*;
-import java.awt.*;
-
/**
* Eine Klasse die das Implementieren von Plugins erleichtert.
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IPluginDescriptor.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IPluginDescriptor.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IPluginDescriptor.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,12 +1,12 @@
package net.sf.magicmap.client.plugin;
+import java.util.ArrayList;
+import java.util.Collection;
+
import net.sf.magicmap.artifact.IArtifact;
import net.sf.magicmap.artifact.IVendor;
-import java.util.ArrayList;
-import java.util.Collection;
-
/**
*
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginLoader.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginLoader.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginLoader.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,9 +1,6 @@
package net.sf.magicmap.client.plugin;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.lang.reflect.Constructor;
import java.net.JarURLConnection;
import java.net.URL;
@@ -12,6 +9,9 @@
import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Created by IntelliJ IDEA.
*/
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginRepository.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginRepository.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginRepository.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,23 +1,24 @@
package net.sf.magicmap.client.plugin;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
import net.sf.magicmap.artifact.Artifact;
import net.sf.magicmap.artifact.ArtifactTools;
import net.sf.magicmap.artifact.IArtifact;
import net.sf.magicmap.client.plugin.util.PluginDescriptorReader;
import net.sf.magicmap.client.utils.HtmlSaxParser;
+
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Node;
import org.dom4j.io.SAXReader;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
/**
*
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/SimplePluginDescriptor.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/SimplePluginDescriptor.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/SimplePluginDescriptor.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,14 +1,18 @@
package net.sf.magicmap.client.plugin;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+
import net.sf.magicmap.artifact.ArtifactComparator;
import net.sf.magicmap.artifact.IArtifact;
import net.sf.magicmap.artifact.IVendor;
import net.sf.magicmap.artifact.Version;
import net.sf.magicmap.client.plugin.util.OperatingSystemInfo;
-import java.util.*;
-
/**
* Beschreibt ein Plugin. Eine immutable Klasse.
* @author jan_fride
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java 2007-03-09 09:37:11 UTC (rev 596)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java 2007-03-09 14:04:52 UTC (rev 597)
@@ -1,13 +1,13 @@
package net.sf.magicmap.client.plugin.action;
-import net.sf.magicmap.client.gui.utils.GUIConstants;
-import net.sf.magicmap.client.gui.utils.MagicAction;
-
import java.awt.event.ActionEvent;
import java.awt.event.I...
[truncated message content] |
|
From: <Jan...@us...> - 2007-03-09 09:37:39
|
Revision: 596
http://svn.sourceforge.net/magicmap/?rev=596&view=rev
Author: Jan_fride
Date: 2007-03-09 01:37:11 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
Added task to copy jar into local maven repository.
Modified Paths:
--------------
trunk/magicmapclient/build.xml
Modified: trunk/magicmapclient/build.xml
===================================================================
--- trunk/magicmapclient/build.xml 2007-03-07 23:37:34 UTC (rev 595)
+++ trunk/magicmapclient/build.xml 2007-03-09 09:37:11 UTC (rev 596)
@@ -6,8 +6,11 @@
<property name="jar.name" value="${application}.jar" />
<property name="main.class" value="net.sf.magicmap.client.core.MagicMapApplication" />
+ <!-- Setting for maven path-->
+ <property name="maven.home" value="D:\_development\_Tools\maven-2.0.5"/>
+
<property name="server" value="../magicmapserver" />
<property name="build" value="build" />
<property name="build-test" value="build-test" />
@@ -148,4 +151,15 @@
</copy>
</target>
+ <!-- Setting for maven path must be checked.-->
+ <target name="maven-install">
+ <exec executable="${maven.home}/bin/mvn.bat">
+ <arg value="install:install-file"/>
+ <arg value="-Dfile=magicmap.jar"/>
+ <arg value="-DgroupId=net.sf.magicmap"/>
+ <arg value="-DartifactId=magicmapclient"/>
+ <arg value="-Dversion=${version.number}"/>
+ <arg value="-Dpackaging=jar"/>
+ </exec>
+ </target>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-07 23:37:58
|
Revision: 595
http://svn.sourceforge.net/magicmap/?rev=595&view=rev
Author: flederohr
Date: 2007-03-07 15:37:34 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
header and uninstall-icon for the installer
Modified Paths:
--------------
trunk/magicmapclient/MagicMapSetup.nsi
Added Paths:
-----------
trunk/magicmapclient/MagicMap_InstallHeader.bmp
trunk/magicmapclient/MagicMap_Uninst.ico
Modified: trunk/magicmapclient/MagicMapSetup.nsi
===================================================================
--- trunk/magicmapclient/MagicMapSetup.nsi 2007-03-04 17:28:09 UTC (rev 594)
+++ trunk/magicmapclient/MagicMapSetup.nsi 2007-03-07 23:37:34 UTC (rev 595)
@@ -36,8 +36,11 @@
;Interface Settings
!define MUI_HEADERIMAGE
- !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp" ; optional
+ !define MUI_HEADERIMAGE_BITMAP "MagicMap_InstallHeader.bmp"
+ !define MUI_ICON "MagicMap.ico"
+ !define MUI_UNICON "MagicMap_Uninst.ico"
!define MUI_ABORTWARNING
+
;--------------------------------
;Pages
@@ -78,7 +81,6 @@
;ADD YOUR OWN FILES HERE...
File LICENSE.txt
File magicmap.jar
- File magicmap-splash.png
File MagicMap.ico
File /r /x .svn lib
File /oname=lib\magicmap-server.jar "..\magicmapserver\dist\magicmap-server.jar"
@@ -140,7 +142,6 @@
Delete "$INSTDIR\lib\*.*"
Delete "$INSTDIR\MagicMap.ico"
Delete "$INSTDIR\magicmap.jar"
- Delete "$INSTDIR\magicmap-splash.png"
; Delete "$INSTDIR\start.bat"
; Delete "$INSTDIR\start_nightly.bat"
Delete "$INSTDIR\LICENSE.txt"
Added: trunk/magicmapclient/MagicMap_InstallHeader.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/magicmapclient/MagicMap_InstallHeader.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/magicmapclient/MagicMap_Uninst.ico
===================================================================
(Binary files differ)
Property changes on: trunk/magicmapclient/MagicMap_Uninst.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jan...@us...> - 2007-03-04 17:28:34
|
Revision: 594
http://svn.sourceforge.net/magicmap/?rev=594&view=rev
Author: Jan_fride
Date: 2007-03-04 09:28:09 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
new things.
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java 2007-03-02 21:29:04 UTC (rev 593)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/InfoObject.java 2007-03-04 17:28:09 UTC (rev 594)
@@ -1,12 +1,12 @@
/**
- *
+ *
*/
package net.sf.magicmap.client.model.node;
-import java.util.Set;
/**
+ *
* @author Johannes Zapotoczky (joh...@za...)
* @author Jan Friderici
*
@@ -20,7 +20,7 @@
String getInfoUrl();
/**
- *
+ *
* @return an url to an webservice.
*/
String getServiceUrl();
@@ -34,22 +34,45 @@
/**
* usually the shortcut icon.
- *
+ *
* @return the url to a smale image.
*/
String getDepiction();
/**
* a Description of the info.
- *
+ *
* @return
*/
String getDescription();
/**
* the title of the infoobject.
- *
+ *
* @return a title or "<notitle>"
*/
String getInfoTitle();
+
+ /**
+ * the last update of this object
+ *
+ * @return the milliseconds
+ */
+ long getLastUpdate();
+
+ /**
+ *
+ * @return
+ */
+ long getCreationTime();
+
+ /**
+ *
+ * @return
+ */
+ State getState();
+
+ public enum State{
+ CREATED, LOADED, INVALID;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jan...@us...> - 2007-03-02 21:29:07
|
Revision: 593
http://svn.sourceforge.net/magicmap/?rev=593&view=rev
Author: Jan_fride
Date: 2007-03-02 13:29:04 -0800 (Fri, 02 Mar 2007)
Log Message:
-----------
Added constants for views
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java 2007-03-02 21:27:14 UTC (rev 592)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java 2007-03-02 21:29:04 UTC (rev 593)
@@ -46,6 +46,10 @@
private NodeIcons nodeIcons;
private MainFrame mainFrame;
+
+ public static final String VIEW_KEY_MAP_VIEW = "mapView";
+ public static final String VIEW_KEY_MAP_PANEL = "mapPanel";
+
/**
* Erzeugt Hauptfenster der Anwendung.
* Private constructor, only used by getInstance() to fulfill singleton pattern
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jan...@us...> - 2007-03-02 21:27:15
|
Revision: 592
http://svn.sourceforge.net/magicmap/?rev=592&view=rev
Author: Jan_fride
Date: 2007-03-02 13:27:14 -0800 (Fri, 02 Mar 2007)
Log Message:
-----------
removed the attributes String[] method.
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java 2007-03-02 21:22:09 UTC (rev 591)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UserInterface.java 2007-03-02 21:27:14 UTC (rev 592)
@@ -2,13 +2,20 @@
package net.sf.magicmap.client.gui.forms;
import javax.swing.JComponent;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.PlainDocument;
+import javax.swing.text.SimpleAttributeSet;
/**
* A userinterface is an object that can display its attributes.
+ * Attributes are diplayable properties.
*
*/
public interface UserInterface {
+
+
+
/**
* Returns a visual proxy for the given attribute.
*
@@ -19,10 +26,4 @@
*/
public abstract JComponent visualProxy(String attributeName, JComponent parent) throws IllegalArgumentException;
- /**
- *
- * @return
- */
- public String[] getAttributeNames();
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jan...@us...> - 2007-03-02 21:22:11
|
Revision: 591
http://svn.sourceforge.net/magicmap/?rev=591&view=rev
Author: Jan_fride
Date: 2007-03-02 13:22:09 -0800 (Fri, 02 Mar 2007)
Log Message:
-----------
Helper class fpr Swing text documents
Added Paths:
-----------
trunk/magicmapclient/src/net/sf/magicmap/client/utils/DocumentAdapter.java
Added: trunk/magicmapclient/src/net/sf/magicmap/client/utils/DocumentAdapter.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/utils/DocumentAdapter.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/utils/DocumentAdapter.java 2007-03-02 21:22:09 UTC (rev 591)
@@ -0,0 +1,65 @@
+package net.sf.magicmap.client.utils;
+
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.JTextComponent;
+import javax.swing.text.SimpleAttributeSet;
+
+
+/**
+ *
+ * @author Jan Friderici
+ *
+ */
+public abstract class DocumentAdapter implements DocumentListener {
+
+ private final Document document;
+
+ public DocumentAdapter(Document document){
+ this.document = document;
+ document.addDocumentListener(this);
+ }
+
+ public DocumentAdapter(JTextComponent component){
+ this(component.getDocument());
+ }
+
+ public void changedUpdate(DocumentEvent e){
+ handleChange(getDocumentContents());
+ }
+
+ public void insertUpdate(DocumentEvent e){
+ handleChange(getDocumentContents());
+ }
+
+ public void removeUpdate(DocumentEvent e){
+ handleChange(getDocumentContents());
+ }
+ /**
+ * to implement
+ * @param text
+ */
+ public abstract void handleChange(String text);
+
+ public final String getDocumentContents(){
+ try {
+ return document.getText(0, document.getLength());
+ } catch (BadLocationException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ public final synchronized void setDocumentContents(String contents){
+ document.removeDocumentListener(this);
+ try {
+ document.remove(0, document.getLength());
+ document.insertString(0, contents, SimpleAttributeSet.EMPTY);
+ } catch (BadLocationException e) {
+ throw new IllegalStateException(e);
+ }finally{
+ document.addDocumentListener(this);
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jan...@us...> - 2007-03-02 21:18:28
|
Revision: 590
http://svn.sourceforge.net/magicmap/?rev=590&view=rev
Author: Jan_fride
Date: 2007-03-02 13:18:24 -0800 (Fri, 02 Mar 2007)
Log Message:
-----------
private memebers possible
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java 2007-03-02 20:55:13 UTC (rev 589)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java 2007-03-02 21:18:24 UTC (rev 590)
@@ -15,31 +15,20 @@
*/
public abstract class AbstractAttributeForm<T extends UserInterface> {
- private final Map<String, Field> uiAttributeMap = new HashMap<String, Field>();
+
public AbstractAttributeForm() {
super();
- getAttributes();
}
- private void getAttributes() {
- Field[] fields = this.getClass().getDeclaredFields();
- for (Field field: fields){
- if (field.isAnnotationPresent(UIAttribute.class)){
- String attributeName = field.getAnnotation(UIAttribute.class).name();
- uiAttributeMap.put(attributeName, field);
- }
- }
- }
-
/**
*
* @param model
* @return
*/
public final JComponent attattch(T model) {
- initComponents(model);
+ initComponents(this, model);
return doAttattch(model);
}
@@ -52,22 +41,25 @@
* @param model the model containing the attributes.
* @throws IllegalArgumentException if an annotated field is not accessable.
*/
- private void initComponents(UserInterface model) throws IllegalArgumentException {
- for (String attributeName: uiAttributeMap.keySet()){
+ private void initComponents(Object object, UserInterface model) throws IllegalArgumentException {
+ Field[] fields = object.getClass().getDeclaredFields();
+ for (Field field: fields){
+ if (field.isAnnotationPresent(UIAttribute.class)){
+ String attributeName = field.getAnnotation(UIAttribute.class).name();
+ Class fieldClass = field.getType();
- Field field = uiAttributeMap.get(attributeName);
- Class fieldClass = field.getType();
-
- JComponent component = model.visualProxy(attributeName, null);
- Class<? extends JComponent> componentClass = component.getClass();
- if (fieldClass.isAssignableFrom(componentClass)){
- try {
- field.set(this, component);
- } catch (IllegalAccessException e) {
- e.printStackTrace();
+ JComponent component = model.visualProxy(attributeName, null);
+ Class<? extends JComponent> componentClass = component.getClass();
+ if (fieldClass.isAssignableFrom(componentClass)){
+ try {
+ field.setAccessible(true);
+ field.set(object, component);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
}
+ else throw new IllegalArgumentException("Form und Userinteface classes incompatible: " + fieldClass + " - " + componentClass);
}
- else throw new IllegalArgumentException("Form und Userinteface classes incompatible: " + fieldClass + " - " + componentClass);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jan...@us...> - 2007-03-02 20:55:37
|
Revision: 589
http://svn.sourceforge.net/magicmap/?rev=589&view=rev
Author: Jan_fride
Date: 2007-03-02 12:55:13 -0800 (Fri, 02 Mar 2007)
Log Message:
-----------
Helper for Guibuilding
Added Paths:
-----------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UIAttribute.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UIAttributeContainer.java
Added: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/AbstractAttributeForm.java 2007-03-02 20:55:13 UTC (rev 589)
@@ -0,0 +1,75 @@
+package net.sf.magicmap.client.gui.forms;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.JComponent;
+
+/**
+ * A form that uses annotations to get the visual proxies
+ * from a user interface.
+ *
+ * @author Jan Friderici
+ *
+ */
+public abstract class AbstractAttributeForm<T extends UserInterface> {
+
+ private final Map<String, Field> uiAttributeMap = new HashMap<String, Field>();
+
+ public AbstractAttributeForm() {
+ super();
+ getAttributes();
+ }
+
+ private void getAttributes() {
+ Field[] fields = this.getClass().getDeclaredFields();
+ for (Field field: fields){
+ if (field.isAnnotationPresent(UIAttribute.class)){
+ String attributeName = field.getAnnotation(UIAttribute.class).name();
+ uiAttributeMap.put(attributeName, field);
+ }
+ }
+
+ }
+
+ /**
+ *
+ * @param model
+ * @return
+ */
+ public final JComponent attattch(T model) {
+ initComponents(model);
+ return doAttattch(model);
+ }
+
+ protected abstract JComponent doAttattch(T model);
+
+ /**
+ * gets all attributes from the user interface.
+ * We use Annotations to do it.
+ *
+ * @param model the model containing the attributes.
+ * @throws IllegalArgumentException if an annotated field is not accessable.
+ */
+ private void initComponents(UserInterface model) throws IllegalArgumentException {
+ for (String attributeName: uiAttributeMap.keySet()){
+
+ Field field = uiAttributeMap.get(attributeName);
+ Class fieldClass = field.getType();
+
+ JComponent component = model.visualProxy(attributeName, null);
+ Class<? extends JComponent> componentClass = component.getClass();
+ if (fieldClass.isAssignableFrom(componentClass)){
+ try {
+ field.set(this, component);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+ else throw new IllegalArgumentException("Form und Userinteface classes incompatible: " + fieldClass + " - " + componentClass);
+ }
+
+ }
+
+}
\ No newline at end of file
Added: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UIAttribute.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UIAttribute.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UIAttribute.java 2007-03-02 20:55:13 UTC (rev 589)
@@ -0,0 +1,21 @@
+/**
+ *
+ */
+package net.sf.magicmap.client.gui.forms;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+
+/**
+ * An UIAttribute is an attribute or property of an object
+ * that has an visual proxy. A visual proxy is some JComponent
+ * capable of displaying end editing the attribute.
+ *
+ * @author Jan Friderici
+ *
+ */
+@Retention(value=RetentionPolicy.RUNTIME)
+public @interface UIAttribute {
+ String name();
+}
Added: trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UIAttributeContainer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UIAttributeContainer.java (rev 0)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/forms/UIAttributeContainer.java 2007-03-02 20:55:13 UTC (rev 589)
@@ -0,0 +1,6 @@
+package net.sf.magicmap.client.gui.forms;
+
+
+public @interface UIAttributeContainer {
+ String[] attributes();
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-01 19:02:45
|
Revision: 588
http://svn.sourceforge.net/magicmap/?rev=588&view=rev
Author: flederohr
Date: 2007-03-01 11:02:36 -0800 (Thu, 01 Mar 2007)
Log Message:
-----------
moved graphics in seperate folder
fixing issue of resourceloading
deleted unused graphics
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java
Added Paths:
-----------
trunk/magicmapclient/res/magicmapGraphics/
trunk/magicmapclient/res/magicmapGraphics/MagicMap.png
trunk/magicmapclient/res/magicmapGraphics/magicmap-splash.png
Removed Paths:
-------------
trunk/magicmapclient/res/MagicMap.png
trunk/magicmapclient/res/MagicMapLogo.gif
trunk/magicmapclient/res/magicmap-splash.png
trunk/magicmapclient/res/magicmap_header.png
Deleted: trunk/magicmapclient/res/MagicMap.png
===================================================================
(Binary files differ)
Deleted: trunk/magicmapclient/res/MagicMapLogo.gif
===================================================================
(Binary files differ)
Deleted: trunk/magicmapclient/res/magicmap-splash.png
===================================================================
(Binary files differ)
Added: trunk/magicmapclient/res/magicmapGraphics/MagicMap.png
===================================================================
(Binary files differ)
Property changes on: trunk/magicmapclient/res/magicmapGraphics/MagicMap.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/magicmapclient/res/magicmapGraphics/magicmap-splash.png
===================================================================
(Binary files differ)
Property changes on: trunk/magicmapclient/res/magicmapGraphics/magicmap-splash.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/magicmapclient/res/magicmap_header.png
===================================================================
(Binary files differ)
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java 2007-03-01 18:25:55 UTC (rev 587)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java 2007-03-01 19:02:36 UTC (rev 588)
@@ -7,13 +7,13 @@
import java.awt.Toolkit;
import java.util.Locale;
-import javax.swing.ImageIcon;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JWindow;
import net.sf.magicmap.client.controller.Controller;
import net.sf.magicmap.client.gui.MainGUI;
+import net.sf.magicmap.client.gui.utils.GUIBuilder;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.utils.Settings;
import net.sf.magicmap.client.utils.Version;
@@ -30,7 +30,7 @@
JWindow splashScreen = new JWindow();
- JLabel splashLabel = new JLabel(new ImageIcon(MagicMapApplication.class.getClassLoader().getResource("magicmap-splash.png"))) {
+ JLabel splashLabel = new JLabel(GUIBuilder.getToolIcon("magicmap-splash.png", "magicmapGraphics")) {
private static final long serialVersionUID = 5735447445835224982L;
@@ -56,14 +56,14 @@
GUIUtils.setPlasticLookAndFeel();
GUIUtils.setLocale(Locale.getDefault());
-
+
JFrame frame = MainGUI.getInstance().getMainFrame();
GUIUtils.locateOnScreen(frame);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
// plugins laden.
Controller.getInstance().initializePlugins();
-
+
splashScreen.setVisible(false);
splashScreen.dispose();
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-03-01 18:25:55 UTC (rev 587)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-03-01 19:02:36 UTC (rev 588)
@@ -5,16 +5,13 @@
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.HeadlessException;
-import java.awt.Image;
import java.awt.event.ActionEvent;
-import java.awt.image.VolatileImage;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.rmi.RemoteException;
import javax.swing.AbstractAction;
-import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JFrame;
@@ -58,50 +55,50 @@
import com.brunchboy.util.swing.relativelayout.RelativeLayout;
import com.jgoodies.uif_lite.component.UIFSplitPane;
-public class MainFrame extends JFrame
-implements
-ServerConnectCallback,
-ServerDisconnectCallback,
-CreateNewMapCallback,
-MapNamesCallback,
-LoadMapDialogListener {
+public class MainFrame extends JFrame
+ implements
+ ServerConnectCallback,
+ ServerDisconnectCallback,
+ CreateNewMapCallback,
+ MapNamesCallback,
+ LoadMapDialogListener {
/**
* serial version id
*/
- private static final long serialVersionUID = -3842976532877305041L;
- private JMenuBar menuBar;
- private JToolBar toolBar;
- private StatusPanel statusBar;
- private MapPanel mapPanel;
- private OutlineView outlineView;
- private ConsoleView consoleView;
- private MapView mapView;
- 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;
- 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 long serialVersionUID = -3842976532877305041L;
+ private JMenuBar menuBar;
+ private JToolBar toolBar;
+ private StatusPanel statusBar;
+ private MapPanel mapPanel;
+ private OutlineView outlineView;
+ private ConsoleView consoleView;
+ private MapView mapView;
+ 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;
+ private MagicAction invisibleAction;
+ private MagicAction simpleView;
+ private MagicAction normalView;
+ private MagicAction expertView;
+ private MagicAction userDefinedView;
+ private static final int numberOfdataInvocationRateAction = 10;
+ private MagicAction[] dataInvocationRateAction;
+
public MainFrame() throws HeadlessException {
super();
// Aktionen erstellen
buildActions();
-
+
// Layout vorbereiten
this.layout = new RelativeLayout();
Container pane = this.getContentPane();
@@ -110,7 +107,7 @@
// 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());
+ this.setIconImage(GUIBuilder.getToolIcon("MagicMap.png", "magicmapGraphics").getImage());
//Menu erstellen
this.menuBar = new JMenuBar();
@@ -166,7 +163,7 @@
AttributeType.BOTTOM, GUIConstants.DIVIDER_SIZE));
}
-
+
/**
* Build the main panel
* @return the main panel
@@ -191,7 +188,7 @@
pane2.setDividerLocation(1.0);
return pane;
}
-
+
/**
* Build the file menu
* @return the file menu
@@ -292,7 +289,7 @@
.getInstance().getNodeModel(), "measurementView");
this.mapPanel = new MapPanel("mapPanel");
this.mapPanel.setMapView(this.mapView);
- }
+ }
/**
* Add buttons to main toolbar
@@ -314,7 +311,7 @@
// bar.addSeparator();
}
-
+
/* (non-Javadoc)
* @see net.sf.magicmap.client.interfaces.ServerConnectCallback#connected(long)
*/
@@ -439,7 +436,6 @@
Controller.getInstance().connect(this);
}
-
/**
* Action builder for the action of the GUI
*
@@ -613,7 +609,6 @@
}
};
-
this.simpleView = new MagicAction("simpleview") {
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java 2007-03-01 18:25:55 UTC (rev 587)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java 2007-03-01 19:02:36 UTC (rev 588)
@@ -7,13 +7,13 @@
import java.awt.event.ActionListener;
import java.io.IOException;
-import javax.swing.ImageIcon;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
+import net.sf.magicmap.client.gui.utils.GUIBuilder;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.utils.Version;
@@ -37,7 +37,7 @@
private AboutDialog(Frame owner) {
super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("about")));
- JLabel splashLabel = new JLabel(new ImageIcon("magicmap-splash.png")) {
+ JLabel splashLabel = new JLabel(GUIBuilder.getToolIcon("magicmap-splash.png", "magicmapGraphics")) {
private static final long serialVersionUID = 5735447445835224982L;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-01 18:25:57
|
Revision: 587
http://svn.sourceforge.net/magicmap/?rev=587&view=rev
Author: flederohr
Date: 2007-03-01 10:25:55 -0800 (Thu, 01 Mar 2007)
Log Message:
-----------
set loglevel to debug
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java 2007-03-01 13:20:14 UTC (rev 586)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java 2007-03-01 18:25:55 UTC (rev 587)
@@ -238,7 +238,7 @@
private Vertex addVertex(Node node){
if (findVertex(node) == null) {
- log.info("Adding " + node.getDisplayName());
+ log.debug("Adding " + node.getDisplayName());
Vertex v = new DirectedSparseVertex();
synchronized (vertexLock) {
@@ -253,7 +253,7 @@
this.worker.unsuspend();
}
- log.info("Added " + node.getDisplayName());
+ log.debug("Added " + node.getDisplayName());
return v;
} else {
System.err.print("Vertex exists:");
@@ -319,7 +319,7 @@
* @return
*/
private IMagicEdge addEdge(Vertex v1, Vertex v2){
- log.info("Adding Edge : " + v1 + " -> " + v2);
+ log.debug("Adding Edge : " + v1 + " -> " + v2);
if (v1 == v2) return null;
synchronized (edgeLock) {
Edge e = v1.findEdge(v2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-01 13:20:36
|
Revision: 586
http://svn.sourceforge.net/magicmap/?rev=586&view=rev
Author: flederohr
Date: 2007-03-01 05:20:14 -0800 (Thu, 01 Mar 2007)
Log Message:
-----------
Property Changed:
----------------
trunk/magicmapserver/dblayer/
Property changes on: trunk/magicmapserver/dblayer
___________________________________________________________________
Name: svn:ignore
- build
dist
inf-gen
src-gen
tmp
report
bin
+ build
dist
inf-gen
src-gen
tmp
report
bin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jan...@us...> - 2007-02-28 15:07:57
|
Revision: 585
http://svn.sourceforge.net/magicmap/?rev=585&view=rev
Author: Jan_fride
Date: 2007-02-28 07:06:27 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java 2007-02-28 12:58:24 UTC (rev 584)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java 2007-02-28 15:06:27 UTC (rev 585)
@@ -9,7 +9,7 @@
/**
* Einfacher Knoten in unserem Graphen aus Clients, AccessPoints, und
* Referenzpunkten.
- *
+ *
* @author thuebner
*/
public abstract class Node implements INode{
@@ -24,7 +24,7 @@
}
};
/**
- * Ein leerer Knoten.
+ * Ein leerer Knoten.
*/
public static final Node EMPTY_NODE = new Node(null) {
@@ -41,29 +41,29 @@
};
/**
- *
+ *
*/
private static int counter = 0;
/**
- *
+ *
*/
private String name; // Beschreibung
/**
- *
+ *
*/
private String displayName;
/**
- *
+ *
*/
private String internal;
protected boolean fix; // Fest oder beweglich
/**
- *
+ *
*/
protected boolean update = false; // wenn Referenzpunktupdate = true
@@ -75,7 +75,7 @@
private long id;
- private INodeModel model;
+ private transient INodeModel model;
private Node parentNode;
@@ -91,7 +91,7 @@
* beliebige Knotentypen ohne \xC4nderungen an NodeModel hinzugef\xFCgt werden.
* Siehe Methode getNeighbors, welche vom Knotentyp abh\xE4ngig mit Hilfe von
* NodeModel potenzielle Nachbarknoten des Knoten sucht.
- *
+ *
* @param model
*/
public Node(INodeModel model) {
@@ -210,6 +210,10 @@
public void setPhysical(boolean physical){
this.physical = physical;
}
+
+ /**
+ *
+ */
public NodeContainer getNodeContainer(){
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jan...@us...> - 2007-02-28 12:58:26
|
Revision: 584
http://svn.sourceforge.net/magicmap/?rev=584&view=rev
Author: Jan_fride
Date: 2007-02-28 04:58:24 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
changed calculateRepulsion.
method uses getVisibleVertices() to prevent concurrency problems.
Modified Paths:
--------------
trunk/magicmapclient/src/edu/uci/ics/jung/visualization/SpringLayout.java
Modified: trunk/magicmapclient/src/edu/uci/ics/jung/visualization/SpringLayout.java
===================================================================
--- trunk/magicmapclient/src/edu/uci/ics/jung/visualization/SpringLayout.java 2007-02-28 09:55:47 UTC (rev 583)
+++ trunk/magicmapclient/src/edu/uci/ics/jung/visualization/SpringLayout.java 2007-02-28 12:58:24 UTC (rev 584)
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2003, the JUNG Project and the Regents of the University of
* California All rights reserved.
- *
+ *
* This software is open-source under the BSD license; see either "license.txt"
* or http://jung.sourceforge.net/license.txt for a description.
*/
@@ -23,12 +23,12 @@
/**
* Anegpasst an die Magicmac sachen... drum der enue Name!
- *
+ *
* The SpringLayout package represents a visualization of a set of nodes. The
* SpringLayout, which is initialized with a Graph, assigns X/Y locations to
* each node. When called <code>relax()</code>, the SpringLayout moves the
* visualization forward one step.
- *
+ *
* @author Danyel Fisher
* @author Joshua O'Madadhain
*/
@@ -63,7 +63,7 @@
/**
* Constructor for a SpringLayout for a raw graph with associated component.
- *
+ *
* @param g
* the input Graph
* @param f
@@ -75,13 +75,13 @@
/**
* Constructor for a SpringLayout for a raw graph with associated component.
- *
+ *
* @param g
* the input Graph
* @param f
* the length function
- * @param r
- * the repulsion function
+ * @param r
+ * the repulsion function
*/
public SpringLayout(Graph g, LengthFunction f, RepulsionFunction r) {
super(g);
@@ -105,14 +105,14 @@
}
/**
- * <p>Sets the stretch parameter for this instance. This value
+ * <p>Sets the stretch parameter for this instance. This value
* specifies how much the degrees of an edge's incident vertices
* should influence how easily the endpoints of that edge
* can move (that is, that edge's tendency to change its length).</p>
- *
+ *
* <p>The default value is 0.70. Positive values less than 1 cause
- * high-degree vertices to move less than low-degree vertices, and
- * values > 1 cause high-degree vertices to move more than
+ * high-degree vertices to move less than low-degree vertices, and
+ * values > 1 cause high-degree vertices to move more than
* low-degree vertices. Negative values will have unpredictable
* and inconsistent results.</p>
* @param stretch
@@ -150,7 +150,7 @@
/**
* (non-Javadoc)
- *
+ *
* @see edu.uci.ics.jung.visualization.AbstractLayout#initialize_local_vertex(edu.uci.ics.jung.graph.Vertex)
*/
protected void initialize_local_vertex(Vertex v){
@@ -252,7 +252,7 @@
}
protected void calculateRepulsion(){
- for (Iterator iter = getGraph().getVertices().iterator(); iter.hasNext();){
+ for (Iterator iter = getVisibleVertices().iterator(); iter.hasNext();){
Vertex v = (Vertex) iter.next();
if (dontMove(v)) continue;
@@ -261,7 +261,7 @@
double repulsion_range = 0;
- for (Iterator iter2 = getGraph().getVertices().iterator(); iter2.hasNext();){
+ for (Iterator iter2 = getVisibleVertices().iterator(); iter2.hasNext();){
Vertex v2 = (Vertex) iter2.next();
if (v == v2) continue;
@@ -355,8 +355,8 @@
/**
* Extension for PACW: Make the Repulsion configurable.
- *
- *
+ *
+ *
* @author thuebner
*/
public static interface RepulsionFunction {
@@ -370,14 +370,14 @@
};
/**
* Extension for PACW: Make the Repulsion configurable.
- *
- *
+ *
+ *
* @author thuebner
*/
public static interface ForceFunction {
/**
- * Sets the force multiplier for this instance. This value is used to
+ * Sets the force multiplier for this instance. This value is used to
* specify how strongly an edge "wants" to be its default length
* (higher values indicate a greater attraction for the default length),
* which affects how much its endpoints move at each timestep.
@@ -399,8 +399,8 @@
};
/**
* Extension for PACW: Make the Repulsion configurable.
- *
- *
+ *
+ *
* @author thuebner
*/
public static interface CanLeaveMapFunction {
@@ -418,7 +418,7 @@
/**
* If the edge is weighted, then override this method to show what the
* visualized length is.
- *
+ *
* @author Danyel Fisher
*/
public static interface LengthFunction {
@@ -534,7 +534,7 @@
public void setForceFunction(ForceFunction forceFunction){
this.forceFunction = forceFunction;
}
-
+
public LengthFunction getLengthFunction(){
return lengthFunction;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
