diff options
Diffstat (limited to 'src/main/java/com/c2kernel/gui/tabs/collection')
3 files changed, 18 insertions, 19 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 79c11cb..a2e43f0 100644 --- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java +++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java @@ -13,15 +13,14 @@ import javax.swing.table.AbstractTableModel; import com.c2kernel.collection.Aggregation;
import com.c2kernel.collection.Collection;
import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.EntityProxy;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.entity.proxy.MemberSubscription;
+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.EntityPath;
-import com.c2kernel.lookup.InvalidEntityPathException;
+import com.c2kernel.lookup.InvalidItemPathException;
+import com.c2kernel.lookup.ItemPath;
import com.c2kernel.persistency.ClusterStorage;
import com.c2kernel.persistency.outcome.Outcome;
import com.c2kernel.process.Gateway;
@@ -45,7 +44,7 @@ public class CollectionHistoryWindow extends JFrame { this.setVisible(true);
}
- private class HistoryTableModel extends AbstractTableModel implements EntityProxyObserver<Event> {
+ private class HistoryTableModel extends AbstractTableModel implements ProxyObserver<Event> {
ItemProxy item;
ArrayList<Event> collEvents;
@@ -97,14 +96,14 @@ public class CollectionHistoryWindow extends JFrame { return "Click to view";
String name;
try {
- EntityProxy childItem = Gateway.getProxyManager().getProxy(new EntityPath(Integer.parseInt(((String[])collEventData.get(rowIndex))[2])));
+ ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(Integer.parseInt(((String[])collEventData.get(rowIndex))[2])));
name = childItem.getName();
} catch (NumberFormatException e) {
- name = "Invalid entity key: "+((String[])collEventData.get(rowIndex))[2];
+ name = "Invalid Item key: "+((String[])collEventData.get(rowIndex))[2];
} catch (ObjectNotFoundException e) {
name = "Item deleted: "+((String[])collEventData.get(rowIndex))[2];
- } catch (InvalidEntityPathException e) {
- name = "Invalid entity key: "+((String[])collEventData.get(rowIndex))[2];
+ } catch (InvalidItemPathException e) {
+ name = "Invalid Item key: "+((String[])collEventData.get(rowIndex))[2];
}
return name;
default:
@@ -170,7 +169,7 @@ public class CollectionHistoryWindow extends JFrame { else {
String[] params = (String[])data;
try {
- EntityProxy childItem = Gateway.getProxyManager().getProxy(new EntityPath(Integer.parseInt(params[2])));
+ ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(Integer.parseInt(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 6004f59..248240e 100644 --- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java +++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java @@ -22,9 +22,9 @@ import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.gui.MainFrame;
import com.c2kernel.gui.graph.view.PropertyTable;
import com.c2kernel.gui.graph.view.PropertyTableModel;
-import com.c2kernel.gui.tabs.EntityTabPane;
-import com.c2kernel.lookup.EntityPath;
-import com.c2kernel.lookup.InvalidEntityPathException;
+import com.c2kernel.gui.tabs.ItemTabPane;
+import com.c2kernel.lookup.InvalidItemPathException;
+import com.c2kernel.lookup.ItemPath;
import com.c2kernel.process.Gateway;
import com.c2kernel.utils.Language;
@@ -57,11 +57,11 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe selectedCollMem = cm;
String newMemberName;
try {
- EntityPath path = new EntityPath(cm.getEntityKey());
+ ItemPath path = new ItemPath(cm.getSystemKey());
newMemberName = Gateway.getProxyManager().getProxy(path).getProperty("Name");
} catch (ObjectNotFoundException e) {
newMemberName = "Item or Item name property not found";
- } catch (InvalidEntityPathException e) {
+ } catch (InvalidItemPathException e) {
newMemberName = "No member";
}
@@ -84,7 +84,7 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe c.ipady = 5;
selObjSlot = new JLabel();
- selObjSlot.setFont(EntityTabPane.titleFont);
+ selObjSlot.setFont(ItemTabPane.titleFont);
gridbag.setConstraints(selObjSlot, c);
add(selObjSlot);
@@ -95,7 +95,7 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe c.gridy++;
JLabel title = new JLabel("Properties");
- title.setFont(EntityTabPane.titleFont);
+ title.setFont(ItemTabPane.titleFont);
gridbag.setConstraints(title, c);
add(title);
diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java index 022433f..f9f7d50 100644 --- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java +++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java @@ -28,8 +28,8 @@ public abstract class CollectionView<M extends CollectionMember> extends JPanel super();
}
- public void setItem(ItemProxy entity) {
- this.item = entity;
+ public void setItem(ItemProxy item) {
+ this.item = item;
}
public abstract void setCollection(Collection<M> coll);
|