From a5a9d90ec6714ad6a9358c35ca7093e5868373f7 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 23:19:04 +0200
Subject: Rolled back the renaming of existing exceptions.

---
 src/main/java/com/c2kernel/gui/tree/Node.java           | 6 +++---
 src/main/java/com/c2kernel/gui/tree/NodeCollection.java | 4 ++--
 src/main/java/com/c2kernel/gui/tree/NodeItem.java       | 8 ++++----
 src/main/java/com/c2kernel/gui/tree/NodeRole.java       | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/main/java/com/c2kernel/gui/tree')

diff --git a/src/main/java/com/c2kernel/gui/tree/Node.java b/src/main/java/com/c2kernel/gui/tree/Node.java
index 82cfca8..d81061f 100644
--- a/src/main/java/com/c2kernel/gui/tree/Node.java
+++ b/src/main/java/com/c2kernel/gui/tree/Node.java
@@ -11,7 +11,7 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.gui.DynamicTreeBuilder;
 import com.c2kernel.gui.ImageLoader;
 import com.c2kernel.gui.ItemTabManager;
@@ -56,7 +56,7 @@ public abstract class Node implements Runnable {
         this.desktop = desktop;
         try {
 			this.itemPath = path.getItemPath();
-		} catch (ObjectNotFound e) { }
+		} catch (ObjectNotFoundException e) { }
         // get the name of this node (last path element)
         String[] pathComponents = path.getPath();
         if (pathComponents.length > 0)
@@ -76,7 +76,7 @@ public abstract class Node implements Runnable {
                 return new NodeAgent(path, desktop);
             else
                 return new NodeItem(path, desktop);
-        } catch (ObjectNotFound ex) {
+        } catch (ObjectNotFoundException ex) {
         	if (path instanceof RolePath)
                 return new NodeRole(path, desktop);
             return new NodeContext(path, desktop);
diff --git a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java b/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
index 66f4940..36d32e3 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
+++ b/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
@@ -7,7 +7,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import com.c2kernel.collection.Collection;
 import com.c2kernel.collection.CollectionMember;
 import com.c2kernel.collection.Dependency;
-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;
@@ -54,7 +54,7 @@ public class NodeCollection extends Node implements ProxyObserver<Collection<? e
         		add(initColl);
         	}
             parent.subscribe(new MemberSubscription<Collection<? extends CollectionMember>>(this, ClusterStorage.COLLECTION, false));
-        } catch (ObjectNotFound ex) {
+        } catch (ObjectNotFoundException ex) {
             end(false);
             return;
         }
diff --git a/src/main/java/com/c2kernel/gui/tree/NodeItem.java b/src/main/java/com/c2kernel/gui/tree/NodeItem.java
index 2eb1bbc..3194bcd 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeItem.java
+++ b/src/main/java/com/c2kernel/gui/tree/NodeItem.java
@@ -15,7 +15,7 @@ import javax.swing.JPopupMenu;
 import com.c2kernel.collection.Aggregation;
 import com.c2kernel.collection.Collection;
 import com.c2kernel.collection.CollectionMember;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.agent.Job;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.gui.ItemDetails;
@@ -53,19 +53,19 @@ public class NodeItem extends Node implements Transferable {
 	
 	        try {
 				this.type = myItem.getProperty("Type");
-			} catch (ObjectNotFound e) {
+			} catch (ObjectNotFoundException e) {
 				this.type = "";
 			}
 	        String iconString = this.type;
 	        if (type.equals("ActivityDesc"))
 				try {
 					iconString = myItem.getProperty("Complexity")+iconString;
-				} catch (ObjectNotFound e) {
+				} catch (ObjectNotFoundException e) {
 					iconString = "error";
 				}
 	        iconString = iconString.toLowerCase();
 	        this.setIcon(iconString);
-		} catch (ObjectNotFound e1) {
+		} catch (ObjectNotFoundException e1) {
 			this.itemPath = null;
 			this.type="Error";
 			this.name="Entity not found";
diff --git a/src/main/java/com/c2kernel/gui/tree/NodeRole.java b/src/main/java/com/c2kernel/gui/tree/NodeRole.java
index cb1171e..df04e3a 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeRole.java
+++ b/src/main/java/com/c2kernel/gui/tree/NodeRole.java
@@ -1,6 +1,6 @@
 package com.c2kernel.gui.tree;
 
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.gui.ItemTabManager;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.Path;
@@ -23,7 +23,7 @@ public class NodeRole extends NodeContext {
 			for (AgentPath agentPath : agents) {
 				add (newNode(agentPath));
 			}
-		} catch (ObjectNotFound e) {
+		} catch (ObjectNotFoundException e) {
 			Logger.error("Role "+role.getName()+" not found");
 		}
 		super.loadChildren();
-- 
cgit v1.2.3