From 31c13eed377fe1324ebed7fbaa56483a43e3d3d1 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 17:31:07 +0200
Subject: Adapt to new Exceptions

---
 .../com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java   | 6 +++---
 .../c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java | 4 ++--
 src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
index b97fa3c..3d5a29a 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
@@ -12,7 +12,7 @@ import javax.swing.table.AbstractTableModel;
 
 import com.c2kernel.collection.Aggregation;
 import com.c2kernel.collection.Collection;
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.entity.proxy.MemberSubscription;
 import com.c2kernel.entity.proxy.ProxyObserver;
@@ -97,7 +97,7 @@ public class CollectionHistoryWindow extends JFrame  {
 					try {
 						ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(((String[])collEventData.get(rowIndex))[2]));
 						name = childItem.getName();
-					} catch (ObjectNotFoundException e) {
+					} catch (ObjectNotFound e) {
 						name = "Item deleted: "+((String[])collEventData.get(rowIndex))[2];
 					} catch (Exception e) {
 						name = "Problem resolving Item key: "+((String[])collEventData.get(rowIndex))[2];
@@ -117,7 +117,7 @@ public class CollectionHistoryWindow extends JFrame  {
 				try {
 				Outcome oc = (Outcome)item.getObject(ClusterStorage.OUTCOME+"/PredefinedStepOutcome/0/"+thisEv.getID());
 				params = PredefinedStep.getDataList(oc.getData());
-				} catch (ObjectNotFoundException ex) { return; }
+				} catch (ObjectNotFound ex) { return; }
 				if (thisEv.getStepName().equals("AssignItemToSlot")) {
 					if (params[0].equals(coll.getName()))
 						collEventData.add(params);
diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
index 478403c..4072d83 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
@@ -17,7 +17,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 
 import com.c2kernel.collection.CollectionMember;
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.gui.MainFrame;
 import com.c2kernel.gui.graph.view.PropertyTable;
 import com.c2kernel.gui.graph.view.PropertyTableModel;
@@ -59,7 +59,7 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe
 			ItemPath path = cm.getItemPath();
 			if (path == null) newMemberName = "No member";
 			else newMemberName = Gateway.getProxyManager().getProxy(path).getProperty("Name");
-		} catch (ObjectNotFoundException e) {
+		} catch (ObjectNotFound e) {
 			newMemberName = "Item or Item name property not found";
 		}
 		
diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java b/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java
index a53f562..7bfe5d9 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java
@@ -8,7 +8,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
 
 import com.c2kernel.collection.Collection;
 import com.c2kernel.collection.DependencyMember;
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.gui.MainFrame;
 import com.c2kernel.gui.TreeBrowser;
 import com.c2kernel.gui.tree.Node;
@@ -51,7 +51,7 @@ public class DependencyView extends CollectionView<DependencyMember>
 							try {
 								propPanel.setMember(thisItem.getParentCollection().getMember(thisItem.getSlotNo()));
 								return;
-							} catch (ObjectNotFoundException e1) { }
+							} catch (ObjectNotFound e1) { }
 						}
 						propPanel.clear();
 					}
-- 
cgit v1.2.3