Menu
▾
▴
[Magicmap-commits] SF.net SVN: magicmap: [710] trunk
|
From: <jan...@us...> - 2008-01-02 18:15:00
|
Revision: 710
http://magicmap.svn.sourceforge.net/magicmap/?rev=710&view=rev
Author: jan_fride
Date: 2008-01-02 10:14:57 -0800 (Wed, 02 Jan 2008)
Log Message:
-----------
Improved Os X Look.
Modified Paths:
--------------
trunk/magicmapclient/build.xml
trunk/magicmapclient/magicmapclient.iml
trunk/magicmapclient/src/com/jgoodies/uif_lite/panel/SimpleInternalFrame.java
trunk/magicmapclient/src/edu/uci/ics/jung/visualization/VisualizationViewer.java
trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INode.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java
trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java
trunk/magicmapserver/magicmapserver.iml
Added Paths:
-----------
trunk/magicmapclient/lib/looks-2.1.4.jar
Modified: trunk/magicmapclient/build.xml
===================================================================
--- trunk/magicmapclient/build.xml 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/build.xml 2008-01-02 18:14:57 UTC (rev 710)
@@ -8,7 +8,7 @@
<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="maven.home" value="/usr/local/maven"/>
@@ -156,7 +156,7 @@
<!-- Setting for maven path must be checked.-->
<target name="maven-install">
- <exec executable="${maven.home}/bin/mvn.bat">
+ <exec executable="${maven.home}/bin/mvn">
<arg value="install:install-file"/>
<arg value="-Dfile=magicmap.jar"/>
<arg value="-DgroupId=net.sf.magicmap"/>
Added: trunk/magicmapclient/lib/looks-2.1.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/magicmapclient/lib/looks-2.1.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/magicmapclient/magicmapclient.iml
===================================================================
--- trunk/magicmapclient/magicmapclient.iml 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/magicmapclient.iml 2008-01-02 18:14:57 UTC (rev 710)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="false" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<output url="file://$MODULE_DIR$/build" />
<exclude-output />
<output-test url="file://$MODULE_DIR$/build-test" />
@@ -9,35 +8,34 @@
<sourceFolder url="file://$MODULE_DIR$/res" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src-gen" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- <excludeFolder url="file://$MODULE_DIR$/build-test" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
+ <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
</content>
- <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://X:/maven/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../magicmapserver/dist/magicmap-server.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="file://$MODULE_DIR$/../magicmapserver/src" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/dom4j-1.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/commons-httpclient-3.0-rc3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/forms-1.0.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/colt.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -55,7 +53,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/foxtrot.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/concurrent.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -64,7 +62,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jaxrpc.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/xercesImpl.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -73,7 +71,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/ostermillerutils_1_05_00.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/xml-apis.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -82,7 +80,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/commons-codec-1.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/xmlParserAPIs.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -91,7 +89,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/concurrent.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/RelativeLayout.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -100,7 +98,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/colt.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/forms-1.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -109,7 +107,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/nekohtml.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/activation.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -118,7 +116,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/mail.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -127,7 +125,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jung-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/commons-discovery.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -136,7 +134,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/saaj.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -145,7 +143,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/xmlParserAPIs.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/jaxrpc.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -154,7 +152,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/derby.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/saaj.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -163,7 +161,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/RelativeLayout.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/wsdl4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -172,7 +170,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/xercesImpl.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/axis.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -181,7 +179,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/xml-apis.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/jung-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -190,7 +188,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/mail.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/derby.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -199,7 +197,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jaxen-1.1-beta-9.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/jpox-20041204.032009.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -208,7 +206,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/commons-httpclient-3.0-rc3.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/log4j-1.2.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -217,7 +215,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jpox-20041204.032009.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/ostermillerutils_1_05_00.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -226,7 +224,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/looks-1.2.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/dom4j-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -235,7 +233,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/log4j-1.2.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/commons-codec-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -244,7 +242,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/axis.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/jaxen-1.1-beta-9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -253,7 +251,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/activation.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/foxtrot.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -262,7 +260,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/wsdl4j.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/nekohtml.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -271,15 +269,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/commons-discovery.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/lib-dev/junit.jar!/" />
</CLASSES>
<JAVADOC />
@@ -289,13 +278,12 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib-dev/axis-ant.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/looks-2.1.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="magicmapserver" />
<orderEntryProperties />
</component>
</module>
Modified: trunk/magicmapclient/src/com/jgoodies/uif_lite/panel/SimpleInternalFrame.java
===================================================================
--- trunk/magicmapclient/src/com/jgoodies/uif_lite/panel/SimpleInternalFrame.java 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/src/com/jgoodies/uif_lite/panel/SimpleInternalFrame.java 2008-01-02 18:14:57 UTC (rev 710)
@@ -30,30 +30,13 @@
package com.jgoodies.uif_lite.panel;
-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 java.awt.Insets;
-import java.awt.LayoutManager;
-import java.awt.Paint;
+import com.jgoodies.looks.LookUtils;
+import net.sf.magicmap.client.gui.utils.ShadowBorder;
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JToolBar;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
+import javax.swing.*;
import javax.swing.border.AbstractBorder;
+import java.awt.*;
-import net.sf.magicmap.client.gui.utils.ShadowBorder;
-
-import com.jgoodies.plaf.LookUtils;
-
/**
* A <code>JPanel</code> subclass that has a drop shadow border and
* that provides a header with icon, title and tool bar.<p>
Modified: trunk/magicmapclient/src/edu/uci/ics/jung/visualization/VisualizationViewer.java
===================================================================
--- trunk/magicmapclient/src/edu/uci/ics/jung/visualization/VisualizationViewer.java 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/src/edu/uci/ics/jung/visualization/VisualizationViewer.java 2008-01-02 18:14:57 UTC (rev 710)
@@ -24,7 +24,6 @@
import java.awt.geom.AffineTransform;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.swing.JPanel;
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java 2008-01-02 18:14:57 UTC (rev 710)
@@ -22,11 +22,16 @@
/**
* Main entry point for the whole client
- *
+ *
* @param args
*/
public static void main(String[] args){
Settings.setup(args);
+ // set this before the first window.....
+ if (GUIUtils.isOsX()) {
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
+ System.setProperty("com.apple.mrj.application.apple.menu.about.name", "MagicMap");
+ }
JWindow splashScreen = new JWindow();
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIUtils.java 2008-01-02 18:14:57 UTC (rev 710)
@@ -5,32 +5,23 @@
package net.sf.magicmap.client.gui.utils;
-import java.awt.Dimension;
-import java.awt.Window;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import com.jgoodies.looks.Options;
+import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
+import com.jgoodies.looks.plastic.PlasticLookAndFeel;
+import com.jgoodies.looks.plastic.theme.ExperienceBlue;
+import net.sf.magicmap.client.gui.MainGUI;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.plaf.metal.MetalLookAndFeel;
+import java.awt.*;
+import java.util.*;
-import net.sf.magicmap.client.gui.MainGUI;
+import apple.laf.AquaLookAndFeel;
-import com.jgoodies.plaf.FontSizeHints;
-import com.jgoodies.plaf.Options;
-import com.jgoodies.plaf.plastic.Plastic3DLookAndFeel;
-import com.jgoodies.plaf.plastic.theme.ExperienceBlue;
-
/**
* @author msc
- *
+ *
*/
public class GUIUtils {
@@ -39,22 +30,44 @@
private static Map<String, ResourceBundle> bundles = null;
public static void setPlasticLookAndFeel(){
+
try {
- UIManager.setLookAndFeel(new Plastic3DLookAndFeel());
+ if (!isOsX()) {
+ UIManager.setLookAndFeel(new Plastic3DLookAndFeel());
+
+ } else {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ }
} catch (UnsupportedLookAndFeelException e) {
e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ } catch (InstantiationException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
- UIManager.put("Application.useSystemFontSettings", Boolean.TRUE);
- UIManager.put(Options.USE_SYSTEM_FONTS_APP_KEY, Boolean.TRUE);
- UIManager.put(com.jgoodies.plaf.Options.DEFAULT_ICON_SIZE_KEY, new Dimension(18, 18));
- Options.setGlobalFontSizeHints(FontSizeHints.MIXED);
- // PlasticLookAndFeel.setFontSizeHints(FontSizeHints.SYSTEM);
- MetalLookAndFeel.setCurrentTheme(new ExperienceBlue());
- Options.setGlobalFontSizeHints(FontSizeHints.MIXED);
+ if (!isOsX()) {
+ UIManager.put("Application.useSystemFontSettings", Boolean.TRUE);
+ UIManager.put(Options.USE_SYSTEM_FONTS_APP_KEY, Boolean.TRUE);
+ //UIManager.put(com.jgoodies.plaf.Options.DEFAULT_ICON_SIZE_KEY, new Dimension(18, 18));
+ // Options.setGlobalFontSizeHints(FontSizeHints.MIXED);
+ // PlasticLookAndFeel.setFontSizeHints(FontSizeHints.SYSTEM);
+ MetalLookAndFeel.setCurrentTheme(new ExperienceBlue());
+ //Options.setGlobalFontSizeHints(FontSizeHints.MIXED);
+ } else {
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
+ System.setProperty("com.apple.mrj.application.apple.menu.about.name", "MagicMap");
+ }
}
+ public static boolean isOsX() {
+ String lcOSName = System.getProperty("os.name").toLowerCase();
+ return lcOSName.startsWith("mac os x");
+ }
+
public static void locateOnScreen(Window frame){
Dimension paneSize = frame.getSize();
Dimension screenSize = frame.getToolkit().getScreenSize();
@@ -155,14 +168,14 @@
return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(), GUIUtils.i18n("serverresponse")
+ "\n" + message, GUIUtils.i18n("authentificationerror"), JOptionPane.OK_CANCEL_OPTION,
JOptionPane.ERROR_MESSAGE, null, new String[]{GUIUtils.i18n("retry"), GUIUtils.i18n("no")}, GUIUtils
- .i18n("retry")) == JOptionPane.YES_OPTION;
+ .i18n("retry")) == JOptionPane.YES_OPTION;
}
public static boolean showConnectionError(){
return JOptionPane.showOptionDialog(MainGUI.getInstance().getMainFrame(), GUIUtils
.i18n("connectionsproblemsreconnect"), GUIUtils.i18n("connectionproblems"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE, null, new String[]{GUIUtils.i18n("yes"),
- GUIUtils.i18n("no")}, GUIUtils.i18n("yes")) == JOptionPane.YES_OPTION;
+ GUIUtils.i18n("no")}, GUIUtils.i18n("yes")) == JOptionPane.YES_OPTION;
}
public static void showErrorDialog(String message){
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INode.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INode.java 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INode.java 2008-01-02 18:14:57 UTC (rev 710)
@@ -3,15 +3,19 @@
import java.util.List;
/**
- * Created by IntelliJ IDEA.
- * User: Jan
- * Date: 08.02.2007
- * Time: 09:22:33
- * To change this template use File | Settings | File Templates.
+ * <p>
+ * Interface for all nodes.
+ * </p>
+ * @author Jan Friderici
*/
public interface INode {
- String getDisplayName();
+ /**
+ *
+ * @return
+ */
+ String getDisplayName();
+
void setDisplayName(String displayName);
boolean isUpdate();
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/INodeModel.java 2008-01-02 18:14:57 UTC (rev 710)
@@ -24,13 +24,13 @@
*
* @param node the node to add
*/
- public abstract void addNode(Node node);
+ void addNode(Node node);
/**
* Remove a node
* @param node removes a node from the model
*/
- public abstract void removeNode(Node node);
+ void removeNode(Node node);
/**
* Notifies all listeners that the state of a given node
@@ -42,7 +42,7 @@
* @param data new data, may be null.
* @see NodeModelListener
*/
- public abstract void updateNode(Node node, int type, Object data);
+ void updateNode(Node node, int type, Object data);
/**
* Aktualisiert den Hash-Schl\xFCssel f\xFCr einen Knoten.
@@ -51,7 +51,7 @@
* @param node Knoten der aktualisiert werden soll
* @param name Alter Hash-Wert
*/
- public abstract void rehashNode(Node node, String name);
+ void rehashNode(Node node, String name);
/**
* returns all neighbours for the given node.
@@ -59,7 +59,7 @@
* @param node the node
* @return all neighbours of the given node.
*/
- public abstract ArrayList<? extends Node> findNeighbors(Node node);
+ ArrayList<? extends Node> findNeighbors(Node node);
/**
* what for?
@@ -67,27 +67,27 @@
* @return
*/
@Deprecated
- public abstract ArrayList<? extends Node> findNonNeighbors(Node node);
+ ArrayList<? extends Node> findNonNeighbors(Node node);
/**
* Adds a NodeModelListener
* @param nodeModelListener the list\xE9ner to add.
*/
- public abstract void addNodeModelListener(NodeModelListener nodeModelListener);
+ void addNodeModelListener(NodeModelListener nodeModelListener);
/**
* remove a NodeModelListener
* @param l the listener to remove
*/
- public abstract void removeNodeModelListener(NodeModelListener l);
+ void removeNodeModelListener(NodeModelListener l);
/**
* returns an array of all NodeModelListener.
* @return an array of all NodeModelListener registered to this model.
*/
- public abstract NodeModelListener[] nodeModelListeners();
+ NodeModelListener[] nodeModelListeners();
- public Set<AccessPointSeerNode> getAccessPointSeerNodes();
+ Set<AccessPointSeerNode> getAccessPointSeerNodes();
/**
*
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java 2008-01-02 18:14:57 UTC (rev 710)
@@ -104,6 +104,12 @@
this.id = -1;
}
+ /**
+ * <p>the name to display in the gui.</p>
+ * <p>The default value is the nodes name.</p>
+ *
+ * @return the display name for this node.
+ */
public String getDisplayName(){
if (this.displayName == null) {
return this.name;
@@ -112,23 +118,43 @@
}
}
+ /**
+ * <p>Set the name to display.</p>
+ * @param displayName the new name.
+ */
public void setDisplayName(String displayName){
this.displayName = displayName;
}
+ /**
+ * TODO what does this mean?
+ * @return
+ */
public boolean isUpdate(){
return update;
}
+ /**
+ * TODO !?
+ * @param newupdate
+ */
public void setUpdate(boolean newupdate){
this.update = newupdate;
this.model.updateNode(this, NodeModel.UPDATE_RESCAN, null);
}
+ /**
+ *
+ * @return
+ */
public boolean isFix(){
return fix;
}
+ /**
+ *
+ * @param fix
+ */
public void setFix(boolean fix){
this.fix = fix;
this.model.updateNode(this, NodeModel.UPDATE_FIXSTATE, null);
@@ -152,12 +178,24 @@
return y;
}
+ /**
+ * Move the node without notifying.
+ * @param x
+ * @param y
+ * @param z
+ */
public void setPositionSilent(int x, int y, int z){
this.x = x;
this.y = y;
this.z = z;
}
+ /**
+ * Move this node an notify.
+ * @param x
+ * @param y
+ * @param z
+ */
public void setPosition(int x, int y, int z){
setPositionSilent(x, y, z);
model.updateNode(this, NodeModel.UPDATE_POSITION, null);
@@ -165,6 +203,10 @@
public abstract ArrayList<? extends Node> getNeighbors();
+ /**
+ * The model this node belongs to
+ * @return
+ */
public INodeModel getModel(){
return model;
}
@@ -179,6 +221,10 @@
return internal;
}
+ /**
+ *
+ * @return
+ */
public long getId(){
return id;
}
@@ -199,10 +245,19 @@
return parentNode;
}
+ /**
+ * Set the parent node.
+ * @param parentNode
+ */
public void setParentNode(Node parentNode){
this.parentNode = parentNode;
}
+
+ /**
+ * Ask if this node is a physical or information node.
+ * @return
+ */
public boolean isPhysical(){
return physical;
}
Modified: trunk/magicmapserver/magicmapserver.iml
===================================================================
--- trunk/magicmapserver/magicmapserver.iml 2008-01-01 23:17:35 UTC (rev 709)
+++ trunk/magicmapserver/magicmapserver.iml 2008-01-02 18:14:57 UTC (rev 710)
@@ -1,22 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="false" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/web" relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="magicmapserver">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<output url="file://$MODULE_DIR$/target/classes" />
<exclude-output />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/dblayer/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://X:/maven/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/log4j-1.2.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -25,7 +51,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib.dev/jasper-runtime.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/jpox-20041204.032009.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -34,7 +60,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib.dev/jsp-api.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/magicmap-db-layer.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -43,7 +69,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib.dev/servlet-api.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib.dev/jasper-runtime.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -52,7 +78,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/dom4j-1.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib.dev/jsp-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -61,7 +87,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/forms-1.0.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib.dev/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -70,7 +96,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-collections-3.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/commons-discovery.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -79,7 +105,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/foxtrot.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/commons-logging.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -88,7 +114,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/jaxrpc.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/saaj.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -97,7 +123,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/ostermillerutils_1_05_00.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/axis.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -106,7 +132,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-codec-1.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/wsdl4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -115,7 +141,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/concurrent.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/jaxrpc.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -124,7 +150,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/colt.jar!/" />
+ <root url="jar://$MODULE_DIR$/web/WEB-INF/lib/axis-ant.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -133,7 +159,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/nekohtml.jar!/" />
+ <root url="jar://$MODULE_DIR$/../infoobject/lib/db4o-6.4.14.8131-java5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -142,165 +168,12 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-logging.jar!/" />
+ <root url="jar://$MODULE_DIR$/dist/magicmap-server.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/jung-1.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/saaj.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/xmlParserAPIs.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/derby.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/RelativeLayout.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/xercesImpl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/xml-apis.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/mail.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/jaxen-1.1-beta-9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-httpclient-3.0-rc3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/jpox-20041204.032009.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/looks-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/log4j-1.2.8.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/axis.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/activation.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/wsdl4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://E:/_Projekte/_Diplomarbeit/_magicmap/magicmap/magicmapclient/lib/commons-discovery.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
