diff options
Diffstat (limited to 'src/main/java/com/c2kernel/gui/tabs')
13 files changed, 90 insertions, 93 deletions
diff --git a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java b/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java index bb07c19..ac69f68 100644 --- a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java @@ -8,7 +8,7 @@ import com.c2kernel.collection.Collection; import com.c2kernel.collection.CollectionDescription;
import com.c2kernel.collection.CollectionMember;
import com.c2kernel.collection.Dependency;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
+import com.c2kernel.entity.proxy.ProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.gui.tabs.collection.AggregationView;
@@ -21,7 +21,7 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.36 $ $Date: 2005/10/06 06:51:15 $
* @author $Author: abranson $
*/
-public class CollectionPane extends EntityTabPane implements EntityProxyObserver<Collection<? extends CollectionMember>>
+public class CollectionPane extends ItemTabPane implements ProxyObserver<Collection<? extends CollectionMember>>
{
JTabbedPane collTabs;
@@ -40,13 +40,13 @@ public class CollectionPane extends EntityTabPane implements EntityProxyObserver if (thisCollView == null){
if (contents instanceof Aggregation) {
AggregationView thisAggView = new AggregationView();
- thisAggView.setItem((ItemProxy)sourceEntity.getEntity());
+ thisAggView.setItem(sourceItem.getItem());
thisAggView.setCollection((Aggregation)contents);
thisCollView = thisAggView;
}
else if (contents instanceof Dependency) {
DependencyView thisDepView = new DependencyView();
- thisDepView.setItem((ItemProxy)sourceEntity.getEntity());
+ thisDepView.setItem(sourceItem.getItem());
thisDepView.setCollection((Dependency)contents);
thisCollView = thisDepView;
}
@@ -94,15 +94,15 @@ public class CollectionPane extends EntityTabPane implements EntityProxyObserver public void run()
{
Thread.currentThread().setName("Collection Loader");
- sourceEntity.getEntity().subscribe(new MemberSubscription<Collection<?>>(this, ClusterStorage.COLLECTION, true));
+ sourceItem.getItem().subscribe(new MemberSubscription<Collection<?>>(this, ClusterStorage.COLLECTION, true));
}
@Override
public void reload()
{
- Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.COLLECTION);
+ Gateway.getStorage().clearCache(sourceItem.getSysKey(), ClusterStorage.COLLECTION);
collTabs.removeAll();
- initForEntity(sourceEntity);
+ initForItem(sourceItem);
}
@Override
diff --git a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java b/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java index 1f5d3b8..e16c9e3 100644 --- a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java @@ -14,7 +14,7 @@ import javax.swing.JLabel; import javax.swing.JPanel;
import com.c2kernel.entity.agent.Job;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
+import com.c2kernel.entity.proxy.ProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.gui.MainFrame;
@@ -25,7 +25,7 @@ import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.utils.Language;
import com.c2kernel.utils.Logger;
-public class ExecutionPane extends EntityTabPane implements EntityProxyObserver<Workflow> {
+public class ExecutionPane extends ItemTabPane implements ProxyObserver<Workflow> {
ArrayList<Job> jobList = null;
Object jobLock = new Object();
@@ -69,7 +69,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< @Override
public void run() {
Thread.currentThread().setName("Execution Pane Builder");
- sourceEntity.getEntity().subscribe(new MemberSubscription<Workflow>(this, ClusterStorage.LIFECYCLE, false));
+ sourceItem.getItem().subscribe(new MemberSubscription<Workflow>(this, ClusterStorage.LIFECYCLE, false));
loadJobList();
init = true;
if (autoRun != null) {
@@ -83,7 +83,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< view.removeAll();
activities = new ArrayList<ActivityItem>();
try {
- jobList = ((ItemProxy)sourceEntity.getEntity()).getJobList(MainFrame.userAgent);
+ jobList = (sourceItem.getItem()).getJobList(MainFrame.userAgent);
activitySelector.addItem(emptyAct);
for (Job thisJob : jobList) {
//Logger.msg(7, "ExecutionPane - loadJobList " + thisJob.hasOutcome() + "|" + thisJob.getSchemaName() + "|" + thisJob.getSchemaVersion() + "|");
@@ -106,7 +106,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< view.add(noActs);
break;
case 1 :
- currentActView = new ActivityViewer(activities.get(0), (ItemProxy)sourceEntity.getEntity(), this);
+ currentActView = new ActivityViewer(activities.get(0), sourceItem.getItem(), this);
c.fill = GridBagConstraints.BOTH;
gridbag.setConstraints(view, c);
view.add(currentActView);
@@ -144,7 +144,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< view.removeAll();
c.fill = GridBagConstraints.BOTH;
gridbag.setConstraints(view, c);
- currentActView = new ActivityViewer((ActivityItem)selObj, (ItemProxy)sourceEntity.getEntity(), this);
+ currentActView = new ActivityViewer((ActivityItem)selObj, sourceItem.getItem(), this);
view.add(currentActView);
revalidate();
updateUI();
@@ -171,7 +171,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< else { // look to see if this form is now invalid
// get the new joblist
try {
- jobList = ((ItemProxy)sourceEntity.getEntity()).getJobList(MainFrame.userAgent);
+ jobList = (sourceItem.getItem()).getJobList(MainFrame.userAgent);
} catch (Exception ex) {
return;
}
diff --git a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java index 1e03a41..01fc3ff 100644 --- a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java @@ -23,7 +23,7 @@ import javax.swing.JTable; import javax.swing.table.AbstractTableModel;
import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
+import com.c2kernel.entity.proxy.ProxyObserver;
import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.events.Event;
import com.c2kernel.events.History;
@@ -40,7 +40,7 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.22 $ $Date: 2005/04/26 06:48:13 $
* @author $Author: abranson $
*/
-public class HistoryPane extends EntityTabPane implements ActionListener, EntityProxyObserver<Event> {
+public class HistoryPane extends ItemTabPane implements ActionListener, ProxyObserver<Event> {
History history;
HistoryTableModel model;
@@ -114,8 +114,8 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity Thread.currentThread().setName("History Pane Builder");
MainFrame.progress.startBouncing("Loading history");
try {
- history = (History)sourceEntity.getEntity().getObject(ClusterStorage.HISTORY);
- sourceEntity.getEntity().subscribe(new MemberSubscription<Event>(this, ClusterStorage.HISTORY, true));
+ history = (History)sourceItem.getItem().getObject(ClusterStorage.HISTORY);
+ sourceItem.getItem().subscribe(new MemberSubscription<Event>(this, ClusterStorage.HISTORY, true));
} catch (ObjectNotFoundException e) {
Logger.error(e);
}
diff --git a/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java b/src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java index 70f4930..46bfcdf 100644 --- a/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java @@ -22,13 +22,13 @@ import javax.swing.JPanel; import javax.swing.JToggleButton;
import javax.swing.SwingConstants;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
-import com.c2kernel.gui.EntityDetails;
+import com.c2kernel.entity.proxy.ProxyObserver;
+import com.c2kernel.gui.ItemDetails;
import com.c2kernel.gui.ImageLoader;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.gui.tabs.outcome.OutcomeHandler;
import com.c2kernel.gui.tabs.outcome.form.OutcomePanel;
-import com.c2kernel.gui.tree.NodeEntity;
+import com.c2kernel.gui.tree.NodeItem;
import com.c2kernel.process.Gateway;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.Logger;
@@ -38,9 +38,9 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.31 $ $Date: 2005/06/08 16:47:44 $
* @author $Author: abranson $
*/
-public class EntityTabPane extends JPanel implements Runnable {
+public class ItemTabPane extends JPanel implements Runnable {
- protected NodeEntity sourceEntity;
+ protected NodeItem sourceItem;
protected String titleText = null;
protected ImageIcon titleIcon = null;
private final String tabName;
@@ -48,7 +48,7 @@ public class EntityTabPane extends JPanel implements Runnable { protected GridBagConstraints c = null;
public static Font titleFont = null;
public static Color headingColor = new Color(0, 0, 185);
- protected EntityDetails parent;
+ protected ItemDetails parent;
protected static ImageIcon mReloadIcon = null;
protected Box titleBox;
static {
@@ -63,7 +63,7 @@ public class EntityTabPane extends JPanel implements Runnable { {
}
- public EntityTabPane(String tabName, String titleText) {
+ public ItemTabPane(String tabName, String titleText) {
this.tabName = Language.translate(tabName);
this.titleText =
titleText == null ? null : Language.translate(titleText);
@@ -73,7 +73,7 @@ public class EntityTabPane extends JPanel implements Runnable { Logger.msg(2, "ItemTabPane.<init> - viewing " + tabName);
setLayout(gridbag);
}
- public void setParent(EntityDetails parent) {
+ public void setParent(ItemDetails parent) {
this.parent = parent;
}
public String getTabName() {
@@ -134,8 +134,8 @@ public class EntityTabPane extends JPanel implements Runnable { gridbag.setConstraints(titleBox, c);
this.add(titleBox);
}
- public void initForEntity(NodeEntity sourceEntity) {
- this.sourceEntity = sourceEntity;
+ public void initForItem(NodeItem sourceItem) {
+ this.sourceItem = sourceItem;
Thread loader = new Thread(this);
loader.start();
}
@@ -161,8 +161,8 @@ public class EntityTabPane extends JPanel implements Runnable { }
public void destroy() {
- if (sourceEntity != null && this instanceof EntityProxyObserver<?>) {
- sourceEntity.getEntity().unsubscribe((EntityProxyObserver<?>)this);
+ if (sourceItem != null && this instanceof ProxyObserver<?>) {
+ sourceItem.getItem().unsubscribe((ProxyObserver<?>)this);
}
parent = null;
}
diff --git a/src/main/java/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java b/src/main/java/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java index 8f047ca..638ed01 100644 --- a/src/main/java/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java +++ b/src/main/java/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java @@ -10,7 +10,7 @@ import javax.swing.JTabbedPane; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import com.c2kernel.gui.EntityDetails;
+import com.c2kernel.gui.ItemDetails;
/**
* @author Developpement
@@ -51,9 +51,9 @@ public class JTabbedPaneWithCloseIcons extends JTabbedPane implements MouseListe { //the tab is being closed
cp = this.getComponent(tabNumber);
//if (getComponentCount() != 1)
- if (cp instanceof EntityDetails)
+ if (cp instanceof ItemDetails)
{
- ((EntityDetails) cp).closeTab();
+ ((ItemDetails) cp).closeTab();
remove(cp);
}
}
@@ -91,6 +91,6 @@ public class JTabbedPaneWithCloseIcons extends JTabbedPane implements MouseListe public void stateChanged(ChangeEvent e)
{
if (getSelectedComponent()!= null)
- ((EntityDetails) getSelectedComponent()).refresh();
+ ((ItemDetails) getSelectedComponent()).refresh();
}
}
diff --git a/src/main/java/com/c2kernel/gui/tabs/JobListPane.java b/src/main/java/com/c2kernel/gui/tabs/JobListPane.java index 20a4e05..bfc3019 100644 --- a/src/main/java/com/c2kernel/gui/tabs/JobListPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/JobListPane.java @@ -27,7 +27,7 @@ import javax.swing.table.AbstractTableModel; import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.entity.agent.Job;
import com.c2kernel.entity.agent.JobList;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
+import com.c2kernel.entity.proxy.ProxyObserver;
import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.persistency.ClusterStorage;
@@ -42,7 +42,7 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.4 $ $Date: 2004/10/21 08:02:21 $
* @author $Author: abranson $
*/
-public class JobListPane extends EntityTabPane implements ActionListener, EntityProxyObserver<Job> {
+public class JobListPane extends ItemTabPane implements ActionListener, ProxyObserver<Job> {
JobList joblist;
JoblistTableModel model;
@@ -105,8 +105,8 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity public void run() {
Thread.currentThread().setName("Joblist Pane Builder");
try {
- joblist = (JobList)sourceEntity.getEntity().getObject(ClusterStorage.JOB);
- sourceEntity.getEntity().subscribe(new MemberSubscription<Job>(this, ClusterStorage.JOB, false));
+ joblist = (JobList)sourceItem.getItem().getObject(ClusterStorage.JOB);
+ sourceItem.getItem().subscribe(new MemberSubscription<Job>(this, ClusterStorage.JOB, false));
} catch (ObjectNotFoundException e) {
Logger.error(e);
}
diff --git a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java index 7cbd00e..b6fca75 100644 --- a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java @@ -24,7 +24,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel;
import javax.swing.SwingConstants;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
+import com.c2kernel.entity.proxy.ProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.gui.MainFrame;
@@ -40,7 +40,7 @@ import com.c2kernel.utils.Language; * @version $Revision: 1.44 $ $Date: 2005/08/31 07:21:20 $
* @author $Author: abranson $
*/
-public class PropertiesPane extends EntityTabPane implements EntityProxyObserver<Property>, ActionListener {
+public class PropertiesPane extends ItemTabPane implements ProxyObserver<Property>, ActionListener {
Box propertyBox;
JButton eraseButton;
@@ -94,25 +94,25 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver @Override
public void reload() {
- Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.PROPERTY);
+ Gateway.getStorage().clearCache(sourceItem.getSysKey(), ClusterStorage.PROPERTY);
loadedProps = new HashMap<String, JLabel>();
- initForEntity(sourceEntity);
+ initForItem(sourceItem);
}
@Override
public void run() {
Thread.currentThread().setName("Property Pane Builder");
- if (sourceEntity instanceof NodeAgent) {
+ if (sourceItem instanceof NodeAgent) {
remove(domAdmin);
remove(domTitle);
eraseButton.setEnabled(false);
}
else if (domAdmin != null)
- domAdmin.setEntity((ItemProxy)sourceEntity.getEntity());
+ domAdmin.setEntity(sourceItem.getItem());
propertyBox.removeAll();
propertyBox.add(Box.createGlue());
revalidate();
- sourceEntity.getEntity().subscribe(new MemberSubscription<Property>(this, ClusterStorage.PROPERTY, true));
+ sourceItem.getItem().subscribe(new MemberSubscription<Property>(this, ClusterStorage.PROPERTY, true));
}
/**
@@ -140,7 +140,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver JOptionPane.QUESTION_MESSAGE, null, null, oldVal);
if (newVal!=null && !(newVal.equals(oldVal))) {
try {
- ((ItemProxy)sourceEntity.getEntity()).setProperty(MainFrame.userAgent, e.getActionCommand(), newVal);
+ (sourceItem.getItem()).setProperty(MainFrame.userAgent, e.getActionCommand(), newVal);
} catch (Exception ex) {
MainFrame.exceptionDialog(ex);
}
@@ -186,7 +186,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver return;
try {
- MainFrame.userAgent.execute((ItemProxy)sourceEntity.getEntity(), predefStep, params);
+ MainFrame.userAgent.execute(sourceItem.getItem(), predefStep, params);
} catch (Exception ex) {
MainFrame.exceptionDialog(ex);
}
diff --git a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java index 4f7db24..234f1db 100644 --- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java @@ -25,9 +25,8 @@ import javax.swing.SwingConstants; import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.entity.C2KLocalObject;
-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.gui.tabs.outcome.OutcomeException;
@@ -40,7 +39,7 @@ import com.c2kernel.utils.Language; import com.c2kernel.utils.LocalObjectLoader;
import com.c2kernel.utils.Logger;
-public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver<C2KLocalObject> {
+public class ViewpointPane extends ItemTabPane implements ItemListener, ActionListener, ProxyObserver<C2KLocalObject> {
JComboBox schemas;
JComboBox views;
@@ -155,21 +154,21 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action clearView();
// reload
- initForEntity(sourceEntity);
+ initForItem(sourceItem);
}
@Override
public void run() {
Thread.currentThread().setName("Viewpoint Pane Builder");
//Local object subscriptions
- sourceEntity.getEntity().subscribe(new MemberSubscription<C2KLocalObject>(this, ClusterStorage.VIEWPOINT, false));
- sourceEntity.getEntity().subscribe(new MemberSubscription<C2KLocalObject>(this, ClusterStorage.OUTCOME, false));
+ sourceItem.getItem().subscribe(new MemberSubscription<C2KLocalObject>(this, ClusterStorage.VIEWPOINT, false));
+ sourceItem.getItem().subscribe(new MemberSubscription<C2KLocalObject>(this, ClusterStorage.OUTCOME, false));
clearView();
schemas.addItem("--");
currentSchema = null;
schemaList = new ArrayList<String>();
try {
- String outcomeTypes = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/all");
+ String outcomeTypes = sourceItem.getItem().queryData(ClusterStorage.VIEWPOINT+"/all");
StringTokenizer tok = new StringTokenizer(outcomeTypes, ",");
while (tok.hasMoreTokens()) {
String thisType = tok.nextToken();
@@ -209,12 +208,12 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action try {
// populate views
- String viewNames = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/"+schemaName+"/all");
+ String viewNames = sourceItem.getItem().queryData(ClusterStorage.VIEWPOINT+"/"+schemaName+"/all");
StringTokenizer tok = new StringTokenizer(viewNames, ",");
Viewpoint lastView = null;
while(tok.hasMoreTokens()) {
String viewName = tok.nextToken();
- Viewpoint thisView = (Viewpoint)sourceEntity.getEntity().getObject(ClusterStorage.VIEWPOINT+"/"+schemaName+"/"+viewName);
+ Viewpoint thisView = (Viewpoint)sourceItem.getItem().getObject(ClusterStorage.VIEWPOINT+"/"+schemaName+"/"+viewName);
views.addItem(thisView);
if (lastView == null) lastView = thisView;
if (thisView.getName().equals("last")) //select
@@ -222,11 +221,11 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action viewpointList.add(thisView);
}
- String ocVersions = sourceEntity.getEntity().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/all");
+ String ocVersions = sourceItem.getItem().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/all");
tok = new StringTokenizer(ocVersions, ",");
while(tok.hasMoreTokens()) {
int schemaVersion = Integer.parseInt(tok.nextToken());
- String ocEvents = sourceEntity.getEntity().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/"+schemaVersion+"/all");
+ String ocEvents = sourceItem.getItem().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/"+schemaVersion+"/all");
StringTokenizer tok2 = new StringTokenizer(ocEvents, ",");
while(tok2.hasMoreTokens()) {
int eventId = Integer.parseInt(tok2.nextToken());
@@ -277,7 +276,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action public void showEvent(EventItem thisEvent) {
eventDetails.setText(thisEvent.getEventDesc());
try {
- setView((Outcome)sourceEntity.getEntity().getObject(
+ setView((Outcome)sourceItem.getItem().getObject(
ClusterStorage.OUTCOME+"/"+currentSchema+"/"+thisEvent.schemaVersion+"/"+thisEvent.eventId));
} catch (Exception ex) {
Logger.error(ex);
@@ -295,7 +294,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action String error = null;
try {
schema = LocalObjectLoader.getSchema(data.getSchemaType(), data.getSchemaVersion()).schema;
- thisOutcome = EntityTabPane.getOutcomeHandler(data.getSchemaType(), data.getSchemaVersion());
+ thisOutcome = ItemTabPane.getOutcomeHandler(data.getSchemaType(), data.getSchemaVersion());
thisOutcome.setDescription(schema);
thisOutcome.setOutcome(data.getData());
thisOutcome.setReadOnly(true);
@@ -373,7 +372,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action try {
String[] predefParams = new String[1];
predefParams[0] = Gateway.getMarshaller().marshall(oldView);
- MainFrame.userAgent.execute((ItemProxy)sourceEntity.getEntity(), "AddC2KObject", predefParams);
+ MainFrame.userAgent.execute(sourceItem.getItem(), "AddC2KObject", predefParams);
} catch (Exception e) {
Logger.error(e);
MainFrame.exceptionDialog(e);
@@ -504,7 +503,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action public String getEventDesc() {
try {
- Event myEvent = (Event)sourceEntity.getEntity().getObject(ClusterStorage.HISTORY+"/"+eventId);
+ Event myEvent = (Event)sourceItem.getItem().getObject(ClusterStorage.HISTORY+"/"+eventId);
return (Language.translate("Recorded on")+" "+myEvent.getTimeString()+" "+
Language.translate("by")+" "+myEvent.getAgentName()+" "+
Language.translate("using schema v")+schemaVersion);
diff --git a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java index 754cf60..bc31ac2 100644 --- a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java @@ -9,9 +9,8 @@ import javax.swing.JButton; import javax.swing.JFileChooser;
import javax.swing.JSplitPane;
-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.graph.layout.DefaultGraphLayoutGenerator;
import com.c2kernel.graph.model.EdgeFactory;
import com.c2kernel.graph.model.VertexFactory;
@@ -34,7 +33,7 @@ import com.c2kernel.process.Gateway; import com.c2kernel.utils.FileStringUtility;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.Logger;
-public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<Workflow>
+public class WorkflowPane extends ItemTabPane implements ProxyObserver<Workflow>
{
// Only for the purpose of loading and saving
protected Workflow mWorkflow = null;
@@ -180,14 +179,14 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<W mEditorPanel.setEditable(MainFrame.isAdmin);
init = true;
}
- sourceEntity.getEntity().subscribe(new MemberSubscription<Workflow>(this, ClusterStorage.LIFECYCLE, true));
- transPanel.setItem((ItemProxy) sourceEntity.getEntity());
+ sourceItem.getItem().subscribe(new MemberSubscription<Workflow>(this, ClusterStorage.LIFECYCLE, true));
+ transPanel.setItem(sourceItem.getItem());
}
@Override
public void reload()
{
- Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.LIFECYCLE);
- initForEntity(sourceEntity);
+ Gateway.getStorage().clearCache(sourceItem.getSysKey(), ClusterStorage.LIFECYCLE);
+ initForItem(sourceItem);
}
protected void createLayout()
{
@@ -229,7 +228,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<W {
CompositeActivity cact = (CompositeActivity)mWorkflow.getWf().search("workflow/domain");
MainFrame.userAgent.execute(
- (ItemProxy)sourceEntity.getEntity(),
+ sourceItem.getItem(),
"ReplaceDomainWorkflow",
new String[] { Gateway.getMarshaller().marshall(cact)});
mEditorPanel.mGraphPanel.setSelection(new Selection(null,null,0,0,0,0));
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);
diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java index 82c45ff..9405937 100644 --- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java +++ b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java @@ -24,7 +24,7 @@ import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.agent.Job;
import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.gui.MainFrame;
-import com.c2kernel.gui.tabs.EntityTabPane;
+import com.c2kernel.gui.tabs.ItemTabPane;
import com.c2kernel.gui.tabs.ExecutionPane;
import com.c2kernel.gui.tabs.outcome.InvalidOutcomeException;
import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;
@@ -84,7 +84,7 @@ public class ActivityViewer extends JPanel implements Runnable { // activity title
JLabel actTitle = new JLabel(Language.translate("Activity")+": "+newAct.name);
- actTitle.setFont(EntityTabPane.titleFont);
+ actTitle.setFont(ItemTabPane.titleFont);
gridbag.setConstraints(actTitle, c);
add(actTitle);
@@ -150,7 +150,7 @@ public class ActivityViewer extends JPanel implements Runnable { c.gridy++;
status = new JLabel(Language.translate("Waiting for request"));
- status.setFont(EntityTabPane.titleFont);
+ status.setFont(ItemTabPane.titleFont);
gridbag.setConstraints(status, c);
add(status);
@@ -229,7 +229,7 @@ public class ActivityViewer extends JPanel implements Runnable { String schema;
OutcomeHandler thisForm;
schema = LocalObjectLoader.getSchema(thisJob.getSchemaName(), thisJob.getSchemaVersion()).schema;
- thisForm = EntityTabPane.getOutcomeHandler(thisJob.getSchemaName(), thisJob.getSchemaVersion());
+ thisForm = ItemTabPane.getOutcomeHandler(thisJob.getSchemaName(), thisJob.getSchemaVersion());
thisForm.setReadOnly(false);
thisForm.setDescription(schema);
String outcomeString = thisJob.getOutcomeString();
|