diff options
author | isikm | 2008-05-29 21:22:13 +0000 |
---|---|---|
committer | isikm | 2008-05-29 21:22:13 +0000 |
commit | 53e1f1db247d89f0a5f22b3ebb9fa76ac6763716 (patch) | |
tree | a9e09694fac42b56a74c136bbdea6b59068aa453 | |
parent | 41f22e744251b389bc2cfe89609bc9da80d974ef (diff) | |
download | org.eclipse.ecf-20080529-1603.tar.gz org.eclipse.ecf-20080529-1603.tar.xz org.eclipse.ecf-20080529-1603.zip |
fixed license headers according to bug 234141 (see eclipse bugzilla)v20080529-1603
10 files changed, 101 insertions, 21 deletions
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java index 1ed44446c..f615471c3 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2007 Composent, Inc. and others. + * Copyright (c) 2007, 2008 Composent, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Composent, Inc. - initial API and implementation + * Mustafa K. Isik - conflict resolution via operational transformations *****************************************************************************/ package org.eclipse.ecf.docshare; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/IdentityMapping.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/IdentityMapping.java index 372e6a465..e8f643456 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/IdentityMapping.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/IdentityMapping.java @@ -1,3 +1,14 @@ +/**************************************************************************** + * Copyright (c) 2008 Mustafa K. Isik and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mustafa K. Isik - conflict resolution via operational transformations + *****************************************************************************/ + package org.eclipse.ecf.docshare; import org.eclipse.ecf.docshare.messages.UpdateMessage; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/SynchronizationStrategy.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/SynchronizationStrategy.java index a9d8819d3..4cd9b20fe 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/SynchronizationStrategy.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/SynchronizationStrategy.java @@ -1,3 +1,14 @@ +/**************************************************************************** + * Copyright (c) 2008 Mustafa K. Isik and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mustafa K. Isik - conflict resolution via operational transformations + *****************************************************************************/ + package org.eclipse.ecf.docshare; import org.eclipse.ecf.docshare.messages.UpdateMessage; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaDeletion.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaDeletion.java index 471c347ce..d8e3df9a6 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaDeletion.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaDeletion.java @@ -1,15 +1,24 @@ +/**************************************************************************** + * Copyright (c) 2008 Mustafa K. Isik and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mustafa K. Isik - conflict resolution via operational transformations + *****************************************************************************/ + package org.eclipse.ecf.docshare.cola; public class ColaDeletion implements TransformationStrategy { - public ColaUpdateMessage getForOwner(ColaUpdateMessage toBeTransformed, - ColaUpdateMessage alreadyApplied) { + public ColaUpdateMessage getForOwner(ColaUpdateMessage toBeTransformed, ColaUpdateMessage alreadyApplied) { // TODO Auto-generated method stub return null; } - public ColaUpdateMessage getForParticipant(ColaUpdateMessage toBeTransformed, - ColaUpdateMessage alreadyApplied) { + public ColaUpdateMessage getForParticipant(ColaUpdateMessage toBeTransformed, ColaUpdateMessage alreadyApplied) { // TODO Auto-generated method stub return null; } diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaInsertion.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaInsertion.java index 5af6b2115..a5c135072 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaInsertion.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaInsertion.java @@ -1,22 +1,29 @@ +/**************************************************************************** + * Copyright (c) 2008 Mustafa K. Isik and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mustafa K. Isik - conflict resolution via operational transformations + *****************************************************************************/ + package org.eclipse.ecf.docshare.cola; public class ColaInsertion implements TransformationStrategy { - public ColaUpdateMessage getForOwner(ColaUpdateMessage toBeTransformed, - ColaUpdateMessage alreadyApplied) { + public ColaUpdateMessage getForOwner(ColaUpdateMessage toBeTransformed, ColaUpdateMessage alreadyApplied) { // i.e. this strategy belongs to an operation/msg coming from a // participant-->lesser prio // remote is to be properly transformed - if (toBeTransformed.getOffset() > alreadyApplied.getOffset() - && toBeTransformed.getOffset() < (alreadyApplied.getOffset() + alreadyApplied.getText() - .length())) { + if (toBeTransformed.getOffset() > alreadyApplied.getOffset() && toBeTransformed.getOffset() < (alreadyApplied.getOffset() + alreadyApplied.getText().length())) { // the modification } return null; } - public ColaUpdateMessage getForParticipant(ColaUpdateMessage toBeTransformed, - ColaUpdateMessage alreadyApplied) { + public ColaUpdateMessage getForParticipant(ColaUpdateMessage toBeTransformed, ColaUpdateMessage alreadyApplied) { // TODO Auto-generated method stub return null; } diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaReplacement.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaReplacement.java index 0c0b566fd..fe5c47a1e 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaReplacement.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/ColaReplacement.java @@ -1,15 +1,24 @@ +/**************************************************************************** + * Copyright (c) 2008 Mustafa K. Isik and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mustafa K. Isik - conflict resolution via operational transformations + *****************************************************************************/ + package org.eclipse.ecf.docshare.cola; public class ColaReplacement implements TransformationStrategy { - public ColaUpdateMessage getForOwner(ColaUpdateMessage toBeTransformed, - ColaUpdateMessage alreadyApplied) { + public ColaUpdateMessage getForOwner(ColaUpdateMessage toBeTransformed, ColaUpdateMessage alreadyApplied) { // TODO Auto-generated method stub return null; } - public ColaUpdateMessage getForParticipant(ColaUpdateMessage toBeTransformed, - ColaUpdateMessage alreadyApplied) { + public ColaUpdateMessage getForParticipant(ColaUpdateMessage toBeTransformed, ColaUpdateMessage alreadyApplied) { // TODO Auto-generated method stub return null; } 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 f208049ac..29ab8963c 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 @@ -1,3 +1,14 @@ +/**************************************************************************** + * Copyright (c) 2008 Mustafa K. Isik and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mustafa K. Isik - conflict resolution via operational transformations + *****************************************************************************/ + package org.eclipse.ecf.docshare.cola; import java.util.*; 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 54cf2cdfe..8bbbcccd8 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 @@ -1,3 +1,14 @@ +/**************************************************************************** + * Copyright (c) 2008 Mustafa K. Isik and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mustafa K. Isik - conflict resolution via operational transformations + *****************************************************************************/ + package org.eclipse.ecf.docshare.cola; import org.eclipse.ecf.docshare.messages.UpdateMessage; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/TransformationStrategy.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/TransformationStrategy.java index c32154264..966f014b1 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/TransformationStrategy.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/cola/TransformationStrategy.java @@ -1,10 +1,19 @@ +/**************************************************************************** + * Copyright (c) 2008 Mustafa K. Isik and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mustafa K. Isik - conflict resolution via operational transformations + *****************************************************************************/ + package org.eclipse.ecf.docshare.cola; public interface TransformationStrategy { - ColaUpdateMessage getForOwner(ColaUpdateMessage toBeTransformed, - ColaUpdateMessage alreadyApplied); + ColaUpdateMessage getForOwner(ColaUpdateMessage toBeTransformed, ColaUpdateMessage alreadyApplied); - ColaUpdateMessage getForParticipant(ColaUpdateMessage toBeTransformed, - ColaUpdateMessage alreadyApplied); + ColaUpdateMessage getForParticipant(ColaUpdateMessage toBeTransformed, ColaUpdateMessage alreadyApplied); } diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/UpdateMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/UpdateMessage.java index 57713ab6a..a2790470c 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/UpdateMessage.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/UpdateMessage.java @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2007 Composent, Inc. and others. + * Copyright (c) 2007, 2008 Composent, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Composent, Inc. - initial API and implementation + * Mustafa K. Isik *****************************************************************************/ package org.eclipse.ecf.docshare.messages; |