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 /examples/bundles
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().
Diffstat (limited to 'examples/bundles')
-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
25 files changed, 396 insertions, 389 deletions
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();

Back to the top