Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorisikm2008-06-15 17:28:24 +0000
committerisikm2008-06-15 17:28:24 +0000
commit553bd0e32ed36a6b56d83fa1f12a4aa0adf7861a (patch)
treef524775df193c9699195375f99f26706e7c7f70b
parent8d21db84a4d2bc5fb8e9866d82043d5ffaf124fe (diff)
downloadorg.eclipse.ecf-553bd0e32ed36a6b56d83fa1f12a4aa0adf7861a.tar.gz
org.eclipse.ecf-553bd0e32ed36a6b56d83fa1f12a4aa0adf7861a.tar.xz
org.eclipse.ecf-553bd0e32ed36a6b56d83fa1f12a4aa0adf7861a.zip
changed visibility modifiers on instance fields in ColaUpdateMessage
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaSynchronizer.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaUpdateMessage.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaSynchronizer.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaSynchronizer.java
index bf3239860..d72ccb625 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaSynchronizer.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaSynchronizer.java
@@ -104,7 +104,7 @@ public class ColaSynchronizer implements SynchronizationStrategy {
// queued up operations!!! 2008-06-08
if (!unacknowledgedLocalOperations.isEmpty()) {
ColaUpdateMessage localOp = (ColaUpdateMessage) unacknowledgedLocalOperations.getFirst();
- Assert.isTrue(transformedRemote.getRemoteOperationsCount() == localOp.localOperationsCount);
+ Assert.isTrue(transformedRemote.getRemoteOperationsCount() == localOp.getLocalOperationsCount());
for (final Iterator it = unacknowledgedLocalOperations.iterator(); it.hasNext();) {
// returns new instance
// clarify operation preference, owner/docshare initiator
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaUpdateMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaUpdateMessage.java
index 2f463c9d6..be892f4bb 100644
--- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaUpdateMessage.java
+++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaUpdateMessage.java
@@ -22,9 +22,9 @@ public class ColaUpdateMessage extends UpdateMessage {
// TODO encapsulate in a new ColaOpOriginationState and re-implement equals,
// hashCode, i.e. make comparable
- final long localOperationsCount;
- long remoteOperationsCount;
- final TransformationStrategy trafoStrat;
+ private final long localOperationsCount;
+ private long remoteOperationsCount;
+ private final TransformationStrategy trafoStrat;
public ColaUpdateMessage(UpdateMessage msg, long localOperationsCount, long remoteOperationsCount) {
super(msg.getOffset(), msg.getLengthOfReplacedText(), msg.getText());

Back to the top