Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2006-01-02 23:39:07 -0500
committerslewis2006-01-02 23:39:07 -0500
commit0d00787f0d8de19464aaac7bc951d9817fd7c518 (patch)
tree9b0f0f3ac17c993cd463def4a92e52a6149dedd9
parent98e09eacc4650e6086e1e690b0932cf84267291a (diff)
downloadorg.eclipse.ecf-0d00787f0d8de19464aaac7bc951d9817fd7c518.tar.gz
org.eclipse.ecf-0d00787f0d8de19464aaac7bc951d9817fd7c518.tar.xz
org.eclipse.ecf-0d00787f0d8de19464aaac7bc951d9817fd7c518.zip
Changed 'make' factory methods (e.g. IDFactory.getDefault().makeID) to 'create' methods (e.g. IDFactory.getDefault().createID().
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html2
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/concepts/intro.html6
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html2
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html8
-rw-r--r--examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SOClient.java2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java12
-rw-r--r--examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java8
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Collab Server.launch6
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch539
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ChatRoomManagerUI.java2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java6
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java10
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java6
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java40
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EditorHelper.java4
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java10
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/SharedObjectMsg.java38
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java4
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java4
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java10
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java16
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java4
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java44
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatHandler.java4
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatView.java2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java8
-rw-r--r--examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java4
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java12
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java12
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java4
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java4
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java36
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java8
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java6
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java8
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java8
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java4
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java32
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java22
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java14
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java28
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java26
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/provider/ISynchAsynchConnectionInstantiator.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDFactory.java76
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IIDFactory.java44
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/Namespace.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java4
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java38
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerInstantiator.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java42
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSNamespace.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java12
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/SecureContainerInstantiator.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java28
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java24
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java38
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java68
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPSClientSOContainer.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPNamespace.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPRoomNamespace.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPSNamespace.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ECFConnection.java2
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd24
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh24
-rw-r--r--server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh24
76 files changed, 774 insertions, 773 deletions
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html b/doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html
index 7c073d7fa..12308ff30 100644
--- a/doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html
+++ b/doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html
@@ -27,7 +27,7 @@ creating ISharedObjectContainer instances called <a
The lifecycle of a ISharedObjectContainer is typically as follows:
<ol>
<li>An ISharedObjectContainer instance is created via
-SharedObjectContainerFactory.getDefault().makeSharedObjectContainer() </li>
+SharedObjectContainerFactory.getDefault().createSharedObjectContainer() </li>
<li>ISharedObjects are created and added to the
ISharedObjectContainer </li>
<li>The ISharedObjectContainer 'joins/connects' with a remote
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/concepts/intro.html b/doc/bundles/org.eclipse.ecf.doc/html/concepts/intro.html
index 3ea141882..dd5abedbc 100644
--- a/doc/bundles/org.eclipse.ecf.doc/html/concepts/intro.html
+++ b/doc/bundles/org.eclipse.ecf.doc/html/concepts/intro.html
@@ -19,7 +19,7 @@
Container instance creation is done via ECF-provided factory APIs. For example, here's code to create
and IContainer instance:
<pre>
- IContainer container = ContainerFactory.getDefault().makeContainer("containertype");
+ IContainer container = ContainerFactory.getDefault().createContainer("containertype");
</pre>
Once constructed, <a href="http://www.eclipse.org/ecf/org.eclipse.ecf.docs/api/org/eclipse/ecf/core/IContainer.html">IContainer</a> instances may be used in the manner appropriate for the given application. When
no longer required the <a href="http://www.eclipse.org/ecf/org.eclipse.ecf.docs/api/org/eclipse/ecf/core/IContainer.html#dispose()">IContainer.dispose()</a> method should be called to release any resources associated with
@@ -41,9 +41,9 @@
Here's an example code snippet that shows the creation and connection of an ECF container:
<pre>
// make container instance
- IContainer cont = ContainerFactory.getDefault().makeContainer("ecf.generic.client");
+ IContainer cont = ContainerFactory.getDefault().createContainer("ecf.generic.client");
// make targetID
- ID targetID = IDFactory.getDefault().makeID(cont.getConnectNamespace(),"ecftcp://ecf1.osuosl.org:3282/server");
+ ID targetID = IDFactory.getDefault().createID(cont.getConnectNamespace(),"ecftcp://ecf1.osuosl.org:3282/server");
// then connect to targetID
cont.connect(targetID,null);
</pre>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html b/doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html
index 2bbc2dbaf..3b515666c 100644
--- a/doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html
+++ b/doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html
@@ -77,7 +77,7 @@ ISharedObject.dispose() method.
<h4>Example Creation Code</h4>
Here is a code snippet that creates a container and adds a single
shared object to that container:
-<pre>ISharedObjectContainer container = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer('standalone');<br>ID newID = IDFactory.makeStringID('foo');<br>SharedObjectDescription sd = new SharedObjectDescription(newID,TestSharedObject.class);<br>container.getSharedObjectManager().createSharedObject(sd,null);<br></pre>
+<pre>ISharedObjectContainer container = SharedObjectContainerFactory.getDefault().createSharedObjectContainer('standalone');<br>ID newID = IDFactory.createStringID('foo');<br>SharedObjectDescription sd = new SharedObjectDescription(newID,TestSharedObject.class);<br>container.getSharedObjectManager().createSharedObject(sd,null);<br></pre>
Note this creates and adds to the container a ISharedObject instance of
class "TestSharedObject". The TestSharedObject
null constructor is called, followed by a call to
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html b/doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html
index 003c6af53..bf84e9416 100644
--- a/doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html
+++ b/doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html
@@ -13,7 +13,7 @@
that will trigger the instantiation of our Hello World client class:<br><pre>public void run(IAction action) {
HelloClient client = new HelloClient();
try {
- client.createAndConnect(IDFactory.makeStringID("ecftcp://localhost:3282/server"));
+ client.createAndConnect(IDFactory.createStringID("ecftcp://localhost:3282/server"));
} catch (Exception e) {
e.printStackTrace();
}
@@ -33,9 +33,9 @@
ISharedObjectContainer container = null;
try {
// Create container instance via ECF container factory
- container = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(DEFAULT_CONTAINER_TYPE);
+ container = SharedObjectContainerFactory.getDefault().createSharedObjectContainer(DEFAULT_CONTAINER_TYPE);
// Create ID for shared object
- ID sharedObjectID = IDFactory.makeStringID(SHARED_OBJECT_ID);
+ ID sharedObjectID = IDFactory.createStringID(SHARED_OBJECT_ID);
// Create actual shared object
ISharedObject sharedObject = new HelloSharedObject();
// Add shared object to container
@@ -51,7 +51,7 @@
World example to be able to join a shared container, an instance of <code>org.eclipse.ecf.provider.app.ServerApplication</code> in the
<code>org.eclipse.ecf.example.collab</code> needs to be running on the same machine. The configuration information we are passing to the HelloClient is the following:
<ol>
- <li>An ID to represent the group of contained object.<pre>client.createAndConnect(IDFactory.makeStringID("ecftcp://localhost:3282/server"));</pre>
+ <li>An ID to represent the group of contained object.<pre>client.createAndConnect(IDFactory.createStringID("ecftcp://localhost:3282/server"));</pre>
<ul><li>This ID is passed into HelloClient.createAndConnect().
This ID is shared among all instances of our application that communicate with each other.</li><li>You may notice a URI-style protocol descriptor in our example.
This tells the shared container what protocol to use when adding instances of SharedObjects to the container.</li></ul>
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SOClient.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SOClient.java
index 59a3655bc..8f3546822 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SOClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SOClient.java
@@ -12,7 +12,7 @@ public class SOClient {
ID targetID = null;
protected void setupContainer(String type) throws Exception {
- container = ContainerFactory.getDefault().makeContainer(type);
+ container = ContainerFactory.getDefault().createContainer(type);
socontainer = (ISharedObjectContainer) container.getAdapter(ISharedObjectContainer.class);
}
}
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java
index 1f2689c30..4a78d7c4a 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java
@@ -40,9 +40,9 @@ public class XMPPChatClient {
this.receiver = receiver;
}
public void connect(String account, String password) throws ECFException {
- container = ContainerFactory.getDefault().makeContainer(CONTAINER_TYPE);
+ container = ContainerFactory.getDefault().createContainer(CONTAINER_TYPE);
namespace = container.getConnectNamespace();
- ID targetID = IDFactory.getDefault().makeID(namespace, account);
+ ID targetID = IDFactory.getDefault().createID(namespace, account);
presence = (IPresenceContainer) container
.getAdapter(IPresenceContainer.class);
sender = presence.getMessageSender();
@@ -55,20 +55,20 @@ public class XMPPChatClient {
});
//
// Now connect
- container.connect(targetID,ConnectContextFactory.makePasswordConnectContext(password));
+ container.connect(targetID,ConnectContextFactory.createPasswordConnectContext(password));
userID = getID(account);
}
protected void connectChatRoom(String chatRoomID) throws Exception {
chatmanager = presence.getChatRoomManager();
- chatroom = chatmanager.makeChatRoomContainer();
+ chatroom = chatmanager.createChatRoomContainer();
socontainer = (ISharedObjectContainer) chatroom.getAdapter(ISharedObjectContainer.class);
- ID targetChatID = IDFactory.getDefault().makeID(chatroom.getConnectNamespace(),chatRoomID);
+ ID targetChatID = IDFactory.getDefault().createID(chatroom.getConnectNamespace(),chatRoomID);
chatroom.connect(targetChatID, null);
}
private ID getID(String name) {
try {
- return IDFactory.getDefault().makeID(namespace, name);
+ return IDFactory.getDefault().createID(namespace, name);
} catch (IDInstantiationException e) {
e.printStackTrace();
return null;
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
index 28c773527..f1da90a8b 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
@@ -34,9 +34,9 @@ public class XMPPClient {
this.receiver = receiver;
}
public void connect(String account, String password) throws ECFException {
- container = ContainerFactory.getDefault().makeContainer(CONTAINER_TYPE);
+ container = ContainerFactory.getDefault().createContainer(CONTAINER_TYPE);
namespace = container.getConnectNamespace();
- ID targetID = IDFactory.getDefault().makeID(namespace, account);
+ ID targetID = IDFactory.getDefault().createID(namespace, account);
presence = (IPresenceContainer) container
.getAdapter(IPresenceContainer.class);
sender = presence.getMessageSender();
@@ -48,12 +48,12 @@ public class XMPPClient {
}
});
// Now connect
- container.connect(targetID,ConnectContextFactory.makePasswordConnectContext(password));
+ container.connect(targetID,ConnectContextFactory.createPasswordConnectContext(password));
userID = getID(account);
}
private ID getID(String name) {
try {
- return IDFactory.getDefault().makeID(namespace, name);
+ return IDFactory.getDefault().createID(namespace, name);
} catch (IDInstantiationException e) {
e.printStackTrace();
return null;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Collab Server.launch b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Collab Server.launch
index 3fee8b662..83aae3f4d 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Collab Server.launch
+++ b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Collab Server.launch
@@ -2,6 +2,9 @@
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ecf.provider.app.ServerApplication"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry type=&quot;4&quot; path=&quot;1&quot; containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;org.eclipse.ecf.provider&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento project=&quot;org.eclipse.ecf.provider&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
@@ -9,5 +12,8 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ecf.example.collab"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.ecf.provider.Trace=true -Dorg.eclipse.ecf.Trace=true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.ecf.example.collab"/>
+</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
</launchConfiguration>
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch
index 45d08c485..51755a91c 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch
+++ b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch
@@ -8,303 +8,303 @@
<stringAttribute key="location2" value="C:\eclipse3.1m4\eclipse\runtime-workspace"/>
<booleanAttribute key="automaticValidate" value="false"/>
<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackconnection" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.irc/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
+<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
+<mapEntry key="org.eclipse.ecf/debug/twophasecommiteventprocessor" value="true"/>
+<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
+<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
+<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
+<mapEntry key="org.eclipse.ecf.sdo/DataGraphSharingFactory" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/XMPPClientSOContainer" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.irc/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.update.core/debug" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/containerfactory" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.yahooim/debug/yahoocontainer" value="true"/>
+<mapEntry key="org.eclipse.ecf/debug" value="true"/>
+<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
+<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
+<mapEntry key="org.eclipse.ecf/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
+<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
+<mapEntry key="org.eclipse.ecf.provider.jms/debug/servercontainer" value="true"/>
+<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.ecf/debug/containerfactory" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.irc/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug/urlsharedobject" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
+<mapEntry key="org.eclipse.ecf/debug/idfactory" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.yahooim/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug/genericsharedobject" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
+<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectmanager" value="true"/>
+<mapEntry key="org.eclipse.ecf.datashare/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf/debug/factoryinit" value="true"/>
+<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
+<mapEntry key="org.eclipse.ecf.sdo/debug" value="true"/>
+<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
+<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
+<mapEntry key="org.eclipse.ecf.sdo/EMFUpdateManager" value="true"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
+<mapEntry key="org.eclipse.ecf.ui/debug/textchatcomposite" value="true"/>
+<mapEntry key="org.eclipse.ecf.datashare/ConsistentMulticaster" value="true"/>
<mapEntry key="org.eclipse.ecf.example.collab/debug/transactionsharedobject" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.ecf.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.ecf.ui/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/transactioneventprocessor" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.ecf.datashare/ConsistentMulticaster" value="true"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
+<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
+<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug/connectionfactory" value="true"/>
+<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/XMPPClientSOContainer" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.ecf/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.ecf.provider.irc/debug/irccontainer" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
+<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug" value="true"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
+<mapEntry key="org.eclipse.help/debug/context" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug" value="true"/>
+<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
+<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
+<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
+<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/preferences/get" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/transactioneventprocessor" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
+<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
-<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/container" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.ecf.datashare/OrderedMulticaster" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug/filetransfersharedobject" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectwrapper" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.irc/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.help.base/debug" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
<mapEntry key="org.eclipse.ecf.sdo/SharedDataGraph" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
-<mapEntry key="org.eclipse.ecf.sdo/debug" value="true"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jms/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
+<mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/set" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
+<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
+<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/connection" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/get" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectwrapper" value="false"/>
-<mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/containerfactory" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/jmdns" value="true"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/container" value="true"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
+<mapEntry key="org.eclipse.ecf.discovery/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.yahooim/debug/filter" value="*"/>
<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.yahooim/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.irc/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.ecf.discovery/debug" value="true"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug/progsharedobject" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
+<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
+<mapEntry key="org.eclipse.ecf.datashare/SimpleMulticaster" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.provider/debug" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug/urlsharedobject" value="false"/>
<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/hideDerivedFromRefactoring" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.ecf.ui/debug/textchatcomposite" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.ecf.discovery/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/gmm" value="true"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.jms/debug/brokercontainer" value="true"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jms/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
+<mapEntry key="org.eclipse.ecf/debug/abstractsharedobject" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/preferences/set" value="false"/>
+<mapEntry key="org.eclipse.team.core/streams" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.ecf.example.collab/debug/genericsharedobject" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug/sharedobjectcontainerfactory" value="true"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.ecf.datashare/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.yahooim/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
+<mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug/progsharedobject" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
+<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.irc/debug/irccontainer" value="true"/>
+<mapEntry key="org.eclipse.ecf/debug/connectionfactory" value="true"/>
<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingIsEqualTo" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
+<mapEntry key="org.eclipse.ecf.example.collab/debug/filetransfersharedobject" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/connection" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/flag" value="true"/>
<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
<mapEntry key="org.eclipse.ecf.provider.jms/debug/clientcontainer" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug/factoryinit" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectmanager" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
+<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
+<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf/debug/sharedobjectcontainerfactory" value="true"/>
+<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
+<mapEntry key="org.eclipse.ecf/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/hideDerivedFromRefactoring" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
+<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
+<mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
+<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
+<mapEntry key="org.eclipse.ecf.ui/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/basesharedobject" value="false"/>
<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.ecf.provider.yahooim/debug/yahoocontainer" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms/debug/servercontainer" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.ecf.sdo/DataGraphSharingFactory" value="true"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.ecf/debug/idfactory" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/gmm" value="true"/>
+<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
+<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ecf.sdo/EMFUpdateManager" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.ecf.discovery/debug/flag" value="true"/>
+<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jms/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
+<mapEntry key="org.eclipse.team.core/debug" value="false"/>
+<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
+<mapEntry key="org.eclipse.ecf.datashare/OrderedMulticaster" value="true"/>
<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/container" value="true"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
+<mapEntry key="org.eclipse.ecf.discovery/debug/filter" value="*"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
+<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
+<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject" value="true"/>
+<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
<mapEntry key="org.eclipse.ecf.provider.jms/debug/channel" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.jms/debug/brokercontainer" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug/twophasecommiteventprocessor" value="true"/>
-<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
+<mapEntry key="org.eclipse.ecf.provider.yahooim/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
+<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
+<mapEntry key="org.eclipse.ecf.discovery/debug" value="true"/>
+<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
+<mapEntry key="org.eclipse.help/debug" value="true"/>
+<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
+<mapEntry key="org.eclipse.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider/debug/container" value="true"/>
<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug/abstractsharedobject" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.ecf.ui/debug" value="true"/>
<mapEntry key="org.eclipse.ecf.provider.jmdns/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.irc/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ecf.datashare/SimpleMulticaster" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.yahooim/debug/filter" value="*"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/flag" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/>
-<mapEntry key="org.eclipse.ecf/debug/containerfactory" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackconnection" value="true"/>
-<mapEntry key="org.eclipse.ecf.provider/debug/basesharedobject" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
+<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
+<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/jmdns" value="true"/>
+<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
+<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
+<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
</mapAttribute>
<stringAttribute key="selectedPlugin" value="org.eclipse.ecf.provider.xmpp"/>
<booleanAttribute key="automaticAdd" value="true"/>
@@ -314,12 +314,13 @@
<stringAttribute key="configLocation" value=""/>
<booleanAttribute key="clearws" value="false"/>
<stringAttribute key="location1" value="C:\eclipse3.1m4\eclipse\second-runtime-workspace"/>
+<stringAttribute key="pde.version" value="3.2"/>
<stringAttribute key="templateConfig" value=""/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="askclear" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ChatRoomManagerUI.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ChatRoomManagerUI.java
index bc3c77bc0..0beb3d251 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ChatRoomManagerUI.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ChatRoomManagerUI.java
@@ -40,7 +40,7 @@ public class ChatRoomManagerUI {
try {
IChatRoomContainer chatRoom = null;
try {
- chatRoom = manager.makeChatRoomContainer();
+ chatRoom = manager.createChatRoomContainer();
} catch (ContainerInstantiationException e1) {
// can't happen
}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java
index 6b4e447e1..b0e6e5daa 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java
@@ -43,12 +43,12 @@ public class CollabClient {
throws Exception {
// First create the new container instance
final IContainer newClient = ContainerFactory
- .getDefault().makeContainer(containerType);
+ .getDefault().createContainer(containerType);
// Get the target namespace, so we can create a target ID of appropriate type
Namespace targetNamespace = newClient.getConnectNamespace();
// Create the targetID instance
- ID targetID = IDFactory.getDefault().makeID(targetNamespace, uri);
+ ID targetID = IDFactory.getDefault().createID(targetNamespace, uri);
// Setup username
String username = setupUsername(targetID,nickname);
@@ -86,7 +86,7 @@ public class CollabClient {
// Now connect
try {
- newClient.connect(targetID, ConnectContextFactory.makeUsernamePasswordConnectContext(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
EclipseCollabSharedObject so = newClientEntry.getObject();
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
index 64bfce5d4..cac8ad863 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
@@ -55,7 +55,7 @@ public class DiscoveryStartup {
}
protected void setupDiscovery() throws Exception {
try {
- socontainer = ContainerFactory.getDefault().makeContainer(
+ socontainer = ContainerFactory.getDefault().createContainer(
DISCOVERY_CONTAINER);
discovery = (IDiscoveryContainer) socontainer
.getAdapter(IDiscoveryContainer.class);
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
index c39de4fb2..eedb59620 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
@@ -61,12 +61,12 @@ public class ServerStartup {
int j = 0;
for (Iterator i = connectors.iterator(); i.hasNext();) {
Connector connect = (Connector) i.next();
- serverGroups[j] = makeServerGroup(connect.getHostname(),
+ serverGroups[j] = createServerGroup(connect.getHostname(),
connect.getPort());
List groups = connect.getGroups();
for (Iterator g = groups.iterator(); g.hasNext();) {
NamedGroup group = (NamedGroup) g.next();
- TCPServerSOContainer cont = makeServerContainer(group
+ TCPServerSOContainer cont = createServerContainer(group
.getIDForGroup(), serverGroups[j], group.getName(),
connect.getTimeout());
servers.add(cont);
@@ -93,15 +93,15 @@ public class ServerStartup {
throws URISyntaxException {
DiscoveryStartup.registerService(cont.getID().toURI());
}
- protected TCPServerSOContainerGroup makeServerGroup(String name, int port) {
+ protected TCPServerSOContainerGroup createServerGroup(String name, int port) {
TCPServerSOContainerGroup group = new TCPServerSOContainerGroup(name,
port);
return group;
}
- protected TCPServerSOContainer makeServerContainer(String id,
+ protected TCPServerSOContainer createServerContainer(String id,
TCPServerSOContainerGroup group, String path, int keepAlive)
throws IDInstantiationException {
- ID newServerID = IDFactory.getDefault().makeStringID(id);
+ ID newServerID = IDFactory.getDefault().createStringID(id);
SOContainerConfig config = new SOContainerConfig(newServerID);
return new TCPServerSOContainer(config, group, path, keepAlive);
}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java
index b18153683..cb02c309a 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java
@@ -81,7 +81,7 @@ public class SharedObjectContainerUI {
IResource project = (proj == null) ? CollabClient.getWorkspace() : proj;
User user = getUserData(client.getClass().getName(), client
.getContainer().getID(), username, proj);
- makeAndAddSharedObject(soContainer, client, project, user,
+ createAndAddSharedObject(soContainer, client, project, user,
getSharedFileDirectoryForProject(project));
}
@@ -106,7 +106,7 @@ public class SharedObjectContainerUI {
}, "");
}
- protected void makeAndAddSharedObject(final ISharedObjectContainer soContainer, final ClientEntry client,
+ protected void createAndAddSharedObject(final ISharedObjectContainer soContainer, final ClientEntry client,
final IResource proj, User user, String fileDir) throws Exception {
IWorkbenchWindow ww = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow();
@@ -136,7 +136,7 @@ public class SharedObjectContainerUI {
CollabClient.removeClientForResource(proj, groupID);
}
});
- ID newID = IDFactory.getDefault().makeStringID(COLLAB_SHARED_OBJECT_ID);
+ ID newID = IDFactory.getDefault().createStringID(COLLAB_SHARED_OBJECT_ID);
soContainer.getSharedObjectManager().addSharedObject(newID,
sharedObject, new HashMap());
client.setObject(sharedObject);
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
index 4393baeb2..e5e3d9cd2 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
@@ -187,7 +187,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
try {
if (LineChatView.isDisposed())
showView();
- localGUI = LineChatView.makeClientView(
+ localGUI = LineChatView.createClientView(
EclipseCollabSharedObject.this, pn, init,
getLocalFullDownloadPath());
show(true);
@@ -246,7 +246,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
// SharedObjectMsg handlers
protected void handleCreateObject(SharedObjectDescription cons) {
try {
- makeObject(cons.getID(), cons.getClassname(), cons.getProperties());
+ createObject(cons.getID(), cons.getClassname(), cons.getProperties());
} catch (Exception e) {
debugdump(e, "Exception creating local object " + cons);
}
@@ -375,7 +375,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
}
public void sendStartedTyping() {
try {
- forwardMsgTo(null, SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(null, SharedObjectMsg.createMsg(null,
"handleStartedTyping", localUser));
} catch (Exception e) {
debugdump(e, "Exception on sendStartedTyping to remote clients");
@@ -480,7 +480,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
return null;
return crs.getSharedObjectManager().getSharedObject(obj);
}
- public void makeProxyObject(ID target, String proxyClass, String name) {
+ public void createProxyObject(ID target, String proxyClass, String name) {
ID[] targets = new ID[1];
targets[0] = target;
if (name == null)
@@ -513,7 +513,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
}
public void messageProxyObject(ID target, String classname, String meth,
Object[] args) {
- SharedObjectMsg m = SharedObjectMsg.makeMsg(null, classname, meth,
+ SharedObjectMsg m = SharedObjectMsg.createMsg(null, classname, meth,
(Object[]) args);
try {
forwardMsgTo(target, m);
@@ -584,7 +584,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
// SharedObjectMsg senders
public void sendNotifyUserAdded() {
try {
- forwardMsgTo(null, SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(null, SharedObjectMsg.createMsg(null,
"handleNotifyUserAdded", localUser));
} catch (Exception e) {
debugdump(e, "Exception on sendNotifyUserAdded to remote clients");
@@ -592,7 +592,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
}
public void sendPrivateMessageToUser(User touser, String msg) {
try {
- forwardMsgTo(touser.getUserID(), SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(touser.getUserID(), SharedObjectMsg.createMsg(null,
"handleShowPrivateTextMsg", localUser, msg));
} catch (Exception e) {
debugdump(e,
@@ -601,7 +601,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
}
public void sendRegisterProxy(ID toID, String proxyClass, String name) {
try {
- forwardMsgTo(toID, SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(toID, SharedObjectMsg.createMsg(null,
"handleRegisterProxy", localUser, proxyClass, name));
} catch (IOException e) {
debugdump(e, "Exception sendRegisterProxy");
@@ -609,7 +609,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
}
public void sendRequestUserUpdate(ID requestTarget) {
try {
- forwardMsgTo(requestTarget, SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(requestTarget, SharedObjectMsg.createMsg(null,
"handleRequestUserUpdate", getUniqueID()));
} catch (Exception e) {
debugdump(e, "Exception on sendRequestUserUpdate to remote clients");
@@ -621,7 +621,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
receiver = touser.getUserID();
}
try {
- SharedObjectMsg m = SharedObjectMsg.makeMsg(null,
+ SharedObjectMsg m = SharedObjectMsg.createMsg(null,
"handleCVSProjectUpdateRequest", getUser(), msg);
forwardMsgTo(receiver, m);
if (receiver == null) {
@@ -667,7 +667,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
receiver = user.getUserID();
}
try {
- SharedObjectMsg m = SharedObjectMsg.makeMsg(null,
+ SharedObjectMsg m = SharedObjectMsg.createMsg(null,
"handleUserMessage", this.localUser, msg);
forwardMsgTo(receiver, m);
if (receiver == null)
@@ -679,7 +679,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
public void sendShowTextMsg(String msg) {
try {
trace("sendShowTextMsg(" + msg + ")");
- forwardMsgTo(null, SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(null, SharedObjectMsg.createMsg(null,
"handleShowTextMsg", getUniqueID(), msg));
} catch (Exception e) {
debugdump(e, "Exception on sendShowTextMsg to remote clients");
@@ -687,7 +687,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
}
public void sendUnregisterProxy(ID toID, String proxyClass) {
try {
- forwardMsgTo(toID, SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(toID, SharedObjectMsg.createMsg(null,
"handleUnregisterProxy", localUser, proxyClass));
} catch (IOException e) {
debugdump(e, "Exception sendRegisterProxy");
@@ -695,7 +695,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
}
public void sendUpdateTreeDisplay(ID target, TreeItem item) {
try {
- forwardMsgTo(target, SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(target, SharedObjectMsg.createMsg(null,
"handleUpdateTreeDisplay", getUniqueID(), item));
} catch (Exception e) {
debugdump(e, "Exception on sendUpdateTreeDisplay to remote clients");
@@ -703,7 +703,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
}
public void sendUserUpdate(ID target) {
try {
- forwardMsgTo(target, SharedObjectMsg.makeMsg(null,
+ forwardMsgTo(target, SharedObjectMsg.createMsg(null,
"handleUserUpdate", localUser));
} catch (Exception e) {
debugdump(e, "Exception on sendUserUpdate to remote clients");
@@ -823,7 +823,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
receiver = touser.getUserID();
}
try {
- SharedObjectMsg m = SharedObjectMsg.makeMsg(null,
+ SharedObjectMsg m = SharedObjectMsg.createMsg(null,
"handleAddMarkerForFile", getUser(), resourceName,
new SharedMarker("ECF marker", new Integer(offset),
new Integer(length)));
@@ -842,7 +842,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
receiver = touser.getUserID();
}
try {
- SharedObjectMsg m = SharedObjectMsg.makeMsg(null,
+ SharedObjectMsg m = SharedObjectMsg.createMsg(null,
"handleOpenAndSelectForFile", getUser(), resourceName,
new SharedMarker("ECF marker", new Integer(offset),
new Integer(length)));
@@ -860,7 +860,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
receiver = touser.getUserID();
}
try {
- SharedObjectMsg m = SharedObjectMsg.makeMsg(null,
+ SharedObjectMsg m = SharedObjectMsg.createMsg(null,
"handleLaunchEditorForFile", getUser(), resourceName);
forwardMsgTo(receiver, m);
if (receiver == null) {
@@ -1054,7 +1054,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
receiver = touser.getUserID();
}
try {
- SharedObjectMsg m = SharedObjectMsg.makeMsg(null,
+ SharedObjectMsg m = SharedObjectMsg.createMsg(null,
"handleShowViewWithID", getUser(), id, secID, mode);
forwardMsgTo(receiver, m);
if (receiver == null) {
@@ -1070,7 +1070,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
receiver = touser.getUserID();
}
try {
- SharedObjectMsg m = SharedObjectMsg.makeMsg(null, "handleShowView",
+ SharedObjectMsg m = SharedObjectMsg.createMsg(null, "handleShowView",
getUser(), id);
forwardMsgTo(receiver, m);
if (receiver == null) {
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java
index 6b8260c5f..a29d1527b 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java
@@ -34,7 +34,7 @@ public interface EclipseProject {
public ISharedObjectContext getContext();
- public void makeProxyObject(ID target,String classname,String name);
+ public void createProxyObject(ID target,String classname,String name);
public void messageProxyObject(ID target, String name, String meth, Object [] args);
public void removeProxyObject(ID target,String name);
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EditorHelper.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EditorHelper.java
index 7ca6b750e..2f0da9622 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EditorHelper.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EditorHelper.java
@@ -52,7 +52,7 @@ public class EditorHelper {
if (textEditor == null) return;
setTextEditorSelection(textEditor,offset,length);
}
- protected IMarker makeMarkerForFile(IFile file, EclipseCollabSharedObject.SharedMarker marker) throws CoreException {
+ protected IMarker createMarkerForFile(IFile file, EclipseCollabSharedObject.SharedMarker marker) throws CoreException {
IMarker m = file.createMarker(EclipseCollabSharedObject.SHARED_MARKER_TYPE);
m.setAttribute(EclipseCollabSharedObject.SHARED_MARKER_KEY, "slewis");
//m.setAttribute(IMarker.MESSAGE, marker.getMessage());
@@ -79,7 +79,7 @@ public class EditorHelper {
String editorId = getEditorIdForFile(file);
part = page.openEditor(input, editorId);
}
- makeMarkerForFile(file,marker);
+ createMarkerForFile(file,marker);
}
protected void setTextEditorSelection(ITextEditor textEditor, int offset, int length) {
textEditor.selectAndReveal(offset, length);
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
index 95386e8d7..5584eb3ea 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
@@ -147,7 +147,7 @@ public class GenericSharedObject implements ISharedObject {
trace(" proxy msg=" + methName);
trace(" o=" + o);
if (methName != null) {
- msg = SharedObjectMsg.makeMsg(msg.getClassName(), methName, msg
+ msg = SharedObjectMsg.createMsg(msg.getClassName(), methName, msg
.getArgs());
}
if (currentMsgFromObjID == null)
@@ -470,12 +470,12 @@ public void handleEvent(Event event) {
}
}
- public ID makeObject(ID target, String className, Map map) throws Exception {
+ public ID createObject(ID target, String className, Map map) throws Exception {
ISharedObjectContext crs = getContext();
- ID newID = IDFactory.getDefault().makeStringID(getNewUniqueIDString());
+ ID newID = IDFactory.getDefault().createStringID(getNewUniqueIDString());
if (crs == null) {
throw new InstantiationException(
- "Cannot make object. Have no local creation capability because context is null");
+ "Cannot create object. Have no local creation capability because context is null");
} else {
if (className != null && !className.equals("")) {
trace("Creating new replicated object with class: " + className);
@@ -507,7 +507,7 @@ public void handleEvent(Event event) {
return newID;
} else {
trace("Invalid classname '" + className
- + "'. Cannot make object.");
+ + "'. Cannot create object.");
throw new InstantiationException("Invalid classname '"
+ className);
}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/SharedObjectMsg.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/SharedObjectMsg.java
index 1cea43468..0cb757a65 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/SharedObjectMsg.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/SharedObjectMsg.java
@@ -25,7 +25,7 @@ public class SharedObjectMsg implements Serializable {
public static final Class[] nullTypes = new Class[0];
// Static factory methods for creating SharedObjectMsg instances
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object[] param) {
if (methodName == null || param == null) {
throw new NullPointerException(
@@ -34,50 +34,50 @@ public class SharedObjectMsg implements Serializable {
return new SharedObjectMsg(className, methodName, param);
}
- public static SharedObjectMsg makeMsg(String methodName, Object[] param) {
- return makeMsg((String) null, methodName, param);
+ public static SharedObjectMsg createMsg(String methodName, Object[] param) {
+ return createMsg((String) null, methodName, param);
}
- public static SharedObjectMsg makeMsg(String methodName) {
- return makeMsg((String) null, methodName, nullArgs);
+ public static SharedObjectMsg createMsg(String methodName) {
+ return createMsg((String) null, methodName, nullArgs);
}
- public static SharedObjectMsg makeMsg(String className, String methodName) {
- return makeMsg(className, methodName, nullArgs);
+ public static SharedObjectMsg createMsg(String className, String methodName) {
+ return createMsg(className, methodName, nullArgs);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg) {
Object args[] = { arg };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
- public static SharedObjectMsg makeMsg(String methodName, Object arg) {
- return makeMsg((String) null, methodName, arg);
+ public static SharedObjectMsg createMsg(String methodName, Object arg) {
+ return createMsg((String) null, methodName, arg);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg1, Object arg2) {
Object args[] = { arg1, arg2 };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg1, Object arg2, Object arg3) {
Object args[] = { arg1, arg2, arg3 };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg1, Object arg2, Object arg3, Object arg4) {
Object args[] = { arg1, arg2, arg3, arg4 };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
Object args[] = { arg1, arg2, arg3, arg4, arg5 };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
/**
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java
index 4557c7208..2d8babab9 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java
@@ -152,7 +152,7 @@ public class TransactionSharedObject extends GenericSharedObject implements ISha
if (e == null) {
// send commit message right back.
try {
- forwardMsgTo(fromID, SharedObjectMsg.makeMsg((String) null,REPLICA_COMMIT_METHOD));
+ forwardMsgTo(fromID, SharedObjectMsg.createMsg((String) null,REPLICA_COMMIT_METHOD));
} catch (Exception except) {
traceDump("Exception sending commit message to "+fromID,except);
}
@@ -223,7 +223,7 @@ public class TransactionSharedObject extends GenericSharedObject implements ISha
if (participantIDs != null && others > 0) {
// Send replicaCommit message to all remote clients
try {
- forwardMsgTo(null, SharedObjectMsg.makeMsg((String) null,REPLICA_COMMIT_METHOD));
+ forwardMsgTo(null, SharedObjectMsg.createMsg((String) null,REPLICA_COMMIT_METHOD));
} catch (Exception e2) {
doAbort(new SharedObjectAddAbortException("Exception sending commit message", e2));
}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java
index 0a42beaea..2fd26cbce 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java
@@ -118,7 +118,7 @@ public class EclipseFileTransfer extends FileTransferSharedObject implements
}
}
- protected File makePath(EclipseCollabSharedObject stage, boolean server,
+ protected File createPath(EclipseCollabSharedObject stage, boolean server,
File file, long length, float rate) {
String downloadpath = null;
@@ -231,7 +231,7 @@ public class EclipseFileTransfer extends FileTransferSharedObject implements
if (receiverStage != null) {
receiverUI = receiverStage.getFileReceiverUI(EclipseFileTransfer.this, transferParams);
}
- localFile = makePath(receiverStage, isServer, aFile, length, rate);
+ localFile = createPath(receiverStage, isServer, aFile, length, rate);
// Our superclass depends upon the transferParams.getRemoteFile() call
// to give a valid file.
// We modify this to the new local file we've decided upon
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java
index a3b034593..60c7b6e46 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java
@@ -222,7 +222,7 @@ public class FileTransferSharedObject extends TransactionSharedObject
protected boolean sendData(ID rcvr, FileData data) throws IOException
{
// Send it. This does all data delivery.
- forwardMsgTo(rcvr, SharedObjectMsg.makeMsg(recvMethodName, data));
+ forwardMsgTo(rcvr, SharedObjectMsg.createMsg(recvMethodName, data));
return data.isDone();
}
@@ -278,7 +278,7 @@ public class FileTransferSharedObject extends TransactionSharedObject
// Report failure back to host if we're not disconnected
try {
// Send it. This does the done msg delivery.
- forwardMsgHome(SharedObjectMsg.makeMsg(doneMethodName, e));
+ forwardMsgHome(SharedObjectMsg.createMsg(doneMethodName, e));
// Make sure everything is cleaned up
hardClose();
} catch (Exception e1) {
@@ -306,7 +306,7 @@ public class FileTransferSharedObject extends TransactionSharedObject
// object
if (progressListener != null) progressListener.receiveDone(this, except);
try {
- forwardMsgHome(SharedObjectMsg.makeMsg(doneMethodName, except));
+ forwardMsgHome(SharedObjectMsg.createMsg(doneMethodName, except));
} catch (Exception e) {
debug(e,"Exception sending done message home");
}
@@ -390,7 +390,7 @@ public class FileTransferSharedObject extends TransactionSharedObject
wait(DEFAULT_START_WAIT_INTERVAL);
}
// Asynchronous tail recursion.
- sendSelf(SharedObjectMsg.makeMsg("start"));
+ sendSelf(SharedObjectMsg.createMsg("start"));
} catch (Exception e) {}
} else {
preStartSending();
@@ -421,7 +421,7 @@ public class FileTransferSharedObject extends TransactionSharedObject
}
// If all data not sent, send message to self. This results
// in this method iterating until entire file is sent.
- sendSelf(SharedObjectMsg.makeMsg(startMethodName));
+ sendSelf(SharedObjectMsg.createMsg(startMethodName));
} else {
// Close input stream.
hardClose();
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java
index b27cdf5bb..cbadc79fc 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java
@@ -1100,7 +1100,7 @@ public class ChatComposite extends Composite {
String fileName, Date startDate, ID target, final boolean launch) {
try {
ID eclipseStageID = IDFactory
- .getDefault().makeStringID(org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject.ECLIPSEOBJECTNAME);
+ .getDefault().createStringID(org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject.ECLIPSEOBJECTNAME);
java.io.BufferedInputStream ins = new java.io.BufferedInputStream(
local);
java.io.File remoteFile = new File((new File(fileName)).getName());
@@ -1113,7 +1113,7 @@ public class ChatComposite extends Composite {
new Thread(new Runnable() {
public void run() {
if (launch) {
- ChatComposite.this.view.makeObject(
+ ChatComposite.this.view.createObject(
null,
org.eclipse.ecf.example.collab.share.io.EclipseFileTransferAndLaunch.class
.getName(), new String[] {
@@ -1123,7 +1123,7 @@ public class ChatComposite extends Composite {
FileTransferParams.class.getName(),
ID.class.getName() }, args);
} else {
- ChatComposite.this.view.makeObject(
+ ChatComposite.this.view.createObject(
null,
org.eclipse.ecf.example.collab.share.io.EclipseFileTransfer.class
.getName(), new String[] {
@@ -1185,7 +1185,7 @@ public class ChatComposite extends Composite {
HashMap map = new HashMap();
map.put("args",args);
map.put("types",LineChatClientView.APPSHAREARGTYPES);
- ID serverID = this.view.lch.makeObject(null, LineChatClientView.APPSHARECLASSNAME, map);
+ ID serverID = this.view.lch.createObject(null, LineChatClientView.APPSHARECLASSNAME, map);
EclipseAppShareServer server = (EclipseAppShareServer) this.view.lch.getObject(serverID);
if (server != null) {
LineChatView.setAppShareID(serverID,server);
@@ -1219,7 +1219,7 @@ public class ChatComposite extends Composite {
if (res != null) {
Object[] args = { userID, res };
// Do it
- this.view.makeObject(null, LineChatClientView.SHOWURLCLASSNAME, LineChatClientView.SHOWURLARGTYPES,
+ this.view.createObject(null, LineChatClientView.SHOWURLCLASSNAME, LineChatClientView.SHOWURLARGTYPES,
args);
}
}
@@ -1238,7 +1238,7 @@ public class ChatComposite extends Composite {
initStr);
}
if (res != null)
- this.view.makeProxyObject(userID, res);
+ this.view.createProxyObject(userID, res);
}
protected void sendFile(String pathName, final String fileName,
@@ -1310,7 +1310,7 @@ public class ChatComposite extends Composite {
"");
if (res != null & !res.equals("")) {
String[] args = { res, this.view.userdata.getNickname() };
- this.view.makeObject(null, LineChatClientView.MESSAGECLASSNAME, args);
+ this.view.createObject(null, LineChatClientView.MESSAGECLASSNAME, args);
}
}
@@ -1329,7 +1329,7 @@ public class ChatComposite extends Composite {
"Replicated Object Class and Args (separated by whitespace):",
"");
if (result != null && !result.equals("")) {
- this.view.makeObject(null, getCommand(result), getArgs(result));
+ this.view.createObject(null, getCommand(result), getArgs(result));
}
}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
index 6381e8fc9..cc09a5304 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
@@ -76,8 +76,8 @@ public class JoinGroupWizard extends Wizard {
/*
ID groupID = null;
if (namespace != null) {
- groupID = IDFactory.getDefault().makeID(namespace,new Object[] { groupName });
- } else groupID = IDFactory.getDefault().makeStringID(groupName);
+ groupID = IDFactory.getDefault().createID(namespace,new Object[] { groupName });
+ } else groupID = IDFactory.getDefault().createStringID(groupName);
client = new ClientConnectAction();
client.setProject(project);
client.setUsername(nickName);
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
index c117c7ca3..b434f8077 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
@@ -126,7 +126,7 @@ public class LineChatClientView implements FileSenderUI {
return false;
} else {
myNames.put(userID, username);
- final String str = makeChatLine(username + " " + ENTER_STRING);
+ final String str = createChatLine(username + " " + ENTER_STRING);
addUserToTree(ud);
showText(new ChatLine(str));
return true;
@@ -139,7 +139,7 @@ public class LineChatClientView implements FileSenderUI {
* @param line Input text
* @return User-defined output of chat text.
*/
- private String makeChatLine(String line) {
+ private String createChatLine(String line) {
if (showTimestamp) {
return dateTime() + line;
}
@@ -153,7 +153,7 @@ public class LineChatClientView implements FileSenderUI {
TreeParent root = getPresenceRoot();
if (root == null)
return;
- TreeUser top = makeUserNode(ud);
+ TreeUser top = createUserNode(ud);
if (top == null)
return;
root.addChild(top);
@@ -233,13 +233,13 @@ public class LineChatClientView implements FileSenderUI {
protected String getPrefix(ID objID) {
String prefix = "";
if (userdata.getUserID().equals(objID)) {
- prefix += makeChatLine(" " + HOST_PREFIX + ": ");
+ prefix += createChatLine(" " + HOST_PREFIX + ": ");
} else {
String tmp = getUserData(objID);
if (tmp == null) {
tmp = objID.toString();
}
- prefix += makeChatLine(" " + tmp + CLIENT_PREFIX + ": ");
+ prefix += createChatLine(" " + tmp + CLIENT_PREFIX + ": ");
}
return prefix;
}
@@ -258,13 +258,13 @@ public class LineChatClientView implements FileSenderUI {
protected String getPrivatePrefix(ID objID) {
String prefix = "";
if (userdata.getUserID().equals(objID)) {
- prefix += makeChatLine(" " + HOST_PREFIX + " (private): ");
+ prefix += createChatLine(" " + HOST_PREFIX + " (private): ");
} else {
String tmp = getUserData(objID);
if (tmp == null) {
tmp = objID.toString();
}
- prefix += makeChatLine(" " + tmp + CLIENT_PREFIX + " (private): ");
+ prefix += createChatLine(" " + tmp + CLIENT_PREFIX + " (private): ");
}
return prefix;
}
@@ -308,18 +308,18 @@ public class LineChatClientView implements FileSenderUI {
lch.inputText(text);
}
- protected void makeObject(ID target, String className, String[] args) {
- makeObject(target, className, null, args);
+ protected void createObject(ID target, String className, String[] args) {
+ createObject(target, className, null, args);
}
- protected void makeObject(ID target, final String className,
+ protected void createObject(ID target, final String className,
String[] argTypes, Object[] args) {
if (lch != null) {
HashMap map = new HashMap();
map.put("args", args);
map.put("types", argTypes);
try {
- lch.makeObject(target, className, map);
+ lch.createObject(target, className, map);
} catch (final Exception e) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
@@ -330,18 +330,18 @@ public class LineChatClientView implements FileSenderUI {
}
});
e.printStackTrace();
- lch.chatException(e, "makeObject(" + className + ")");
+ lch.chatException(e, "createObject(" + className + ")");
}
}
}
- protected void makeProxyObject(ID target, final String className) {
+ protected void createProxyObject(ID target, final String className) {
if (lch != null) {
try {
// With this interface, we'll simply supply the class name
// as the instance name. Eventually, the user interface should
// allow the creation of some other instance name
- lch.makeProxyObject(target, className, className);
+ lch.createProxyObject(target, className, className);
proxyObjects.add(className);
teamChat.enableProxyMessage(true);
} catch (final Exception e) {
@@ -354,12 +354,12 @@ public class LineChatClientView implements FileSenderUI {
}
});
e.printStackTrace();
- lch.chatException(e, "makeProxyObject(" + className + ")");
+ lch.chatException(e, "createProxyObject(" + className + ")");
}
}
}
- protected TreeParent makeUserNode(TreeParent node, Vector ht) {
+ protected TreeParent createUserNode(TreeParent node, Vector ht) {
if (node == null || ht == null)
return null;
for (Enumeration e = ht.elements(); e.hasMoreElements();) {
@@ -368,7 +368,7 @@ public class LineChatClientView implements FileSenderUI {
final TreeParent tn = new TreeParent(this, ti);
if (val instanceof Vector) {
// Create new tree node
- makeUserNode(tn, (Vector) val);
+ createUserNode(tn, (Vector) val);
}
node.addChild(tn);
}
@@ -376,11 +376,11 @@ public class LineChatClientView implements FileSenderUI {
return node;
}
- protected TreeUser makeUserNode(User ud) {
+ protected TreeUser createUserNode(User ud) {
if (ud == null)
return null;
TreeUser tu = new TreeUser(this, ud);
- return (TreeUser) makeUserNode(tu, ud.getUserFields());
+ return (TreeUser) createUserNode(tu, ud.getUserFields());
}
protected void messageProxyObject(ID target, String classname, String meth,
@@ -432,7 +432,7 @@ public class LineChatClientView implements FileSenderUI {
public void removeUser(ID id) {
String name = getUserData(id);
if (name != null) {
- final String str = makeChatLine(name + " " + LEFT_STRING);
+ final String str = createChatLine(name + " " + LEFT_STRING);
showText(new ChatLine(str));
}
myNames.remove(id);
@@ -460,7 +460,7 @@ public class LineChatClientView implements FileSenderUI {
Object[] args = { receiver, cmds, env, new Boolean(receiver == null),
new Boolean(false) };
// Do it
- makeObject(null, EXECPROGCLASSNAME, EXECPROGARGTYPES, args);
+ createObject(null, EXECPROGCLASSNAME, EXECPROGARGTYPES, args);
}
public void sendData(File aFile, long dataLength) {
@@ -518,7 +518,7 @@ public class LineChatClientView implements FileSenderUI {
TreeParent newRoot = new TreeParent(this, item);
Object val = item.getValue();
if (val instanceof Vector) {
- return makeUserNode(newRoot, (Vector) val);
+ return createUserNode(newRoot, (Vector) val);
} else
return newRoot;
}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatHandler.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatHandler.java
index 81b429b2d..724cbe9aa 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatHandler.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatHandler.java
@@ -32,7 +32,7 @@ public interface LineChatHandler {
public void sendStartedTyping();
public void inputText(String aString);
- public ID makeObject(ID target, String classname, Map map)
+ public ID createObject(ID target, String classname, Map map)
throws Exception;
public Object getObject(ID target);
@@ -47,7 +47,7 @@ public interface LineChatHandler {
public void sendRingMessageToUser(User touser,String msg);
public void sendPrivateMessageToUser(User touser, String msg);
- public void makeProxyObject(ID target,String classname,String name);
+ public void createProxyObject(ID target,String classname,String name);
public void messageProxyObject(ID target, String name, String meth, Object [] args);
public void removeProxyObject(ID target,String name);
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatView.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatView.java
index fb5904df5..2c9017d22 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatView.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatView.java
@@ -135,7 +135,7 @@ public class LineChatView extends ViewPart {
});
}
- public static LineChatClientView makeClientView(final LineChatHandler lch, final String name,final String initText,String downloaddir)
+ public static LineChatClientView createClientView(final LineChatHandler lch, final String name,final String initText,String downloaddir)
throws Exception {
LineChatClientView newView = null;
synchronized (clientViews) {
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java
index ffd370938..85f0e9dc8 100644
--- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java
+++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java
@@ -115,7 +115,7 @@ public class EditorPlugin extends AbstractUIPlugin {
.getWorkspace().getRoot().getProject(p.segment(0)));
PublishedGraphTracker tracker = getTracker(container);
- ID id = IDFactory.getDefault().makeStringID(path);
+ ID id = IDFactory.getDefault().createStringID(path);
WaitableSubscriptionCallback mutex = new WaitableSubscriptionCallback();
ISharedDataGraph result = DataGraphSharingFactory.getDataGraphSharing(
container, "default").subscribe(id, new EMFUpdateProvider(),
@@ -141,7 +141,7 @@ public class EditorPlugin extends AbstractUIPlugin {
.getWorkspace().getRoot().getProject(p.segment(0)));
PublishedGraphTracker tracker = getTracker(container);
- ID id = IDFactory.getDefault().makeStringID(path);
+ ID id = IDFactory.getDefault().createStringID(path);
WaitablePublicationCallback mutex = new WaitablePublicationCallback();
ISharedDataGraph result = DataGraphSharingFactory.getDataGraphSharing(
container, "default").publish(dataGraph, id,
@@ -162,7 +162,7 @@ public class EditorPlugin extends AbstractUIPlugin {
ISharedObjectContainer container = getContainer(ResourcesPlugin
.getWorkspace().getRoot().getProject(p.segment(0)));
PublishedGraphTracker tracker = getTracker(container);
- return tracker.isPublished(IDFactory.getDefault().makeStringID(path));
+ return tracker.isPublished(IDFactory.getDefault().createStringID(path));
}
public synchronized void checkConnected(IProject project)
@@ -179,7 +179,7 @@ public class EditorPlugin extends AbstractUIPlugin {
private PublishedGraphTracker getTracker(ISharedObjectContainer container)
throws ECFException {
- ID id = IDFactory.getDefault().makeStringID(PublishedGraphTracker.class.getName());
+ ID id = IDFactory.getDefault().createStringID(PublishedGraphTracker.class.getName());
PublishedGraphTracker tracker = (PublishedGraphTracker) container
.getSharedObjectManager().getSharedObject(id);
if (tracker == null) {
diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java
index fc2dcca0a..73634f125 100644
--- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java
+++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java
@@ -31,7 +31,7 @@ public class DataGraphSharingManager implements IDataGraphSharingManager {
public synchronized IDataGraphSharing getInstance(
ISharedObjectContainer container) throws ECFException {
ISharedObjectManager mgr = container.getSharedObjectManager();
- ID id = IDFactory.getDefault().makeStringID(DataGraphSharing.DATA_GRAPH_SHARING_ID);
+ ID id = IDFactory.getDefault().createStringID(DataGraphSharing.DATA_GRAPH_SHARING_ID);
DataGraphSharing result = (DataGraphSharing) mgr.getSharedObject(id);
if (result == null) {
result = new DataGraphSharing();
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java
index 2d99eea9e..788c4c636 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java
@@ -32,10 +32,10 @@ public interface IChatRoomManager {
*/
public IRoomInfo[] getChatRoomsInfo();
/**
- * Make a new IChatRoomContainer instance
+ * Create a new IChatRoomContainer instance
* @return non-null IChatRoomContainer implementer
* @throws ContainerInstantiationException if chat room container cannot be made
*/
- public IChatRoomContainer makeChatRoomContainer() throws ContainerInstantiationException;
+ public IChatRoomContainer createChatRoomContainer() throws ContainerInstantiationException;
}
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java
index f99422da1..c16c2447f 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java
@@ -71,14 +71,14 @@ public class ClientApplication {
contd = new ContainerDescription(ClientApplication.class.getClassLoader(),CONTAINER_FACTORY_NAME,CONTAINER_FACTORY_CLASS,null);
ContainerFactory.getDefault().addDescription(contd);
for(int i=0; i < clientCount; i++) {
- sm[i] = makeClient();
+ sm[i] = createClient();
}
}
- protected ISharedObjectContainer makeClient() throws Exception {
+ protected ISharedObjectContainer createClient() throws Exception {
// Make identity instance for the new container
- ID newContainerID = IDFactory.getDefault().makeGUID();
- ISharedObjectContainer result = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(contd,null,new Object[] { newContainerID, new Integer(DEFAULT_TIMEOUT)});
+ ID newContainerID = IDFactory.getDefault().createGUID();
+ ISharedObjectContainer result = SharedObjectContainerFactory.getDefault().createSharedObjectContainer(contd,null,new Object[] { newContainerID, new Integer(DEFAULT_TIMEOUT)});
return result;
}
@@ -104,7 +104,7 @@ public class ClientApplication {
ISharedObjectContainer scg = sm[j];
for(int i=0; i < sharedObjectClassNames.length; i++) {
System.out.println("Creating sharedObject: "+sharedObjectClassNames[i]+" for client "+scg.getID().getName());
- SharedObjectDescription sd = new SharedObjectDescription(IDFactory.getDefault().makeStringID(String.valueOf(aRan.nextInt())),sharedObjectClassNames[i]);
+ SharedObjectDescription sd = new SharedObjectDescription(IDFactory.getDefault().createStringID(String.valueOf(aRan.nextInt())),sharedObjectClassNames[i]);
scg.getSharedObjectManager().createSharedObject(sd);
System.out.println("Created sharedObject for client "+scg.getID().getName());
}
@@ -125,7 +125,7 @@ public class ClientApplication {
ClientApplication st = new ClientApplication();
st.init(args);
// Get server id to join
- ID serverID = IDFactory.getDefault().makeStringID(st.serverName);
+ ID serverID = IDFactory.getDefault().createStringID(st.serverName);
st.connect(serverID);
st.createStages();
System.out.println("Waiting "+DEFAULT_WAITTIME+" ms...");
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java
index 25f464e22..dcc8d83f3 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java
@@ -75,12 +75,12 @@ public class ServerApplication {
int j=0;
for(Iterator i=connectors.iterator(); i.hasNext(); ) {
Connector connect = (Connector) i.next();
- serverGroups[j] = makeServerGroup(connect.getHostname(),connect.getPort());
+ serverGroups[j] = createServerGroup(connect.getHostname(),connect.getPort());
List groups = connect.getGroups();
for(Iterator g=groups.iterator(); g.hasNext(); ) {
NamedGroup group = (NamedGroup) g.next();
- TCPServerSOContainer cont = makeServerContainer(group.getIDForGroup(),serverGroups[j],group.getName(),connect.getTimeout());
+ TCPServerSOContainer cont = createServerContainer(group.getIDForGroup(),serverGroups[j],group.getName(),connect.getTimeout());
servers.add(cont);
}
System.out.println("Putting server "+connect.getHostname()+" on the air");
@@ -105,7 +105,7 @@ public class ServerApplication {
// Setup server group
serverGroups[0] = new TCPServerSOContainerGroup(anURL.getPort());
// Create identity for server
- ID id = IDFactory.getDefault().makeStringID(serverName);
+ ID id = IDFactory.getDefault().createStringID(serverName);
// Create server config object with identity and default timeout
SOContainerConfig config = new SOContainerConfig(id);
// Make server instance
@@ -127,14 +127,14 @@ public class ServerApplication {
}
}
- protected static TCPServerSOContainerGroup makeServerGroup(String name, int port) {
+ protected static TCPServerSOContainerGroup createServerGroup(String name, int port) {
System.out.println("Creating server group named "+name+" to listen on port "+port);
TCPServerSOContainerGroup group = new TCPServerSOContainerGroup(name,port);
return group;
}
- protected static TCPServerSOContainer makeServerContainer(String id, TCPServerSOContainerGroup group, String path, int keepAlive) throws IDInstantiationException {
+ protected static TCPServerSOContainer createServerContainer(String id, TCPServerSOContainerGroup group, String path, int keepAlive) throws IDInstantiationException {
System.out.println(" Creating container with id="+id+", group="+path+" keepAlive="+keepAlive);
- ID newServerID = IDFactory.getDefault().makeStringID(id);
+ ID newServerID = IDFactory.getDefault().createStringID(id);
SOContainerConfig config = new SOContainerConfig(newServerID);
return new TCPServerSOContainer(config,group,path,keepAlive);
}
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java
index 1b1f366be..a95ee43b4 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java
@@ -46,7 +46,7 @@ import org.eclipse.ecf.provider.Trace;
public final class Client implements ISynchAsynchConnection {
public static class Creator implements ISynchAsynchConnectionInstantiator {
- public ISynchAsynchConnection makeInstance(ConnectionDescription description,
+ public ISynchAsynchConnection createInstance(ConnectionDescription description,
ISynchAsynchConnectionEventHandler handler, Class[] clazzes,
Object[] args) throws ConnectionInstantiationException {
try {
@@ -189,7 +189,7 @@ public final class Client implements ISynchAsynchConnection {
return null;
ID retID = null;
try {
- retID = IDFactory.getDefault().makeStringID(PROTOCOL + "://"
+ retID = IDFactory.getDefault().createStringID(PROTOCOL + "://"
+ socket.getLocalAddress().getHostName() + ":" + socket.getLocalPort());
} catch (Exception e) {
dumpStack("Exception in getLocalID()",e);
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
index dfc319dc4..3f76e2af2 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
@@ -88,7 +88,7 @@ public abstract class ClientSOContainer extends SOContainer {
}
}
- protected Callback[] makeAuthorizationCallbacks() {
+ protected Callback[] createAuthorizationCallbacks() {
return null;
}
@@ -101,7 +101,7 @@ public abstract class ClientSOContainer extends SOContainer {
if (isClosing)
throw new IllegalStateException("container is closing");
debug("connect:" + remote + ":" + joinContext);
- ISynchAsynchConnection aConnection = makeConnection(remote,
+ ISynchAsynchConnection aConnection = createConnection(remote,
joinContext);
Object response = null;
synchronized (connectLock) {
@@ -123,7 +123,7 @@ public abstract class ClientSOContainer extends SOContainer {
connection = aConnection;
}
// Now call join callback handler, if it exists
- Callback[] callbacks = makeAuthorizationCallbacks();
+ Callback[] callbacks = createAuthorizationCallbacks();
if (joinContext != null) {
CallbackHandler handler = joinContext.getCallbackHandler();
if (handler != null) {
@@ -133,7 +133,7 @@ public abstract class ClientSOContainer extends SOContainer {
synchronized (aConnection) {
try {
- Object connectData = makeConnectData(remote, callbacks,
+ Object connectData = createConnectData(remote, callbacks,
null);
// Make connect call
response = aConnection.connect(remote, connectData,
@@ -271,8 +271,8 @@ public abstract class ClientSOContainer extends SOContainer {
// NOP
}
- protected Object makeConnectData(ID target, Callback[] cbs, Object data) {
- return ContainerMessage.makeJoinGroupMessage(getID(), target,
+ protected Object createConnectData(ID target, Callback[] cbs, Object data) {
+ return ContainerMessage.createJoinGroupMessage(getID(), target,
getNextSequenceNumber(), (Serializable) data);
}
@@ -292,7 +292,7 @@ public abstract class ClientSOContainer extends SOContainer {
try {
connection.sendSynch(groupID,
serializeObject(ContainerMessage
- .makeLeaveGroupMessage(getID(),
+ .createLeaveGroupMessage(getID(),
groupID,
getNextSequenceNumber(),
getLeaveData(groupID))));
@@ -312,7 +312,7 @@ public abstract class ClientSOContainer extends SOContainer {
.getID(), groupID));
}
- protected abstract ISynchAsynchConnection makeConnection(ID remoteSpace,
+ protected abstract ISynchAsynchConnection createConnection(ID remoteSpace,
Object data) throws ConnectionInstantiationException;
protected void queueContainerMessage(ContainerMessage message)
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java
index e3742d36a..679ee5675 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java
@@ -42,12 +42,12 @@ public class ContainerInstantiator implements
if (arg instanceof String) {
String val = (String) arg;
if (val == null || val.equals("")) {
- return IDFactory.getDefault().makeGUID();
- } else return IDFactory.getDefault().makeStringID((String) arg);
+ return IDFactory.getDefault().createGUID();
+ } else return IDFactory.getDefault().createStringID((String) arg);
} else if (arg instanceof Integer) {
- return IDFactory.getDefault().makeGUID(((Integer) arg).intValue());
+ return IDFactory.getDefault().createGUID(((Integer) arg).intValue());
} else
- return IDFactory.getDefault().makeGUID();
+ return IDFactory.getDefault().createGUID();
}
protected Integer getIntegerFromArg(Class type, Object arg)
@@ -59,7 +59,7 @@ public class ContainerInstantiator implements
} else return new Integer(-1);
}
- public IContainer makeInstance(
+ public IContainer createInstance(
ContainerDescription description, Class[] argTypes,
Object[] args) throws ContainerInstantiationException {
boolean isClient = true;
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java
index d48415994..f3ed10c16 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java
@@ -81,40 +81,40 @@ public class ContainerMessage implements Serializable {
this.toContainerID = toContainerID;
}
- public static ContainerMessage makeViewChangeMessage(ID from, ID to, long seq,
+ public static ContainerMessage createViewChangeMessage(ID from, ID to, long seq,
ID ids[], boolean add, Serializable data) {
return new ContainerMessage(from, to, seq, new ViewChangeMessage(ids,
add, data));
}
- public static ContainerMessage makeJoinGroupMessage(ID from, ID to, long seq,
+ public static ContainerMessage createJoinGroupMessage(ID from, ID to, long seq,
Serializable data) {
return new ContainerMessage(from, to, seq, new JoinGroupMessage(data));
}
- public static ContainerMessage makeLeaveGroupMessage(ID from, ID to, long seq,
+ public static ContainerMessage createLeaveGroupMessage(ID from, ID to, long seq,
Serializable data) {
return new ContainerMessage(from, to, seq, new LeaveGroupMessage(data));
}
- public static ContainerMessage makeSharedObjectCreateMessage(ID from, ID to,
+ public static ContainerMessage createSharedObjectCreateMessage(ID from, ID to,
long seq, Serializable data) {
return new ContainerMessage(from, to, seq, new CreateMessage(data));
}
- public static ContainerMessage makeSharedObjectCreateResponseMessage(ID from,
+ public static ContainerMessage createSharedObjectCreateResponseMessage(ID from,
ID to, long contSeq, ID soID, Throwable e, long sequence) {
return new ContainerMessage(from, to, contSeq,
new CreateResponseMessage(soID, e, sequence));
}
- public static ContainerMessage makeSharedObjectMessage(ID from, ID to, long seq,
+ public static ContainerMessage createSharedObjectMessage(ID from, ID to, long seq,
ID fromSharedObject, Serializable data) {
return new ContainerMessage(from, to, seq, new SharedObjectMessage(
fromSharedObject, data));
}
- public static ContainerMessage makeSharedObjectDisposeMessage(ID from, ID to,
+ public static ContainerMessage createSharedObjectDisposeMessage(ID from, ID to,
long seq, ID sharedObjectID) {
return new ContainerMessage(from, to, seq,
new SharedObjectDisposeMessage(sharedObjectID));
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
index f46eb15cc..e82092179 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
@@ -42,9 +42,9 @@ public class SOConfig implements ISharedObjectConfig {
protected void makeActive(IQueueEnqueue queue) {
isActive = true;
if (container.getID().equals(homeContainerID)) {
- this.context = container.makeSharedObjectContext(this,queue);
+ this.context = container.createSharedObjectContext(this,queue);
} else {
- this.context = container.makeRemoteSharedObjectContext(this,queue);
+ this.context = container.createRemoteSharedObjectContext(this,queue);
}
}
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
index 4b97fd946..a403261c6 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
@@ -105,7 +105,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
ISharedObject obj = load(description);
// Create wrapper object and move from loading to active
// list.
- SOWrapper wrap = makeRemoteSharedObjectWrapper(fromID,
+ SOWrapper wrap = createRemoteSharedObjectWrapper(fromID,
description, obj);
wrap.init();
// Check to make sure thread has not been
@@ -238,7 +238,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
this.config = config;
groupManager = new SOContainerGMM(this, new Member(config.getID()));
sharedObjectManager = new SOManager(this);
- loadingThreadGroup = makeLoadingThreadGroup();
+ loadingThreadGroup = createLoadingThreadGroup();
sharedObjectThreadGroup = getSharedObjectThreadGroup();
listeners = new Vector();
receiver = new MessageReceiver();
@@ -266,7 +266,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
}
protected ISharedObjectContainerTransaction addSharedObject0(
SharedObjectDescription sd, ISharedObject s) throws Exception {
- return addSharedObjectWrapper(makeSharedObjectWrapper(sd, s));
+ return addSharedObjectWrapper(createSharedObjectWrapper(sd, s));
}
protected void addSharedObjectAndWait(SharedObjectDescription sd,
ISharedObject s) throws Exception {
@@ -764,41 +764,41 @@ public abstract class SOContainer implements ISharedObjectContainer {
protected void logException(String msg, Throwable e) {
dumpStack(msg, e);
}
- protected ThreadGroup makeLoadingThreadGroup() {
+ protected ThreadGroup createLoadingThreadGroup() {
return new ThreadGroup(getID() + ":load");
}
- protected SOConfig makeSharedObjectConfig(SharedObjectDescription sd,
+ protected SOConfig createSharedObjectConfig(SharedObjectDescription sd,
ISharedObject obj) {
ID homeID = sd.getHomeID();
if (homeID == null)
homeID = getID();
return new SOConfig(sd.getID(), homeID, this, sd.getProperties());
}
- protected SOConfig makeRemoteSharedObjectConfig(ID fromID,
+ protected SOConfig createRemoteSharedObjectConfig(ID fromID,
SharedObjectDescription sd, ISharedObject obj) {
ID homeID = sd.getHomeID();
if (homeID == null)
homeID = fromID;
return new SOConfig(sd.getID(), homeID, this, sd.getProperties());
}
- protected SOContext makeSharedObjectContext(SOConfig soconfig,
+ protected SOContext createSharedObjectContext(SOConfig soconfig,
IQueueEnqueue queue) {
return new SOContext(soconfig.getSharedObjectID(), soconfig
.getHomeContainerID(), this, soconfig.getProperties(), queue);
}
- protected SOContext makeRemoteSharedObjectContext(SOConfig soconfig,
+ protected SOContext createRemoteSharedObjectContext(SOConfig soconfig,
IQueueEnqueue queue) {
return new SOContext(soconfig.getSharedObjectID(), soconfig
.getHomeContainerID(), this, soconfig.getProperties(), queue);
}
- protected SOWrapper makeSharedObjectWrapper(SharedObjectDescription sd,
+ protected SOWrapper createSharedObjectWrapper(SharedObjectDescription sd,
ISharedObject s) {
- SOConfig newConfig = makeSharedObjectConfig(sd, s);
+ SOConfig newConfig = createSharedObjectConfig(sd, s);
return new SOWrapper(newConfig, s, this);
}
- protected SOWrapper makeRemoteSharedObjectWrapper(ID fromID,
+ protected SOWrapper createRemoteSharedObjectWrapper(ID fromID,
SharedObjectDescription sd, ISharedObject s) {
- SOConfig newConfig = makeRemoteSharedObjectConfig(fromID, sd, s);
+ SOConfig newConfig = createRemoteSharedObjectConfig(fromID, sd, s);
return new SOWrapper(newConfig, s, this);
}
protected void memberLeave(ID target, IConnection conn) {
@@ -807,7 +807,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
if (groupManager.removeMember(target)) {
try {
forwardExcluding(getID(), target, ContainerMessage
- .makeViewChangeMessage(getID(), null,
+ .createViewChangeMessage(getID(), null,
getNextSequenceNumber(), new ID[] { target },
false, null));
} catch (IOException e) {
@@ -961,7 +961,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
}
protected void sendCreateResponseSharedObjectMessage(ID toContainerID,
ID fromSharedObject, Throwable t, long ident) throws IOException {
- sendMessage(ContainerMessage.makeSharedObjectCreateResponseMessage(
+ sendMessage(ContainerMessage.createSharedObjectCreateResponseMessage(
getID(), toContainerID, getNextSequenceNumber(),
fromSharedObject, t, ident));
}
@@ -971,7 +971,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
if (toContainerID == null) {
synchronized (getGroupMembershipLock()) {
// Send message to all
- sendMessage(ContainerMessage.makeSharedObjectCreateMessage(
+ sendMessage(ContainerMessage.createSharedObjectCreateMessage(
getID(), toContainerID, getNextSequenceNumber(), sd));
returnIDs = getOtherMemberIDs();
}
@@ -980,7 +980,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
if (getID().equals(toContainerID)) {
returnIDs = new ID[0];
} else {
- sendMessage(ContainerMessage.makeSharedObjectCreateMessage(
+ sendMessage(ContainerMessage.createSharedObjectCreateMessage(
getID(), toContainerID, getNextSequenceNumber(), sd));
returnIDs = new ID[1];
returnIDs[0] = toContainerID;
@@ -994,7 +994,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
}
protected void sendDisposeSharedObjectMessage(ID toContainerID,
ID fromSharedObject) throws IOException {
- sendMessage(ContainerMessage.makeSharedObjectDisposeMessage(getID(),
+ sendMessage(ContainerMessage.createSharedObjectDisposeMessage(getID(),
toContainerID, getNextSequenceNumber(), fromSharedObject));
}
protected void sendMessage(ContainerMessage data) throws IOException {
@@ -1054,7 +1054,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
}
protected void sendSharedObjectMessage(ID toContainerID,
ID fromSharedObject, Serializable data) throws IOException {
- sendMessage(ContainerMessage.makeSharedObjectMessage(getID(),
+ sendMessage(ContainerMessage.createSharedObjectMessage(getID(),
toContainerID, getNextSequenceNumber(), fromSharedObject, data));
}
protected void setIsClosing() {
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
index 997cbe52a..d96e994ea 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
@@ -88,7 +88,7 @@ public class SOManager implements ISharedObjectManager {
return AbstractFactory.getClassesForTypes(argTypes, args, cl);
}
- protected ISharedObject makeSharedObjectInstance(final Class newClass,
+ protected ISharedObject createSharedObjectInstance(final Class newClass,
final Class[] argTypes, final Object[] args) throws Exception {
Object newObject = null;
try {
@@ -126,7 +126,7 @@ public class SOManager implements ISharedObjectManager {
Class[] argTypes = getArgTypes(types, args, cl);
// Now load top-level class
final Class newClass = Class.forName(sd.getClassname(), true, cl);
- return makeSharedObjectInstance(newClass, argTypes, args);
+ return createSharedObjectInstance(newClass, argTypes, args);
}
/*
@@ -255,7 +255,7 @@ public class SOManager implements ISharedObjectManager {
throw new SharedObjectConnectException("receivers cannot be null");
ISharedObjectConnector result = null;
synchronized (container.getGroupMembershipLock()) {
- // Get from to make sure it's there
+ // Get from to create sure it's there
SOWrapper wrap = container.getSharedObjectWrapper(sharedObjectFrom);
if (wrap == null)
throw new SharedObjectConnectException("sender object "
@@ -269,7 +269,7 @@ public class SOManager implements ISharedObjectManager {
+ sharedObjectsTo[i].getName() + " not found");
queues[i] = new QueueEnqueueImpl(w.getQueue());
}
- // OK now we've got ids and wrappers, make a connector
+ // OK now we've got ids and wrappers, create a connector
result = new SOConnector(sharedObjectFrom, sharedObjectsTo, queues);
}
return result;
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
index e8772d40e..813bce7e2 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
@@ -141,7 +141,7 @@ public class ServerSOContainer extends SOContainer implements ISharedObjectConta
// Notify existing remotes about new member
try {
forwardExcluding(getID(), remoteID, ContainerMessage
- .makeViewChangeMessage(getID(), remoteID,
+ .createViewChangeMessage(getID(), remoteID,
getNextSequenceNumber(),
new ID[] { remoteID }, true, null));
} catch (IOException e) {
@@ -160,7 +160,7 @@ public class ServerSOContainer extends SOContainer implements ISharedObjectConta
// notify listeners
fireContainerEvent(new ContainerConnectedEvent(this.getID(),remoteID));
- return ContainerMessage.makeViewChangeMessage(getID(), remoteID,
+ return ContainerMessage.createViewChangeMessage(getID(), remoteID,
getNextSequenceNumber(), memberIDs, true, null);
} catch (Exception e) {
logException("Exception in acceptNewClient(" + socket + ","
@@ -198,7 +198,7 @@ public class ServerSOContainer extends SOContainer implements ISharedObjectConta
return;
try {
conn.sendSynch(memberID, serializeObject(ContainerMessage
- .makeLeaveGroupMessage(getID(), memberID,
+ .createLeaveGroupMessage(getID(), memberID,
getNextSequenceNumber(), reason)));
} catch (Exception e) {
logException("Exception in ejectGroupMember.sendAsynch()",e);
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
index 83673fc7e..900e6cdbf 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
@@ -32,22 +32,22 @@ public class TCPClientSOContainer extends ClientSOContainer {
keepAlive = ka;
}
- protected ISynchAsynchConnection makeConnection(ID remoteSpace,
+ protected ISynchAsynchConnection createConnection(ID remoteSpace,
Object data) throws ConnectionInstantiationException {
debug("getClientConnection:" + remoteSpace + ":" + data);
Object[] args = { new Integer(keepAlive) };
ISynchAsynchConnection conn = null;
- conn = ConnectionFactory.makeSynchAsynchConnection(receiver,
+ conn = ConnectionFactory.createSynchAsynchConnection(receiver,
DEFAULT_COMM_NAME, args);
return conn;
}
public static final void main(String[] args) throws Exception {
ISharedObjectContainerConfig config = new SOContainerConfig(IDFactory
- .getDefault().makeGUID());
+ .getDefault().createGUID());
TCPClientSOContainer container = new TCPClientSOContainer(config);
// now join group
- ID serverID = IDFactory.getDefault().makeStringID(TCPServerSOContainer
+ ID serverID = IDFactory.getDefault().createStringID(TCPServerSOContainer
.getDefaultServerURL());
container.connect(serverID, null);
Thread.sleep(200000);
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 fef5d54e7..5a1b6a1f9 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
@@ -877,7 +877,7 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
if (strres != null && !strres.equals("")) {
ID target = null;
try {
- target = IDFactory.getDefault().makeStringID(strres);
+ target = IDFactory.getDefault().createStringID(strres);
} catch (Exception e) {
MessageDialog.openError(getSite().getShell(), "Error",
"Error in IM target");
@@ -1008,7 +1008,7 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
// now, create chat room instance
IChatRoomContainer chatRoom = null;
try {
- chatRoom = selectedManager.makeChatRoomContainer();
+ chatRoom = selectedManager.createChatRoomContainer();
} catch (ContainerInstantiationException e1) {
MessageDialog.openError(RosterView.this.getViewSite()
.getShell(), "Could not create chat room",
@@ -1164,7 +1164,7 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
synchronized (chatThreads) {
window = (ChatWindow) chatThreads.get(targetID);
if (window == null) {
- window = makeChatWindowForTarget(targetID);
+ window = createChatWindowForTarget(targetID);
if (window != null)
window.open();
} else {
@@ -1177,7 +1177,7 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
}
return window;
}
- protected ChatWindow makeChatWindowForTarget(ID targetID) {
+ protected ChatWindow createChatWindowForTarget(ID targetID) {
UserAccount account = getAccountForUser(targetID);
if (account == null)
return null;
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java
index 2649f8074..90ee9e782 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java
@@ -288,7 +288,7 @@ public class TextChatComposite extends Composite {
sb.append(df.format(new Date())).append(") ");
return sb.toString();
}
- private String makeLineWithTimestamp(String line) {
+ private String createLineWithTimestamp(String line) {
if (showTimestamp) {
return getCurrentDateTime() + line;
}
@@ -308,7 +308,7 @@ public class TextChatComposite extends Composite {
StringBuffer sb = new StringBuffer();
if (text.getOriginator() != null) {
- sb.append(makeLineWithTimestamp(text.getOriginator().getName() + ": "));
+ sb.append(createLineWithTimestamp(text.getOriginator().getName() + ": "));
StyleRange sr = new StyleRange();
sr.start = startRange;
sr.length = sb.length();
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
index e447c07bd..05c9f2966 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
@@ -24,7 +24,7 @@ import org.eclipse.ecf.internal.core.Trace;
* <br>
* <code>
* IContainer container = <br>
- * ContainerFactory.getDefault().makeContainer('standalone');
+ * ContainerFactory.getDefault().createContainer('standalone');
* <br><br>
* ...further use of container variable here...
* </code>
@@ -132,13 +132,13 @@ public class ContainerFactory implements IContainerFactory {
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(org.eclipse.ecf.core.ContainerDescription,
+ * @see org.eclipse.ecf.core.IContainerFactory#createContainer(org.eclipse.ecf.core.ContainerDescription,
* java.lang.String[], java.lang.Object[])
*/
- public IContainer makeContainer(ContainerDescription desc,
+ public IContainer createContainer(ContainerDescription desc,
String[] argTypes, Object[] args)
throws ContainerInstantiationException {
- trace("makeContainer(" + desc + ","
+ trace("createContainer(" + desc + ","
+ Trace.convertStringAToString(argTypes) + ","
+ Trace.convertObjectAToString(args) + ")");
if (desc == null)
@@ -157,10 +157,10 @@ public class ContainerFactory implements IContainerFactory {
.getClassLoader());
} catch (Exception e) {
ContainerInstantiationException newexcept = new ContainerInstantiationException(
- "makeContainer exception with description: " + desc + ": "
+ "createContainer exception with description: " + desc + ": "
+ e.getClass().getName() + ": " + e.getMessage());
newexcept.setStackTrace(e.getStackTrace());
- dumpStack("Exception in makeContainer", newexcept);
+ dumpStack("Exception in createContainer", newexcept);
throw newexcept;
}
if (instantiator == null)
@@ -168,39 +168,39 @@ public class ContainerFactory implements IContainerFactory {
"Instantiator for ContainerDescription " + cd.getName()
+ " is null");
// Ask instantiator to actually create instance
- return (IContainer) instantiator.makeInstance(desc, clazzes, args);
+ return (IContainer) instantiator.createInstance(desc, clazzes, args);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String)
+ * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String)
*/
- public IContainer makeContainer(String descriptionName)
+ public IContainer createContainer(String descriptionName)
throws ContainerInstantiationException {
- return makeContainer(getDescriptionByName(descriptionName), null, null);
+ return createContainer(getDescriptionByName(descriptionName), null, null);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String,
+ * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String,
* java.lang.Object[])
*/
- public IContainer makeContainer(String descriptionName, Object[] args)
+ public IContainer createContainer(String descriptionName, Object[] args)
throws ContainerInstantiationException {
- return makeContainer(getDescriptionByName(descriptionName), null, args);
+ return createContainer(getDescriptionByName(descriptionName), null, args);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String,
+ * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String,
* java.lang.String[], java.lang.Object[])
*/
- public IContainer makeContainer(String descriptionName, String[] argsTypes,
+ public IContainer createContainer(String descriptionName, String[] argsTypes,
Object[] args) throws ContainerInstantiationException {
- return makeContainer(getDescriptionByName(descriptionName), argsTypes,
+ return createContainer(getDescriptionByName(descriptionName), argsTypes,
args);
}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java
index a21763212..6a623e92c 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java
@@ -71,7 +71,7 @@ public interface IContainer extends IAdaptable, IIdentifiable {
* </p>
*
* <pre>
- * IContainer newContainer = ContainerFactory.makeContainer(type);
+ * IContainer newContainer = ContainerFactory.createContainer(type);
* ISharedObjectContainer soContainer = (ISharedObjectContainer) newContainer
* .getAdapter(ISharedObjectContainer.class);
* if (soContainer == null)
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java
index fda15fe76..9867184bf 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java
@@ -53,7 +53,7 @@ public interface IContainerFactory {
* <li>lookup the known ContainerDescriptions to find one of matching name</li>
* <li>if found, will retrieve or create an IContainerInstantiator for that
* description</li>
- * <li>Call the IContainerInstantiator.makeInstance method to return an
+ * <li>Call the IContainerInstantiator.createInstance method to return an
* instance of IContainer</li>
* </ul>
*
@@ -62,12 +62,12 @@ public interface IContainerFactory {
* @param argTypes
* a String [] defining the types of the args parameter
* @param args
- * an Object [] of arguments passed to the makeInstance method of
+ * an Object [] of arguments passed to the createInstance method of
* the IContainerInstantiator
* @return a valid instance of IContainer
* @throws ContainerInstantiationException
*/
- public IContainer makeContainer(ContainerDescription desc,
+ public IContainer createContainer(ContainerDescription desc,
String[] argTypes, Object[] args)
throws ContainerInstantiationException;
@@ -79,7 +79,7 @@ public interface IContainerFactory {
* <li>lookup the known ContainerDescriptions to find one of matching name</li>
* <li>if found, will retrieve or create an IContainerInstantiator for that
* description</li>
- * <li>Call the IContainerInstantiator.makeInstance method to return an
+ * <li>Call the IContainerInstantiator.createInstance method to return an
* instance of IContainer</li>
* </ul>
*
@@ -88,7 +88,7 @@ public interface IContainerFactory {
* @return a valid instance of IContainer
* @throws ContainerInstantiationException
*/
- public IContainer makeContainer(String descriptionName)
+ public IContainer createContainer(String descriptionName)
throws ContainerInstantiationException;
/**
@@ -99,7 +99,7 @@ public interface IContainerFactory {
* <li>lookup the known ContainerDescriptions to find one of matching name</li>
* <li>if found, will retrieve or create an IContainerInstantiator for that
* description</li>
- * <li>Call the IContainerInstantiator.makeInstance method to return an
+ * <li>Call the IContainerInstantiator.createInstance method to return an
* instance of IContainer</li>
* </ul>
*
@@ -107,11 +107,11 @@ public interface IContainerFactory {
* the ContainerDescription name to lookup
* @param args
* the Object [] of arguments passed to the
- * IContainerInstantiator.makeInstance method
+ * IContainerInstantiator.createInstance method
* @return a valid instance of IContainer
* @throws ContainerInstantiationException
*/
- public IContainer makeContainer(String descriptionName, Object[] args)
+ public IContainer createContainer(String descriptionName, Object[] args)
throws ContainerInstantiationException;
/**
@@ -122,7 +122,7 @@ public interface IContainerFactory {
* <li>lookup the known ContainerDescriptions to find one of matching name</li>
* <li>if found, will retrieve or create an IContainerInstantiator for that
* description</li>
- * <li>Call the IContainerInstantiator.makeInstance method to return an
+ * <li>Call the IContainerInstantiator.createInstance method to return an
* instance of IContainer</li>
* </ul>
*
@@ -132,11 +132,11 @@ public interface IContainerFactory {
* the String [] of argument types of the following args
* @param args
* the Object [] of arguments passed to the
- * IContainerInstantiator.makeInstance method
+ * IContainerInstantiator.createInstance method
* @return a valid instance of IContainer
* @throws ContainerInstantiationException
*/
- public IContainer makeContainer(String descriptionName, String[] argsTypes,
+ public IContainer createContainer(String descriptionName, String[] argsTypes,
Object[] args) throws ContainerInstantiationException;
/**
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java
index 4a143ce9e..90c1ddac1 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java
@@ -12,12 +12,12 @@ public interface ISharedObjectContainerFactory {
* @param argTypes
* a String [] defining the types of the args parameter
* @param args
- * an Object [] of arguments passed to the makeInstance method of
+ * an Object [] of arguments passed to the createInstance method of
* the IContainerInstantiator
* @return a valid instance of ISharedObjectContainer
* @throws ContainerInstantiationException
*/
- public ISharedObjectContainer makeSharedObjectContainer(
+ public ISharedObjectContainer createSharedObjectContainer(
ContainerDescription desc, String[] argTypes, Object[] args)
throws ContainerInstantiationException;
@@ -29,7 +29,7 @@ public interface ISharedObjectContainerFactory {
* @return a valid instance of ISharedObjectContainer
* @throws ContainerInstantiationException
*/
- public ISharedObjectContainer makeSharedObjectContainer(
+ public ISharedObjectContainer createSharedObjectContainer(
String descriptionName) throws ContainerInstantiationException;
/**
@@ -39,11 +39,11 @@ public interface ISharedObjectContainerFactory {
* the ContainerDescription name to lookup
* @param args
* the Object [] of arguments passed to the
- * IContainerInstantiator.makeInstance method
+ * IContainerInstantiator.createInstance method
* @return a valid instance of ISharedObjectContainer
* @throws ContainerInstantiationException
*/
- public ISharedObjectContainer makeSharedObjectContainer(
+ public ISharedObjectContainer createSharedObjectContainer(
String descriptionName, Object[] args)
throws ContainerInstantiationException;
@@ -56,11 +56,11 @@ public interface ISharedObjectContainerFactory {
* the String [] of argument types of the following args
* @param args
* the Object [] of arguments passed to the
- * IContainerInstantiator.makeInstance method
+ * IContainerInstantiator.createInstance method
* @return a valid instance of ISharedObjectContainer
* @throws ContainerInstantiationException
*/
- public ISharedObjectContainer makeSharedObjectContainer(
+ public ISharedObjectContainer createSharedObjectContainer(
String descriptionName, String[] argsTypes, Object[] args)
throws ContainerInstantiationException;
} \ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java
index 528e0682a..e5c4f8299 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java
@@ -21,7 +21,7 @@ import org.eclipse.ecf.internal.core.Trace;
* <br>
* <code>
* ISharedObjectContainer container = <br>
- * SharedObjectContainerFactory.getDefault().makeSharedObjectContainer('standalone');
+ * SharedObjectContainerFactory.getDefault().createSharedObjectContainer('standalone');
* <br><br>
* ...further use of container variable here...
* </code>
@@ -51,19 +51,19 @@ public class SharedObjectContainerFactory implements
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(org.eclipse.ecf.core.SharedObjectContainerDescription,
+ * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(org.eclipse.ecf.core.SharedObjectContainerDescription,
* java.lang.String[], java.lang.Object[])
*/
- public ISharedObjectContainer makeSharedObjectContainer(
+ public ISharedObjectContainer createSharedObjectContainer(
ContainerDescription desc, String[] argTypes, Object[] args)
throws ContainerInstantiationException {
- trace("makeSharedObjectContainer(" + desc + ","
+ trace("createSharedObjectContainer(" + desc + ","
+ Trace.convertStringAToString(argTypes) + ","
+ Trace.convertObjectAToString(args) + ")");
if (desc == null)
throw new ContainerInstantiationException(
"ContainerDescription cannot be null");
- IContainer newContainer = ContainerFactory.getDefault().makeContainer(
+ IContainer newContainer = ContainerFactory.getDefault().createContainer(
desc, argTypes, args);
ISharedObjectContainer soContainer = (ISharedObjectContainer) newContainer
.getAdapter(ISharedObjectContainer.class);
@@ -78,37 +78,37 @@ public class SharedObjectContainerFactory implements
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String)
+ * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String)
*/
- public ISharedObjectContainer makeSharedObjectContainer(
+ public ISharedObjectContainer createSharedObjectContainer(
String descriptionName) throws ContainerInstantiationException {
- return makeSharedObjectContainer(ContainerFactory.getDefault()
+ return createSharedObjectContainer(ContainerFactory.getDefault()
.getDescriptionByName(descriptionName), null, null);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String,
+ * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String,
* java.lang.Object[])
*/
- public ISharedObjectContainer makeSharedObjectContainer(
+ public ISharedObjectContainer createSharedObjectContainer(
String descriptionName, Object[] args)
throws ContainerInstantiationException {
- return makeSharedObjectContainer(ContainerFactory.getDefault()
+ return createSharedObjectContainer(ContainerFactory.getDefault()
.getDescriptionByName(descriptionName), null, args);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String,
+ * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String,
* java.lang.String[], java.lang.Object[])
*/
- public ISharedObjectContainer makeSharedObjectContainer(
+ public ISharedObjectContainer createSharedObjectContainer(
String descriptionName, String[] argsTypes, Object[] args)
throws ContainerInstantiationException {
- return makeSharedObjectContainer(ContainerFactory.getDefault()
+ return createSharedObjectContainer(ContainerFactory.getDefault()
.getDescriptionByName(descriptionName), argsTypes, args);
}
} \ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java
index d2afce1ab..8371bceb7 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java
@@ -84,20 +84,20 @@ public class ConnectionFactory {
return new ArrayList(connectiontypes.values());
}
- public static ISynchAsynchConnection makeSynchAsynchConnection(
+ public static ISynchAsynchConnection createSynchAsynchConnection(
ISynchAsynchConnectionEventHandler handler,
ConnectionDescription desc, Object[] args)
throws ConnectionInstantiationException {
if (handler == null)
throw new ConnectionInstantiationException("handler cannot be null");
- return makeSynchAsynchConnection(handler, desc, null, args);
+ return createSynchAsynchConnection(handler, desc, null, args);
}
- public static ISynchAsynchConnection makeSynchAsynchConnection(
+ public static ISynchAsynchConnection createSynchAsynchConnection(
ISynchAsynchConnectionEventHandler handler,
ConnectionDescription desc, String[] argTypes, Object[] args)
throws ConnectionInstantiationException {
- debug("makeSynchAsynchConnection(" + handler + "," + desc + ","
+ debug("createSynchAsynchConnection(" + handler + "," + desc + ","
+ Trace.convertStringAToString(argTypes) + ","
+ Trace.convertObjectAToString(args) + ")");
if (handler == null)
@@ -123,18 +123,18 @@ public class ConnectionFactory {
+ cd.getName() + " is null");
} catch (Exception e) {
ConnectionInstantiationException newexcept = new ConnectionInstantiationException(
- "makeSynchAsynchConnection exception with description: "
+ "createSynchAsynchConnection exception with description: "
+ desc + ": " + e.getClass().getName() + ": "
+ e.getMessage());
newexcept.setStackTrace(e.getStackTrace());
- dumpStack("Exception in makeSynchAsynchConnection", newexcept);
+ dumpStack("Exception in createSynchAsynchConnection", newexcept);
throw newexcept;
}
// Ask instantiator to actually create instance
- return instantiator.makeInstance(desc, handler, clazzes, args);
+ return instantiator.createInstance(desc, handler, clazzes, args);
}
- public static ISynchAsynchConnection makeSynchAsynchConnection(
+ public static ISynchAsynchConnection createSynchAsynchConnection(
ISynchAsynchConnectionEventHandler handler, String descriptionName)
throws ConnectionInstantiationException {
if (handler == null)
@@ -144,10 +144,10 @@ public class ConnectionFactory {
if (desc == null)
throw new ConnectionInstantiationException(
"Connection type named '" + descriptionName + "' not found");
- return makeSynchAsynchConnection(handler, desc, null, null);
+ return createSynchAsynchConnection(handler, desc, null, null);
}
- public static ISynchAsynchConnection makeSynchAsynchConnection(
+ public static ISynchAsynchConnection createSynchAsynchConnection(
ISynchAsynchConnectionEventHandler handler, String descriptionName,
Object[] args) throws ConnectionInstantiationException {
if (handler == null)
@@ -157,10 +157,10 @@ public class ConnectionFactory {
if (desc == null)
throw new ConnectionInstantiationException(
"Connection type named '" + descriptionName + "' not found");
- return makeSynchAsynchConnection(handler, desc, args);
+ return createSynchAsynchConnection(handler, desc, args);
}
- public static ISynchAsynchConnection makeSynchAsynchConnection(
+ public static ISynchAsynchConnection createSynchAsynchConnection(
ISynchAsynchConnectionEventHandler handler, String descriptionName,
String[] argTypes, Object[] args)
throws ConnectionInstantiationException {
@@ -171,7 +171,7 @@ public class ConnectionFactory {
if (desc == null)
throw new ConnectionInstantiationException(
"Connection type named '" + descriptionName + "' not found");
- return makeSynchAsynchConnection(handler, desc, argTypes, args);
+ return createSynchAsynchConnection(handler, desc, argTypes, args);
}
public final static ConnectionDescription removeDescription(
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/provider/ISynchAsynchConnectionInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/provider/ISynchAsynchConnectionInstantiator.java
index 4e8860578..31de42871 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/provider/ISynchAsynchConnectionInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/provider/ISynchAsynchConnectionInstantiator.java
@@ -14,7 +14,7 @@ import org.eclipse.ecf.core.comm.ISynchAsynchConnection;
import org.eclipse.ecf.core.comm.ISynchAsynchConnectionEventHandler;
public interface ISynchAsynchConnectionInstantiator {
- public ISynchAsynchConnection makeInstance(
+ public ISynchAsynchConnection createInstance(
ConnectionDescription description,
ISynchAsynchConnectionEventHandler handler, Class[] clazzes,
Object[] args) throws ConnectionInstantiationException;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
index e747d742e..1546a85ea 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
@@ -28,7 +28,7 @@ public class GUID extends StringID {
super(GUID.class.getName(), "GUID Namespace");
}
- public ID makeInstance(Class[] argTypes, Object[] args)
+ public ID createInstance(Class[] argTypes, Object[] args)
throws IDInstantiationException {
if (args.length == 1)
return new GUID(this, ((Integer) args[0]).intValue());
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDFactory.java
index 77bc25a2d..6302e08f6 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDFactory.java
@@ -154,21 +154,21 @@ public class IDFactory implements IIDFactory {
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeGUID()
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createGUID()
*/
- public ID makeGUID() throws IDInstantiationException {
- return makeGUID(GUID.DEFAULT_BYTE_LENGTH);
+ public ID createGUID() throws IDInstantiationException {
+ return createGUID(GUID.DEFAULT_BYTE_LENGTH);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeGUID(int)
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createGUID(int)
*/
- public ID makeGUID(int length) throws IDInstantiationException {
- debug("makeGUID(" + length + ")");
+ public ID createGUID(int length) throws IDInstantiationException {
+ debug("createGUID(" + length + ")");
Namespace n = new GUID.GUIDNamespace();
- return makeID(n, new String[] { Namespace.class.getName(),
+ return createID(n, new String[] { Namespace.class.getName(),
Integer.class.getName() }, new Object[] { n,
new Integer(length) });
}
@@ -204,12 +204,12 @@ public class IDFactory implements IIDFactory {
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(org.eclipse.ecf.core.identity.Namespace,
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createID(org.eclipse.ecf.core.identity.Namespace,
* java.lang.String[], java.lang.Object[])
*/
- public ID makeID(Namespace n, String[] argTypes, Object[] args)
+ public ID createID(Namespace n, String[] argTypes, Object[] args)
throws IDInstantiationException {
- debug("makeID(" + n + "," + Trace.convertStringAToString(argTypes)
+ debug("createID(" + n + "," + Trace.convertStringAToString(argTypes)
+ "," + Trace.convertObjectAToString(args) + ")");
// Verify namespace is non-null
if (n == null)
@@ -229,109 +229,109 @@ public class IDFactory implements IIDFactory {
logAndThrow("Exception in getClassesForTypes", e);
}
// Ask instantiator to actually create instance
- return ns.makeInstance(clazzes, args);
+ return ns.createInstance(clazzes, args);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,
* java.lang.String[], java.lang.Object[])
*/
- public ID makeID(String namespacename, String[] argTypes, Object[] args)
+ public ID createID(String namespacename, String[] argTypes, Object[] args)
throws IDInstantiationException {
Namespace n = getNamespaceByName(namespacename);
if (n == null)
throw new IDInstantiationException("Namespace named "
+ namespacename + " not found");
- return makeID(n, argTypes, args);
+ return createID(n, argTypes, args);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(org.eclipse.ecf.core.identity.Namespace,
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createID(org.eclipse.ecf.core.identity.Namespace,
* java.lang.Object[])
*/
- public ID makeID(Namespace n, Object[] args)
+ public ID createID(Namespace n, Object[] args)
throws IDInstantiationException {
- return makeID(n, null, args);
+ return createID(n, null, args);
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,
* java.lang.Object[])
*/
- public ID makeID(String namespacename, Object[] args)
+ public ID createID(String namespacename, Object[] args)
throws IDInstantiationException {
Namespace n = getNamespaceByName(namespacename);
if (n == null)
throw new IDInstantiationException("Namespace " + namespacename
+ " not found");
- return makeID(n, args);
+ return createID(n, args);
}
- public ID makeID(Namespace namespace, URI uri) throws IDInstantiationException {
- return makeID(namespace,new Object[] { uri });
+ public ID createID(Namespace namespace, URI uri) throws IDInstantiationException {
+ return createID(namespace,new Object[] { uri });
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,
* java.net.URI)
*/
- public ID makeID(String namespacename, URI uri)
+ public ID createID(String namespacename, URI uri)
throws IDInstantiationException {
if (uri == null)
throw new IDInstantiationException("Null uri not allowed");
Namespace n = getNamespaceByName(namespacename);
if (n == null)
throw new IDInstantiationException("Namespace " + n + " not found");
- return makeID(n, new Object[] { uri });
+ return createID(n, new Object[] { uri });
}
- public ID makeID(Namespace namespace, String uri) throws IDInstantiationException {
- return makeID(namespace,new Object[] { uri });
+ public ID createID(Namespace namespace, String uri) throws IDInstantiationException {
+ return createID(namespace,new Object[] { uri });
}
- public ID makeID(String namespace, String uri) throws IDInstantiationException {
- return makeID(namespace,new Object[] { uri });
+ public ID createID(String namespace, String uri) throws IDInstantiationException {
+ return createID(namespace,new Object[] { uri });
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeStringID(java.lang.String)
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createStringID(java.lang.String)
*/
- public ID makeStringID(String idstring) throws IDInstantiationException {
+ public ID createStringID(String idstring) throws IDInstantiationException {
if (idstring == null)
throw new IDInstantiationException("String cannot be null");
Namespace n = new StringID.StringIDNamespace();
- return makeID(n, new String[] { String.class.getName() },
+ return createID(n, new String[] { String.class.getName() },
new Object[] { idstring });
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeLongID(java.lang.Long)
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(java.lang.Long)
*/
- public ID makeLongID(Long l) throws IDInstantiationException {
+ public ID createLongID(Long l) throws IDInstantiationException {
if (l == null)
throw new IDInstantiationException("Long cannot be null");
Namespace n = new LongID.LongNamespace();
- return makeID(n, new String[] { String.class.getName() },
+ return createID(n, new String[] { String.class.getName() },
new Object[] { l });
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.identity.IIDFactory#makeLongID(long)
+ * @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(long)
*/
- public ID makeLongID(long l) throws IDInstantiationException {
+ public ID createLongID(long l) throws IDInstantiationException {
Namespace n = new LongID.LongNamespace();
- return makeID(n, new String[] { String.class.getName() },
+ return createID(n, new String[] { String.class.getName() },
new Object[] { new Long(l) });
}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IIDFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IIDFactory.java
index e3e0a1a0c..41e097fc6 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IIDFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IIDFactory.java
@@ -73,7 +73,7 @@ public interface IIDFactory {
* @return new ID instance
* @throws IDInstantiationException if ID cannot be constructed
*/
- public ID makeGUID() throws IDInstantiationException;
+ public ID createGUID() throws IDInstantiationException;
/**
* Make a GUID using SHA-1 hash algorithm and a default of 16bits of data length. The
@@ -83,7 +83,7 @@ public interface IIDFactory {
* @return new ID instance
* @throws IDInstantiationException if ID cannot be constructed
*/
- public ID makeGUID(int length) throws IDInstantiationException;
+ public ID createGUID(int length) throws IDInstantiationException;
/**
* Make a new identity. Given a Namespace instance, constructor argument
@@ -101,7 +101,7 @@ public interface IIDFactory {
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeID(Namespace n, String[] argTypes, Object[] args)
+ public ID createID(Namespace n, String[] argTypes, Object[] args)
throws IDInstantiationException;
/**
@@ -120,7 +120,7 @@ public interface IIDFactory {
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeID(String namespacename, String[] argTypes, Object[] args)
+ public ID createID(String namespacename, String[] argTypes, Object[] args)
throws IDInstantiationException;
/**
@@ -137,7 +137,7 @@ public interface IIDFactory {
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeID(Namespace n, Object[] args)
+ public ID createID(Namespace n, Object[] args)
throws IDInstantiationException;
/**
@@ -154,69 +154,69 @@ public interface IIDFactory {
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeID(String namespacename, Object[] args)
+ public ID createID(String namespacename, Object[] args)
throws IDInstantiationException;
/**
* Make a new identity instance from a namespace and String.
*
* @param namespace
- * the namespace to use to make the ID
+ * the namespace to use to create the ID
* @param uri
- * the String uri to use to make the ID
+ * the String uri to use to create the ID
* @exception IDInstantiationException
* thrown if class for instantiator or ID instance can't be
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeID(Namespace namespace, String uri)
+ public ID createID(Namespace namespace, String uri)
throws IDInstantiationException;
/**
* Make a new identity instance from a namespacename and URI. The namespacename
* is first used to lookup the namespace with getNamespaceByName(), and then
- * the result is passed into makeID(Namespace,String).
+ * the result is passed into createID(Namespace,String).
*
* @param namespacename
- * the namespacename to use to make the ID
+ * the namespacename to use to create the ID
* @param uri
- * the String uri to use to make the ID
+ * the String uri to use to create the ID
* @exception IDInstantiationException
* thrown if class for instantiator or ID instance can't be
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeID(String namespacename, String uri)
+ public ID createID(String namespacename, String uri)
throws IDInstantiationException;
/**
* Make a new identity instance from a namespace and URI.
*
* @param namespace
- * the namespace to use to make the ID
+ * the namespace to use to create the ID
* @param uri
- * the URI to use to make ID.
+ * the URI to use to create ID.
* @exception IDInstantiationException
* thrown if class for instantiator or ID instance can't be
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeID(Namespace namespace, URI uri)
+ public ID createID(Namespace namespace, URI uri)
throws IDInstantiationException;
/**
* Make a new identity instance from a namespace name and URI.
*
* @param namespacename
- * the name of the namespace to use to make the ID
+ * the name of the namespace to use to create the ID
* @param uri
- * the URI to use to make ID.
+ * the URI to use to create ID.
* @exception IDInstantiationException
* thrown if class for instantiator or ID instance can't be
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeID(String namespacename, URI uri)
+ public ID createID(String namespacename, URI uri)
throws IDInstantiationException;
/**
@@ -231,7 +231,7 @@ public interface IIDFactory {
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeStringID(String idstring) throws IDInstantiationException;
+ public ID createStringID(String idstring) throws IDInstantiationException;
/**
* Make a an ID from a Long
@@ -245,7 +245,7 @@ public interface IIDFactory {
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeLongID(Long l) throws IDInstantiationException;
+ public ID createLongID(Long l) throws IDInstantiationException;
/**
* Make a an ID from a long
@@ -259,7 +259,7 @@ public interface IIDFactory {
* loaded, if something goes wrong during instance
* construction
*/
- public ID makeLongID(long l) throws IDInstantiationException;
+ public ID createLongID(long l) throws IDInstantiationException;
/**
* Remove the given Namespace from our table of available Namespaces
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java
index 2a9e3843f..cb91d16c1 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java
@@ -25,7 +25,7 @@ public class LongID extends BaseID {
super(LongID.class.getName(), "Long Namespace");
}
- public ID makeInstance(Class[] argTypes, Object[] args)
+ public ID createInstance(Class[] argTypes, Object[] args)
throws IDInstantiationException {
return new LongID(this, (Long) args[0]);
}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/Namespace.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/Namespace.java
index e8f79fc81..2160964e4 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/Namespace.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/Namespace.java
@@ -121,7 +121,7 @@ public abstract class Namespace implements Serializable {
* the ID interface directly
* @throws IDInstantiationException if construction fails
*/
- public abstract ID makeInstance(Class[] argTypes, Object[] args)
+ public abstract ID createInstance(Class[] argTypes, Object[] args)
throws IDInstantiationException;
/**
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java
index 698c7e15f..e3fc29455 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java
@@ -29,7 +29,7 @@ public class StringID extends BaseID {
super(StringID.class.getName(), "String Namespace");
}
- public ID makeInstance(Class[] argTypes, Object[] args)
+ public ID createInstance(Class[] argTypes, Object[] args)
throws IDInstantiationException {
return new StringID(this, (String) args[0]);
}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java
index f770d6c31..864d268cd 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java
@@ -13,7 +13,7 @@ import org.eclipse.ecf.core.ContainerInstantiationException;
import org.eclipse.ecf.core.IContainer;
public interface IContainerInstantiator {
- public IContainer makeInstance(ContainerDescription description,
+ public IContainer createInstance(ContainerDescription description,
Class[] argTypes, Object[] args)
throws ContainerInstantiationException;
} \ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java
index d46dc540f..4afe0e2cc 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java
@@ -14,7 +14,7 @@ public class ConnectContextFactory {
private ConnectContextFactory() {
super();
}
- public static IConnectContext makeUsernamePasswordConnectContext(final String username, final Object password) {
+ public static IConnectContext createUsernamePasswordConnectContext(final String username, final Object password) {
return new IConnectContext() {
public CallbackHandler getCallbackHandler() {
return new CallbackHandler() {
@@ -37,7 +37,7 @@ public class ConnectContextFactory {
};
}
- public static IConnectContext makePasswordConnectContext(final String password) {
+ public static IConnectContext createPasswordConnectContext(final String password) {
return new IConnectContext() {
public CallbackHandler getCallbackHandler() {
return new CallbackHandler() {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java
index d56831e76..26a5f9b5e 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java
@@ -27,7 +27,7 @@ public class SharedObjectMsg implements Serializable {
public static final Object[] nullArgs = new Object[0];
public static final Class[] nullTypes = new Class[0];
// Static factory methods for creating SharedObjectMsg instances
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object[] param) {
if (methodName == null || param == null) {
throw new NullPointerException(
@@ -35,42 +35,42 @@ public class SharedObjectMsg implements Serializable {
}
return new SharedObjectMsg(className, methodName, param);
}
- public static SharedObjectMsg makeMsg(String methodName, Object[] param) {
- return makeMsg((String) null, methodName, param);
+ public static SharedObjectMsg createMsg(String methodName, Object[] param) {
+ return createMsg((String) null, methodName, param);
}
- public static SharedObjectMsg makeMsg(String methodName) {
- return makeMsg((String) null, methodName, nullArgs);
+ public static SharedObjectMsg createMsg(String methodName) {
+ return createMsg((String) null, methodName, nullArgs);
}
- public static SharedObjectMsg makeMsg(String className, String methodName) {
- return makeMsg(className, methodName, nullArgs);
+ public static SharedObjectMsg createMsg(String className, String methodName) {
+ return createMsg(className, methodName, nullArgs);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg) {
Object args[] = { arg };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
- public static SharedObjectMsg makeMsg(String methodName, Object arg) {
- return makeMsg((String) null, methodName, arg);
+ public static SharedObjectMsg createMsg(String methodName, Object arg) {
+ return createMsg((String) null, methodName, arg);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg1, Object arg2) {
Object args[] = { arg1, arg2 };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg1, Object arg2, Object arg3) {
Object args[] = { arg1, arg2, arg3 };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg1, Object arg2, Object arg3, Object arg4) {
Object args[] = { arg1, arg2, arg3, arg4 };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
- public static SharedObjectMsg makeMsg(String className, String methodName,
+ public static SharedObjectMsg createMsg(String className, String methodName,
Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
Object args[] = { arg1, arg2, arg3, arg4, arg5 };
- return makeMsg(className, methodName, args);
+ return createMsg(className, methodName, args);
}
/**
* Utility for getting a Class instance from a String class name. Calls
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerInstantiator.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerInstantiator.java
index 201e30537..669a843e8 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerInstantiator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerInstantiator.java
@@ -15,7 +15,7 @@ public class ContainerInstantiator implements
super();
}
- public IContainer makeInstance(
+ public IContainer createInstance(
ContainerDescription description, Class[] argTypes,
Object[] args) throws ContainerInstantiationException {
try {
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
index cc153c30b..51dfcc6e7 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
@@ -82,7 +82,7 @@ public class JMDNSDiscoveryContainer implements IContainer,
trace("<init>");
intf = (addr == null) ? InetAddress.getLocalHost() : addr;
this.config = new ContainerConfig(IDFactory
- .getDefault().makeStringID(JMDNSDiscoveryContainer.class.getName()));
+ .getDefault().createStringID(JMDNSDiscoveryContainer.class.getName()));
}
public void addServiceListener(ServiceID type, IServiceListener listener) {
@@ -116,8 +116,8 @@ public class JMDNSDiscoveryContainer implements IContainer,
}
protected void fireServiceAdded(ServiceEvent arg0) {
- IServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);
- ServiceID svcID = makeServiceID(arg0.getType(), null);
+ IServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);
+ ServiceID svcID = createServiceID(arg0.getType(), null);
synchronized (serviceListeners) {
Vector v = (Vector) serviceListeners.get(svcID);
if (v != null) {
@@ -131,8 +131,8 @@ public class JMDNSDiscoveryContainer implements IContainer,
}
protected void fireServiceRemoved(ServiceEvent arg0) {
- IServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);
- ServiceID svcID = makeServiceID(arg0.getType(), null);
+ IServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);
+ ServiceID svcID = createServiceID(arg0.getType(), null);
synchronized (serviceListeners) {
Vector v = (Vector) serviceListeners.get(svcID);
if (v != null) {
@@ -146,8 +146,8 @@ public class JMDNSDiscoveryContainer implements IContainer,
}
protected void fireServiceResolved(ServiceEvent arg0) {
- IServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);
- ServiceID svcID = makeServiceID(arg0.getType(), null);
+ IServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);
+ ServiceID svcID = createServiceID(arg0.getType(), null);
synchronized (serviceListeners) {
Vector v = (Vector) serviceListeners.get(svcID);
if (v != null) {
@@ -166,7 +166,7 @@ public class JMDNSDiscoveryContainer implements IContainer,
IServiceTypeListener l = (IServiceTypeListener) i.next();
l
.serviceTypeAdded(new ServiceContainerEvent(
- makeIServiceInfoFromServiceEvent(arg0), config
+ createIServiceInfoFromServiceEvent(arg0), config
.getID()));
}
}
@@ -188,7 +188,7 @@ public class JMDNSDiscoveryContainer implements IContainer,
trace("getServiceInfo(" + service + "," + timeout + ")");
synchronized (lock) {
if (jmdns != null) {
- return makeIServiceInfoFromServiceInfo(jmdns.getServiceInfo(
+ return createIServiceInfoFromServiceInfo(jmdns.getServiceInfo(
service.getServiceType(), service.getServiceName(),
timeout));
} else
@@ -204,7 +204,7 @@ public class JMDNSDiscoveryContainer implements IContainer,
if (svcs != null) {
svs = new IServiceInfo[svcs.length];
for (int i = 0; i < svcs.length; i++) {
- svs[i] = makeIServiceInfoFromServiceInfo(svcs[i]);
+ svs[i] = createIServiceInfoFromServiceInfo(svcs[i]);
}
}
}
@@ -257,22 +257,22 @@ public class JMDNSDiscoveryContainer implements IContainer,
.getID(), getConnectedID()));
}
- protected IServiceInfo makeIServiceInfoFromServiceEvent(ServiceEvent event) {
- ServiceID sID = makeServiceID(event.getType(), event.getName());
+ protected IServiceInfo createIServiceInfoFromServiceEvent(ServiceEvent event) {
+ ServiceID sID = createServiceID(event.getType(), event.getName());
ServiceInfo sinfo = event.getInfo();
if (sinfo != null) {
- return makeIServiceInfoFromServiceInfo(sinfo);
+ return createIServiceInfoFromServiceInfo(sinfo);
}
IServiceInfo newInfo = new JMDNSServiceInfo(null, sID, -1, -1, -1,
new ServiceProperties());
return newInfo;
}
- protected IServiceInfo makeIServiceInfoFromServiceInfo(
+ protected IServiceInfo createIServiceInfoFromServiceInfo(
final ServiceInfo serviceInfo) {
if (serviceInfo == null)
return null;
- ServiceID sID = makeServiceID(serviceInfo.getType(), serviceInfo
+ ServiceID sID = createServiceID(serviceInfo.getType(), serviceInfo
.getName());
InetAddress addr = serviceInfo.getAddress();
int port = serviceInfo.getPort();
@@ -297,20 +297,20 @@ public class JMDNSDiscoveryContainer implements IContainer,
return newInfo;
}
- protected ServiceID makeServiceID(String type, String name) {
+ protected ServiceID createServiceID(String type, String name) {
ServiceID id = null;
try {
- id = (ServiceID) IDFactory.getDefault().makeID(JMDNS_NAMESPACE_ID, new Object[] {
+ id = (ServiceID) IDFactory.getDefault().createID(JMDNS_NAMESPACE_ID, new Object[] {
type, name });
} catch (IDInstantiationException e) {
// Should never happen
if (trace != null) {
- trace.dumpStack(e, "JDNSDiscoveryContainer.makeServiceID");
+ trace.dumpStack(e, "JDNSDiscoveryContainer.createServiceID");
}
}
return id;
}
- protected ServiceInfo makeServiceInfoFromIServiceInfo(
+ protected ServiceInfo createServiceInfoFromIServiceInfo(
IServiceInfo serviceInfo) {
if (serviceInfo == null)
return null;
@@ -366,7 +366,7 @@ public class JMDNSDiscoveryContainer implements IContainer,
if (trace != null) {
trace.msg("registering service with jmdns: " + serviceInfo);
}
- jmdns.registerService(makeServiceInfoFromIServiceInfo(serviceInfo));
+ jmdns.registerService(createServiceInfoFromIServiceInfo(serviceInfo));
}
}
@@ -480,7 +480,7 @@ public class JMDNSDiscoveryContainer implements IContainer,
+ serviceInfo);
}
jmdns
- .unregisterService(makeServiceInfoFromIServiceInfo(serviceInfo));
+ .unregisterService(createServiceInfoFromIServiceInfo(serviceInfo));
}
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSNamespace.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSNamespace.java
index 1071f1318..ec76727a5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSNamespace.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSNamespace.java
@@ -8,7 +8,7 @@ public class JMDNSNamespace extends Namespace {
private static final long serialVersionUID = 1L;
private static final String JMDNS_SCHEME = "jmdns";
- public ID makeInstance(Class[] argTypes, Object[] args)
+ public ID createInstance(Class[] argTypes, Object[] args)
throws IDInstantiationException {
String type = (String) args[0];
String name = null;
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java
index 6367b83ba..e7bcd95a1 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java
@@ -28,13 +28,13 @@ public class ContainerInstantiator implements IContainerInstantiator {
if (arg instanceof String) {
String val = (String) arg;
if (val == null || val.equals("")) {
- return IDFactory.getDefault().makeGUID();
+ return IDFactory.getDefault().createGUID();
} else
- return IDFactory.getDefault().makeStringID((String) arg);
+ return IDFactory.getDefault().createStringID((String) arg);
} else if (arg instanceof Integer) {
- return IDFactory.getDefault().makeGUID(((Integer) arg).intValue());
+ return IDFactory.getDefault().createGUID(((Integer) arg).intValue());
} else
- return IDFactory.getDefault().makeGUID();
+ return IDFactory.getDefault().createGUID();
}
protected Integer getIntegerFromArg(Class type, Object arg)
@@ -50,10 +50,10 @@ public class ContainerInstantiator implements IContainerInstantiator {
/*
* (non-Javadoc)
*
- * @see org.eclipse.ecf.core.provider.IContainerInstantiator#makeInstance(.ContainerDescription,
+ * @see org.eclipse.ecf.core.provider.IContainerInstantiator#createInstance(.ContainerDescription,
* java.lang.Class[], java.lang.Object[])
*/
- public IContainer makeInstance(
+ public IContainer createInstance(
ContainerDescription description, Class[] argTypes,
Object[] args)
throws ContainerInstantiationException {
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/SecureContainerInstantiator.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/SecureContainerInstantiator.java
index 767848a64..94c3067f8 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/SecureContainerInstantiator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/SecureContainerInstantiator.java
@@ -8,7 +8,7 @@ public class SecureContainerInstantiator extends ContainerInstantiator {
public SecureContainerInstantiator() {
super();
}
- public IContainer makeInstance(
+ public IContainer createInstance(
ContainerDescription description, Class[] argTypes,
Object[] args)
throws ContainerInstantiationException {
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
index c9f7200b0..f5dd1d07f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
@@ -115,13 +115,13 @@ public class XMPPClientSOContainer extends ClientSOContainer {
}
public XMPPClientSOContainer(int ka) throws Exception {
- super(new SOContainerConfig(IDFactory.getDefault().makeGUID()));
+ super(new SOContainerConfig(IDFactory.getDefault().createGUID()));
keepAlive = ka;
initializeSharedObject();
}
public XMPPClientSOContainer(String userhost, int ka) throws Exception {
- super(new SOContainerConfig(IDFactory.getDefault().makeStringID(userhost)));
+ super(new SOContainerConfig(IDFactory.getDefault().createStringID(userhost)));
keepAlive = ka;
initializeSharedObject();
}
@@ -190,7 +190,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
super.dispose();
}
- protected ISynchAsynchConnection makeConnection(ID remoteSpace,
+ protected ISynchAsynchConnection createConnection(ID remoteSpace,
Object data) throws ConnectionInstantiationException {
ISynchAsynchConnection conn = null;
boolean google = false;
@@ -210,7 +210,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
return conn;
}
- protected Object makeConnectData(ID target, Callback [] cbs, Object data) {
+ protected Object createConnectData(ID target, Callback [] cbs, Object data) {
// first one is password callback
if (cbs.length > 0) {
if (cbs[0] instanceof ObjectCallback) {
@@ -221,7 +221,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
return data;
}
- protected Callback[] makeAuthorizationCallbacks() {
+ protected Callback[] createAuthorizationCallbacks() {
Callback [] cbs = new Callback[1];
cbs[0] = new ObjectCallback();
return cbs;
@@ -351,7 +351,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
}
protected void initializeSharedObject() throws Exception {
- sharedObjectID = IDFactory.getDefault().makeStringID(XMPP_SHARED_OBJECT_ID);
+ sharedObjectID = IDFactory.getDefault().createStringID(XMPP_SHARED_OBJECT_ID);
sharedObject = new XMPPPresenceSharedObject();
}
@@ -399,7 +399,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
dispose();
}
- protected SOContext makeSharedObjectContext(SOConfig soconfig,
+ protected SOContext createSharedObjectContext(SOConfig soconfig,
IQueueEnqueue queue) {
return new XMPPContainerContext(soconfig.getSharedObjectID(), soconfig
.getHomeContainerID(), this, soconfig.getProperties(), queue);
@@ -437,8 +437,8 @@ public class XMPPClientSOContainer extends ClientSOContainer {
}
}
- protected Presence makePresenceFromIPresence(IPresence presence) {
- return sharedObject.makePresence(presence);
+ protected Presence createPresenceFromIPresence(IPresence presence) {
+ return sharedObject.createPresence(presence);
}
protected void sendPresenceUpdate(ID target, Presence presence) throws IOException {
if (messageSender != null) {
@@ -490,7 +490,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
return new IPresenceSender() {
public void sendPresenceUpdate(ID fromID, ID toID, IPresence presence) {
try {
- Presence newPresence = makePresenceFromIPresence(presence);
+ Presence newPresence = createPresenceFromIPresence(presence);
XMPPClientSOContainer.this.sendPresenceUpdate(toID,newPresence);
} catch (IOException e) {
dumpStack("Exception in sendPresenceUpdate to "+toID+" with presence "+presence,e);
@@ -551,7 +551,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
public IRoomInfo getChatRoomInfo(ID roomID) {
return XMPPClientSOContainer.this.getChatRoomInfo(roomID);
}
- public IChatRoomContainer makeChatRoomContainer() throws ContainerInstantiationException {
+ public IChatRoomContainer createChatRoomContainer() throws ContainerInstantiationException {
IChatRoomContainer chatContainer = null;
try {
chatContainer = new XMPPGroupChatSOContainer(XMPPClientSOContainer.this.getConnection(),sharedObject.getConnection(),getConnectNamespace());
@@ -589,12 +589,12 @@ public class XMPPClientSOContainer extends ClientSOContainer {
protected Collection getHostedRoomForService(String svc) throws XMPPException {
return MultiUserChat.getHostedRooms(sharedObject.getConnection(),svc);
}
- protected ID makeIDFromHostedRoom(HostedRoom room) {
+ protected ID createIDFromHostedRoom(HostedRoom room) {
try {
return new XMPPRoomID(getConnectNamespace(),sharedObject.getConnection(),room.getJid(),room.getName());
} catch (URISyntaxException e) {
// debug output
- dumpStack("Exception in makeIDFromHostedRoom("+room+")",e);
+ dumpStack("Exception in createIDFromHostedRoom("+room+")",e);
return null;
}
}
@@ -610,7 +610,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
Collection rooms = getHostedRoomForService(svc);
for(Iterator roomsi = rooms.iterator(); roomsi.hasNext(); ) {
HostedRoom room = (HostedRoom) roomsi.next();
- ID roomID = makeIDFromHostedRoom(room);
+ ID roomID = createIDFromHostedRoom(room);
if (roomID != null) result.add(roomID);
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
index 30be855ea..d81f68248 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
@@ -10,9 +10,11 @@ package org.eclipse.ecf.provider.xmpp.container;
import java.io.IOException;
import java.util.HashMap;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
+
import org.eclipse.ecf.core.ContainerConnectException;
import org.eclipse.ecf.core.ISharedObjectContainerConfig;
import org.eclipse.ecf.core.SharedObjectAddException;
@@ -82,7 +84,7 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer implements
public XMPPGroupChatSOContainer(ISynchAsynchConnection conn,
XMPPConnection xmppconn, Namespace usernamespace)
throws IDInstantiationException {
- this(new SOContainerConfig(IDFactory.getDefault().makeGUID()), conn,
+ this(new SOContainerConfig(IDFactory.getDefault().createGUID()), conn,
xmppconn, usernamespace);
}
public void dispose() {
@@ -177,7 +179,7 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer implements
}
}
protected void initializeSharedObject() throws IDInstantiationException {
- sharedObjectID = IDFactory.getDefault().makeStringID(
+ sharedObjectID = IDFactory.getDefault().createStringID(
XMPP_GROUP_CHAT_SHARED_OBJECT_ID);
sharedObject = new XMPPGroupChatSharedObject(usernamespace,
xmppconnection);
@@ -261,10 +263,6 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer implements
public void left(String arg0) {
handleChatMembershipEvent(arg0, false);
}
- public void kicked(String arg0) {
- // TODO Auto-generated method stub
- System.out.println("kicked(" + arg0 + ")");
- }
public void voiceGranted(String arg0) {
// TODO Auto-generated method stub
System.out
@@ -275,10 +273,6 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer implements
System.out
.println("voiceRevoked(" + arg0 + ")");
}
- public void banned(String arg0) {
- // TODO Auto-generated method stub
- System.out.println("banned(" + arg0 + ")");
- }
public void membershipGranted(String arg0) {
// TODO Auto-generated method stub
System.out.println("membershipGranted(" + arg0
@@ -391,12 +385,12 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer implements
fireContainerEvent(new ContainerDisconnectedEvent(this
.getID(), groupID));
}
- protected SOContext makeSharedObjectContext(SOConfig soconfig,
+ protected SOContext createSharedObjectContext(SOConfig soconfig,
IQueueEnqueue queue) {
return new XMPPContainerContext(soconfig.getSharedObjectID(), soconfig
.getHomeContainerID(), this, soconfig.getProperties(), queue);
}
- protected ID makeChatRoomID(String groupName)
+ protected ID createChatRoomID(String groupName)
throws IDInstantiationException {
String username = xmppconnection.getUser();
int atIndex = username.indexOf('@');
@@ -404,11 +398,11 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer implements
username = username.substring(0, atIndex);
String host = xmppconnection.getHost();
Namespace ns = getConnectNamespace();
- ID targetID = IDFactory.getDefault().makeID(ns,
+ ID targetID = IDFactory.getDefault().createID(ns,
new Object[] { username, host, null, groupName, username });
return targetID;
}
- protected ISynchAsynchConnection makeConnection(ID remoteSpace, Object data)
+ protected ISynchAsynchConnection createConnection(ID remoteSpace, Object data)
throws ConnectionInstantiationException {
return null;
}
@@ -436,7 +430,7 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer implements
public void connect(String groupName) throws ContainerConnectException {
ID targetID = null;
try {
- targetID = makeChatRoomID(groupName);
+ targetID = createChatRoomID(groupName);
} catch (IDInstantiationException e) {
throw new ContainerConnectException(
"Exception creating chat room id", e);
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java
index 37b0505b8..672502b4c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java
@@ -91,13 +91,13 @@ public class XMPPGroupChatSharedObject implements ISharedObject {
this.config = initData;
}
- protected ID makeUserIDFromName(String name) {
+ protected ID createUserIDFromName(String name) {
ID result = null;
try {
result = new XMPPID(usernamespace,name);
return result;
} catch (Exception e) {
- dumpStack("Exception in makeIDFromName", e);
+ dumpStack("Exception in createIDFromName", e);
return null;
}
}
@@ -125,7 +125,7 @@ public class XMPPGroupChatSharedObject implements ISharedObject {
}
return from;
}
- protected IMessageListener.Type makeMessageType(Message.Type type) {
+ protected IMessageListener.Type createMessageType(Message.Type type) {
if (type == null)
return IMessageListener.Type.NORMAL;
if (type == Message.Type.CHAT) {
@@ -158,11 +158,11 @@ public class XMPPGroupChatSharedObject implements ISharedObject {
return to;
}
- protected ID makeRoomIDFromName(String from) {
+ protected ID createRoomIDFromName(String from) {
try {
return new XMPPRoomID(usernamespace,connection,from);
} catch (URISyntaxException e) {
- dumpStack("Exception in makeRoomIDFromName", e);
+ dumpStack("Exception in createRoomIDFromName", e);
return null;
}
}
@@ -173,13 +173,13 @@ public class XMPPGroupChatSharedObject implements ISharedObject {
String to = msg.getTo();
String body = msg.getBody();
String subject = msg.getSubject();
- ID fromID = makeUserIDFromName(canonicalizeRoomFrom(from));
- ID toID = makeUserIDFromName(canonicalizeRoomTo(to));
+ ID fromID = createUserIDFromName(canonicalizeRoomFrom(from));
+ ID toID = createUserIDFromName(canonicalizeRoomTo(to));
msg = filterMessageType(msg);
- if (msg != null) fireMessage(fromID, toID, makeMessageType(msg.getType()), subject, body);
+ if (msg != null) fireMessage(fromID, toID, createMessageType(msg.getType()), subject, body);
}
- protected IPresence.Type makeIPresenceType(Presence xmppPresence) {
+ protected IPresence.Type createIPresenceType(Presence xmppPresence) {
if (xmppPresence == null)
return IPresence.Type.AVAILABLE;
Type type = xmppPresence.getType();
@@ -201,7 +201,7 @@ public class XMPPGroupChatSharedObject implements ISharedObject {
return IPresence.Type.AVAILABLE;
}
- protected IPresence.Mode makeIPresenceMode(Presence xmppPresence) {
+ protected IPresence.Mode createIPresenceMode(Presence xmppPresence) {
if (xmppPresence == null)
return IPresence.Mode.AVAILABLE;
Mode mode = xmppPresence.getMode();
@@ -220,26 +220,26 @@ public class XMPPGroupChatSharedObject implements ISharedObject {
}
return IPresence.Mode.AVAILABLE;
}
- protected IPresence makeIPresence(Presence xmppPresence) {
+ protected IPresence createIPresence(Presence xmppPresence) {
int priority = xmppPresence.getPriority();
String status = xmppPresence.getStatus();
IPresence newPresence = new org.eclipse.ecf.presence.impl.Presence(
- makeIPresenceType(xmppPresence), priority, status,
- makeIPresenceMode(xmppPresence));
+ createIPresenceType(xmppPresence), priority, status,
+ createIPresenceMode(xmppPresence));
return newPresence;
}
protected void handlePresenceEvent(PresenceEvent evt) {
Presence xmppPresence = evt.getPresence();
String from = canonicalizeRoomFrom(xmppPresence.getFrom());
- IPresence newPresence = makeIPresence(xmppPresence);
- ID fromID = makeUserIDFromName(from);
+ IPresence newPresence = createIPresence(xmppPresence);
+ ID fromID = createUserIDFromName(from);
fireParticipant(fromID, newPresence);
}
protected void handleChatMembershipEvent(ChatMembershipEvent evt) {
String from = canonicalizeRoomFrom(evt.getFrom());
- ID fromID = makeUserIDFromName(from);
+ ID fromID = createUserIDFromName(from);
fireChatParticipant(fromID,evt.isAdd());
}
protected void fireParticipant(ID fromID, IPresence presence) {
@@ -292,10 +292,10 @@ public class XMPPGroupChatSharedObject implements ISharedObject {
protected void handleInvitationEvent(InvitationReceivedEvent event) {
XMPPConnection conn = event.getConnection();
if (conn == connection) {
- ID roomID = makeRoomIDFromName(event.getRoom());
- ID fromID = makeUserIDFromName(event.getInviter());
+ ID roomID = createRoomIDFromName(event.getRoom());
+ ID fromID = createUserIDFromName(event.getInviter());
Message mess = event.getMessage();
- ID toID = makeUserIDFromName(mess.getTo());
+ ID toID = createUserIDFromName(mess.getTo());
String subject = mess.getSubject();
String body = event.getReason();
fireInvitationReceived(roomID,fromID,toID,subject,body);
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java
index 8f21d5d87..85aa57603 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java
@@ -274,7 +274,7 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
RosterPacket rosterPacket = (RosterPacket) iq;
if (rosterPacket.getType() == IQ.Type.SET || rosterPacket.getType() == IQ.Type.RESULT) {
for (Iterator i = rosterPacket.getRosterItems(); i.hasNext();) {
- IRosterEntry entry = makeRosterEntry((RosterPacket.Item) i
+ IRosterEntry entry = createRosterEntry((RosterPacket.Item) i
.next());
fireSetRosterEntry(entry);
}
@@ -303,17 +303,17 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
String to = msg.getTo();
String body = msg.getBody();
String subject = msg.getSubject();
- ID fromID = makeIDFromName(canonicalizePresenceFrom(from));
- ID toID = makeIDFromName(canonicalizePresenceFrom(to));
+ ID fromID = createIDFromName(canonicalizePresenceFrom(from));
+ ID toID = createIDFromName(canonicalizePresenceFrom(to));
msg = filterMessageType(msg);
- if (msg != null) fireMessage(fromID, toID, makeMessageType(msg.getType()), subject, body);
+ if (msg != null) fireMessage(fromID, toID, createMessageType(msg.getType()), subject, body);
}
protected void handlePresenceEvent(PresenceEvent evt) {
Presence xmppPresence = evt.getPresence();
String from = canonicalizePresenceFrom(xmppPresence.getFrom());
- IPresence newPresence = makeIPresence(xmppPresence);
- ID fromID = makeIDFromName(from);
+ IPresence newPresence = createIPresence(xmppPresence);
+ ID fromID = createIDFromName(from);
if (newPresence.getType().equals(IPresence.Type.SUBSCRIBE) ||
newPresence.getType().equals(IPresence.Type.UNSUBSCRIBE) ||
newPresence.getType().equals(IPresence.Type.SUBSCRIBED) ||
@@ -324,7 +324,7 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
protected void handleRoster(Roster roster) {
for (Iterator i = roster.getEntries(); i.hasNext();) {
- IRosterEntry entry = makeRosterEntry((RosterEntry) i.next());
+ IRosterEntry entry = createRosterEntry((RosterEntry) i.next());
fireRosterEntry(entry);
}
}
@@ -340,18 +340,18 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
this.namespace = getContext().getConnectNamespace();
}
- protected ID makeIDFromName(String name) {
+ protected ID createIDFromName(String name) {
ID result = null;
try {
- result = IDFactory.getDefault().makeID(namespace, new Object[] { name });
+ result = IDFactory.getDefault().createID(namespace, new Object[] { name });
return result;
} catch (Exception e) {
- dumpStack("Exception in makeIDFromName", e);
+ dumpStack("Exception in createIDFromName", e);
return null;
}
}
- protected IRosterEntry.InterestType makeInterestType(
+ protected IRosterEntry.InterestType createInterestType(
RosterPacket.ItemType itemType) {
if (itemType == RosterPacket.ItemType.BOTH) {
return IRosterEntry.InterestType.BOTH;
@@ -367,7 +367,7 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
return IRosterEntry.InterestType.BOTH;
}
- protected IMessageListener.Type makeMessageType(Message.Type type) {
+ protected IMessageListener.Type createMessageType(Message.Type type) {
if (type == null)
return IMessageListener.Type.NORMAL;
if (type == Message.Type.CHAT) {
@@ -384,25 +384,25 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
return IMessageListener.Type.NORMAL;
}
- protected IPresence makeIPresence(Presence xmppPresence) {
+ protected IPresence createIPresence(Presence xmppPresence) {
int priority = xmppPresence.getPriority();
String status = xmppPresence.getStatus();
IPresence newPresence = new org.eclipse.ecf.presence.impl.Presence(
- makeIPresenceType(xmppPresence), priority, status,
- makeIPresenceMode(xmppPresence));
+ createIPresenceType(xmppPresence), priority, status,
+ createIPresenceMode(xmppPresence));
return newPresence;
}
- protected Presence makePresence(IPresence ipresence) {
+ protected Presence createPresence(IPresence ipresence) {
int priority = ipresence.getPriority();
String status = ipresence.getStatus();
Presence newPresence = new Presence(
- makePresenceType(ipresence), status, priority,
- makePresenceMode(ipresence));
+ createPresenceType(ipresence), status, priority,
+ createPresenceMode(ipresence));
return newPresence;
}
- protected IPresence.Mode makeIPresenceMode(Presence xmppPresence) {
+ protected IPresence.Mode createIPresenceMode(Presence xmppPresence) {
if (xmppPresence == null)
return IPresence.Mode.AVAILABLE;
Mode mode = xmppPresence.getMode();
@@ -422,7 +422,7 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
return IPresence.Mode.AVAILABLE;
}
- protected Presence.Mode makePresenceMode(IPresence ipresence) {
+ protected Presence.Mode createPresenceMode(IPresence ipresence) {
if (ipresence == null)
return Presence.Mode.AVAILABLE;
IPresence.Mode mode = ipresence.getMode();
@@ -442,7 +442,7 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
return Presence.Mode.AVAILABLE;
}
- protected IPresence.Type makeIPresenceType(Presence xmppPresence) {
+ protected IPresence.Type createIPresenceType(Presence xmppPresence) {
if (xmppPresence == null)
return IPresence.Type.AVAILABLE;
Type type = xmppPresence.getType();
@@ -464,7 +464,7 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
return IPresence.Type.AVAILABLE;
}
- protected Presence.Type makePresenceType(IPresence ipresence) {
+ protected Presence.Type createPresenceType(IPresence ipresence) {
if (ipresence == null)
return Presence.Type.AVAILABLE;
IPresence.Type type = ipresence.getType();
@@ -486,55 +486,55 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
return Presence.Type.AVAILABLE;
}
- protected IRosterEntry makeRosterEntry(RosterEntry entry) {
+ protected IRosterEntry createRosterEntry(RosterEntry entry) {
try {
- ID userID = makeIDFromName(entry.getUser());
+ ID userID = createIDFromName(entry.getUser());
String name = entry.getName();
RosterPacket.ItemType itemType = entry.getType();
- IRosterEntry.InterestType iType = makeInterestType(itemType);
+ IRosterEntry.InterestType iType = createInterestType(itemType);
ID svcID = getContext().getConnectedID();
IRosterEntry newEntry = new org.eclipse.ecf.presence.impl.RosterEntry(svcID,
userID, name, iType);
Iterator grps = entry.getGroups();
for (; grps.hasNext();) {
RosterGroup grp = (RosterGroup) grps.next();
- IRosterGroup localGrp = makeRosterGroup(grp);
+ IRosterGroup localGrp = createRosterGroup(grp);
newEntry.add(localGrp);
}
return newEntry;
} catch (Exception e) {
- dumpStack("Exception in makeRosterEntry", e);
+ dumpStack("Exception in createRosterEntry", e);
}
return null;
}
- protected IRosterEntry makeRosterEntry(RosterPacket.Item entry) {
+ protected IRosterEntry createRosterEntry(RosterPacket.Item entry) {
try {
- ID userID = makeIDFromName(entry.getUser());
+ ID userID = createIDFromName(entry.getUser());
String name = entry.getName();
RosterPacket.ItemType itemType = entry.getItemType();
- IRosterEntry.InterestType iType = makeInterestType(itemType);
+ IRosterEntry.InterestType iType = createInterestType(itemType);
ID svcID = getContext().getConnectedID();
IRosterEntry newEntry = new org.eclipse.ecf.presence.impl.RosterEntry(svcID,
userID, name, iType);
Iterator grps = entry.getGroupNames();
for (; grps.hasNext();) {
String grp = (String) grps.next();
- IRosterGroup localGrp = makeRosterGroup(grp);
+ IRosterGroup localGrp = createRosterGroup(grp);
newEntry.add(localGrp);
}
return newEntry;
} catch (Exception e) {
- dumpStack("Exception in makeRosterEntry", e);
+ dumpStack("Exception in createRosterEntry", e);
}
return null;
}
- protected IRosterGroup makeRosterGroup(RosterGroup grp) {
+ protected IRosterGroup createRosterGroup(RosterGroup grp) {
return new org.eclipse.ecf.presence.impl.RosterGroup(grp.getName());
}
- protected IRosterGroup makeRosterGroup(String grp) {
+ protected IRosterGroup createRosterGroup(String grp) {
return new org.eclipse.ecf.presence.impl.RosterGroup(grp);
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPSClientSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPSClientSOContainer.java
index bdc94db74..4387a4cc0 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPSClientSOContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPSClientSOContainer.java
@@ -34,7 +34,7 @@ public class XMPPSClientSOContainer extends XMPPClientSOContainer {
public Namespace getConnectNamespace() {
return IDFactory.getDefault().getNamespaceByName(XmppPlugin.getDefault().getSecureNamespaceIdentifier());
}
- protected ISynchAsynchConnection makeConnection(ID remoteSpace,
+ protected ISynchAsynchConnection createConnection(ID remoteSpace,
Object data) throws ConnectionInstantiationException {
ISynchAsynchConnection conn = null;
boolean google = false;
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPNamespace.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPNamespace.java
index 6715b5f52..57318fb03 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPNamespace.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPNamespace.java
@@ -10,7 +10,7 @@ public class XMPPNamespace extends Namespace {
private static final String XMPP_PROTOCOL = "xmpp";
- public ID makeInstance(Class[] argTypes, Object[] args)
+ public ID createInstance(Class[] argTypes, Object[] args)
throws IDInstantiationException {
try {
return new XMPPID(this, (String) args[0]);
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPRoomNamespace.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPRoomNamespace.java
index b92e90af2..6a2e3b715 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPRoomNamespace.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPRoomNamespace.java
@@ -9,7 +9,7 @@ public class XMPPRoomNamespace extends Namespace {
private static final long serialVersionUID = 4348545761410397583L;
private static final String XMPP_ROOM_PROTOCOL = "xmpp.muc";
- public ID makeInstance(Class[] argTypes, Object[] args)
+ public ID createInstance(Class[] argTypes, Object[] args)
throws IDInstantiationException {
try {
if (args.length == 5) {
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPSNamespace.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPSNamespace.java
index 1b4b8f81a..8bed9334b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPSNamespace.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPSNamespace.java
@@ -9,7 +9,7 @@ public class XMPPSNamespace extends Namespace {
private static final long serialVersionUID = 390139788867091795L;
private static final String XMPP_PROTOCOL = "xmpps";
- public ID makeInstance(Class[] argTypes, Object[] args)
+ public ID createInstance(Class[] argTypes, Object[] args)
throws IDInstantiationException {
try {
return new XMPPID(this, (String) args[0]);
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ECFConnection.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ECFConnection.java
index 8f4abc779..f4720e04f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ECFConnection.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ECFConnection.java
@@ -198,7 +198,7 @@ public class ECFConnection implements ISynchAsynchConnection, IIMMessageSender {
if (!isConnected())
return null;
try {
- return IDFactory.getDefault().makeID(namespace.getName(), new Object[] { connection
+ return IDFactory.getDefault().createID(namespace.getName(), new Object[] { connection
.getConnectionID() });
} catch (Exception e) {
logException("Exception in getLocalID", e);
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
index c2a13ba26..db6763230 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd
@@ -2,18 +2,18 @@ echo off
setlocal
cd %~dp0
set RP=..\..\..\plugins
-set ECF=%RP%\org.eclipse.ecf_0.5.5\ecf.jar
-set UI=%RP%\org.eclipse.ecf.ui_0.5.5\ui.jar
-set SDO=%RP%\org.eclipse.ecf.sdo_0.5.5\ecf.sdo.jar
-set DS=%RP%\org.eclipse.ecf.datashare_0.5.5\datashare.jar
-set PROVIDER=%RP%\org.eclipse.ecf.provider_0.5.5\provider.jar
-set PRESENCE=%RP%\org.eclipse.ecf.presence_0.5.5\presence.jar
-set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.5.5\editor.jar
-set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.5.5\editor.jar
-set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.5.5\runtime\org.eclipse.ecf.example.library.jar
-set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.5.5\discovery.jar
-set HELLO=%RP%\org.eclipse.ecf.example.hello_0.5.5\hello.jar
-set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.5.5\client.jar
+set ECF=%RP%\org.eclipse.ecf_0.6.0\ecf.jar
+set UI=%RP%\org.eclipse.ecf.ui_0.6.0\ui.jar
+set SDO=%RP%\org.eclipse.ecf.sdo_0.6.0\ecf.sdo.jar
+set DS=%RP%\org.eclipse.ecf.datashare_0.6.0\datashare.jar
+set PROVIDER=%RP%\org.eclipse.ecf.provider_0.6.0\provider.jar
+set PRESENCE=%RP%\org.eclipse.ecf.presence_0.6.0\presence.jar
+set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.6.0\editor.jar
+set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.6.0\editor.jar
+set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.6.0\runtime\org.eclipse.ecf.example.library.jar
+set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.6.0\discovery.jar
+set HELLO=%RP%\org.eclipse.ecf.example.hello_0.6.0\hello.jar
+set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.6.0\client.jar
set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DISCOVERY%;%COLLAB%;."
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
index dd215032f..89308fc43 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh
@@ -4,18 +4,18 @@ RP=../../../plugins
CURRENT=`pwd`
cd ${CURRENT}
# Relative path for accessing plugins
-ECF=${RP}/org.eclipse.ecf_0.5.5/ecf.jar
-UI=${RP}/org.eclipse.ecf.ui_0.5.5/ui.jar
-SDO=${RP}/org.eclipse.ecf.sdo_0.5.5/ecf.sdo.jar
-DS=${RP}/org.eclipse.ecf.datashare_0.5.5/datashare.jar
-PROVIDER=${RP}/org.eclipse.ecf.provider_0.5.5/provider.jar
-PRESENCE=${RP}/org.eclipse.ecf.presence_0.5.5/presence.jar
-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.5/editor.jar
-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.5/editor.jar
-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.5/runtime/org.eclipse.ecf.example.library.jar
-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.5/discovery.jar
-HELLO=${RP}/org.eclipse.ecf.example.hello_0.5.5/hello.jar
-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.5/client.jar
+ECF=${RP}/org.eclipse.ecf_0.6.0/ecf.jar
+UI=${RP}/org.eclipse.ecf.ui_0.6.0/ui.jar
+SDO=${RP}/org.eclipse.ecf.sdo_0.6.0/ecf.sdo.jar
+DS=${RP}/org.eclipse.ecf.datashare_0.6.0/datashare.jar
+PROVIDER=${RP}/org.eclipse.ecf.provider_0.6.0/provider.jar
+PRESENCE=${RP}/org.eclipse.ecf.presence_0.6.0/presence.jar
+GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.6.0/editor.jar
+ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.6.0/editor.jar
+LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.6.0/runtime/org.eclipse.ecf.example.library.jar
+DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.6.0/discovery.jar
+HELLO=${RP}/org.eclipse.ecf.example.hello_0.6.0/hello.jar
+COLLAB=${RP}/org.eclipse.ecf.example.collab_0.6.0/client.jar
CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${HELLO}:${DISCOVERY}:${COLLAB}:."
diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh
index f283b6d37..df25eebcd 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh
+++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh
@@ -4,18 +4,18 @@ RP=../../../plugins
CURRENT=`pwd`
cd ${CURRENT}
# Relative path for accessing plugins
-ECF=${RP}/org.eclipse.ecf_0.5.5/ecf.jar
-UI=${RP}/org.eclipse.ecf.ui_0.5.5/ui.jar
-SDO=${RP}/org.eclipse.ecf.sdo_0.5.5/ecf.sdo.jar
-DS=${RP}/org.eclipse.ecf.datashare_0.5.5/datashare.jar
-PROVIDER=${RP}/org.eclipse.ecf.provider_0.5.5/provider.jar
-PRESENCE=${RP}/org.eclipse.ecf.presence_0.5.5/presence.jar
-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.5/editor.jar
-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.5/editor.jar
-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.5/runtime/org.eclipse.ecf.example.library.jar
-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.5/discovery.jar
-HELLO=${RP}/org.eclipse.ecf.example.hello_0.5.5/hello.jar
-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.5/client.jar
+ECF=${RP}/org.eclipse.ecf_0.6.0/ecf.jar
+UI=${RP}/org.eclipse.ecf.ui_0.6.0/ui.jar
+SDO=${RP}/org.eclipse.ecf.sdo_0.6.0/ecf.sdo.jar
+DS=${RP}/org.eclipse.ecf.datashare_0.6.0/datashare.jar
+PROVIDER=${RP}/org.eclipse.ecf.provider_0.6.0/provider.jar
+PRESENCE=${RP}/org.eclipse.ecf.presence_0.6.0/presence.jar
+GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.6.0/editor.jar
+ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.6.0/editor.jar
+LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.6.0/runtime/org.eclipse.ecf.example.library.jar
+DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.6.0/discovery.jar
+HELLO=${RP}/org.eclipse.ecf.example.hello_0.6.0/hello.jar
+COLLAB=${RP}/org.eclipse.ecf.example.collab_0.6.0/client.jar
CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${HELLO}:${DISCOVERY}:${COLLAB}:."

Back to the top