Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsuen2008-12-14 03:35:47 -0500
committerrsuen2008-12-14 03:35:47 -0500
commita4891537880f31847c50c28d247d47b7181b7591 (patch)
tree93fcccba09d7b01eaab1055d3f27437d896558f6 /examples/bundles/org.eclipse.ecf.example.collab
parent1a7b2130530d51e9976beda1b1b7182d402f53f4 (diff)
downloadorg.eclipse.ecf-a4891537880f31847c50c28d247d47b7181b7591.tar.gz
org.eclipse.ecf-a4891537880f31847c50c28d247d47b7181b7591.tar.xz
org.eclipse.ecf-a4891537880f31847c50c28d247d47b7181b7591.zip
Reference the constant to another constant.
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.example.collab')
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/CollabClient.java55
1 files changed, 18 insertions, 37 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/CollabClient.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/CollabClient.java
index d84d1f0c2..bb1f7fc11 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/CollabClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/CollabClient.java
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2004 Composent, Inc. and others.
+ * Copyright (c) 2004, 2008 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
@@ -12,15 +12,9 @@ package org.eclipse.ecf.internal.example.collab;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ecf.core.ContainerConnectException;
-import org.eclipse.ecf.core.ContainerFactory;
+import java.util.*;
+import org.eclipse.core.resources.*;
+import org.eclipse.ecf.core.*;
import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.IDFactory;
@@ -28,11 +22,12 @@ import org.eclipse.ecf.core.security.ConnectContextFactory;
import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer;
import org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject;
import org.eclipse.ecf.internal.example.collab.ui.SharedObjectContainerUI;
+import org.eclipse.ecf.provider.generic.GenericContainerInstantiator;
public class CollabClient {
public static final String WORKSPACE_NAME = Messages.CollabClient_WORKSPACE_NAME;
- public static final String GENERIC_CONTAINER_CLIENT_NAME = "ecf.generic.client"; //$NON-NLS-1$
+ public static final String GENERIC_CONTAINER_CLIENT_NAME = GenericContainerInstantiator.TCPCLIENT_NAME;
static Hashtable clients = new Hashtable();
@@ -56,35 +51,26 @@ public class CollabClient {
* Must not be null.
* @throws Exception
*/
- public void createAndConnectClient(final String containerType, String uri,
- String nickname, final Object connectData, final IResource resource)
- throws Exception {
+ public void createAndConnectClient(final String containerType, String uri, String nickname, final Object connectData, final IResource resource) throws Exception {
// First create the new container instance
- final IContainer newClient = ContainerFactory.getDefault()
- .createContainer(containerType);
+ final IContainer newClient = ContainerFactory.getDefault().createContainer(containerType);
// Create the targetID instance
- ID targetID = IDFactory.getDefault().createID(
- newClient.getConnectNamespace(), uri);
+ ID targetID = IDFactory.getDefault().createID(newClient.getConnectNamespace(), uri);
// Setup username
String username = setupUsername(targetID, nickname);
// Create a new container entry to hold onto container once created
- final ClientEntry newClientEntry = new ClientEntry(containerType,
- newClient);
+ final ClientEntry newClientEntry = new ClientEntry(containerType, newClient);
// Setup sharedobject container if the new instance supports
// this
- ISharedObjectContainer sharedObjectContainer = (ISharedObjectContainer) newClient
- .getAdapter(ISharedObjectContainer.class);
- SharedObjectContainerUI socui = new SharedObjectContainerUI(this,
- sharedObjectContainer);
+ ISharedObjectContainer sharedObjectContainer = (ISharedObjectContainer) newClient.getAdapter(ISharedObjectContainer.class);
+ SharedObjectContainerUI socui = new SharedObjectContainerUI(this, sharedObjectContainer);
socui.setup(sharedObjectContainer, newClientEntry, resource, username);
// Now connect
try {
- newClient.connect(targetID,
- ConnectContextFactory.createUsernamePasswordConnectContext(
- username, connectData));
+ newClient.connect(targetID, ConnectContextFactory.createUsernamePasswordConnectContext(username, connectData));
} catch (ContainerConnectException e) {
// If we have a connect exception then we remove any previously
// added shared object
@@ -174,8 +160,7 @@ public class CollabClient {
return null;
}
- protected static ClientEntry getClientEntry(IResource proj,
- String containerType) {
+ protected static ClientEntry getClientEntry(IResource proj, String containerType) {
synchronized (clients) {
Vector v = getClientEntries(proj);
if (v == null)
@@ -214,18 +199,15 @@ public class CollabClient {
return false;
}
- public synchronized static ISharedObjectContainer getContainer(
- IResource proj) {
+ public synchronized static ISharedObjectContainer getContainer(IResource proj) {
ClientEntry entry = getClientEntry(proj, GENERIC_CONTAINER_CLIENT_NAME);
if (entry == null) {
- entry = getClientEntry(ResourcesPlugin.getWorkspace().getRoot(),
- GENERIC_CONTAINER_CLIENT_NAME);
+ entry = getClientEntry(ResourcesPlugin.getWorkspace().getRoot(), GENERIC_CONTAINER_CLIENT_NAME);
}
if (entry != null) {
IContainer cont = entry.getContainer();
if (cont != null)
- return (ISharedObjectContainer) cont
- .getAdapter(ISharedObjectContainer.class);
+ return (ISharedObjectContainer) cont.getAdapter(ISharedObjectContainer.class);
else
return null;
} else
@@ -241,8 +223,7 @@ public class CollabClient {
removeClientForResource(proj, entry.getContainer().getConnectedID());
}
- protected String setupUsername(ID targetID, String nickname)
- throws URISyntaxException {
+ protected String setupUsername(ID targetID, String nickname) throws URISyntaxException {
String username = null;
if (nickname != null) {
username = nickname;

Back to the top