diff options
author | slewis | 2005-06-18 23:25:59 +0000 |
---|---|---|
committer | slewis | 2005-06-18 23:25:59 +0000 |
commit | e1cf7cc09e7be208257821765f2443f8c5334aaa (patch) | |
tree | dd2db46d98ff8a056e93a7a54810f87de32c8f4e | |
parent | 493e99b073d3bcfead51c77a6e533f6931f679dd (diff) | |
download | org.eclipse.ecf-e1cf7cc09e7be208257821765f2443f8c5334aaa.tar.gz org.eclipse.ecf-e1cf7cc09e7be208257821765f2443f8c5334aaa.tar.xz org.eclipse.ecf-e1cf7cc09e7be208257821765f2443f8c5334aaa.zip |
Fixes for compiler warnings
5 files changed, 11 insertions, 14 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectAction.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectAction.java index 6815f6f42..e47594393 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectAction.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectAction.java @@ -28,7 +28,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; public class ClientConnectAction implements IWorkbenchWindowActionDelegate { - private IWorkbenchWindow window; public static final String DEFAULT_SERVER_ID = "ecftcp://localhost:3282/server"; @@ -114,6 +113,5 @@ public class ClientConnectAction implements IWorkbenchWindowActionDelegate { } public void init(IWorkbenchWindow window) { - this.window = window; } }
\ No newline at end of file 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 cd0cd2e00..5d07c7060 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 @@ -46,8 +46,6 @@ public class EditorPlugin extends AbstractUIPlugin { // Resource bundle. private ResourceBundle resourceBundle; - private Client client; - /** * The constructor. */ diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java index 14f2b70d1..f3e11f729 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java +++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java @@ -208,7 +208,7 @@ public class SharedDataGraph implements ISharedObject, ISharedDataGraph { } private synchronized void handleReceiveDataGraphMessage(ID containerID, - Version version, Object data) { + Version v, Object data) { if (dataGraph == null) { try { dataGraph = updateProvider.deserializeDataGraph(data); @@ -222,7 +222,7 @@ public class SharedDataGraph implements ISharedObject, ISharedDataGraph { return; } - this.version = version; + this.version = v; dataGraph.getChangeSummary().beginLogging(); if (subscriptionCallback != null) subscriptionCallback.dataGraphSubscribed(this, containerID); @@ -230,15 +230,15 @@ public class SharedDataGraph implements ISharedObject, ISharedDataGraph { } private synchronized void handleUpdateDataGraphMessage(ID containerID, - Version version, Object data) { + Version v, Object data) { if (dataGraph == null) return; - if (!version.equals(this.version)) { + if (!v.equals(this.version)) { if (SDOPlugin.isTracing(TRACE_TAG)) SDOPlugin.getTraceLog().println( "Version mismatch: current=" + this.version + "; new=" - + version); + + v); updateConsumer.updateFailed(this, containerID, null); return; diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/WaitableSubscriptionCallback.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/WaitableSubscriptionCallback.java index c52207ebd..429f7dc3a 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/WaitableSubscriptionCallback.java +++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/WaitableSubscriptionCallback.java @@ -32,8 +32,8 @@ public class WaitableSubscriptionCallback implements ISubscriptionCallback { * org.eclipse.ecf.core.identity.ID) */ public synchronized void dataGraphSubscribed(ISharedDataGraph graph, - ID containerID) { - this.containerID = containerID; + ID cID) { + this.containerID = cID; notifyAll(); } @@ -44,8 +44,8 @@ public class WaitableSubscriptionCallback implements ISubscriptionCallback { * java.lang.Throwable) */ public synchronized void subscriptionFailed(ISharedDataGraph graph, - Throwable cause) { - this.cause = cause; + Throwable c) { + this.cause = c; notifyAll(); } diff --git a/server-side/features/org.eclipse.ecf.server-feature/feature.xml b/server-side/features/org.eclipse.ecf.server-feature/feature.xml index 919501eb8..59f551900 100644 --- a/server-side/features/org.eclipse.ecf.server-feature/feature.xml +++ b/server-side/features/org.eclipse.ecf.server-feature/feature.xml @@ -103,7 +103,8 @@ to any source code in the Content.</p> id="org.eclipse.ecf.provider" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false" /> <plugin id="org.eclipse.ecf.sdo" |