summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/gui/tree
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2014-10-03 17:31:07 +0200
committerAndrew Branson <andrew.branson@cern.ch>2014-10-03 17:31:07 +0200
commit31c13eed377fe1324ebed7fbaa56483a43e3d3d1 (patch)
tree5d2dca5b22131c33bc771b5ba15b72e2673bd99b /src/main/java/com/c2kernel/gui/tree
parent73185740e8067278e4cdd9fe24300e2651cfee09 (diff)
Adapt to new Exceptions
Diffstat (limited to 'src/main/java/com/c2kernel/gui/tree')
-rw-r--r--src/main/java/com/c2kernel/gui/tree/Node.java6
-rw-r--r--src/main/java/com/c2kernel/gui/tree/NodeCollection.java4
-rw-r--r--src/main/java/com/c2kernel/gui/tree/NodeItem.java8
-rw-r--r--src/main/java/com/c2kernel/gui/tree/NodeRole.java4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/com/c2kernel/gui/tree/Node.java b/src/main/java/com/c2kernel/gui/tree/Node.java
index d81061f..82cfca8 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.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
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 (ObjectNotFoundException e) { }
+ } catch (ObjectNotFound 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 (ObjectNotFoundException ex) {
+ } catch (ObjectNotFound 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 36d32e3..66f4940 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.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
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 (ObjectNotFoundException ex) {
+ } catch (ObjectNotFound 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 3194bcd..2eb1bbc 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.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
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 (ObjectNotFoundException e) {
+ } catch (ObjectNotFound e) {
this.type = "";
}
String iconString = this.type;
if (type.equals("ActivityDesc"))
try {
iconString = myItem.getProperty("Complexity")+iconString;
- } catch (ObjectNotFoundException e) {
+ } catch (ObjectNotFound e) {
iconString = "error";
}
iconString = iconString.toLowerCase();
this.setIcon(iconString);
- } catch (ObjectNotFoundException e1) {
+ } catch (ObjectNotFound 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 df04e3a..cb1171e 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.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
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 (ObjectNotFoundException e) {
+ } catch (ObjectNotFound e) {
Logger.error("Role "+role.getName()+" not found");
}
super.loadChildren();