From a5a9d90ec6714ad6a9358c35ca7093e5868373f7 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 3 Oct 2014 23:19:04 +0200 Subject: Rolled back the renaming of existing exceptions. --- .../com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java') 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 3d5a29a..b97fa3c 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.ObjectNotFound; +import com.c2kernel.common.ObjectNotFoundException; 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 (ObjectNotFound e) { + } catch (ObjectNotFoundException 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 (ObjectNotFound ex) { return; } + } catch (ObjectNotFoundException ex) { return; } if (thisEv.getStepName().equals("AssignItemToSlot")) { if (params[0].equals(coll.getName())) collEventData.add(params); -- cgit v1.2.3