Rolled back the renaming of existing exceptions.

8 files changed, 19 insertions, 19 deletions

diff --git a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java b/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java
index 08c784e..5745731 100644
--- a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java
+++ b/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java
@@ -13,7 +13,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.table.AbstractTableModel;

 

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.gui.MainFrame;

 import com.c2kernel.lookup.DomainPath;

@@ -121,7 +121,7 @@ public void actionPerformed(ActionEvent e) {
                 DomainPath thisPath = (DomainPath)currentPaths.next();

                 try {

 					if (thisPath.getItemPath().equals(entity.getPath())) domPaths.add(thisPath);

-				} catch (ObjectNotFound e) { }

+				} 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 bf1697c..ad10ad3 100644
--- a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java
@@ -22,7 +22,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.table.AbstractTableModel;

 

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.proxy.ProxyObserver;

 import com.c2kernel.entity.proxy.MemberSubscription;

 import com.c2kernel.events.Event;

@@ -116,7 +116,7 @@ public class HistoryPane extends ItemTabPane implements ActionListener, ProxyObs
 		try {

 			history = (History)sourceItem.getItem().getObject(ClusterStorage.HISTORY);

             sourceItem.getItem().subscribe(new MemberSubscription<Event>(this, ClusterStorage.HISTORY, true));

-		} catch (ObjectNotFound e) {

+		} catch (ObjectNotFoundException e) {

 			Logger.error(e);

 		}

 		model = new HistoryTableModel();

diff --git a/src/main/java/com/c2kernel/gui/tabs/JobListPane.java b/src/main/java/com/c2kernel/gui/tabs/JobListPane.java
index 17cfb29..4893ae5 100644
--- a/src/main/java/com/c2kernel/gui/tabs/JobListPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/JobListPane.java
@@ -24,7 +24,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.table.AbstractTableModel;

 

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.agent.Job;

 import com.c2kernel.entity.agent.JobList;

 import com.c2kernel.entity.proxy.ProxyObserver;

@@ -107,7 +107,7 @@ public class JobListPane extends ItemTabPane implements ActionListener, ProxyObs
 		try {

             joblist = (JobList)sourceItem.getItem().getObject(ClusterStorage.JOB);

             sourceItem.getItem().subscribe(new MemberSubscription<Job>(this, ClusterStorage.JOB, false));

-		} catch (ObjectNotFound e) {

+		} catch (ObjectNotFoundException e) {

 			Logger.error(e);

 		}

 		model = new JoblistTableModel(joblist);

diff --git a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
index 43b91fd..7dea317 100644
--- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
@@ -23,7 +23,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;

 import javax.swing.SwingConstants;

 

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.entity.proxy.MemberSubscription;

 import com.c2kernel.entity.proxy.ProxyObserver;

@@ -304,7 +304,7 @@ public class ViewpointPane extends ItemTabPane implements ItemListener, ActionLi
             exportButton.setEnabled(true);

             if (viewButton!=null) viewButton.setEnabled(true);

             return;

-        } catch (ObjectNotFound ex) {

+        } catch (ObjectNotFoundException ex) {

             error = "Schema not found";

         } catch (OutcomeException ex) {

             error = "Outcome was not valid. See log for details: "+ex.getMessage();

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 3d5a29a..b97fa3c 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
@@ -12,7 +12,7 @@ import javax.swing.table.AbstractTableModel;
 

 import com.c2kernel.collection.Aggregation;

 import com.c2kernel.collection.Collection;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.entity.proxy.MemberSubscription;

 import com.c2kernel.entity.proxy.ProxyObserver;

@@ -97,7 +97,7 @@ public class CollectionHistoryWindow extends JFrame  {
 					try {

 						ItemProxy childItem = Gateway.getProxyManager().getProxy(new ItemPath(((String[])collEventData.get(rowIndex))[2]));

 						name = childItem.getName();

-					} catch (ObjectNotFound e) {

+					} catch (ObjectNotFoundException e) {

 						name = "Item deleted: "+((String[])collEventData.get(rowIndex))[2];

 					} catch (Exception e) {

 						name = "Problem resolving Item key: "+((String[])collEventData.get(rowIndex))[2];

@@ -117,7 +117,7 @@ public class CollectionHistoryWindow extends JFrame  {
 				try {

 				Outcome oc = (Outcome)item.getObject(ClusterStorage.OUTCOME+"/PredefinedStepOutcome/0/"+thisEv.getID());

 				params = PredefinedStep.getDataList(oc.getData());

-				} catch (ObjectNotFound ex) { return; }

+				} catch (ObjectNotFoundException ex) { return; }

 				if (thisEv.getStepName().equals("AssignItemToSlot")) {

 					if (params[0].equals(coll.getName()))

 						collEventData.add(params);

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 4072d83..478403c 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
@@ -17,7 +17,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextField;

 

 import com.c2kernel.collection.CollectionMember;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.gui.MainFrame;

 import com.c2kernel.gui.graph.view.PropertyTable;

 import com.c2kernel.gui.graph.view.PropertyTableModel;

@@ -59,7 +59,7 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe
 			ItemPath path = cm.getItemPath();

 			if (path == null) newMemberName = "No member";

 			else newMemberName = Gateway.getProxyManager().getProxy(path).getProperty("Name");

-		} catch (ObjectNotFound e) {

+		} catch (ObjectNotFoundException e) {

 			newMemberName = "Item or Item name property not found";

 		}

 		

diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java b/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java
index 7bfe5d9..a53f562 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/DependencyView.java
@@ -8,7 +8,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
 

 import com.c2kernel.collection.Collection;

 import com.c2kernel.collection.DependencyMember;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.gui.MainFrame;

 import com.c2kernel.gui.TreeBrowser;

 import com.c2kernel.gui.tree.Node;

@@ -51,7 +51,7 @@ public class DependencyView extends CollectionView<DependencyMember>
 							try {

 								propPanel.setMember(thisItem.getParentCollection().getMember(thisItem.getSlotNo()));

 								return;

-							} catch (ObjectNotFound e1) { }

+							} catch (ObjectNotFoundException e1) { }

 						}

 						propPanel.clear();

 					}

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 03afe67..9405937 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
+++ b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
@@ -19,8 +19,8 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;

 import javax.swing.JTextArea;

 

-import com.c2kernel.common.InvalidData;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.agent.Job;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.gui.MainFrame;

@@ -188,7 +188,7 @@ public class ActivityViewer extends JPanel implements Runnable {
             			outcomePanel = getOutcomeHandler(thisJob);

 						outcomeView = outcomePanel.getPanel();

 						newButton.setEnabled(true);

-					} catch (ObjectNotFound ex) {

+					} catch (ObjectNotFoundException ex) {

 						outcomeView.add(new JLabel(Language.translate("Schema not found:")+" "+schemaName+" v"+schemaVersion));

 	              	} catch (Exception ex) {

 	                    outcomeView.add(new JLabel(Language.translate("ERROR loading outcome editor: ")

@@ -225,7 +225,7 @@ public class ActivityViewer extends JPanel implements Runnable {
 

     }

 

-    public OutcomeHandler getOutcomeHandler(Job thisJob) throws ObjectNotFound, InvalidSchemaException, InvalidOutcomeException, InvalidData {

+    public OutcomeHandler getOutcomeHandler(Job thisJob) throws ObjectNotFoundException, InvalidSchemaException, InvalidOutcomeException, InvalidDataException {

         String schema;

         OutcomeHandler thisForm;

     	schema = LocalObjectLoader.getSchema(thisJob.getSchemaName(), thisJob.getSchemaVersion()).schema;