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. --- src/main/java/com/c2kernel/gui/tabs/CollectionPane.java | 2 +- src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java | 6 ++++-- src/main/java/com/c2kernel/gui/tabs/HistoryPane.java | 2 +- src/main/java/com/c2kernel/gui/tabs/JobListPane.java | 2 +- src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java | 2 +- src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java | 2 +- src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java | 2 +- .../c2kernel/gui/tabs/collection/CollectionHistoryWindow.java | 10 ++++------ .../gui/tabs/collection/CollectionMemberPropertyPanel.java | 7 +++---- 9 files changed, 17 insertions(+), 18 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/tabs') diff --git a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java b/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java index 4469af5..c55c4c7 100644 --- a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java @@ -99,7 +99,7 @@ public class CollectionPane extends ItemTabPane implements ProxyObserver currentPaths = Gateway.getLookup().search(new DomainPath(), entity.getName()); currentPaths.hasNext();) { DomainPath thisPath = (DomainPath)currentPaths.next(); - if (thisPath.getSysKey() == entity.getSystemKey()) - domPaths.add(thisPath); + try { + if (thisPath.getItemPath().equals(entity.getPath())) domPaths.add(thisPath); + } catch (ObjectNotFoundException e) { } } fireTableDataChanged(); } diff --git a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java index 01fc3ff..ad10ad3 100644 --- a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java @@ -267,7 +267,7 @@ public class HistoryPane extends ItemTabPane implements ActionListener, ProxyObs case 2: return sm[rowIndex]==null?"Unknown": sm[rowIndex].getTransition(event[rowIndex].getTransition()).getName(); case 3: return event[rowIndex].getTimeString(); - case 4: return event[rowIndex].getAgentName(); + case 4: return event[rowIndex].getAgentPath().getAgentName(); case 5: return event[rowIndex].getAgentRole(); case 6: return event[rowIndex].getSchemaName()+" v"+event[rowIndex].getSchemaVersion(); case 7: return event[rowIndex].getViewName(); diff --git a/src/main/java/com/c2kernel/gui/tabs/JobListPane.java b/src/main/java/com/c2kernel/gui/tabs/JobListPane.java index bfc3019..4893ae5 100644 --- a/src/main/java/com/c2kernel/gui/tabs/JobListPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/JobListPane.java @@ -197,7 +197,7 @@ public class JobListPane extends ItemTabPane implements ActionListener, ProxyObs job[idx] = joblist.getJob(thisJobId.intValue()); itemNames[idx] = "Item Not Found"; try { - itemNames[idx] = ((Property)Gateway.getStorage().get(job[count-startId].getItemSysKey(), ClusterStorage.PROPERTY+"/Name", null)).getValue(); + itemNames[idx] = ((Property)Gateway.getStorage().get(job[count-startId].getItemPath(), ClusterStorage.PROPERTY+"/Name", null)).getValue(); } catch (Exception ex) { Logger.error(ex); } diff --git a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java index fd12ba4..e9b882d 100644 --- a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java @@ -93,7 +93,7 @@ public class PropertiesPane extends ItemTabPane implements ProxyObserver(); initForItem(sourceItem); } diff --git a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java index 234f1db..7dea317 100644 --- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java @@ -505,7 +505,7 @@ public class ViewpointPane extends ItemTabPane implements ItemListener, ActionLi try { Event myEvent = (Event)sourceItem.getItem().getObject(ClusterStorage.HISTORY+"/"+eventId); return (Language.translate("Recorded on")+" "+myEvent.getTimeString()+" "+ - Language.translate("by")+" "+myEvent.getAgentName()+" "+ + Language.translate("by")+" "+myEvent.getAgentPath().getAgentName()+" "+ Language.translate("using schema v")+schemaVersion); } catch (Exception ex) { Logger.error(ex); diff --git a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java index bc31ac2..1a38470 100644 --- a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java @@ -185,7 +185,7 @@ public class WorkflowPane extends ItemTabPane implements ProxyObserver @Override public void reload() { - Gateway.getStorage().clearCache(sourceItem.getSysKey(), ClusterStorage.LIFECYCLE); + Gateway.getStorage().clearCache(sourceItem.getItemPath(), ClusterStorage.LIFECYCLE); initForItem(sourceItem); } protected void createLayout() 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