[API] Move WatchdogServer and DocumentChecksum to core

The Saros/I versions of these classes were deleted; the remaining
classes were altered to use the Core classes.

The Handler cannot be moved easily due to specific
editor dependencies. This is why further changes were
made since it won't go away anytime soon.

Also IsInconsistentObservable will be moved together with the Client.

Change-Id: I71249f62ddc0bc581ee66b0804732474db17ce5e
Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2959
Tested-by: Jenkins CI
Reviewed-by: Stefan Rossbach <srossbach@arcor.de>

Author: sungaila

de.fu_berlin.inf.dpp.core/META-INF/MANIFEST.MF

@@ -40,6 +40,7 @@ Export-Package: com.strangeberry.jmdns.tools,
  de.fu_berlin.inf.dpp.concurrent.jupiter.internal,
  de.fu_berlin.inf.dpp.concurrent.jupiter.internal.text,
  de.fu_berlin.inf.dpp.concurrent.management,
+ de.fu_berlin.inf.dpp.concurrent.watchdog,
  de.fu_berlin.inf.dpp.editor,
  de.fu_berlin.inf.dpp.editor.colorstorage,
  de.fu_berlin.inf.dpp.editor.text,

de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/concurrent/watchdog/ConsistencyWatchdogServer.java renamed to de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/concurrent/watchdog/ConsistencyWatchdogServer.java

@@ -253,13 +253,13 @@ private void updateChecksum(SPath docPath, Set<SPath> localEditors,
         String content = editorManager.getContent(checksum.getPath());
 
         if (content == null) {
-            if (localEditors.contains(checksum)) {
+            if (localEditors.contains(checksum.getPath())) {
                 LOG.error("EditorManager is in an inconsistent state. "
                     + "It is reporting a locally open editor but no"
                     + " document could be found in the underlying file system: "
                     + checksum);
             }
-            if (!remoteEditors.contains(checksum)) {
+            if (!remoteEditors.contains(checksum.getPath())) {
                 /*
                  * Since session participants do not report this document as
                  * open, they are right (and our EditorPool might be confused)

de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/concurrent/watchdog/DocumentChecksum.java renamed to de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/concurrent/watchdog/DocumentChecksum.java

@@ -15,7 +15,6 @@ public class DocumentChecksum {
      * doesn't exist).
      */
     public static final int NOT_AVAILABLE = -1;
-
     private SPath path;
     private int length;
     private int hash;

de.fu_berlin.inf.dpp.intellij/src/de/fu_berlin/inf/dpp/core/concurrent/ConsistencyWatchdogHandler.java

@@ -27,6 +27,7 @@
 import de.fu_berlin.inf.dpp.activities.ChecksumErrorActivity;
 import de.fu_berlin.inf.dpp.activities.RecoveryFileActivity;
 import de.fu_berlin.inf.dpp.activities.SPath;
+import de.fu_berlin.inf.dpp.concurrent.watchdog.DocumentChecksum;
 import de.fu_berlin.inf.dpp.core.monitoring.IStatus;
 import de.fu_berlin.inf.dpp.core.monitoring.Status;
 import de.fu_berlin.inf.dpp.core.util.FileUtils;
@@ -236,13 +237,10 @@ void recoverFile(User from, final ISarosSession sarosSession,
          * verify the recovered file
          */
         final DocumentChecksum checksum = new DocumentChecksum(path);
-        checksum
-            .bind(ResourceConverter.getDocument(path.getFullPath().toFile()));
-        checksum.update();
+        checksum.update(ResourceConverter.getDocument(path.getFullPath().toFile()).getText());
 
         fireActivity(new ChecksumActivity(user, path, checksum.hashCode(),
                 checksum.getLength(), null)
         );
-        checksum.dispose();
     }
 }