Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2006-04-29 21:41:46 +0000
committerslewis2006-04-29 21:41:46 +0000
commit6a0fe0a41624f694ce3c34d3e63923075bc3ab0b (patch)
treebb079d27e6486cfb30eacee731f32a268994e6f8 /framework
parent3d4993401606bed2b11ea198977ed94720e21299 (diff)
downloadorg.eclipse.ecf-6a0fe0a41624f694ce3c34d3e63923075bc3ab0b.tar.gz
org.eclipse.ecf-6a0fe0a41624f694ce3c34d3e63923075bc3ab0b.tar.xz
org.eclipse.ecf-6a0fe0a41624f694ce3c34d3e63923075bc3ab0b.zip
Changed org.eclipse.ecf.start extension point to org.eclipse.ecf.startup. Added org.eclipse.ecf.presence.IChatID to presence API as an adapter for the ID interface.
Diffstat (limited to 'framework')
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IChatID.java19
-rw-r--r--framework/bundles/org.eclipse.ecf/plugin.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf/schema/startup.exsd (renamed from framework/bundles/org.eclipse.ecf/schema/start.exsd)2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java2
6 files changed, 24 insertions, 5 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IChatID.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IChatID.java
new file mode 100644
index 000000000..9f71814be
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IChatID.java
@@ -0,0 +1,19 @@
+package org.eclipse.ecf.presence;
+
+/**
+ * Adapter interface for chatIDs. The typical usage of this
+ * interface is as follows:
+ * <pre>
+ * IChatID chatID = (IChatID) id.getAdapter(IChatID.class);
+ * if (chatID != null) {
+ * ...use chatID here
+ * }
+ * </pre>
+ */
+public interface IChatID {
+ /**
+ * Get username for this ID
+ * @return String username for ID
+ */
+ public String getUsername();
+}
diff --git a/framework/bundles/org.eclipse.ecf/plugin.xml b/framework/bundles/org.eclipse.ecf/plugin.xml
index ea0db284b..e65011194 100644
--- a/framework/bundles/org.eclipse.ecf/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf/plugin.xml
@@ -5,5 +5,5 @@
<extension-point id="namespace" name="ECF Namespace" schema="schema/namespace.exsd"/>
<extension-point id="connectionFactory" name="ECF Connection Factory" schema="schema/connectionFactory.exsd"/>
<extension-point id="sharedObjectFactory" name="ECF Shared Object Factory" schema="schema/sharedObjectFactory.exsd"/>
- <extension-point id="start" name="ECF Start" schema="schema/start.exsd"/>
+ <extension-point id="startup" name="ECF Start Up" schema="schema/startup.exsd"/>
</plugin>
diff --git a/framework/bundles/org.eclipse.ecf/schema/start.exsd b/framework/bundles/org.eclipse.ecf/schema/startup.exsd
index 8d76b6222..38198bead 100644
--- a/framework/bundles/org.eclipse.ecf/schema/start.exsd
+++ b/framework/bundles/org.eclipse.ecf/schema/startup.exsd
@@ -3,7 +3,7 @@
<schema targetNamespace="org.eclipse.ecf">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.ecf" id="start" name="ECF Start"/>
+ <meta.schema plugin="org.eclipse.ecf" id="startup" name="ECF Start"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java
index 3745a9696..8389fc535 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java
@@ -18,6 +18,6 @@ public class ECFStartJob extends Job {
this.start = start;
}
protected IStatus run(IProgressMonitor monitor) {
- return start.start(monitor);
+ return start.startup(monitor);
}
}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java
index e15555326..f1b226157 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java
@@ -22,5 +22,5 @@ public interface IECFStart {
* @return IStatus the status of the start
* @throws ECFStartException if some exception thrown during start
*/
- public IStatus start(IProgressMonitor monitor);
+ public IStatus startup(IProgressMonitor monitor);
}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
index 99f89db8e..6550f4a4d 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
@@ -55,7 +55,7 @@ public class ECFPlugin extends Plugin {
+ ".sharedObjectFactory";
public static final String COMM_FACTORY_EPOINT = ECFNAMESPACE
+ ".connectionFactory";
- public static final String START_EPOINT = ECFNAMESPACE + ".start";
+ public static final String START_EPOINT = ECFNAMESPACE + ".startup";
public static final String PLUGIN_RESOURCE_BUNDLE = ECFNAMESPACE
+ ".ECFPluginResources";

Back to the top