From ba1bf76778e66332e394a2ec028bc50fc9faba4c Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 19 Sep 2014 15:45:56 +0200 Subject: Item.fromUUIDString --- .../c2kernel/gui/tabs/collection/CollectionHistoryWindow.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 bfb81e8..e8ce9f1 100644 --- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java +++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java @@ -4,7 +4,6 @@ import java.awt.HeadlessException; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; -import java.util.UUID; import javax.swing.JFrame; import javax.swing.JScrollPane; @@ -20,6 +19,7 @@ import com.c2kernel.entity.proxy.ProxyObserver; import com.c2kernel.events.Event; import com.c2kernel.gui.MainFrame; import com.c2kernel.lifecycle.instance.predefined.PredefinedStep; +import com.c2kernel.lookup.AgentPath; import com.c2kernel.lookup.ItemPath; import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.persistency.outcome.Outcome; @@ -96,12 +96,12 @@ public class CollectionHistoryWindow extends JFrame { return "Click to view"; String name; try { - ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(UUID.fromString(((String[])collEventData.get(rowIndex))[2]))); + ItemProxy childItem = Gateway.getProxyManager().getProxy(ItemPath.fromUUIDString(((String[])collEventData.get(rowIndex))[2])); name = childItem.getName(); } catch (ObjectNotFoundException e) { name = "Item deleted: "+((String[])collEventData.get(rowIndex))[2]; - } catch (IllegalArgumentException e) { - name = "Invalid Item key: "+((String[])collEventData.get(rowIndex))[2]; + } catch (Exception e) { + name = "Problem resolving Item key: "+((String[])collEventData.get(rowIndex))[2]; } return name; default: @@ -167,7 +167,7 @@ public class CollectionHistoryWindow extends JFrame { else { String[] params = (String[])data; try { - ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(UUID.fromString(params[2]))); + ItemProxy childItem = Gateway.getProxyManager().getProxy(ItemPath.fromUUIDString(params[2])); MainFrame.itemFinder.pushNewKey(childItem.getName()); } catch (Exception ex) { } } -- cgit v1.2.3