[Magicmap-commits] SF.net SVN: magicmap: [714] trunk/magicmapserver/web/WEB-INF/lib

[<jan...@us...>]

Revision: 714
          http://magicmap.svn.sourceforge.net/magicmap/?rev=714&view=rev
Author:   jan_fride
Date:     2008-01-13 15:10:04 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
Added Map Functions to edges (set and get data).

Modified Paths:
--------------
    branches/info/magicmapclient/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java
    branches/info/magicmapclient/magicmapclient/src/net/sf/magicmap/client/model/node/IMagicEdge.java
    trunk/magicmapserver/magicmapserver.iml
    trunk/magicmapserver/web/WEB-INF/lib/ant-project.properties

Modified: branches/info/magicmapclient/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java
===================================================================
--- branches/info/magicmapclient/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java	2008-01-02 22:07:28 UTC (rev 713)
+++ branches/info/magicmapclient/magicmapclient/src/net/sf/magicmap/client/model/location/jung/JungEdge.java	2008-01-13 23:10:04 UTC (rev 714)
@@ -1,9 +1,10 @@
 package net.sf.magicmap.client.model.location.jung;
 
+import edu.uci.ics.jung.graph.Vertex;
+import edu.uci.ics.jung.graph.impl.DirectedSparseEdge;
+import edu.uci.ics.jung.utils.UserData;
 import net.sf.magicmap.client.model.node.IMagicEdge;
 import net.sf.magicmap.client.model.node.Node;
-import edu.uci.ics.jung.graph.Vertex;
-import edu.uci.ics.jung.graph.impl.DirectedSparseEdge;
 
 
 public class JungEdge extends DirectedSparseEdge implements IMagicEdge{
@@ -19,4 +20,22 @@
     public Node getTargetNode(){
         return (Node) getDest().getUserDatum(LayoutSettings.NODE_KEY);
     }
+
+    /**
+     * 
+     * @param key
+     * @return
+     */
+    public Object getData(String key) {
+        return getUserDatum(key);
+    }
+
+    /**
+     *
+     * @param key
+     * @param value
+     */
+    public void setData(String key, Object value) {
+        setUserDatum(key,value, UserData.REMOVE);
+    }
 }

Modified: branches/info/magicmapclient/magicmapclient/src/net/sf/magicmap/client/model/node/IMagicEdge.java
===================================================================
--- branches/info/magicmapclient/magicmapclient/src/net/sf/magicmap/client/model/node/IMagicEdge.java	2008-01-02 22:07:28 UTC (rev 713)
+++ branches/info/magicmapclient/magicmapclient/src/net/sf/magicmap/client/model/node/IMagicEdge.java	2008-01-13 23:10:04 UTC (rev 714)
@@ -24,7 +24,20 @@
 
     /**
      * 
+     * @param key
+     * @return
      */
+    Object getData(String key);
+
+    /**
+     *
+     * @param key
+     */
+    void setData(String key, Object value);
+
+    /**
+     * 
+     */
     public enum EdgeType{
 		NONE, PARENT_EDGE, DISTANCE_EDGE;
 	}

Modified: trunk/magicmapserver/magicmapserver.iml
===================================================================
--- trunk/magicmapserver/magicmapserver.iml	2008-01-02 22:07:28 UTC (rev 713)
+++ trunk/magicmapserver/magicmapserver.iml	2008-01-13 23:10:04 UTC (rev 714)
@@ -9,6 +9,10 @@
         <webroots>
           <root url="file://$MODULE_DIR$/web" relative="/" />
         </webroots>
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/dblayer/src" />
+          <root url="file://$MODULE_DIR$/src" />
+        </sourceRoots>
         <building>
           <setting name="EXPLODED_URL" value="file://" />
           <setting name="EXPLODED_ENABLED" value="false" />

Modified: trunk/magicmapserver/web/WEB-INF/lib/ant-project.properties
===================================================================
--- trunk/magicmapserver/web/WEB-INF/lib/ant-project.properties	2008-01-02 22:07:28 UTC (rev 713)
+++ trunk/magicmapserver/web/WEB-INF/lib/ant-project.properties	2008-01-13 23:10:04 UTC (rev 714)
@@ -16,7 +16,7 @@
 
 # generated java sources (think of stubs etc...)
 src.gen.dir=src-gen
-# descriptors and meta information files
+# descriptors and meta infoObject files
 inf.gen.dir=inf-gen
 # compiled java classes
 classes.dir=classes


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.