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-04-02 13:05:59
|
Revision: 633
http://svn.sourceforge.net/magicmap/?rev=633&view=rev
Author: flederohr
Date: 2007-04-02 06:05:57 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Removed Paths:
-------------
tags/V20070402_0_9_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-04-02 12:17:02
|
Revision: 632
http://svn.sourceforge.net/magicmap/?rev=632&view=rev
Author: flederohr
Date: 2007-04-02 05:17:00 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Tag Version 0.9.0
Added Paths:
-----------
tags/V20070402_0_9_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-04-02 12:07:41
|
Revision: 631
http://svn.sourceforge.net/magicmap/?rev=631&view=rev
Author: flederohr
Date: 2007-04-02 05:07:40 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Removed Paths:
-------------
tags/V20070402_0_9_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-04-02 12:04:23
|
Revision: 630
http://svn.sourceforge.net/magicmap/?rev=630&view=rev
Author: flederohr
Date: 2007-04-02 05:04:21 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Tag Version 0.9.0
Added Paths:
-----------
tags/V20070402_0_9_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-04-02 12:00:24
|
Revision: 629
http://svn.sourceforge.net/magicmap/?rev=629&view=rev
Author: flederohr
Date: 2007-04-02 05:00:22 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Removed Paths:
-------------
tags/V20070402_0_9_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-04-02 11:57:24
|
Revision: 628
http://svn.sourceforge.net/magicmap/?rev=628&view=rev
Author: flederohr
Date: 2007-04-02 04:57:23 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Tag Version 0.9.0
Added Paths:
-----------
tags/V20070402_0_9_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-04-02 11:55:34
|
Revision: 627
http://svn.sourceforge.net/magicmap/?rev=627&view=rev
Author: flederohr
Date: 2007-04-02 04:55:33 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Removed Paths:
-------------
tags/V20070402_0_9_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-04-02 11:51:08
|
Revision: 626
http://svn.sourceforge.net/magicmap/?rev=626&view=rev
Author: flederohr
Date: 2007-04-02 04:51:05 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Added Paths:
-----------
tags/V20070402_0_9_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-04-02 11:47:55
|
Revision: 625
http://svn.sourceforge.net/magicmap/?rev=625&view=rev
Author: flederohr
Date: 2007-04-02 04:47:31 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
changed location NodeIcon
updated Version Number to 0.9.0
Modified Paths:
--------------
trunk/magicmapclient/build.xml
trunk/magicmapclient/plugins/udpplugin-plugin.jar
trunk/magicmapclient/res/NodeIcons/location.png
trunk/magicmapclient/res/NodeIcons/location_rescan.png
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/LocationNodeIcon.java
Modified: trunk/magicmapclient/build.xml
===================================================================
--- trunk/magicmapclient/build.xml 2007-03-29 10:00:34 UTC (rev 624)
+++ trunk/magicmapclient/build.xml 2007-04-02 11:47:31 UTC (rev 625)
@@ -2,7 +2,7 @@
<project name="magicmapclient" default="jar" basedir=".">
<property name="application" value="magicmap" />
<!-- Version Information -->
- <property name="version.number" value="0.8.1" />
+ <property name="version.number" value="0.9.0" />
<property name="jar.name" value="${application}.jar" />
<property name="main.class" value="net.sf.magicmap.client.core.MagicMapApplication" />
Modified: trunk/magicmapclient/plugins/udpplugin-plugin.jar
===================================================================
--- trunk/magicmapclient/plugins/udpplugin-plugin.jar 2007-03-29 10:00:34 UTC (rev 624)
+++ trunk/magicmapclient/plugins/udpplugin-plugin.jar 2007-04-02 11:47:31 UTC (rev 625)
@@ -1,21 +1,21 @@
PK
- |
|
From: <fle...@us...> - 2007-03-29 10:00:35
|
Revision: 624
http://svn.sourceforge.net/magicmap/?rev=624&view=rev
Author: flederohr
Date: 2007-03-29 03:00:34 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
removed message parameter
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/ConsoleView.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/ConsoleView.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/ConsoleView.java 2007-03-28 14:35:06 UTC (rev 623)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/views/ConsoleView.java 2007-03-29 10:00:34 UTC (rev 624)
@@ -72,7 +72,7 @@
listModel.addElement(message);
}
}
- public void clear(String message){
+ public void clear(){
synchronized (listModel) {
listModel.removeAllElements();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-28 14:35:09
|
Revision: 623
http://svn.sourceforge.net/magicmap/?rev=623&view=rev
Author: flederohr
Date: 2007-03-28 07:35:06 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
changed access of LayoutSettings to a static way
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/LayoutSettings.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLayout.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicRepulsionFunction.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-03-28 12:57:03 UTC (rev 622)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-03-28 14:35:06 UTC (rev 623)
@@ -86,7 +86,7 @@
*
* @see net.sf.magicmap.client.algorithms.NodeModelMetric#metric(net.sf.magicmap.client.model.node.Node, net.sf.magicmap.client.model.node.Node)
*/
- public double metric(LayoutSettings settings, Node node1, Node node2){
+ public double metric(Node node1, Node node2){
boolean a1 = (node1.getType() == NodeModelConstants.NODETYPE_ACCESSPOINT);
boolean a2 = (node2.getType() == NodeModelConstants.NODETYPE_ACCESSPOINT);
@@ -98,7 +98,7 @@
boolean rc2 = (c2 || r2);
// Calibreirung auf AP oder LC.
- double calibration = (rc1 && rc2) ? settings.getCalibrationFactorLocation() : settings
+ double calibration = (rc1 && rc2) ? LayoutSettings.getCalibrationFactorLocation() : LayoutSettings
.getCalibrationFactorAccessPoint();
if (a1 && a2) // Zwei AccessPoints
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java 2007-03-28 12:57:03 UTC (rev 622)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java 2007-03-28 14:35:06 UTC (rev 623)
@@ -4,7 +4,6 @@
import java.util.HashMap;
import java.util.Map;
-import net.sf.magicmap.client.model.location.jung.LayoutSettings;
import net.sf.magicmap.client.model.node.Node;
import org.apache.commons.collections.map.MultiKeyMap;
@@ -19,10 +18,10 @@
*/
public class NodeMetricManager implements NodeModelMetric {
- private NodeModelMetric defaultMetric;
- private final MultiKeyMap metricMap = new MultiKeyMap();
- private final Map<Class<? extends Node>,NodeModelMetric> genericMetricMap = new HashMap<Class<? extends Node>, NodeModelMetric>();
-
+ private NodeModelMetric defaultMetric;
+ private final MultiKeyMap metricMap = new MultiKeyMap();
+ private final Map<Class<? extends Node>, NodeModelMetric> genericMetricMap = new HashMap<Class<? extends Node>, NodeModelMetric>();
+
public NodeMetricManager(NodeModelMetric defaultMetric) {
this.defaultMetric = defaultMetric;
}
@@ -42,20 +41,20 @@
}
/**
- * F\xFCgt eine Metric zu einem Tupel von Knoten hinzu. Diese Metric ist generischer als eine
- * welche zwei Knotentypen ben\xF6tigt. Daher werden zuerst die speziellen mit zwei Knotentypen
- * befragt.
- *
- * @param clazz1 der 1. Knotentyp
- * @param metric die Metric die auf die beiden Knotentypen angewant werden soll.
- */
- public final void addMetric(Class<? extends Node> clazz1, NodeModelMetric metric){
- if (genericMetricMap.containsKey(clazz1)) {
- throw new IllegalArgumentException("Mapping for " + clazz1 + " exists");
- }
- genericMetricMap.put(clazz1, metric);
- }
-
+ * F\xFCgt eine Metric zu einem Tupel von Knoten hinzu. Diese Metric ist generischer als eine
+ * welche zwei Knotentypen ben\xF6tigt. Daher werden zuerst die speziellen mit zwei Knotentypen
+ * befragt.
+ *
+ * @param clazz1 der 1. Knotentyp
+ * @param metric die Metric die auf die beiden Knotentypen angewant werden soll.
+ */
+ public final void addMetric(Class<? extends Node> clazz1, NodeModelMetric metric){
+ if (genericMetricMap.containsKey(clazz1)) {
+ throw new IllegalArgumentException("Mapping for " + clazz1 + " exists");
+ }
+ genericMetricMap.put(clazz1, metric);
+ }
+
/**
* entfernt eine Metrci
* @param clazz1
@@ -68,14 +67,14 @@
/**
*
*/
- public double metric(LayoutSettings settings, Node node1, Node node2){
+ public double metric(Node node1, Node node2){
NodeModelMetric delegate = (NodeModelMetric) metricMap.get(node1.getClass(), node2.getClass());
-
- if (delegate != null) return delegate.metric(settings, node1, node2);
+
+ if (delegate != null) return delegate.metric(node1, node2);
delegate = genericMetricMap.get(node1.getClass());
-
- if (delegate != null)return delegate.metric(settings, node1, node2);
- return defaultMetric.metric(settings, node1, node2);
+
+ if (delegate != null) return delegate.metric(node1, node2);
+ return defaultMetric.metric(node1, node2);
}
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java 2007-03-28 12:57:03 UTC (rev 622)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java 2007-03-28 14:35:06 UTC (rev 623)
@@ -4,7 +4,6 @@
package net.sf.magicmap.client.algorithms;
-import net.sf.magicmap.client.model.location.jung.LayoutSettings;
import net.sf.magicmap.client.model.node.Node;
/**
@@ -22,6 +21,6 @@
* @param node2 zweiter Knoten.
* @return den Abstand zwischen den beiden Knoten.
*/
- public abstract double metric(LayoutSettings settings, Node node1, Node node2);
+ public abstract double metric(Node node1, Node node2);
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java 2007-03-28 12:57:03 UTC (rev 622)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungNodePlacer.java 2007-03-28 14:35:06 UTC (rev 623)
@@ -1,4 +1,4 @@
-
+
package net.sf.magicmap.client.model.location.jung;
import java.awt.Dimension;
@@ -49,21 +49,9 @@
/**
* Logger
*/
- private static final Log log = LogFactory.getLog(JungNodePlacer.class);
+ private static final Log log = LogFactory.getLog(JungNodePlacer.class);
/**
- *
- */
- private static final class DefaultSettings extends LayoutSettings {
-
- }
-
- /**
- *
- */
- public static final LayoutSettings DEFAULT_SETTINGS = new DefaultSettings();
-
- /**
* Used to find the Vertex representing a node.
*/
private final Map<Node, Vertex> nodeVertexMapping = new HashMap<Node, Vertex>();
@@ -105,12 +93,11 @@
private final NodeMetricManager metricManager;
- private final Object edgeLock = new Object();
- private final Object vertexLock = new Object();
+ private final Object edgeLock = new Object();
+ private final Object vertexLock = new Object();
-
public JungNodePlacer() {
- this(JungNodePlacer.DEFAULT_SETTINGS, new MagicMetric());
+ this(new MagicMetric());
}
/**
@@ -126,12 +113,12 @@
* @param settings
* @param metric
*/
- public JungNodePlacer(LayoutSettings settings, NodeModelMetric metric) {
+ public JungNodePlacer(NodeModelMetric metric) {
super();
this.metricManager = new NodeMetricManager(metric);
this.clientLocationMap = new HashMap<ClientNode, HashSet<LocationNode>>();
this.locationLocationMap = new HashMap<LocationNode, HashSet<LocationNode>>();
- this.layout = new MagicLayout(this, metricManager, settings);
+ this.layout = new MagicLayout(this, metricManager);
this.worker = new LayoutWorker(this.layout, new Dimension(800, 600));
this.workerRunning = false;
this.workerPaused = false;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/LayoutSettings.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/LayoutSettings.java 2007-03-28 12:57:03 UTC (rev 622)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/LayoutSettings.java 2007-03-28 14:35:06 UTC (rev 623)
@@ -1,5 +1,6 @@
package net.sf.magicmap.client.model.location.jung;
+
/**
* Contains the calibration settings for ur layout.
*
@@ -8,7 +9,6 @@
*/
public class LayoutSettings {
-
/**
* Um die Knoten in den Kanten zu finden.
*/
@@ -19,61 +19,55 @@
*/
public static final String NODE_DISTANCE_KEY = "NODE.distance";
- private double CALIBRATION_FACTOR_LC = 1.0; // Kanten zu Referenzpunkten
+ private static double CALIBRATION_FACTOR_LC = 1.0; // Kanten zu Referenzpunkten
- private double CALIBRATION_FACTOR_AP = 1.0; // Kanten zu APs kalibrieren
+ private static double CALIBRATION_FACTOR_AP = 1.0; // Kanten zu APs kalibrieren
- private boolean calculateHeight = false;
+ private static boolean calculateHeight = false;
- /**
- *
- *
- */
- public LayoutSettings() {
-
- }
-
- public double adjustLocationCalibration(double adjustValue){
+ public static double adjustLocationCalibration(double adjustValue){
// CF must NOT be negativ
- if ((this.CALIBRATION_FACTOR_LC + adjustValue) <= 0) {
- this.CALIBRATION_FACTOR_LC /= 10;
+ if ((CALIBRATION_FACTOR_LC + adjustValue) <= 0) {
+ CALIBRATION_FACTOR_LC /= 10;
} else {
- this.CALIBRATION_FACTOR_LC += adjustValue;
+ CALIBRATION_FACTOR_LC += adjustValue;
}
return adjustValue;
}
- public double adjustAccessPointCalibration(double adjustValue){
- if ((this.CALIBRATION_FACTOR_AP + adjustValue) <= 0) {
- this.CALIBRATION_FACTOR_AP /= 10;
+ private LayoutSettings() {};
+
+ public static double adjustAccessPointCalibration(double adjustValue){
+ if ((CALIBRATION_FACTOR_AP + adjustValue) <= 0) {
+ CALIBRATION_FACTOR_AP /= 10;
} else {
- this.CALIBRATION_FACTOR_AP += adjustValue;
+ CALIBRATION_FACTOR_AP += adjustValue;
}
return adjustValue;
}
- public boolean isCalculateHeight(){
- return this.calculateHeight;
+ public static boolean isCalculateHeight(){
+ return calculateHeight;
}
- public void setCalculateHeight(boolean calcHeight){
- this.calculateHeight = calcHeight;
+ public static void setCalculateHeight(boolean calcHeight){
+ calculateHeight = calcHeight;
}
- public double getCalibrationFactorAccessPoint(){
- return this.CALIBRATION_FACTOR_AP;
+ public static double getCalibrationFactorAccessPoint(){
+ return CALIBRATION_FACTOR_AP;
}
- public void setCalibrationFactorAccessPoint(double calibration_factor_ap){
- this.CALIBRATION_FACTOR_AP = calibration_factor_ap;
+ public static void setCalibrationFactorAccessPoint(double calibration_factor_ap){
+ CALIBRATION_FACTOR_AP = calibration_factor_ap;
}
- public double getCalibrationFactorLocation(){
- return this.CALIBRATION_FACTOR_LC;
+ public static double getCalibrationFactorLocation(){
+ return CALIBRATION_FACTOR_LC;
}
- public void setCalibrationFactorLocation(double calibration_factor_lc){
- this.CALIBRATION_FACTOR_LC = calibration_factor_lc;
+ public static void setCalibrationFactorLocation(double calibration_factor_lc){
+ CALIBRATION_FACTOR_LC = calibration_factor_lc;
}
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLayout.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLayout.java 2007-03-28 12:57:03 UTC (rev 622)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLayout.java 2007-03-28 14:35:06 UTC (rev 623)
@@ -21,9 +21,8 @@
*/
public class MagicLayout extends SpringLayout {
- NodeModelMetric metric;
- private final LayoutSettings settings;
- private final Graph graph;
+ NodeModelMetric metric;
+ private final Graph graph;
/**
*
@@ -31,13 +30,12 @@
* @param metric
* @param settings
*/
- public MagicLayout(Graph g, NodeModelMetric metric, LayoutSettings settings) {
- super(g, new MagicLengthFunction(settings, metric));
+ public MagicLayout(Graph g, NodeModelMetric metric) {
+ super(g, new MagicLengthFunction(metric));
this.graph = g;
this.metric = metric;
- this.settings = settings;
setLeaveFunction(new LeaveFunction());
- setRepulsionFunction(new MagicRepulsionFunction(settings));
+ setRepulsionFunction(new MagicRepulsionFunction());
setForceFunction(new MagicForceFunction(this.lengthFunction));
((MagicLengthFunction) getLengthFunction()).setBaseKey(getBaseKey());
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java 2007-03-28 12:57:03 UTC (rev 622)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java 2007-03-28 14:35:06 UTC (rev 623)
@@ -19,7 +19,6 @@
class MagicLengthFunction implements SpringLayout.LengthFunction {
- private final LayoutSettings settings;
private final NodeModelMetric metric;
private static final Logger log = Logger.getLogger(MagicLengthFunction.class);
@@ -28,8 +27,7 @@
*/
private Object baseKey;
- public MagicLengthFunction(LayoutSettings setings, NodeModelMetric metric) {
- this.settings = setings;
+ public MagicLengthFunction(NodeModelMetric metric) {
this.metric = metric;
}
@@ -45,7 +43,7 @@
* @return
*/
private double calculateLength(Node n1, Node n2){
- if (settings.isCalculateHeight() && Controller.getInstance().getCurrentMap().realwidth > 0
+ if (LayoutSettings.isCalculateHeight() && Controller.getInstance().getCurrentMap().realwidth > 0
&& Controller.getInstance().getCurrentMap().realwidth > 0) {
int diff = n1.getZ() - n2.getZ();
if (diff != 0) {
@@ -61,7 +59,7 @@
// b in pixel umrechnen
b = b * scale;
// System.out.println(b);
- double a = metric.metric(settings, n1, n2);
+ double a = metric.metric(n1, n2);
// System.out.println("Unangepasster Wert: " + a + "
// angepasster
// Wert: " + Math.sqrt(a*a - b*b));
@@ -78,10 +76,10 @@
// System.out.println("Wert angepasst!");
return Math.sqrt(a * a - b * b);
} else {
- return metric.metric(settings, n1, n2);
+ return metric.metric(n1, n2);
}
} else {
- return metric.metric(settings, n1, n2);
+ return metric.metric(n1, n2);
}
}
@@ -121,17 +119,17 @@
if (clientOrLocation) {
if (d < 0.95) {
- settings.adjustLocationCalibration(-Math.max(Math.abs(len - desiredLen) / 200, 0.001));
+ LayoutSettings.adjustLocationCalibration(-Math.max(Math.abs(len - desiredLen) / 200, 0.001));
} else if (d > 1.05) {
- settings.adjustLocationCalibration(Math.max(Math.abs(len - desiredLen) / 200, 0.001));
+ LayoutSettings.adjustLocationCalibration(Math.max(Math.abs(len - desiredLen) / 200, 0.001));
}
} else {
if (d < 0.95) {
- settings.adjustAccessPointCalibration(-Math.max(Math.abs(len - desiredLen) / 200, 0.001));
+ LayoutSettings.adjustAccessPointCalibration(-Math.max(Math.abs(len - desiredLen) / 200, 0.001));
} else if (d > 1.05) {
- settings.adjustAccessPointCalibration(Math.max(Math.abs(len - desiredLen) / 200, 0.001));
+ LayoutSettings.adjustAccessPointCalibration(Math.max(Math.abs(len - desiredLen) / 200, 0.001));
}
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicRepulsionFunction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicRepulsionFunction.java 2007-03-28 12:57:03 UTC (rev 622)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicRepulsionFunction.java 2007-03-28 14:35:06 UTC (rev 623)
@@ -13,18 +13,6 @@
public class MagicRepulsionFunction implements SpringLayout.RepulsionFunction {
- /**
- *
- */
- private final LayoutSettings setings;
-
- /**
-
- */
- MagicRepulsionFunction(LayoutSettings setings) {
- this.setings = setings;
- }
-
public double getRepulsion(Vertex v1, Vertex v2){
Node node1 = this.findNode(v1);
Node node2 = this.findNode(v2);
@@ -32,7 +20,7 @@
if (node1 instanceof AccessPointNode && ((AccessPointNode) node1).isHidden()) return 0;
if (node2 instanceof AccessPointNode && ((AccessPointNode) node2).isHidden()) return 0;
if (node1 instanceof AccessPointNode && node2 instanceof AccessPointNode)
- return 20 * setings.getCalibrationFactorAccessPoint();
+ return 20 * LayoutSettings.getCalibrationFactorAccessPoint();
// Orte und Clients stossen sich nicht ab
if ((node1 instanceof ClientNode || node1 instanceof LocationNode)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-28 12:57:27
|
Revision: 622
http://svn.sourceforge.net/magicmap/?rev=622&view=rev
Author: anweiss
Date: 2007-03-28 05:57:03 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
renamed genericMetrciMap to genericMetricMap
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java 2007-03-27 14:50:51 UTC (rev 621)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java 2007-03-28 12:57:03 UTC (rev 622)
@@ -21,7 +21,7 @@
private NodeModelMetric defaultMetric;
private final MultiKeyMap metricMap = new MultiKeyMap();
- private final Map<Class<? extends Node>,NodeModelMetric> genericMetrciMap = new HashMap<Class<? extends Node>, NodeModelMetric>();
+ private final Map<Class<? extends Node>,NodeModelMetric> genericMetricMap = new HashMap<Class<? extends Node>, NodeModelMetric>();
public NodeMetricManager(NodeModelMetric defaultMetric) {
this.defaultMetric = defaultMetric;
@@ -50,10 +50,10 @@
* @param metric die Metric die auf die beiden Knotentypen angewant werden soll.
*/
public final void addMetric(Class<? extends Node> clazz1, NodeModelMetric metric){
- if (genericMetrciMap.containsKey(clazz1)) {
+ if (genericMetricMap.containsKey(clazz1)) {
throw new IllegalArgumentException("Mapping for " + clazz1 + " exists");
}
- genericMetrciMap.put(clazz1, metric);
+ genericMetricMap.put(clazz1, metric);
}
/**
@@ -72,7 +72,7 @@
NodeModelMetric delegate = (NodeModelMetric) metricMap.get(node1.getClass(), node2.getClass());
if (delegate != null) return delegate.metric(settings, node1, node2);
- delegate = genericMetrciMap.get(node1.getClass());
+ delegate = genericMetricMap.get(node1.getClass());
if (delegate != null)return delegate.metric(settings, node1, node2);
return defaultMetric.metric(settings, node1, node2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-27 14:51:18
|
Revision: 621
http://svn.sourceforge.net/magicmap/?rev=621&view=rev
Author: flederohr
Date: 2007-03-27 07:50:51 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
moved calibrationfactor into MagicMetric
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-03-26 14:55:19 UTC (rev 620)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-03-27 14:50:51 UTC (rev 621)
@@ -12,6 +12,7 @@
import net.sf.magicmap.client.algorithms.distance.MagicDistanceAlgorithm;
import net.sf.magicmap.client.measurement.Constants;
import net.sf.magicmap.client.measurement.MeasurementUtils;
+import net.sf.magicmap.client.model.location.jung.LayoutSettings;
import net.sf.magicmap.client.model.node.AccessPointNode;
import net.sf.magicmap.client.model.node.AccessPointSeerNode;
import net.sf.magicmap.client.model.node.Node;
@@ -85,7 +86,7 @@
*
* @see net.sf.magicmap.client.algorithms.NodeModelMetric#metric(net.sf.magicmap.client.model.node.Node, net.sf.magicmap.client.model.node.Node)
*/
- public double metric(Node node1, Node node2){
+ public double metric(LayoutSettings settings, Node node1, Node node2){
boolean a1 = (node1.getType() == NodeModelConstants.NODETYPE_ACCESSPOINT);
boolean a2 = (node2.getType() == NodeModelConstants.NODETYPE_ACCESSPOINT);
@@ -96,6 +97,10 @@
boolean rc1 = (c1 || r1);
boolean rc2 = (c2 || r2);
+ // Calibreirung auf AP oder LC.
+ double calibration = (rc1 && rc2) ? settings.getCalibrationFactorLocation() : settings
+ .getCalibrationFactorAccessPoint();
+
if (a1 && a2) // Zwei AccessPoints
return Double.POSITIVE_INFINITY;
@@ -108,11 +113,11 @@
findAccessPoints(ap1, ap2, same, diff);
// Kein gemeinsamer Access Point
- if (same.size() == 0) return 1000.0;
+ if (same.size() == 0) return 1000.0 * calibration;
if (same.size() == 1) {
if (diff.size() == 0) return 0.0;
- return 1000.0;
+ return 1000.0 * calibration;
}
// Basteln von Vektoren f\xFCr die Distance-Funktion
@@ -154,7 +159,7 @@
penalty += (Constants.MIN_SIGNALLEVEL + ap1.getSignalLevelForAccessPoint(ap)); // 0.0 wenn ap1 nicht ap sieht
penalty += (Constants.MIN_SIGNALLEVEL + ap2.getSignalLevelForAccessPoint(ap)); // 0.0 wenn ap2 nicht ap sieht
}
- return (distance + penalty * Constants.PENALTY_FACTOR) * 10.0;
+ return (distance + penalty * Constants.PENALTY_FACTOR) * 10.0 * calibration;
} else if ((rc1 && a2) || (a1 && rc2)) {
// Zwischen Ort/Client und AccessPoint
AccessPointSeerNode seer;
@@ -167,7 +172,8 @@
ap = (AccessPointNode) node2;
}
// TODO: Logarithmische Skalierung
- return Math.abs(MeasurementUtils.signalLevelToStrength(seer.getSignalLevelForAccessPoint(ap)));
+ return Math.abs(MeasurementUtils.signalLevelToStrength(seer.getSignalLevelForAccessPoint(ap)))
+ * calibration;
//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
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java 2007-03-26 14:55:19 UTC (rev 620)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeMetricManager.java 2007-03-27 14:50:51 UTC (rev 621)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import net.sf.magicmap.client.model.location.jung.LayoutSettings;
import net.sf.magicmap.client.model.node.Node;
import org.apache.commons.collections.map.MultiKeyMap;
@@ -67,14 +68,14 @@
/**
*
*/
- public double metric(Node node1, Node node2){
+ public double metric(LayoutSettings settings, Node node1, Node node2){
NodeModelMetric delegate = (NodeModelMetric) metricMap.get(node1.getClass(), node2.getClass());
- if (delegate != null) return delegate.metric(node1, node2);
+ if (delegate != null) return delegate.metric(settings, node1, node2);
delegate = genericMetrciMap.get(node1.getClass());
- if (delegate != null)return delegate.metric(node1, node2);
- return defaultMetric.metric(node1, node2);
+ if (delegate != null)return delegate.metric(settings, node1, node2);
+ return defaultMetric.metric(settings, node1, node2);
}
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java 2007-03-26 14:55:19 UTC (rev 620)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/NodeModelMetric.java 2007-03-27 14:50:51 UTC (rev 621)
@@ -4,6 +4,7 @@
package net.sf.magicmap.client.algorithms;
+import net.sf.magicmap.client.model.location.jung.LayoutSettings;
import net.sf.magicmap.client.model.node.Node;
/**
@@ -21,6 +22,6 @@
* @param node2 zweiter Knoten.
* @return den Abstand zwischen den beiden Knoten.
*/
- public abstract double metric(Node node1, Node node2);
+ public abstract double metric(LayoutSettings settings, Node node1, Node node2);
}
\ No newline at end of file
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java 2007-03-26 14:55:19 UTC (rev 620)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java 2007-03-27 14:50:51 UTC (rev 621)
@@ -44,10 +44,7 @@
* @param n2
* @return
*/
- private double calculateLength(Node n1, Node n2, boolean c1, boolean c2){
- // Calibreirung auf AP oder LC.
- double c = (c1 && c2) ? settings.getCalibrationFactorLocation() : settings.getCalibrationFactorAccessPoint();
-
+ private double calculateLength(Node n1, Node n2){
if (settings.isCalculateHeight() && Controller.getInstance().getCurrentMap().realwidth > 0
&& Controller.getInstance().getCurrentMap().realwidth > 0) {
int diff = n1.getZ() - n2.getZ();
@@ -64,7 +61,7 @@
// b in pixel umrechnen
b = b * scale;
// System.out.println(b);
- double a = metric.metric(n1, n2) * c;
+ double a = metric.metric(settings, n1, n2);
// System.out.println("Unangepasster Wert: " + a + "
// angepasster
// Wert: " + Math.sqrt(a*a - b*b));
@@ -81,10 +78,10 @@
// System.out.println("Wert angepasst!");
return Math.sqrt(a * a - b * b);
} else {
- return metric.metric(n1, n2) * c;
+ return metric.metric(settings, n1, n2);
}
} else {
- return metric.metric(n1, n2) * c;
+ return metric.metric(settings, n1, n2);
}
}
@@ -103,7 +100,7 @@
boolean c2 = (t2 == INodeModel.NODETYPE_CLIENT || t2 == INodeModel.NODETYPE_LOCATION);
boolean clientOrLocation = (c1 && c2);
- double desiredLength = calculateLength(n1, n2, c1, c2);
+ double desiredLength = calculateLength(n1, n2);
double vx = getX(v1) - getX(v2);
double vy = getY(v1) - getY(v2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-26 14:55:27
|
Revision: 620
http://svn.sourceforge.net/magicmap/?rev=620&view=rev
Author: anweiss
Date: 2007-03-26 07:55:19 -0700 (Mon, 26 Mar 2007)
Log Message:
-----------
made some i18n strings start with an uppercase letter
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-26 11:48:48 UTC (rev 619)
+++ trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-26 14:55:19 UTC (rev 620)
@@ -111,13 +111,13 @@
plugins.show=Plugins
plugins.show.tooltip=Zeige alle Plugins
plugins.installed=Installierte Plugins
-plugins.load=zeige plugins
-plugins.install=installiere Plugins
-plugins.uninstall=deinstalliere Plugin
+plugins.load=Zeige Plugins
+plugins.install=Installiere Plugin
+plugins.uninstall=Deinstalliere Plugin
plugins.load.tooltip=L\xE4dt die Pluginliste
-plugins.install.tooltip=installiert ausgew\xE4hltes Plugin
-plugins.uninstall.tooltip=deinstalliert ausgew\xE4hltes Plugin
-plugins.available=verf\xFCgbare Plugins
+plugins.install.tooltip=Installiert ausgew\xE4hltes Plugin
+plugins.uninstall.tooltip=Deinstalliert ausgew\xE4hltes Plugin
+plugins.available=Verf\xFCgbare Plugins
plugins.dependencies=Abh\xE4ngigkeiten
plugins.detailview=Detailansicht
plugins.name=Name
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-26 11:49:35
|
Revision: 619
http://svn.sourceforge.net/magicmap/?rev=619&view=rev
Author: flederohr
Date: 2007-03-26 04:48:48 -0700 (Mon, 26 Mar 2007)
Log Message:
-----------
made Table Cells uneditable
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/AbstractMeasurementTableModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/AbstractMeasurementTableModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/AbstractMeasurementTableModel.java 2007-03-23 16:01:06 UTC (rev 618)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/AbstractMeasurementTableModel.java 2007-03-26 11:48:48 UTC (rev 619)
@@ -11,6 +11,11 @@
super();
}
+ @Override
+ public boolean isCellEditable(int row, int column){
+ return false;
+ }
+
public abstract void setSelectedNode(Node selectedNode);
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java 2007-03-23 16:01:06 UTC (rev 618)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java 2007-03-26 11:48:48 UTC (rev 619)
@@ -154,6 +154,8 @@
final UserInterface ui = (UserInterface) plugin;
jMenu.add(new AbstractAction(plugin.getPluginInfos().getName()) {
+ private static final long serialVersionUID = 1L;
+
public void actionPerformed(ActionEvent e){
JDialog d = new JDialog(mainFrame);
d.setContentPane(ui.visualProxy("", null));
@@ -167,7 +169,15 @@
});
repository = new PluginRepository(new URL("http://phl.informatik.hu-berlin.de/magicmap-plugins/"));
- tableModel = new DefaultTableModel();
+ tableModel = new DefaultTableModel() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isCellEditable(int row, int column){
+ return false;
+ }
+ };
tableModel.addColumn(GUIUtils.i18n("plugins.name"));
tableModel.addColumn(GUIUtils.i18n("plugins.version"));
tableModel.addColumn("--");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-23 16:01:12
|
Revision: 618
http://svn.sourceforge.net/magicmap/?rev=618&view=rev
Author: flederohr
Date: 2007-03-23 09:01:06 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
use of i18n strings
plugin name not editable anymore
bug in display of name plugin fixed
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginDescriptorModel.java
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-23 15:59:48 UTC (rev 617)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/DocumentUtils.java 2007-03-23 16:01:06 UTC (rev 618)
@@ -14,7 +14,7 @@
public String setString(Document document, String newText){
try {
- document.remove(0, document.getLength()-1);
+ document.remove(0, document.getLength());
document.insertString(0, newText, null);
} catch (BadLocationException e) {
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java 2007-03-23 15:59:48 UTC (rev 617)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginManager.java 2007-03-23 16:01:06 UTC (rev 618)
@@ -47,6 +47,7 @@
import net.sf.magicmap.client.gui.MainFrame;
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.forms.UserInterface;
+import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.utils.table.FilteredTableModel;
import net.sf.magicmap.client.gui.utils.table.NotFilter;
import net.sf.magicmap.client.gui.views.MapView;
@@ -167,8 +168,8 @@
repository = new PluginRepository(new URL("http://phl.informatik.hu-berlin.de/magicmap-plugins/"));
tableModel = new DefaultTableModel();
- tableModel.addColumn("Name");
- tableModel.addColumn("Version");
+ tableModel.addColumn(GUIUtils.i18n("plugins.name"));
+ tableModel.addColumn(GUIUtils.i18n("plugins.version"));
tableModel.addColumn("--");
installedModel = new FilteredTableModel(tableModel);
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java 2007-03-23 15:59:48 UTC (rev 617)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java 2007-03-23 16:01:06 UTC (rev 618)
@@ -6,7 +6,6 @@
import javax.swing.JDialog;
import javax.swing.JFrame;
-import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIConstants;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.utils.MagicAction;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginDescriptorModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginDescriptorModel.java 2007-03-23 15:59:48 UTC (rev 617)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/ui/PluginDescriptorModel.java 2007-03-23 16:01:06 UTC (rev 618)
@@ -1,6 +1,7 @@
package net.sf.magicmap.client.plugin.ui;
+import java.awt.Color;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
@@ -44,7 +45,7 @@
public PluginDescriptorModel(){
-
+
}
public final Document name = new PlainDocument();
public final Document description = new PlainDocument();
@@ -92,10 +93,14 @@
JComponent proxy;
if ("PLUGIN_NAME".equals(attributeName)){
JTextField tf = new JTextField(name,name.toString(), 6);
+ tf.setEditable(false);
+ tf.setBackground(Color.white);
proxy = tf;
}
else if ("PLUGIN_DESCRIPTION".equals(attributeName)){
JTextArea tf = new JTextArea(description,description.toString(), 6,6);
+ tf.setEditable(false);
+ tf.setBackground(Color.white);
proxy = tf;
}
else if (Attributes.PluginDependencies.getName().equals(attributeName)){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-23 15:59:49
|
Revision: 617
http://svn.sourceforge.net/magicmap/?rev=617&view=rev
Author: anweiss
Date: 2007-03-23 08:59:48 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
once more i18n
Modified Paths:
--------------
trunk/magicmapclient/res/screentext.properties
trunk/magicmapclient/res/screentext_de_DE.properties
Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties 2007-03-23 14:27:28 UTC (rev 616)
+++ trunk/magicmapclient/res/screentext.properties 2007-03-23 15:59:48 UTC (rev 617)
@@ -120,4 +120,5 @@
plugins.available=Available Plugins
plugins.dependencies=Dependencies
plugins.detailview=Detail View
-plugins.name=Name
\ No newline at end of file
+plugins.name=Name
+plugins.version=Version
\ No newline at end of file
Modified: trunk/magicmapclient/res/screentext_de_DE.properties
===================================================================
--- trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-23 14:27:28 UTC (rev 616)
+++ trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-23 15:59:48 UTC (rev 617)
@@ -120,4 +120,5 @@
plugins.available=verf\xFCgbare Plugins
plugins.dependencies=Abh\xE4ngigkeiten
plugins.detailview=Detailansicht
-plugins.name=Name
\ No newline at end of file
+plugins.name=Name
+plugins.version=Version
\ 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: <fle...@us...> - 2007-03-23 14:27:29
|
Revision: 616
http://svn.sourceforge.net/magicmap/?rev=616&view=rev
Author: flederohr
Date: 2007-03-23 07:27:28 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
center plugins dialog when opened
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java 2007-03-23 13:36:21 UTC (rev 615)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java 2007-03-23 14:27:28 UTC (rev 616)
@@ -6,6 +6,7 @@
import javax.swing.JDialog;
import javax.swing.JFrame;
+import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIConstants;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.utils.MagicAction;
@@ -34,6 +35,7 @@
dlg.setModal(true);
dlg.setContentPane(manager.visualProxy("", null));
dlg.pack();
+ GUIUtils.locateOnScreen(dlg);
dlg.setVisible(true);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-23 13:36:25
|
Revision: 615
http://svn.sourceforge.net/magicmap/?rev=615&view=rev
Author: flederohr
Date: 2007-03-23 06:36:21 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
formating with codingconventions
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java 2007-03-23 13:34:29 UTC (rev 614)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java 2007-03-23 13:36:21 UTC (rev 615)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.client.plugin.action;
import java.awt.event.ActionEvent;
@@ -18,19 +19,21 @@
* To change this template use File | Settings | File Templates.
*/
public class ShowPluginsAction extends MagicAction {
- private final JFrame mainFrame;
- private final net.sf.magicmap.client.plugin.PluginManager manager;
- public ShowPluginsAction(JFrame mainFrame, PluginManager manager){
- super ("plugins.show", GUIConstants.ICON_PROPERTIES, "plugins.show.tooltip");
- this.mainFrame = mainFrame;
- this.manager = manager;
- }
- public void actionPerformed(ActionEvent e) {
- JDialog dlg = new JDialog(mainFrame);
- dlg.setModal(true);
- dlg.setContentPane(manager.visualProxy("", null));
- dlg.pack();
- dlg.setVisible(true);
- }
+ private final JFrame mainFrame;
+ private final net.sf.magicmap.client.plugin.PluginManager manager;
+
+ public ShowPluginsAction(JFrame mainFrame, PluginManager manager) {
+ super("plugins.show", GUIConstants.ICON_PROPERTIES, "plugins.show.tooltip");
+ this.mainFrame = mainFrame;
+ this.manager = manager;
+ }
+
+ public void actionPerformed(ActionEvent e){
+ JDialog dlg = new JDialog(mainFrame);
+ dlg.setModal(true);
+ dlg.setContentPane(manager.visualProxy("", null));
+ dlg.pack();
+ dlg.setVisible(true);
+ }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java 2007-03-23 13:34:29 UTC (rev 614)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java 2007-03-23 13:36:21 UTC (rev 615)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.client.plugin.forms;
import static net.sf.magicmap.client.plugin.PluginManager.Attributes.AvailablePlugins;
@@ -32,47 +33,48 @@
*/
public final class PluginsForm extends FormLayoutForm {
- private TabForm tabs;
- private Form settingsForm;
- private Form detailsForm;
+ private TabForm tabs;
+ private Form settingsForm;
+ private Form detailsForm;
- /**
- */
- public PluginsForm(final PluginManager manager){
- super ("p:grow,3dlu,p:grow", "p,3dlu, p:grow");
- tabs = new TabForm();
- tabs.addAttribute(AvailablePlugins.getName(), "",
- new TabForm.TabConstraints(GUIUtils.i18n("plugins.available"), "TT", null));
- tabs.addAttribute(InstalledPlugins.getName(), "",
- new TabForm.TabConstraints(GUIUtils.i18n("plugins.installed"), "TT", null));
- addForm(tabs, new CellConstraints(1,3, CellConstraints.FILL, CellConstraints.FILL));
+ /**
+ */
+ public PluginsForm(final PluginManager manager) {
+ super("p:grow,3dlu,p:grow", "p,3dlu, p:grow");
+ tabs = new TabForm();
+ tabs.addAttribute(AvailablePlugins.getName(), "", new TabForm.TabConstraints(
+ GUIUtils.i18n("plugins.available"), "TT", null));
+ tabs.addAttribute(InstalledPlugins.getName(), "", new TabForm.TabConstraints(
+ GUIUtils.i18n("plugins.installed"), "TT", null));
+ addForm(tabs, new CellConstraints(1, 3, CellConstraints.FILL, CellConstraints.FILL));
- detailsForm = new FormLayoutForm("p,3dlu,p:grow", "p,3dlu,p:grow");
- detailsForm.addLabel(PluginName.getName(), new JLabel(GUIUtils.i18n("plugins.name")), new CellConstraints(1,1));
- detailsForm.addAttribute(PluginName.getName(), "", new CellConstraints(3,1));
- detailsForm.addLabel(PluginDependencies.getName(), new JLabel(GUIUtils.i18n("plugins.dependencies")), new CellConstraints(1,3));
- detailsForm.addAttribute(PluginDependencies.getName(), "", new CellConstraints(3,3));
+ detailsForm = new FormLayoutForm("p,3dlu,p:grow", "p,3dlu,p:grow");
+ detailsForm
+ .addLabel(PluginName.getName(), new JLabel(GUIUtils.i18n("plugins.name")), new CellConstraints(1, 1));
+ detailsForm.addAttribute(PluginName.getName(), "", new CellConstraints(3, 1));
+ detailsForm.addLabel(PluginDependencies.getName(), new JLabel(GUIUtils.i18n("plugins.dependencies")),
+ new CellConstraints(1, 3));
+ detailsForm.addAttribute(PluginDependencies.getName(), "", new CellConstraints(3, 3));
+ detailsForm.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(GUIUtils
+ .i18n("plugins.detailview")), BorderFactory.createEmptyBorder(5, 5, 5, 5)));
+ addForm(detailsForm, new CellConstraints(3, 3, CellConstraints.FILL, CellConstraints.FILL));
+ setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder("Plugin"), BorderFactory
+ .createEmptyBorder(5, 5, 5, 5)));
- detailsForm.setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createTitledBorder(GUIUtils.i18n("plugins.detailview")),
- BorderFactory.createEmptyBorder(5,5,5,5)));
- addForm(detailsForm, new CellConstraints(3,3, CellConstraints.FILL, CellConstraints.FILL));
- setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createTitledBorder("Plugin"),
- BorderFactory.createEmptyBorder(5,5,5,5)));
+ // Actions!
+ FormLayoutForm actionButton = new FormLayoutForm("p,3dlu,p,6dlu,p,3dlu,p:grow", "p");
+ actionButton.addLabel("", new JButton(new net.sf.magicmap.client.plugin.action.InstallPluginAction(manager)),
+ new CellConstraints(1, 1));
+ actionButton.addLabel("", new JButton(new UninstallPluginAction(manager)), new CellConstraints(3, 1));
+ actionButton.addLabel("", new JButton(new LoadPluginsAction(manager)), new CellConstraints(5, 1,
+ CellConstraints.DEFAULT, CellConstraints.FILL));
+ actionButton.addAttribute(PluginRepository.getName(), "", new CellConstraints(7, 1));
+ addForm(actionButton, new CellConstraints(1, 1, 3, 1, CellConstraints.FILL, CellConstraints.FILL));
+ }
- // Actions!
- FormLayoutForm actionButton = new FormLayoutForm("p,3dlu,p,6dlu,p,3dlu,p:grow", "p");
- actionButton.addLabel("", new JButton(new net.sf.magicmap.client.plugin.action.InstallPluginAction(manager)), new CellConstraints(1,1));
- actionButton.addLabel("", new JButton(new UninstallPluginAction(manager)), new CellConstraints(3,1));
- actionButton.addLabel("", new JButton(new LoadPluginsAction(manager)), new CellConstraints(5,1,CellConstraints.DEFAULT, CellConstraints.FILL));
- actionButton.addAttribute(PluginRepository.getName(), "", new CellConstraints(7,1));
- addForm(actionButton, new CellConstraints(1,1,3,1,CellConstraints.FILL, CellConstraints.FILL));
- }
-
- public JComponent attatch(UserInterface ui) {
- JComponent c = super.attatch(ui);
- return c;
- }
+ public JComponent attatch(UserInterface ui){
+ JComponent c = super.attatch(ui);
+ return c;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-03-23 13:34:35
|
Revision: 614
http://svn.sourceforge.net/magicmap/?rev=614&view=rev
Author: flederohr
Date: 2007-03-23 06:34:29 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
Use i18n strings in plugin view
Modified Paths:
--------------
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
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-23 13:28:54 UTC (rev 613)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/InstallPluginAction.java 2007-03-23 13:34:29 UTC (rev 614)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.client.plugin.action;
import java.awt.event.ActionEvent;
@@ -6,6 +7,7 @@
import java.io.IOException;
import net.sf.magicmap.client.gui.utils.GUIConstants;
+import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.utils.MagicAction;
/**
@@ -16,31 +18,33 @@
* To change this template use File | Settings | File Templates.
*/
public class InstallPluginAction extends MagicAction implements ItemListener {
+
private final net.sf.magicmap.client.plugin.PluginManager manager;
- private net.sf.magicmap.client.plugin.IPluginDescriptor descriptor;
+ private net.sf.magicmap.client.plugin.IPluginDescriptor descriptor;
- public InstallPluginAction(net.sf.magicmap.client.plugin.PluginManager manager){
- super ("Plugin Installieren", GUIConstants.ICON_CONNECT,"Plugin Instalieren");
+ public InstallPluginAction(net.sf.magicmap.client.plugin.PluginManager manager) {
+ super("plugins.install", GUIConstants.ICON_CONNECT, "plugins.install.tooltip");
this.manager = manager;
- manager.addItemListener(this);
- setEnabled(false);
- }
- public void actionPerformed(ActionEvent e) {
- try {
- manager.installPlugin(descriptor);
- } catch (IOException e1) {
- e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
- }
+ manager.addItemListener(this);
+ setEnabled(false);
+ }
- public void itemStateChanged(ItemEvent e) {
- if (ItemEvent.SELECTED == e.getStateChange()){
- setDescriptor((net.sf.magicmap.client.plugin.IPluginDescriptor) e.getItem());
- }
- }
+ public void actionPerformed(ActionEvent e){
+ try {
+ manager.installPlugin(descriptor);
+ } catch (IOException e1) {
+ e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ }
- public void setDescriptor(net.sf.magicmap.client.plugin.IPluginDescriptor descriptor) {
- this.descriptor = descriptor;
- setEnabled(descriptor != null && !manager.isInstalled(descriptor));
- }
+ public void itemStateChanged(ItemEvent e){
+ if (ItemEvent.SELECTED == e.getStateChange()) {
+ setDescriptor((net.sf.magicmap.client.plugin.IPluginDescriptor) e.getItem());
+ }
+ }
+
+ public void setDescriptor(net.sf.magicmap.client.plugin.IPluginDescriptor descriptor){
+ this.descriptor = descriptor;
+ setEnabled(descriptor != null && !manager.isInstalled(descriptor));
+ }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/LoadPluginsAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/LoadPluginsAction.java 2007-03-23 13:28:54 UTC (rev 613)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/LoadPluginsAction.java 2007-03-23 13:34:29 UTC (rev 614)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.client.plugin.action;
import java.awt.event.ActionEvent;
@@ -4,6 +5,7 @@
import java.io.IOException;
import net.sf.magicmap.client.gui.utils.GUIConstants;
+import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.utils.MagicAction;
import net.sf.magicmap.client.plugin.IPluginDescriptor;
import net.sf.magicmap.client.plugin.PluginManager;
@@ -15,22 +17,24 @@
* Time: 16:47:19
* To change this template use File | Settings | File Templates.
*/
-public class LoadPluginsAction extends MagicAction{
- private final PluginManager manager;
- private IPluginDescriptor descriptor;
+public class LoadPluginsAction extends MagicAction {
- public LoadPluginsAction(PluginManager manager){
- super ("Pluginliste laden", GUIConstants.ICON_CONNECT,"Die Liste aller vorhandenen Plugin laden");
+ private final PluginManager manager;
+ private IPluginDescriptor descriptor;
+
+ public LoadPluginsAction(PluginManager manager) {
+ super("plugins.load", GUIConstants.ICON_CONNECT, "plugins.load.tooltip");
this.manager = manager;
}
- public void actionPerformed(ActionEvent e) {
- try {
- setEnabled(false);
- manager.loadRepository();
- } catch (IOException e1) {
- e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }finally{
- setEnabled(true);
- }
- }
+
+ public void actionPerformed(ActionEvent e){
+ try {
+ setEnabled(false);
+ manager.loadRepository();
+ } catch (IOException e1) {
+ e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ } finally {
+ setEnabled(true);
+ }
+ }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java 2007-03-23 13:28:54 UTC (rev 613)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/ShowPluginsAction.java 2007-03-23 13:34:29 UTC (rev 614)
@@ -22,7 +22,7 @@
private final net.sf.magicmap.client.plugin.PluginManager manager;
public ShowPluginsAction(JFrame mainFrame, PluginManager manager){
- super (GUIUtils.i18n("plugins.show"), GUIConstants.ICON_PROPERTIES, GUIUtils.i18n("plugins.tooltip"));
+ super ("plugins.show", GUIConstants.ICON_PROPERTIES, "plugins.show.tooltip");
this.mainFrame = mainFrame;
this.manager = manager;
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/UninstallPluginAction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/UninstallPluginAction.java 2007-03-23 13:28:54 UTC (rev 613)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/action/UninstallPluginAction.java 2007-03-23 13:34:29 UTC (rev 614)
@@ -1,3 +1,4 @@
+
package net.sf.magicmap.client.plugin.action;
import java.awt.event.ActionEvent;
@@ -5,6 +6,7 @@
import java.io.IOException;
import net.sf.magicmap.client.gui.utils.GUIConstants;
+import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.gui.utils.MagicAction;
import net.sf.magicmap.client.plugin.IPluginDescriptor;
import net.sf.magicmap.client.plugin.PluginManager;
@@ -18,31 +20,32 @@
*/
public class UninstallPluginAction extends MagicAction {
- private final PluginManager manager;
- private net.sf.magicmap.client.plugin.IPluginDescriptor descriptor;
+ private final PluginManager manager;
+ private net.sf.magicmap.client.plugin.IPluginDescriptor descriptor;
- public UninstallPluginAction(net.sf.magicmap.client.plugin.PluginManager manager){
- super ("Plugin deinstallieren", GUIConstants.ICON_DELETE,"Plugin deinstalieren");
- this.manager = manager;
- manager.addItemListener(this);
- setEnabled(false);
- }
- public void actionPerformed(ActionEvent e) {
- try {
- manager.uninstallPlugin(descriptor);
- } catch (IOException e1) {
- e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
- }
+ public UninstallPluginAction(net.sf.magicmap.client.plugin.PluginManager manager) {
+ super("plugins.uninstall", GUIConstants.ICON_DELETE, "plugins.uninstall.tooltip");
+ this.manager = manager;
+ manager.addItemListener(this);
+ setEnabled(false);
+ }
- public void itemStateChanged(ItemEvent e) {
- if (ItemEvent.SELECTED == e.getStateChange()){
- setDescriptor((IPluginDescriptor) e.getItem());
- }
- }
+ public void actionPerformed(ActionEvent e){
+ try {
+ manager.uninstallPlugin(descriptor);
+ } catch (IOException e1) {
+ e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ }
- public void setDescriptor(IPluginDescriptor descriptor) {
- this.descriptor = descriptor;
- setEnabled(descriptor != null && manager.isInstalled(descriptor));
- }
+ public void itemStateChanged(ItemEvent e){
+ if (ItemEvent.SELECTED == e.getStateChange()) {
+ setDescriptor((IPluginDescriptor) e.getItem());
+ }
+ }
+
+ public void setDescriptor(IPluginDescriptor descriptor){
+ this.descriptor = descriptor;
+ setEnabled(descriptor != null && manager.isInstalled(descriptor));
+ }
}
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java 2007-03-23 13:28:54 UTC (rev 613)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/forms/PluginsForm.java 2007-03-23 13:34:29 UTC (rev 614)
@@ -15,6 +15,7 @@
import net.sf.magicmap.client.gui.forms.FormLayoutForm;
import net.sf.magicmap.client.gui.forms.TabForm;
import net.sf.magicmap.client.gui.forms.UserInterface;
+import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.plugin.PluginManager;
import net.sf.magicmap.client.plugin.action.LoadPluginsAction;
import net.sf.magicmap.client.plugin.action.UninstallPluginAction;
@@ -41,20 +42,20 @@
super ("p:grow,3dlu,p:grow", "p,3dlu, p:grow");
tabs = new TabForm();
tabs.addAttribute(AvailablePlugins.getName(), "",
- new TabForm.TabConstraints("Vorhandene Plugins", "TT", null));
+ new TabForm.TabConstraints(GUIUtils.i18n("plugins.available"), "TT", null));
tabs.addAttribute(InstalledPlugins.getName(), "",
- new TabForm.TabConstraints("Installierte Plugins", "TT", null));
+ new TabForm.TabConstraints(GUIUtils.i18n("plugins.installed"), "TT", null));
addForm(tabs, new CellConstraints(1,3, CellConstraints.FILL, CellConstraints.FILL));
detailsForm = new FormLayoutForm("p,3dlu,p:grow", "p,3dlu,p:grow");
- detailsForm.addLabel(PluginName.getName(), new JLabel("Name"), new CellConstraints(1,1));
+ detailsForm.addLabel(PluginName.getName(), new JLabel(GUIUtils.i18n("plugins.name")), new CellConstraints(1,1));
detailsForm.addAttribute(PluginName.getName(), "", new CellConstraints(3,1));
- detailsForm.addLabel(PluginDependencies.getName(), new JLabel("Abhaengigkeiten"), new CellConstraints(1,3));
+ detailsForm.addLabel(PluginDependencies.getName(), new JLabel(GUIUtils.i18n("plugins.dependencies")), new CellConstraints(1,3));
detailsForm.addAttribute(PluginDependencies.getName(), "", new CellConstraints(3,3));
detailsForm.setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createTitledBorder("Detailansicht"),
+ BorderFactory.createTitledBorder(GUIUtils.i18n("plugins.detailview")),
BorderFactory.createEmptyBorder(5,5,5,5)));
addForm(detailsForm, new CellConstraints(3,3, CellConstraints.FILL, CellConstraints.FILL));
setBorder(BorderFactory.createCompoundBorder(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-23 13:29:00
|
Revision: 613
http://svn.sourceforge.net/magicmap/?rev=613&view=rev
Author: anweiss
Date: 2007-03-23 06:28:54 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
even more i18n
Modified Paths:
--------------
trunk/magicmapclient/res/screentext.properties
Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties 2007-03-23 13:23:24 UTC (rev 612)
+++ trunk/magicmapclient/res/screentext.properties 2007-03-23 13:28:54 UTC (rev 613)
@@ -111,13 +111,13 @@
plugins.show=Plugins
plugins.show.tooltip=Shows all plugins
plugins.installed=Installed Plugins
-plugins.load=show plugins
-plugins.install=install plugins
-plugins.uninstall=deinstall plugins
-plugins.load.tooltip=Load the plugin list
-plugins.install.tooltip=installs the selected plugin
-plugins.uninstall.tooltip=deinstalls the selected plugin
-plugins.available=available plugins
+plugins.load=Show Plugins
+plugins.install=Install Plugins
+plugins.uninstall=Deinstall Plugins
+plugins.load.tooltip=Load the Plugin List
+plugins.install.tooltip=Installs the selected Plugin
+plugins.uninstall.tooltip=Deinstalls the selected Plugin
+plugins.available=Available Plugins
plugins.dependencies=Dependencies
-plugins.detailview=detail view
-plugins.name=name
\ No newline at end of file
+plugins.detailview=Detail View
+plugins.name=Name
\ 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: <an...@us...> - 2007-03-23 13:23:25
|
Revision: 612
http://svn.sourceforge.net/magicmap/?rev=612&view=rev
Author: anweiss
Date: 2007-03-23 06:23:24 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/magicmapclient/res/screentext.properties
Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties 2007-03-23 13:20:16 UTC (rev 611)
+++ trunk/magicmapclient/res/screentext.properties 2007-03-23 13:23:24 UTC (rev 612)
@@ -109,7 +109,7 @@
node.accesspoint.is.hide = OFF
continue=C&ontinue
plugins.show=Plugins
-plugins.show.tooltip=Zeige alle Plugins
+plugins.show.tooltip=Shows all plugins
plugins.installed=Installed Plugins
plugins.load=show plugins
plugins.install=install plugins
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-23 13:20:20
|
Revision: 611
http://svn.sourceforge.net/magicmap/?rev=611&view=rev
Author: anweiss
Date: 2007-03-23 06:20:16 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
more i18n strings
Modified Paths:
--------------
trunk/magicmapclient/res/screentext.properties
trunk/magicmapclient/res/screentext_de_DE.properties
Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties 2007-03-23 12:39:00 UTC (rev 610)
+++ trunk/magicmapclient/res/screentext.properties 2007-03-23 13:20:16 UTC (rev 611)
@@ -107,4 +107,17 @@
map.panel.context.hide.ap = hide accesspoint
map.panel.context.hide.ap.off = compute accesspoint
node.accesspoint.is.hide = OFF
-continue=C&ontinue
\ No newline at end of file
+continue=C&ontinue
+plugins.show=Plugins
+plugins.show.tooltip=Zeige alle Plugins
+plugins.installed=Installed Plugins
+plugins.load=show plugins
+plugins.install=install plugins
+plugins.uninstall=deinstall plugins
+plugins.load.tooltip=Load the plugin list
+plugins.install.tooltip=installs the selected plugin
+plugins.uninstall.tooltip=deinstalls the selected plugin
+plugins.available=available plugins
+plugins.dependencies=Dependencies
+plugins.detailview=detail view
+plugins.name=name
\ No newline at end of file
Modified: trunk/magicmapclient/res/screentext_de_DE.properties
===================================================================
--- trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-23 12:39:00 UTC (rev 610)
+++ trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-23 13:20:16 UTC (rev 611)
@@ -107,4 +107,17 @@
map.panel.context.hide.ap = Accesspoint bei Berechnung ausblenden
map.panel.context.hide.ap.off = Accesspoint bei Berechnung ber\xFCcksichtigen
node.accesspoint.is.hide = AUS
-continue=&Weiter
\ No newline at end of file
+continue=&Weiter
+plugins.show=Plugins
+plugins.show.tooltip=Zeige alle Plugins
+plugins.installed=Installierte Plugins
+plugins.load=zeige plugins
+plugins.install=installiere Plugins
+plugins.uninstall=deinstalliere Plugin
+plugins.load.tooltip=L\xE4dt die Pluginliste
+plugins.install.tooltip=installiert ausgew\xE4hltes Plugin
+plugins.uninstall.tooltip=deinstalliert ausgew\xE4hltes Plugin
+plugins.available=verf\xFCgbare Plugins
+plugins.dependencies=Abh\xE4ngigkeiten
+plugins.detailview=Detailansicht
+plugins.name=Name
\ 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: <fle...@us...> - 2007-03-23 12:39:09
|
Revision: 610
http://svn.sourceforge.net/magicmap/?rev=610&view=rev
Author: flederohr
Date: 2007-03-23 05:39:00 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
check connection status before communication
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-03-23 12:06:22 UTC (rev 609)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java 2007-03-23 12:39:00 UTC (rev 610)
@@ -6,13 +6,11 @@
package net.sf.magicmap.client.controller;
import java.util.ArrayList;
-import java.util.Collection;
import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
import net.sf.magicmap.client.interfaces.CreatePositionCallback;
import net.sf.magicmap.client.interfaces.DeletePositionCallback;
import net.sf.magicmap.client.interfaces.FetchGeoPointsCallback;
-import net.sf.magicmap.client.interfaces.FetchInfoPointsCallback;
import net.sf.magicmap.client.interfaces.FetchMapsCallback;
import net.sf.magicmap.client.interfaces.FetchPositionsCallback;
import net.sf.magicmap.client.interfaces.MapCallback;
@@ -139,6 +137,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
mapFacade.createNewMap(sessionId, name, URL, imageWidth, imageHeight, width, height);
MapInfo mapinfo = new MapInfo();
@@ -171,6 +170,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
ArrayList<String> result = new ArrayList<String>();
@@ -208,6 +208,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
MapDTO mapDTO = mapFacade.getMap(name);
callback.mapReceived(mapDTO);
@@ -236,6 +237,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
positionFacade.createOrUpdatePosition(sessionId, controller.getCurrentMap().name, x, y, z,
signalCharacter, name, fixed);
@@ -267,6 +269,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
mapFacade.createGeoPoint(sessionId, name, x, y, geoPos.getLongitude(),
geoPos.getLatitude(), geoPos.getAltitude());
@@ -294,6 +297,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
positionFacade.deletePosition(sessionId, mapname, positionId);
@@ -323,6 +327,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
positionFacade.movePosition(sessionId, mapname, positionId, x, y, z, fixed);
@@ -351,6 +356,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
positionFacade.createOrUpdateClientPosition(sessionId, controller.getCurrentMap().name, x, y,
@@ -381,6 +387,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
positionFacade.createOrUpdateAccessPosition(sessionId, controller.getCurrentMap().name, x, y,
z, accessPointMac, fixed);
@@ -411,6 +418,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
positionFacade.setAccessPointHiddenStatus(sessionId, controller.getCurrentMap().name,
accessPointMac, hidden);
@@ -436,6 +444,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
PositionDTO[] positions;
if (VirtualServerManager.this.timestamp == -1)
@@ -552,6 +561,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
mapFacade.deleteGeoPoint(VirtualServerManager.this.sessionId, id);
callback.positionDeleted(id);
@@ -579,6 +589,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
// retrieve geo points
GeoPointDTO[] geoPoses = mapFacade.getGeoPointsForMap(VirtualServerManager.this.sessionId,
@@ -609,6 +620,7 @@
public void run(){
synchronized (mutex) {
+ if (!isConnected()) return;
try {
// retrieve maps
StringReplacementDTO[] names = mapFacade.getMapNames();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-23 12:06:45
|
Revision: 609
http://svn.sourceforge.net/magicmap/?rev=609&view=rev
Author: anweiss
Date: 2007-03-23 05:06:22 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
more cleaning of i18n files
Modified Paths:
--------------
trunk/magicmapclient/res/screentext.properties
trunk/magicmapclient/res/screentext_de_DE.properties
trunk/magicmapclient/src/net/sf/magicmap/client/model/outline/OutlineModel.java
Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties 2007-03-23 12:03:15 UTC (rev 608)
+++ trunk/magicmapclient/res/screentext.properties 2007-03-23 12:06:22 UTC (rev 609)
@@ -1,6 +1,6 @@
file=&File
map=&Map
-connect=&Connect
+connect=C&onnect
disconnect=&Disconnect
exit=E&xit
view=&View
@@ -13,8 +13,6 @@
normalview=Advanced
expertview=Expert
userdefinedview=&User-defined...
-connect_to_server=Connect to server
-disconnect_from_server=Disconnect from server
createlocation=New Referencepoint
creategeopos=New Geocoordinate
fetchlocations=Fetch all locations from server
@@ -23,18 +21,11 @@
properties=Properties...
connectserver=Connect with server
ok=&OK
-cancel=Cancel
-finish=&Finish
+cancel=&Cancel
hostname=&Hostname
port=&Port
createconnectiontopacwserver=Create connection with MagicMap server
createconnectiontopacwserverhint=Please enter connection settings
-addvertex=Add a vertex to graph
-test=Test
-addclient=Add client
-addaccesspoint=Add access point
-addlocation=Add location
-seesaccesspoints=Sees Access Point
outline=Outline
console=Console
measurement=Measurement
@@ -42,7 +33,6 @@
accesspoints=Access Points
locations=Locations
clients=Clients
-signalstrength=Signalstrength
nodewiththisnamealreadyexists=A node with this name already exists
macaddress=MAC address
signallevel=Signallevel
@@ -51,17 +41,14 @@
avgsignallevel=Mean
avgstrength=Avg. Strength
password=P&assword
-clientname=&Clientname
+clientname=C&lientname
connected=Connected
connecting=Connecting...
disconnected=Disconnected
newmap=&New map
loadmap=&Load map
-width=Width
-height=Height
imageurl=Image-URL
choosemapimage=Choose map image
-browse=Browse
name=&Name
maps=&Maps
cantconnectretry=Can't establish connection.\n\nDo you want to retry?
@@ -97,13 +84,13 @@
setanhttpproxy=Set an HTTP-Proxy
setanhttpproxyhint=Please enter name and port of your proxy server
setproxytooltip=Set Proxy-server
+geocoordinates=Geopoints
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
-datainvocationratetooltip=Sets the rate for getting data from the server
dataInvocationRate1=1 sec
dataInvocationRate2=2 sec
dataInvocationRate3=3 sec
@@ -117,9 +104,6 @@
heightNode = set node's height
input.dialog.height = Height (in cm) above the map
message.dialog.wrong.height = Error! The Node's height wasn't updated!
-new.map.dialog.real.width = Width of Map(cm)
-new.map.dialog.real.height = Height of Map(cm)
-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
Modified: trunk/magicmapclient/res/screentext_de_DE.properties
===================================================================
--- trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-23 12:03:15 UTC (rev 608)
+++ trunk/magicmapclient/res/screentext_de_DE.properties 2007-03-23 12:06:22 UTC (rev 609)
@@ -13,8 +13,6 @@
normalview=Fortgeschritten
expertview=Experte
userdefinedview=&Benutzerdefiniert...
-connect_to_server=Mit Server verbinden
-disconnect_from_server=Vom Server trennen
createlocation=Neuer Referenzpunkt
creategeopos=Neue Geokoordinate
fetchlocations=Hole alle Orte vom Server
@@ -23,18 +21,11 @@
properties=Eigenschaften...
connectserver=Mit Server verbinden
ok=&OK
-cancel=Abbruch
-finish=&Schlie\xDFen
+cancel=&Abbruch
hostname=&Rechnername
port=&Port
createconnectiontopacwserver=Verbindung mit MagicMap-Server herstellen
createconnectiontopacwserverhint=Geben Sie bitte die Verbindungsoptionen an
-addvertex=Einen Knoten hinzuf\xFCgen
-test=Test
-addclient=Client hinzuf\xFCgen
-addaccesspoint=Access Point hinzuf\xFCgen
-addlocation=Referenzpunkt hinzuf\xFCgen
-seesaccesspoints=Sieht Access Point
outline=\xDCbersicht
console=Konsole
measurement=Messung
@@ -42,7 +33,6 @@
accesspoints=Access Points
locations=Referenzpunkte
clients=Clients
-signalstrength=Signalst\xE4rke
nodewiththisnamealreadyexists=Es existiert bereits ein Knoten mit diesem Namen
macaddress=MAC-Adresse
signallevel=Signallevel
@@ -51,17 +41,14 @@
avgsignallevel=Mittelwert
avgstrength=Durchschn. St\xE4rke
password=P&asswort
-clientname=&Clientname
+clientname=C&lientname
connected=Verbunden
connecting=Verbinde...
disconnected=Nicht verbunden
newmap=&Neue Karte
loadmap=Karte &laden
-width=Breite
-height=H\xF6he
imageurl=Bildadresse
choosemapimage=Kartenbild w\xE4hlen
-browse=Durchsuchen
name=&Name
maps=&Karten
cantconnectretry=Verbindung zum Server kann nicht hergestellt werden. \n\nVerbindungsvorgang wiederholen?
@@ -97,13 +84,13 @@
setanhttpproxy=Einen HTTP-Proxy setzen
setanhttpproxyhint=Geben Sie bitte die Daten ihres Proxy-Servers an
setproxytooltip=Proxy-Server einstellen
+geocoordinates=Geokoordinaten
geopos=Geokoordinate setzen
setgeopos=Eine Geokoordinate setzen
setgeoposhint=Geben Sie bitte eine Geokoordinate an
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
dataInvocationRate2=2 Sek
dataInvocationRate3=3 Sek
@@ -117,9 +104,6 @@
heightNode = H\xF6henkote setzen
input.dialog.height = H\xF6he (in cm) \xFCber der Kartenebene
message.dialog.wrong.height = H\xF6he wurde nicht ge\xE4ndert!
-new.map.dialog.real.width = Kartenbreite(cm)
-new.map.dialog.real.height = Kartenh\xF6he(cm)
-new.map.dialog.scale = Skalierungsfaktoren
map.panel.context.hide.ap = Accesspoint bei Berechnung ausblenden
map.panel.context.hide.ap.off = Accesspoint bei Berechnung ber\xFCcksichtigen
node.accesspoint.is.hide = AUS
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/outline/OutlineModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/outline/OutlineModel.java 2007-03-23 12:03:15 UTC (rev 608)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/outline/OutlineModel.java 2007-03-23 12:06:22 UTC (rev 609)
@@ -21,6 +21,11 @@
*/
public class OutlineModel extends DefaultTreeModel implements NodeModelListener {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private final INodeModel nodeModel;
private final OutlineTreeNode rootNode;
private final Map<Integer, OutlineTreeNode> categories;
@@ -41,8 +46,7 @@
addCategory(NodeModelConstants.NODETYPE_ACCESSPOINT, GUIUtils.i18n("accesspoints"));
addCategory(NodeModelConstants.NODETYPE_CLIENT, GUIUtils.i18n("clients"));
addCategory(NodeModelConstants.NODETYPE_LOCATION, GUIUtils.i18n("locations"));
- addCategory(NodeModelConstants.NODETYPE_GEOPOS, GUIUtils.i18n("Geokoordinaten"));
- //addCategory(NodeModelConstants.NODETYPE_INFO, GUIUtils.i18n("Infoobjekte"));
+ addCategory(NodeModelConstants.NODETYPE_GEOPOS, GUIUtils.i18n("geocoordinates"));
nodeModel.addNodeModelListener(this);
}
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.
