Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2008-11-02 02:14:28 +0000
committerslewis2008-11-02 02:14:28 +0000
commit52def99ed72c1ee8e2e7130a1beb90d4927b1d63 (patch)
tree961f664eaec7bc559038577bf7a129ec4a9af633
parent2532ae1629423522be42d84b89862ea370e85dfc (diff)
downloadorg.eclipse.ecf-52def99ed72c1ee8e2e7130a1beb90d4927b1d63.tar.gz
org.eclipse.ecf-52def99ed72c1ee8e2e7130a1beb90d4927b1d63.tar.xz
org.eclipse.ecf-52def99ed72c1ee8e2e7130a1beb90d4927b1d63.zip
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java1
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties1
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java16
3 files changed, 16 insertions, 2 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java
index 26be6b8dc..c36d4b135 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java
@@ -228,6 +228,7 @@ public class Messages extends NLS {
public static String RosterWorkbenchAdapterFactory_Account;
public static String RosterWorkbenchAdapterFactory_Disconnected;
public static String RosterWorkbenchAdapterFactory_GroupLabel;
+ public static String RosterWorkbenchAdapterFactory_Resource;
public static String BrowseDialog_title;
public static String BrowseDialog_scanning;
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties
index 42e83142e..70beb8308 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties
@@ -61,6 +61,7 @@ RosterWorkbenchAdapterFactory_Type = Type: {0}
RosterWorkbenchAdapterFactory_Account = Account: {0}
RosterWorkbenchAdapterFactory_Disconnected = Disconnected
RosterWorkbenchAdapterFactory_GroupLabel = {0} ({1}/{2})
+RosterWorkbenchAdapterFactory_Resource = Resource: {0}
ChatRoomManagerUI_EXCEPTION_NO_ROOT_CHAT_ROOM_MANAGER=Chat room manager does not expose chat room info for manager. Cannot create UI
ChatRoomManagerView_CONFIRM_CLEAR_TEXT_OUTPUT_TITLE=Confirm Clear Text Output
ChatRoomManagerView_CONFIRM_CLEAR_TEXT_OUTPUT_MESSAGE=Are you sure you want to clear output?
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
index 995e3653f..b35159074 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
@@ -925,7 +925,7 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
GridData td = new GridData();
td.horizontalSpan = 2;
td.heightHint = 100;
- td.widthHint = 200;
+ td.widthHint = 250;
text.setLayoutData(td);
String buffer = getRosterEntryChildrenFromPresence(entry);
@@ -968,10 +968,19 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
return scaled;
}
+ private String getResourceName(ID id) {
+ IFQID fqid = (IFQID) id.getAdapter(IFQID.class);
+ if (fqid != null) {
+ return fqid.getResourceName();
+ }
+ return null;
+ }
+
private String getRosterEntryChildrenFromPresence(IRosterEntry entry) {
IPresence presence = entry.getPresence();
Map properties = presence.getProperties();
- int fixedEntries = 3;
+ int fixedEntries = 4;
+ String resourceName = getResourceName(entry.getUser().getID());
StringBuffer buffer = new StringBuffer();
buffer.append("<form>"); //$NON-NLS-1$
buffer.append("<p>"); //$NON-NLS-1$
@@ -983,6 +992,9 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
buffer.append("<p>");//$NON-NLS-1$
buffer.append(NLS.bind(Messages.RosterWorkbenchAdapterFactory_Mode, presence.getMode().toString()));
buffer.append("</p>"); //$NON-NLS-1$
+ buffer.append("<p>"); //$NON-NLS-1$
+ buffer.append(NLS.bind(Messages.RosterWorkbenchAdapterFactory_Resource, ((resourceName == null) ? "" : resourceName))); //$NON-NLS-1$
+ buffer.append("</p>"); //$NON-NLS-1$
for (Iterator i = properties.keySet().iterator(); i.hasNext(); fixedEntries++) {
buffer.append("<p>"); //$NON-NLS-1$
Object key = i.next();

Back to the top