More graph gui components. Selection moved from GraphModel to GraphPanel

1 files changed, 7 insertions, 1 deletions

diff --git a/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java b/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java
index 8c4b80f..db1426e 100644
--- a/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java
+++ b/src/main/java/com/c2kernel/gui/collection/AggregationMemberRenderer.java
@@ -2,6 +2,8 @@ package com.c2kernel.gui.collection;
 

 import java.awt.FontMetrics;

 import java.awt.Graphics2D;

+import java.awt.Image;

+import com.c2kernel.gui.ImageLoader;

 

 import com.c2kernel.collection.Aggregation;

 import com.c2kernel.collection.AggregationMember;

@@ -49,7 +51,7 @@ public class AggregationMemberRenderer implements VertexRenderer
 

 	        g2d.drawImage

 	        (

-	            memberPair.getImage(),

+	            getImage(memberPair),

 	            centre.x - 8,

 	            centre.y - 8,

 	            null

@@ -122,4 +124,8 @@ public class AggregationMemberRenderer implements VertexRenderer
 

 		return bottomY;

 	}

+	

+    public Image getImage(AggregationMember am) {

+   		return ImageLoader.findImage("typeicons/"+am.getProperties().get("Type")+"_16.png").getImage();

+    }

 }