Adapt to new Exceptions

2 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java b/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java
index 38e3fd3..932d7cc 100644
--- a/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java
+++ b/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java
@@ -3,7 +3,7 @@ package com.c2kernel.gui.collection;
 import com.c2kernel.collection.Aggregation;

 import com.c2kernel.collection.AggregationMember;

 import com.c2kernel.collection.CollectionMember;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.graph.model.Vertex;

 import com.c2kernel.gui.graph.view.VertexPropertyPanel;

 

@@ -29,7 +29,7 @@ public class PropertyPanel extends VertexPropertyPanel {
             }

             else

                 clear();

-        } catch (ObjectNotFoundException ex) {

+        } catch (ObjectNotFound ex) {

             clear();

             selObjClass.setText("No Collection Member object found");

         }

diff --git a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java b/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
index 6b3865f..328d87d 100644
--- a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
+++ b/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java
@@ -14,8 +14,8 @@ import javax.swing.JTextField;
 import javax.swing.JToggleButton;

 

 import com.c2kernel.collection.AggregationMember;

-import com.c2kernel.collection.MembershipException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidCollectionModification;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.graph.model.Vertex;

 import com.c2kernel.gui.DomainKeyConsumer;

@@ -146,9 +146,9 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
         try {

             selectedMember.assignItem(key.getItemPath());

             select(selectedMember);

-        } catch (MembershipException ex) {

+        } catch (InvalidCollectionModification ex) {

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

-        } catch (ObjectNotFoundException e) {

+        } catch (ObjectNotFound e) {

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

 		}

     }