Refactored interfaces and view implementations

4 files changed, 10 insertions, 29 deletions

diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/presence/IPresenceViewer.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/presence/IPresenceViewer.java
deleted file mode 100644
index 20e03b174..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/presence/IPresenceViewer.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/****************************************************************************
-* Copyright (c) 2004 Composent, Inc. and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-*    Composent, Inc. - initial API and implementation
-*****************************************************************************/
-
-package org.eclipse.ecf.ui.presence;
-
-import org.eclipse.ecf.core.identity.ID;
-
-public interface IPresenceViewer {
-    
-    public void receivePresence(ID userID, IPresence presence);
-}
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/presence/IRosterViewer.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/presence/IRosterViewer.java
index 607722c63..da07d2f15 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/presence/IRosterViewer.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/presence/IRosterViewer.java
@@ -11,7 +11,10 @@
 
 package org.eclipse.ecf.ui.presence;
 
+import org.eclipse.ecf.core.identity.ID;
+
 public interface IRosterViewer {
     
     public void receiveRosterEntry(IRosterEntry entry);
+    public void receivePresence(ID userID, IPresence presence);
 }
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/ILocalUserSettable.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IConfigViewer.java
index dcc2e273c..58f5b9930 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/ILocalUserSettable.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IConfigViewer.java
@@ -14,7 +14,7 @@ package org.eclipse.ecf.ui.views;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.user.IUser;
 
-public interface ILocalUserSettable {
+public interface IConfigViewer {
     
     public void setLocalUser(IUser user, ITextInputHandler inputHandler);
     public void setGroup(ID groupManager);
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
index 8385840b4..df5bf28cd 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
@@ -26,7 +26,6 @@ import org.eclipse.ecf.ui.UiPlugin;
 import org.eclipse.ecf.ui.UiPluginConstants;
 import org.eclipse.ecf.ui.messaging.IMessageViewer;
 import org.eclipse.ecf.ui.presence.IPresence;
-import org.eclipse.ecf.ui.presence.IPresenceViewer;
 import org.eclipse.ecf.ui.presence.IRosterEntry;
 import org.eclipse.ecf.ui.presence.IRosterGroup;
 import org.eclipse.ecf.ui.presence.IRosterViewer;
@@ -65,8 +64,8 @@ import org.eclipse.ui.part.ViewPart;
  * WARNING: IN PROGRESS
  * 
  */
-public class RosterView extends ViewPart implements ILocalUserSettable,
-        IRosterViewer, IPresenceViewer, IMessageViewer {
+public class RosterView extends ViewPart implements IConfigViewer,
+        IRosterViewer, IMessageViewer {
     protected static final int TREE_EXPANSION_LEVELS = 1;
     private TreeViewer viewer;
     private Action chatAction;
@@ -554,7 +553,7 @@ public class RosterView extends ViewPart implements ILocalUserSettable,
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.ecf.ui.views.ILocalUserSettable#setUser(org.eclipse.ecf.core.user.IUser)
+     * @see org.eclipse.ecf.ui.views.IConfigViewer#setUser(org.eclipse.ecf.core.user.IUser)
      */
     public void setLocalUser(IUser user, ITextInputHandler textInputHandler) {
         this.localUser = user;
@@ -584,14 +583,12 @@ public class RosterView extends ViewPart implements ILocalUserSettable,
                         System.out.println("disconnect()");
                 }
             };
-        } else if (clazz.equals(ILocalUserSettable.class)) {
+        } else if (clazz.equals(IConfigViewer.class)) {
             return this;
         } else if (clazz.equals(IRosterViewer.class)) {
             return this;
         } else if (clazz.equals(IMessageViewer.class)) {
             return this;
-        } else if (clazz.equals(IPresenceViewer.class)) {
-            return this;
         } else
             return null;
     }
@@ -626,7 +623,7 @@ public class RosterView extends ViewPart implements ILocalUserSettable,
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.ecf.ui.views.ILocalUserSettable#setGroup(org.eclipse.ecf.core.identity.ID)
+     * @see org.eclipse.ecf.ui.views.IConfigViewer#setGroup(org.eclipse.ecf.core.identity.ID)
      */
     public void setGroup(ID groupManager) {
         if (groupManager != null) {
@@ -637,7 +634,7 @@ public class RosterView extends ViewPart implements ILocalUserSettable,
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.ecf.ui.views.ILocalUserSettable#memberDeparted(org.eclipse.ecf.core.identity.ID)
+     * @see org.eclipse.ecf.ui.views.IConfigViewer#memberDeparted(org.eclipse.ecf.core.identity.ID)
      */
     public void memberDeparted(ID member) {
         if (groupID != null) {