1 files changed, 14 insertions, 10 deletions

diff --git a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java b/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
index 89479df..6b3865f 100644
--- a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
+++ b/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
@@ -15,6 +15,7 @@ import javax.swing.JToggleButton;
 

 import com.c2kernel.collection.AggregationMember;

 import com.c2kernel.collection.MembershipException;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.graph.model.Vertex;

 import com.c2kernel.gui.DomainKeyConsumer;

@@ -80,7 +81,7 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
                 }

                 else {

                     MainFrame.itemFinder.clearConsumer(me);

-                    if (selectedMember.getSystemKey() > -1) findButton.setEnabled(true);

+                    if (selectedMember.getItemPath() != null) findButton.setEnabled(true);

                 }

             }

         });

@@ -109,12 +110,13 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
 	public void select(Vertex vert) {

         selectedMember = (AggregationMember)vert;

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

-        int memberId = selectedMember.getSystemKey();

+        ItemPath memberPath = selectedMember.getItemPath();

         String name = "Empty";

-        try {

-            ItemProxy member = Gateway.getProxyManager().getProxy(new ItemPath(memberId));

-            name = member.getName();

-        } catch (Exception e) { }

+        if (memberPath != null)

+        	try {

+        		ItemProxy member = Gateway.getProxyManager().getProxy(memberPath);

+        		name = member.getName();

+        	} catch (Exception e) { }

         memberKey.setText(name);

         setButtons(true);

 

@@ -142,11 +144,13 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
     @Override

 	public void push(DomainPath key) {

         try {

-            selectedMember.assignItem(key.getSysKey());

+            selectedMember.assignItem(key.getItemPath());

             select(selectedMember);

         } catch (MembershipException ex) {

-            JOptionPane.showMessageDialog(null, "Product does not fit in this slot", "Error", JOptionPane.ERROR_MESSAGE);

-        }

+            JOptionPane.showMessageDialog(null, "Item does not fit in this slot", "Error", JOptionPane.ERROR_MESSAGE);

+        } catch (ObjectNotFoundException e) {

+        	JOptionPane.showMessageDialog(null, "Not an item - cannot assign", "Error", JOptionPane.ERROR_MESSAGE);

+		}

     }

 

     /**

@@ -154,7 +158,7 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
      */

     @Override

 	public void push(String name) {

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

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

     }

 

 }