|
Lines 1570-1578
Link Here
|
| 1570 |
for (int i = 0; i < _browseHistory.size(); i++) |
1570 |
for (int i = 0; i < _browseHistory.size(); i++) |
| 1571 |
{ |
1571 |
{ |
| 1572 |
HistoryItem hist = (HistoryItem)_browseHistory.get(i); |
1572 |
HistoryItem hist = (HistoryItem)_browseHistory.get(i); |
| 1573 |
if (hist.getObject() == c) |
1573 |
Object historyObj = hist.getObject(); |
|
|
1574 |
if (historyObj == c || historyObj.equals(c)) |
| 1574 |
{ |
1575 |
{ |
| 1575 |
|
|
|
| 1576 |
_browseHistory.remove(hist); |
1576 |
_browseHistory.remove(hist); |
| 1577 |
if (_browsePosition >= i) |
1577 |
if (_browsePosition >= i) |
| 1578 |
{ |
1578 |
{ |
|
Lines 1610-1620
Link Here
|
| 1610 |
{ |
1610 |
{ |
| 1611 |
int eventType = event.getEventType(); |
1611 |
int eventType = event.getEventType(); |
| 1612 |
Object remoteResource = event.getResource(); |
1612 |
Object remoteResource = event.getResource(); |
| 1613 |
Vector remoteResourceNames = null; |
1613 |
java.util.List remoteResourceNames = null; |
| 1614 |
if (remoteResource instanceof Vector) |
1614 |
if (remoteResource instanceof java.util.List) |
| 1615 |
{ |
1615 |
{ |
| 1616 |
remoteResourceNames = (Vector) remoteResource; |
1616 |
remoteResourceNames = (java.util.List) remoteResource; |
| 1617 |
remoteResource = remoteResourceNames.elementAt(0); |
1617 |
remoteResource = remoteResourceNames.get(0); |
| 1618 |
} |
1618 |
} |
| 1619 |
|
1619 |
|
| 1620 |
Object child = event.getResource(); |
1620 |
Object child = event.getResource(); |
|
Lines 1630-1636
Link Here
|
| 1630 |
referToSameObject = ((SystemRegistry)registry).isSameObjectByAbsoluteName(input, null, child, event.getOldName()); |
1630 |
referToSameObject = ((SystemRegistry)registry).isSameObjectByAbsoluteName(input, null, child, event.getOldName()); |
| 1631 |
} |
1631 |
} |
| 1632 |
|
1632 |
|
| 1633 |
if (input == child || child instanceof Vector || referToSameObject) |
1633 |
if (input == child || child instanceof java.util.List || referToSameObject) |
| 1634 |
{ |
1634 |
{ |
| 1635 |
switch (eventType) |
1635 |
switch (eventType) |
| 1636 |
{ |
1636 |
{ |
|
Lines 1651-1662
Link Here
|
| 1651 |
// -------------------------- |
1651 |
// -------------------------- |
| 1652 |
case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED : |
1652 |
case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED : |
| 1653 |
{ |
1653 |
{ |
| 1654 |
if (child instanceof Vector) |
1654 |
if (child instanceof java.util.List) |
| 1655 |
{ |
1655 |
{ |
| 1656 |
Vector vec = (Vector)child; |
1656 |
java.util.List list = (java.util.List)child; |
| 1657 |
for (int v = 0; v < vec.size(); v++) |
1657 |
for (int v = 0; v < list.size(); v++) |
| 1658 |
{ |
1658 |
{ |
| 1659 |
Object c = vec.get(v); |
1659 |
Object c = list.get(v); |
| 1660 |
|
1660 |
|
| 1661 |
removeFromHistory(c); |
1661 |
removeFromHistory(c); |
| 1662 |
/* |
1662 |
/* |
