From 8e5d28aec9368c29acec858e9d748ed2ed5eb397 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 9 Sep 2014 12:14:01 +0200 Subject: Support move to using UUIDs and ItemPaths as Item identifiers instead of ints. --- .../c2kernel/gui/tabs/collection/CollectionHistoryWindow.java | 10 ++++------ .../gui/tabs/collection/CollectionMemberPropertyPanel.java | 7 +++---- 2 files changed, 7 insertions(+), 10 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 a2e43f0..bfb81e8 100644 --- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java +++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java @@ -4,6 +4,7 @@ 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; @@ -19,7 +20,6 @@ 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.InvalidItemPathException; import com.c2kernel.lookup.ItemPath; import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.persistency.outcome.Outcome; @@ -96,13 +96,11 @@ public class CollectionHistoryWindow extends JFrame { return "Click to view"; String name; try { - ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(Integer.parseInt(((String[])collEventData.get(rowIndex))[2]))); + ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(UUID.fromString(((String[])collEventData.get(rowIndex))[2]))); name = childItem.getName(); - } catch (NumberFormatException e) { - name = "Invalid Item key: "+((String[])collEventData.get(rowIndex))[2]; } catch (ObjectNotFoundException e) { name = "Item deleted: "+((String[])collEventData.get(rowIndex))[2]; - } catch (InvalidItemPathException e) { + } catch (IllegalArgumentException e) { name = "Invalid Item key: "+((String[])collEventData.get(rowIndex))[2]; } return name; @@ -169,7 +167,7 @@ public class CollectionHistoryWindow extends JFrame { else { String[] params = (String[])data; try { - ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(Integer.parseInt(params[2]))); + ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(UUID.fromString(params[2]))); MainFrame.itemFinder.pushNewKey(childItem.getName()); } catch (Exception ex) { } } 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 248240e..bfbcdc5 100644 --- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java +++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java @@ -57,12 +57,11 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe selectedCollMem = cm; String newMemberName; try { - ItemPath path = new ItemPath(cm.getSystemKey()); - newMemberName = Gateway.getProxyManager().getProxy(path).getProperty("Name"); + ItemPath path = cm.getItemPath(); + if (path == null) newMemberName = "No member"; + else newMemberName = Gateway.getProxyManager().getProxy(path).getProperty("Name"); } catch (ObjectNotFoundException e) { newMemberName = "Item or Item name property not found"; - } catch (InvalidItemPathException e) { - newMemberName = "No member"; } selObjSlot.setText(newMemberName); -- cgit v1.2.3