From a5a9d90ec6714ad6a9358c35ca7093e5868373f7 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 3 Oct 2014 23:19:04 +0200 Subject: Rolled back the renaming of existing exceptions. --- src/main/java/com/c2kernel/gui/ImageLoader.java | 10 +++++----- src/main/java/com/c2kernel/gui/MenuBuilder.java | 6 +++--- src/main/java/com/c2kernel/gui/collection/PropertyPanel.java | 4 ++-- .../java/com/c2kernel/gui/collection/SelectedMemberPanel.java | 4 ++-- .../c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java | 6 +++--- .../com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java | 4 ++-- .../com/c2kernel/gui/lifecycle/instance/TransitionPanel.java | 6 +++--- src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java | 4 ++-- src/main/java/com/c2kernel/gui/tabs/HistoryPane.java | 4 ++-- src/main/java/com/c2kernel/gui/tabs/JobListPane.java | 4 ++-- src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java | 4 ++-- .../c2kernel/gui/tabs/collection/CollectionHistoryWindow.java | 6 +++--- .../gui/tabs/collection/CollectionMemberPropertyPanel.java | 4 ++-- .../java/com/c2kernel/gui/tabs/collection/DependencyView.java | 4 ++-- .../java/com/c2kernel/gui/tabs/execution/ActivityViewer.java | 8 ++++---- 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 ++-- 19 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/c2kernel/gui/ImageLoader.java b/src/main/java/com/c2kernel/gui/ImageLoader.java index 6b85945..121bcca 100644 --- a/src/main/java/com/c2kernel/gui/ImageLoader.java +++ b/src/main/java/com/c2kernel/gui/ImageLoader.java @@ -7,7 +7,7 @@ import java.util.Hashtable; import javax.swing.ImageIcon; -import com.c2kernel.common.ObjectNotFound; +import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.process.Gateway; import com.c2kernel.utils.Logger; @@ -28,10 +28,10 @@ public class ImageLoader { for (String ns : Gateway.getResource().getModuleBaseURLs().keySet()) { try { return getImage(ns, resName); - } catch (ObjectNotFound ex) { } + } catch (ObjectNotFoundException ex) { } } return getImage(null, resName); - } catch (ObjectNotFound ex) { + } catch (ObjectNotFoundException ex) { if (!reportedMissingIcons.contains(resName)) { Logger.warning("Image '"+resName+"' not found. Using null icon"); reportedMissingIcons.add(resName); @@ -40,7 +40,7 @@ public class ImageLoader { } } - static public ImageIcon getImage(String ns, String resName) throws ObjectNotFound { + static public ImageIcon getImage(String ns, String resName) throws ObjectNotFoundException { if (resName == null) return nullImg; @@ -67,7 +67,7 @@ public class ImageLoader { return newImg; } } - throw new ObjectNotFound(); + throw new ObjectNotFoundException(); } } diff --git a/src/main/java/com/c2kernel/gui/MenuBuilder.java b/src/main/java/com/c2kernel/gui/MenuBuilder.java index 2e9d44a..100d989 100644 --- a/src/main/java/com/c2kernel/gui/MenuBuilder.java +++ b/src/main/java/com/c2kernel/gui/MenuBuilder.java @@ -25,7 +25,7 @@ import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import javax.swing.text.html.HTMLEditorKit; -import com.c2kernel.common.ObjectNotFound; +import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.lookup.DomainPath; import com.c2kernel.lookup.ItemPath; import com.c2kernel.lookup.Path; @@ -232,13 +232,13 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene StringBuffer lictxt = new StringBuffer(); try { lictxt.append(Gateway.getResource().getTextResource(null, "textFiles/license.html")); - } catch (ObjectNotFound e) { } // no kernel license found + } catch (ObjectNotFoundException e) { } // no kernel license found for (String ns : Gateway.getResource().getModuleBaseURLs().keySet()) { String domlictxt; try { domlictxt = Gateway.getResource().getTextResource(ns, "license.html"); lictxt.append(domlictxt).append("\n"); - } catch (ObjectNotFound e) { } + } catch (ObjectNotFoundException e) { } } diff --git a/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java b/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java index 932d7cc..38e3fd3 100644 --- a/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java +++ b/src/main/java/com/c2kernel/gui/collection/PropertyPanel.java @@ -3,7 +3,7 @@ package com.c2kernel.gui.collection; import com.c2kernel.collection.Aggregation; import com.c2kernel.collection.AggregationMember; import com.c2kernel.collection.CollectionMember; -import com.c2kernel.common.ObjectNotFound; +import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.graph.model.Vertex; import com.c2kernel.gui.graph.view.VertexPropertyPanel; @@ -29,7 +29,7 @@ public class PropertyPanel extends VertexPropertyPanel { } else clear(); - } catch (ObjectNotFound ex) { + } catch (ObjectNotFoundException ex) { clear(); selObjClass.setText("No Collection Member object found"); } diff --git a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java b/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java index 328d87d..20fdde5 100644 --- a/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java +++ b/src/main/java/com/c2kernel/gui/collection/SelectedMemberPanel.java @@ -15,7 +15,7 @@ import javax.swing.JToggleButton; import com.c2kernel.collection.AggregationMember; import com.c2kernel.common.InvalidCollectionModification; -import com.c2kernel.common.ObjectNotFound; +import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.proxy.ItemProxy; import com.c2kernel.graph.model.Vertex; import com.c2kernel.gui.DomainKeyConsumer; @@ -148,7 +148,7 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe select(selectedMember); } catch (InvalidCollectionModification ex) { JOptionPane.showMessageDialog(null, "Item does not fit in this slot", "Error", JOptionPane.ERROR_MESSAGE); - } catch (ObjectNotFound e) { + } catch (ObjectNotFoundException e) { JOptionPane.showMessageDialog(null, "Not an item - cannot assign", "Error", JOptionPane.ERROR_MESSAGE); } } diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java index 6f74968..f02e2f7 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java @@ -6,7 +6,7 @@ import java.io.File; import javax.swing.JOptionPane; import javax.swing.JPanel; -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.graph.model.GraphableVertex; @@ -158,7 +158,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out } } - private static void resolveRealVersion(ActivitySlotDef childDef) throws ObjectNotFound { + private static void resolveRealVersion(ActivitySlotDef childDef) throws ObjectNotFoundException { String defName = childDef.getActName(); ItemProxy actDefItem = LocalObjectLoader.loadLocalObjectDef("/desc/ActivityDesc/", defName); String actType = actDefItem.getProperty("Complexity"); @@ -183,7 +183,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out MainFrame.userAgent.execute(createJob); } catch (Exception e) { Logger.error(e); - throw new ObjectNotFound("Could not create new version of "+defName+" from last"); + throw new ObjectNotFoundException("Could not create new version of "+defName+" from last"); } resolveRealVersion(childDef); } diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java index 76d027a..a13d610 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/ActivityRenderer.java @@ -6,7 +6,7 @@ import java.awt.Paint; import java.awt.Polygon; import com.c2kernel.common.GTimeStamp; -import com.c2kernel.common.InvalidData; +import com.c2kernel.common.InvalidDataException; import com.c2kernel.graph.model.GraphPoint; import com.c2kernel.graph.model.Vertex; import com.c2kernel.gui.graph.view.VertexRenderer; @@ -41,7 +41,7 @@ public class ActivityRenderer implements VertexRenderer String stateName = "Invalid State"; try { stateName = activity.getStateName(); - } catch (InvalidData ex) { } + } catch (InvalidDataException ex) { } linesOfText[2] = Language.translate(stateName) + (showTime ? " " + getWaitTime(activity.getStateDate()) : ""); diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java index 1a8d4fc..f9a1a81 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java @@ -13,7 +13,7 @@ import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JOptionPane; -import com.c2kernel.common.InvalidData; +import com.c2kernel.common.InvalidDataException; import com.c2kernel.entity.agent.Job; import com.c2kernel.entity.proxy.ItemProxy; import com.c2kernel.graph.model.Vertex; @@ -111,7 +111,7 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen StateMachine sm; try { sm = mCurrentAct.getStateMachine(); - } catch (InvalidData e) { + } catch (InvalidDataException e) { status.setText("Invalid state machine."); Logger.error(e); return; @@ -120,7 +120,7 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen int currentState; try { currentState = mCurrentAct.getState(); - } catch (InvalidData e) { + } catch (InvalidDataException e) { status.setText("Could not find activity state"); Logger.error(e); return; 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(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(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 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; 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>(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