Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2008-04-11 04:52:49 +0000
committerslewis2008-04-11 04:52:49 +0000
commita4b279c31c3921fc2541b3982f10ceceac607600 (patch)
tree6b7854a8d16dca3c91dd9ce28115090f7639543c /examples/bundles/org.eclipse.ecf.example.collab/src
parent8f018e3b85643305e06c188da49fab60072a3987 (diff)
downloadorg.eclipse.ecf-a4b279c31c3921fc2541b3982f10ceceac607600.tar.gz
org.eclipse.ecf-a4b279c31c3921fc2541b3982f10ceceac607600.tar.xz
org.eclipse.ecf-a4b279c31c3921fc2541b3982f10ceceac607600.zip
Fixes to address bug 226608
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.example.collab/src')
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/SharedObjectContainerUI.java15
1 files changed, 2 insertions, 13 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/SharedObjectContainerUI.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/SharedObjectContainerUI.java
index a213180d6..8379a0bda 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/SharedObjectContainerUI.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/SharedObjectContainerUI.java
@@ -92,19 +92,8 @@ public class SharedObjectContainerUI {
addObjectToClient(soContainer, newClientEntry, username, resource);
soc.addListener(new IContainerListener() {
public void handleEvent(IContainerEvent evt) {
- if (evt instanceof IContainerDisconnectedEvent) {
- final IContainerDisconnectedEvent cd = (IContainerDisconnectedEvent) evt;
- final ID departedContainerID = cd.getTargetID();
- final ID connectedID = newClientEntry.getContainer().getConnectedID();
- if (connectedID == null || connectedID.equals(departedContainerID)) {
- // This container is done
- if (!newClientEntry.isDisposed()) {
- collabclient.disposeClient(resource, newClientEntry);
- }
- }
- } else if (evt instanceof IContainerEjectedEvent) {
- final IContainerEjectedEvent ce = (IContainerEjectedEvent) evt;
- final ID departedContainerID = ce.getTargetID();
+ if (evt instanceof IContainerDisconnectedEvent || evt instanceof IContainerEjectedEvent) {
+ final ID departedContainerID = ((evt instanceof IContainerDisconnectedEvent) ? ((IContainerDisconnectedEvent) evt).getTargetID() : ((IContainerEjectedEvent) evt).getTargetID());
final ID connectedID = newClientEntry.getContainer().getConnectedID();
if (connectedID == null || connectedID.equals(departedContainerID)) {
if (!newClientEntry.isDisposed()) {

Back to the top