Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2005-06-18 19:25:59 -0400
committerslewis2005-06-18 19:25:59 -0400
commite1cf7cc09e7be208257821765f2443f8c5334aaa (patch)
treedd2db46d98ff8a056e93a7a54810f87de32c8f4e /examples/bundles/org.eclipse.ecf.sdo/src/org
parent493e99b073d3bcfead51c77a6e533f6931f679dd (diff)
downloadorg.eclipse.ecf-e1cf7cc09e7be208257821765f2443f8c5334aaa.tar.gz
org.eclipse.ecf-e1cf7cc09e7be208257821765f2443f8c5334aaa.tar.xz
org.eclipse.ecf-e1cf7cc09e7be208257821765f2443f8c5334aaa.zip
Fixes for compiler warnings
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.sdo/src/org')
-rw-r--r--examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java10
-rw-r--r--examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/WaitableSubscriptionCallback.java8
2 files changed, 9 insertions, 9 deletions
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();
}

Back to the top