More code cleanup:

Refactored Entity Proxy Subscription to handle generics better
Rewrote RemoteMap to use TreeMap instead of the internal array for
order. It now sorts its keys by number if they parse, else as strings.
Removed a no-longer-in-progress outcome form class

3 files changed, 53 insertions, 37 deletions

diff --git a/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java b/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java
index 0d3cb03..6d41d20 100755..100644
--- a/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java
+++ b/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java
@@ -19,31 +19,32 @@ public class AggregationMemberRenderer implements VertexRenderer
 {

 

     private Aggregation mAggregation = null;

-    

+

     public AggregationMemberRenderer()

     {

     }

-    

+

 	public void setAggregation(Aggregation agg)

 	{

 		mAggregation = agg;

-	}    

-    

-    

-    public void draw(Graphics2D g2d, Vertex vertex)

+	}

+

+

+    @Override

+	public void draw(Graphics2D g2d, Vertex vertex)

     {

         GraphPoint   centre    = vertex.getCentrePoint();

         GraphPoint[] outline   = vertex.getOutlinePoints();

         FontMetrics  metrics   = g2d.getFontMetrics();

-						

+

 		AggregationMember memberPair = mAggregation.getMemberPair(vertex.getID());

 

 		try

-		{			

-			String name = memberPair.getEntityName();	

+		{

+			String name = memberPair.getEntityName();

 

-			g2d.drawString( name, 

-				centre.x-metrics.stringWidth(name)/2, 

+			g2d.drawString( name,

+				centre.x-metrics.stringWidth(name)/2,

 				topYOfOutline(outline) );

 

 	        g2d.drawImage

@@ -54,8 +55,8 @@ public class AggregationMemberRenderer implements VertexRenderer
 	            null

 	        );

 

-	

-	

+

+

 	        // Draw the outline of the vertex

 	        if(outline.length > 1)

 	        {

@@ -69,7 +70,7 @@ public class AggregationMemberRenderer implements VertexRenderer
 	                    outline[i+1].y

 	                );

 	            }

-	

+

 	            g2d.drawLine

 	            (

 	                outline[outline.length-1].x,

@@ -84,7 +85,7 @@ public class AggregationMemberRenderer implements VertexRenderer
 		catch (Exception ex)

 		{

 			Logger.error("AggregationMemberRenderer::draw() " + ex);

-		}									                

+		}

     }

 

 

@@ -104,7 +105,7 @@ public class AggregationMemberRenderer implements VertexRenderer
 

         return topY;

     }

-    

+

 	int bottomYOfOutline(GraphPoint[] outline)

 	{

 		int bottomY = outline[0].y;

diff --git a/source/com/c2kernel/collection/gui/view/PropertyPanel.java b/source/com/c2kernel/collection/gui/view/PropertyPanel.java
index 903ddf9..f566d70 100755..100644
--- a/source/com/c2kernel/collection/gui/view/PropertyPanel.java
+++ b/source/com/c2kernel/collection/gui/view/PropertyPanel.java
@@ -1,7 +1,7 @@
 package com.c2kernel.collection.gui.view;

 

+import com.c2kernel.collection.Aggregation;

 import com.c2kernel.collection.AggregationMember;

-import com.c2kernel.collection.Collection;

 import com.c2kernel.collection.CollectionMember;

 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.graph.model.Vertex;

@@ -9,17 +9,18 @@ import com.c2kernel.graph.view.VertexPropertyPanel;
 

 public class PropertyPanel extends VertexPropertyPanel {

 

-    Collection mCollection;

-    

+    Aggregation mCollection;

+

     public PropertyPanel() {

        super();

     }

-    

-    public void setCollection(Collection collection) {

+

+    public void setCollection(Aggregation collection) {

         mCollection = collection;

     }

 

-    public void setVertex(Vertex vert) {

+    @Override

+	public void setVertex(Vertex vert) {

         try {

             CollectionMember newMember = mCollection.getMember(vert.getID());

             if (newMember instanceof AggregationMember) {

diff --git a/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java b/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java
index 5e66c1e..5b59b35 100755..100644
--- a/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java
+++ b/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java
@@ -4,7 +4,14 @@ import java.awt.GridLayout;
 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

 

-import javax.swing.*;

+import javax.swing.Box;

+import javax.swing.BoxLayout;

+import javax.swing.JButton;

+import javax.swing.JLabel;

+import javax.swing.JOptionPane;

+import javax.swing.JPanel;

+import javax.swing.JTextField;

+import javax.swing.JToggleButton;

 

 import com.c2kernel.collection.AggregationMember;

 import com.c2kernel.collection.MembershipException;

@@ -39,22 +46,23 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
 

     SelectedMemberPanel me;

     AggregationMember selectedMember = null;

-	

+

 	public SelectedMemberPanel() {

         me=this;

 		setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));

-        

+

         JPanel attrs = new JPanel(new GridLayout(3,2));

         attrs.add(new JLabel(Language.translate("Slot Number:")));

         attrs.add(slotNumber);

         attrs.add(new JLabel(Language.translate("Assigned Member:")));

         attrs.add(memberKey);

         memberKey.setEditable(false);

-        

+

         add(attrs);

         add(Box.createVerticalStrut(10));

 

 		findButton.addActionListener(new ActionListener() {

+			@Override

 			public void actionPerformed(ActionEvent ae) {

 				String code = memberKey.getText();

 				if (code == null || code.length() == 0)

@@ -62,9 +70,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
 				MainFrame.itemFinder.pushNewKey(code);

 			}

 		});

-		

+

         changeButton.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent ae) {

+            @Override

+			public void actionPerformed(ActionEvent ae) {

                 if (changeButton.getModel().isSelected()) {

                     MainFrame.status.setText(Language.translate("Please scan or type your barcode to assign in the top field"));

                     MainFrame.itemFinder.setConsumer(me, "Assign");

@@ -77,9 +86,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
                 }

             }

         });

-        

+

         removeButton.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent ae) {

+            @Override

+			public void actionPerformed(ActionEvent ae) {

                 selectedMember.clearEntity();

                 selectedMember.getProperties().remove("Name");

                 select(selectedMember);

@@ -92,11 +102,12 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
     		buttonBox.add(changeButton);

 	   	    buttonBox.add(removeButton);

         }

-        

+

         setButtons(false);

 		add(buttonBox);

 	}

 

+	@Override

 	public void select(Vertex vert) {

         selectedMember = (AggregationMember)vert;

 		slotNumber.setText(String.valueOf(vert.getID()));

@@ -108,10 +119,11 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
         } catch (Exception e) { }

         memberKey.setText(name);

         setButtons(true);

-        

+

 		revalidate();

 	}

-	

+

+	@Override

 	public void clear() {

 		slotNumber.setText("");

         memberKey.setText("");

@@ -123,13 +135,14 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
         findButton.setEnabled(state);

         changeButton.getModel().setSelected(false);

         changeButton.setEnabled(state);

-        removeButton.setEnabled(state);   

-        MainFrame.itemFinder.clearConsumer(me);     

+        removeButton.setEnabled(state);

+        MainFrame.itemFinder.clearConsumer(me);

     }

     /**

      *

      */

-    public void push(DomainPath key) {

+    @Override

+	public void push(DomainPath key) {

         MainFrame.status.setText("Assigning entity "+key.getSysKey()+" to slot "+selectedMember.getID());

         try {

             selectedMember.assignEntity(key.getSysKey());

@@ -142,7 +155,8 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
     /**

      *

      */

-    public void push(String name) {

+    @Override

+	public void push(String name) {

         JOptionPane.showMessageDialog(null, "Product is not known in this centre", "Error", JOptionPane.ERROR_MESSAGE);

     }