From 11eb9557a35e17450c0aefb758471f1ff3148336 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 29 Jun 2012 16:20:11 +0200
Subject: Pull remaining graph GUI components into cristal-gui

---
 src/main/java/com/c2kernel/collection/AggregationMember.java   | 10 ----------
 .../collection/gui/model/AggregationVertexFactory.java         |  6 ++----
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'src/main/java/com/c2kernel/collection')

diff --git a/src/main/java/com/c2kernel/collection/AggregationMember.java b/src/main/java/com/c2kernel/collection/AggregationMember.java
index e3b213e..49b9ab7 100644
--- a/src/main/java/com/c2kernel/collection/AggregationMember.java
+++ b/src/main/java/com/c2kernel/collection/AggregationMember.java
@@ -1,6 +1,5 @@
 package com.c2kernel.collection;
 
-import java.awt.Image;
 import java.util.StringTokenizer;
 
 import com.c2kernel.common.ObjectNotFoundException;
@@ -12,7 +11,6 @@ import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.property.Property;
 import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.Resource;
 
 /**
 * @version $Revision: 1.11 $ $Date: 2005/12/01 14:23:15 $
@@ -31,7 +29,6 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb
     private Aggregation          mCollection  = null;
 	private String 			     mClassProps = null;
 	String entityName;
-	Image image;
 
 
    /**************************************************************************
@@ -134,13 +131,6 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb
 
     }
 
-    public Image getImage() {
-    	if (image == null) {
-    		image = Resource.findImage("typeicons/"+getProperties().get("Type")+"_16.png").getImage();
-    	}
-    	return image;
-    }
-
     public String getEntityName() {
     	if (entityName == null) {
     		if (mEntityKey > -1) {
diff --git a/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java b/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java
index 7094644..88dcc3a 100644
--- a/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java
+++ b/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java
@@ -1,7 +1,5 @@
 package com.c2kernel.collection.gui.model;
 
-import java.awt.Point;
-
 import com.c2kernel.collection.Aggregation;
 import com.c2kernel.graph.model.GraphModelManager;
 import com.c2kernel.graph.model.GraphPoint;
@@ -27,12 +25,12 @@ public class AggregationVertexFactory implements VertexFactory
 	public void create
     (
         GraphModelManager           graphModelManager,
-        Point                       location,
+        GraphPoint                       location,
         TypeNameAndConstructionInfo typeNameAndConstructionInfo
     ) throws Exception
     {
         if (typeNameAndConstructionInfo.mInfo.equals("AggregationMember")) {
-            mAggregation.addMember(-1, new CastorHashMap(), "", new GraphPoint(location.x, location.y), 40, 40);
+            mAggregation.addMember(-1, new CastorHashMap(), "",location, 40, 40);
         }
     }
 }
-- 
cgit v1.2.3