diff options
| author | slewis | 2005-02-25 09:50:18 +0000 |
|---|---|---|
| committer | slewis | 2005-02-25 09:50:18 +0000 |
| commit | b6fde37c91101c2cc7b2bbb7ff494b384cafc5ec (patch) | |
| tree | fc9c44be6837604aba420a0c66597be35d85a5fb | |
| parent | 9e6a393d71d3912a415706a10048e12ee7315fa4 (diff) | |
| download | org.eclipse.ecf-b6fde37c91101c2cc7b2bbb7ff494b384cafc5ec.tar.gz org.eclipse.ecf-b6fde37c91101c2cc7b2bbb7ff494b384cafc5ec.tar.xz org.eclipse.ecf-b6fde37c91101c2cc7b2bbb7ff494b384cafc5ec.zip | |
Fixed problem with Client.isConnected() call. Now returns a non-null sharedobject container if given IResource is not directly connected (i.e. a container is associated with that resource) or if the workspace root has a sharedobjectcontainer associated with it
3 files changed, 8 insertions, 2 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java index 920952ba4..e2e14e878 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java @@ -296,6 +296,9 @@ public class Client { public synchronized static ISharedObjectContainer getContainer(IResource proj) { ClientEntry entry = getClientEntry(proj,GENERIC_CONTAINER_CLIENT_NAME); + if (entry == null) { + entry = getClientEntry(ResourcesPlugin.getWorkspace().getRoot(),GENERIC_CONTAINER_CLIENT_NAME); + } if (entry != null) return entry.getContainer(); else return null; } diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF index c6dbf533a..74f3d4462 100644 --- a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF UI Bundle-SymbolicName: org.eclipse.ecf.ui -Bundle-Version: 0.0.1 +Bundle-Version: 1.0.0 Bundle-ClassPath: ui.jar Bundle-Activator: org.eclipse.ecf.ui.UiPlugin Bundle-Vendor: Eclipse.org diff --git a/framework/bundles/org.eclipse.ecf.ui/build.properties b/framework/bundles/org.eclipse.ecf.ui/build.properties index ec7d3b395..51b812078 100644 --- a/framework/bundles/org.eclipse.ecf.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.ui/build.properties @@ -2,4 +2,7 @@ source.ui.jar = src/ output.ui.jar = bin/ bin.includes = plugin.xml,\ META-INF/,\ - ui.jar + ui.jar,\ + icons/ +src.includes = icons/,\ + META-INF/ |