Changeset 8589

Timestamp:

2004-11-17T13:34:59+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed some more dead code.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -101 +101 @@
     private GShellProgressMonitor import_monitor = null;
 
-    /** Holds a reference to the thread responsible for closing the collection. If non-null then only calls from the given thread will see the collection is non-ready. All other threads will have to wait until closing thread, and all of it consequential calls, are completely finished. */
-    private Thread closing_thread = null;
-
     /** The name of the standard lock file. */
     static final public String LOCK_FILE = "gli.lck";
@@ -215 +212 @@
     public void closeCollection() {
     DebugStream.println("Close collection: " + collection.getName());
-    // We set the closing thread, as it should be the only one who can actually see the collection is closed, at least until the closing thread expires.
-    closing_thread = Thread.currentThread();
+
     // Remove the lock on this file, then remove the collection.
     String collection_dir;
@@ -244 +240 @@
         Gatherer.g_man.refresh(COLLECTION_CLOSED, false);
     }
-    // All of the consequences of a close should have been processed by now, so others should now see the collection as non-ready.
-    closing_thread = null;
     }
 
@@ -1180 +1174 @@
     }
     }
+
+
     /** Determine if the manager is ready for actions apon its collection.
      * @return A <i>boolean</i> which is <i>true</i> to indicate a collection has been loaded and thus the collection is ready for editing, <i>false</i> otherwise.
@@ -1192 +1188 @@
     }
 
-    public synchronized boolean reallyReady() {
-    // If the closing thread is non-null we should only allow that thread to see the collection as closed.
-    if(closing_thread != null) {
-        // Only the closing thread sees the truth
-        if(Thread.currentThread() == closing_thread) {
-        return (collection == null);
-        }
-        // All other threads are told a lie.
-        else {
-        return true;
-        }
-    }
-    else {
-        if(collection != null) {
-        return true;
-        }
-        else {
-        return false;
-        }
-    }
-    }
 
     /** This method associates the collection build monitor with the build monitor created in CreatePane.