From 0cdd3894699b80b7ba674930a320bf702eeb6e98 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 9 Jul 2007 20:43:48 +0000 Subject: [PATCH] [193394] Kevin's patch for Changed mentions of Vector to java.util.List as passed child is an ArrayList not a Vector --- .../internal/ui/view/SystemTableViewPart.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java index 125338ee36d..25418dcfed2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java @@ -1570,9 +1570,9 @@ public class SystemTableViewPart extends ViewPart for (int i = 0; i < _browseHistory.size(); i++) { HistoryItem hist = (HistoryItem)_browseHistory.get(i); - if (hist.getObject() == c) + Object historyObj = hist.getObject(); + if (historyObj == c || historyObj.equals(c)) { - _browseHistory.remove(hist); if (_browsePosition >= i) { @@ -1610,11 +1610,11 @@ public class SystemTableViewPart extends ViewPart { int eventType = event.getEventType(); Object remoteResource = event.getResource(); - Vector remoteResourceNames = null; - if (remoteResource instanceof Vector) + java.util.List remoteResourceNames = null; + if (remoteResource instanceof java.util.List) { - remoteResourceNames = (Vector) remoteResource; - remoteResource = remoteResourceNames.elementAt(0); + remoteResourceNames = (java.util.List) remoteResource; + remoteResource = remoteResourceNames.get(0); } Object child = event.getResource(); @@ -1630,7 +1630,7 @@ public class SystemTableViewPart extends ViewPart referToSameObject = ((SystemRegistry)registry).isSameObjectByAbsoluteName(input, null, child, event.getOldName()); } - if (input == child || child instanceof Vector || referToSameObject) + if (input == child || child instanceof java.util.List || referToSameObject) { switch (eventType) { @@ -1651,12 +1651,12 @@ public class SystemTableViewPart extends ViewPart // -------------------------- case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED : { - if (child instanceof Vector) + if (child instanceof java.util.List) { - Vector vec = (Vector)child; - for (int v = 0; v < vec.size(); v++) + java.util.List list = (java.util.List)child; + for (int v = 0; v < list.size(); v++) { - Object c = vec.get(v); + Object c = list.get(v); removeFromHistory(c); /*