[Magicmap-commits] SF.net SVN: magicmap: [534] trunk/magicmapclient/src/net/sf/magicmap/client /controller

[<fle...@us...>]

Revision: 534
          http://svn.sourceforge.net/magicmap/?rev=534&view=rev
Author:   flederohr
Date:     2007-02-14 09:29:03 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
InfoObjects removed from Controller and IController

Modified Paths:
--------------
    trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
    trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java	2007-02-14 15:48:36 UTC (rev 533)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java	2007-02-14 17:29:03 UTC (rev 534)
@@ -428,41 +428,41 @@
         }
     }
 
-    /**
-     * Creates an InfoObject on the current map with the supplied parameters
-     * @param x
-     * @param y
-     * @param z
-     * @param infoObject
-     * @param mapName
-     * @param fixed
-     * @param callback
-     */
-    public void createInfoObject(int x, int y, int z, InfoObject infoObject, String mapName, boolean fixed,
-            CreatePositionCallback callback){
-        if (!isConnected() || !isMapLoaded())
-            callback.positionCreationError(new Exception("Nicht verbunden oder keine Karte geladen."));
-        else {
-            // serverManager.createInfoObject(x, y, z, fixed, infoObject,
-            // mapName, callback);
-            INodeModel model = Controller.getInstance().getNodeModel();
-            if (infoObject instanceof InfoObjectNode) {
-                InfoObjectNode node = (InfoObjectNode) infoObject;
-                model.addNode(node);
-                node.setPosition(x, y, z);
-                node.setFix(false);
-                System.out.println("Added Info:\n -> " + node.toString());
-            } else {
-                InfoObjectNode node = new InfoObjectNode(model, infoObject);
-                model.addNode(node);
-                node.setPosition(x, y, z);
-                node.setFix(false);
-                System.out.println("Added Info:\n -> " + node.toString());
-            }
+//    /**
+//     * Creates an InfoObject on the current map with the supplied parameters
+//     * @param x
+//     * @param y
+//     * @param z
+//     * @param infoObject
+//     * @param mapName
+//     * @param fixed
+//     * @param callback
+//     */
+//    public void createInfoObject(int x, int y, int z, InfoObject infoObject, String mapName, boolean fixed,
+//            CreatePositionCallback callback){
+//        if (!isConnected() || !isMapLoaded())
+//            callback.positionCreationError(new Exception("Nicht verbunden oder keine Karte geladen."));
+//        else {
+//            // serverManager.createInfoObject(x, y, z, fixed, infoObject,
+//            // mapName, callback);
+//            INodeModel model = Controller.getInstance().getNodeModel();
+//            if (infoObject instanceof InfoObjectNode) {
+//                InfoObjectNode node = (InfoObjectNode) infoObject;
+//                model.addNode(node);
+//                node.setPosition(x, y, z);
+//                node.setFix(false);
+//                System.out.println("Added Info:\n -> " + node.toString());
+//            } else {
+//                InfoObjectNode node = new InfoObjectNode(model, infoObject);
+//                model.addNode(node);
+//                node.setPosition(x, y, z);
+//                node.setFix(false);
+//                System.out.println("Added Info:\n -> " + node.toString());
+//            }
+//
+//        }
+//    }
 
-        }
-    }
-
     /**
      *
      * @param name

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java	2007-02-14 15:48:36 UTC (rev 533)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/IController.java	2007-02-14 17:29:03 UTC (rev 534)
@@ -194,18 +194,18 @@
      */
     void createGeoPos(int x, int y, GeoPos geoPos, String mapName, boolean fixed, CreatePositionCallback callback);
 
-    /**
-     * Creates an InfoObject on the current map with the supplied parameters
-     *
-     * @param lastX
-     * @param lastY
-     * @param infoObject
-     * @param string
-     * @param b
-     * @param panel
-     */
-    void createInfoObject(int x, int y, int z, InfoObject infoObject, String mapName, boolean fixed,
-            CreatePositionCallback callback);
+//    /**
+//     * Creates an InfoObject on the current map with the supplied parameters
+//     *
+//     * @param lastX
+//     * @param lastY
+//     * @param infoObject
+//     * @param string
+//     * @param b
+//     * @param panel
+//     */
+//    void createInfoObject(int x, int y, int z, InfoObject infoObject, String mapName, boolean fixed,
+//            CreatePositionCallback callback);
 
     /**
      * Entfernt einen


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