Changeset 8600

Timestamp:

2004-11-18T16:29:37+13:00 (19 years ago)

Author:

mdewsnip

Message:

The first smidgeon of the "plugin suggestion" code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/PlugInManager.java (modified) (5 diffs)
• collection/CollectionContentsChangedListener.java (added)
• collection/CollectionManager.java (modified) (3 diffs)
• file/FileQueue.java (modified) (4 diffs)
• gui/GatherPane.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/PlugInManager.java

@@ -41 +41 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.CollectionContentsChangedListener;
 import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.GLIButton;
@@ -51 +52 @@
 /** This class is for maintaining a list of known plug-ins, and importing new plugins using the parser. */
 public class PlugInManager
-    extends DOMProxyListModel {
+    extends DOMProxyListModel
+    implements CollectionContentsChangedListener
+{
     /** The library 'reserve' of base plugins. */
     private ArrayList library = null;
@@ -72 +75 @@
     // Create the separator, cause we can reuse it.
     separator = getSeparator();
+
+    // Listen for CollectionContentsChanged events, so we can give plugin hints when new files are added
+    Gatherer.c_man.addCollectionContentsChangedListener(this);
     }
 
@@ -104 +110 @@
     return true;
     }
+
+
     /** Destructor. */
     public void destroy() {
@@ -113 +121 @@
     library = null;
     }
+
+
+    public void fileAddedToCollection(File file)
+    {
+    System.err.println("New file added to collection: " + file);
+
+    // First check the plugins already assigned in the collection
+    for (int i = 0; i < super.getSize(); i++) {
+        PlugIn assigned_plugin = (PlugIn) getElementAt(i);
+        if (assigned_plugin.isSeparator() == false) {
+        System.err.println("Assigned plugin: " + assigned_plugin);
+        }
+    }
+
+    // System.err.println("Number of plugins assigned in the collection: " + super.getSize());
+    System.err.println("Number of plugins loaded: " + library.size());
+    }
+
 
     /** Method to retrieve the control for this manager.

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

@@ -89 +89 @@
     /** Are we currently in the process of importing? */
     private boolean importing = false;
+    /** The objects listening for CollectionContentsChanged events. */
+    private ArrayList collection_contents_changed_listeners = new ArrayList();
     /** The collection this manager is managing! */
     static private Collection collection = null;
@@ -118 +120 @@
     this.importing = false;
     this.collection = null;
+    }
+
+
+    public void addCollectionContentsChangedListener(CollectionContentsChangedListener listener)
+    {
+    collection_contents_changed_listeners.add(listener);
     }
 
@@ -517 +525 @@
     catch (Exception error) {
         DebugStream.printStackTrace(error);
+    }
+    }
+
+
+    public void fireFileAddedToCollection(File file)
+    {
+    // Send the event off to all the CollectionContentsChangedListeners
+    for (int i = 0; i < collection_contents_changed_listeners.size(); i++) {
+        ((CollectionContentsChangedListener) collection_contents_changed_listeners.get(i)).fileAddedToCollection(file);
     }
     }

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -161 +161 @@
     public LongProgressBar getProgressBar() {
     return progress;
-    }
-    /** Prevent the progress bar updating momentarily, while its size is re-adjusted. */
-    public void pause() {
-    progress.setIndeterminate(true);
     }
 
@@ -353 +349 @@
                     DebugStream.printStackTrace(exception);
                     }
-                 // If not cancelled
-                    if(!cancel_action) {
-                    // Step one is to create a dummy FileNode. Its important it has the correct structure so getPath works.
-                    FileNode new_record = new FileNode(target_file);
-                    SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, new_record);
-                    new_node = new_record;
-                    new_record = null;
+                    // If not cancelled
+                    if (!cancel_action) {
+                    // Create a dummy FileNode with the correct structure (so getPath works)
+                    new_node = new FileNode(target_file);
+                    SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, new_node);
                     }
                 }
@@ -403 +397 @@
                     source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
                 }
-                
-                // We can't have been cancelled, and we must have created a new FileNode during the above phase, before we can handle metadata.
+
+                // If we haven't been cancelled and we created a new FileNode during the above phase, now is the time to deal with metadata
                 if (!cancel_action && new_node != null) {
-                    /* Time to handle any existing metadata. */
-                    // If the directory came from inside our collection...
+                    // If the file came from inside our collection...
                     if (job.source.toString().equals("Collection")) {
-                    // System.err.println("Move within collection...");
-
                     // Get the non-folder level metadata assigned to the origin node...
                     ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToFile(source_file);
@@ -426 +417 @@
                         MetadataValue metadata_value = (MetadataValue) assigned_metadata.get(i);
                         MetadataXMLFileManager.addMetadata(new_node, metadata_value);
-                    }   
+                    }
+                    }
+
+                    if (job.type == FileJob.COPY) {
+                    Gatherer.c_man.fireFileAddedToCollection(new_node.getFile());
                     }
                 }

trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

@@ -478 +478 @@
     collection_tree.refresh(null);
     }
-    
+
 
     public void refreshWorkspaceTree(int refresh_reason) {