bug5197: cleaned up merge problems, using new operation class; removed unused code in ClientServerOperationPair

java/com.sap.sailing.shared.server/src/com/sap/sailing/shared/server/impl/SharedSailingDataImpl.java

@@ -306,7 +306,7 @@ public class SharedSailingDataImpl implements ReplicatingSharedSailingData, Clea
     @Override
     public void clearPositioningForMarkProperties(final MarkProperties markProperties) {
         final UUID markPropertiesUUID = markProperties.getId();
-        apply(s -> s.internalSetPositioningInformationForMarkProperties(markPropertiesUUID, null));
+        apply(new SetPositioningInformationForMarkPropertiesOperation(markPropertiesUUID, null));
     }
 
     @Override

java/com.sap.sse.operationaltransformation/src/com/sap/sse/operationaltransformation/ClientServerOperationPair.java

@@ -17,19 +17,4 @@ public class ClientServerOperationPair<S, O extends Operation<S>> {
     public O getServerOp() {
         return serverOp;
     }
-    
-    @SuppressWarnings("unchecked")
-    public static <O extends Operation<S>, S> O getNoOp() {
-        return (O) new Operation<S>() {
-            @Override
-            public S applyTo(S toState) {
-                return toState; // don't change anything, return state unchanged
-            }
-
-            @Override
-            public boolean requiresSynchronousExecution() {
-                return false;
-            }
-        };
-    }
 }