Changeset 19718

Timestamp:

2009-06-02T12:01:25+12:00 (15 years ago)

Author:

oranfry

Message:

applied changes relating to incremental building to the other two modes (only expert mode got the changes originally)

File:

• gli/trunk/src/org/greenstone/gatherer/gui/CreatePane.java (modified) (1 diff)

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

@@ -764 +764 @@
      */
     public void actionPerformed(ActionEvent event) {
-        Collection collection = Gatherer.c_man.getCollection();
-        String collection_name = collection.getName();
-
-        //set a static variable marking whether this is a "Complete" or "Minimal" build
-        CollectionDesignManager.setCompleteBuild( full_build_radio_button.isSelected() );
-
-        //prepareForBuild(); 
-        if(!collection.getMetadataChanged() && !collection.getFilesChanged()) {
-            //Only design options have changes, and we want to be smart in the way we handle them.
-            int rebuildTypeRequired = CollectionDesignManager.getRebuildTypeRequired();
-            if (rebuildTypeRequired == CollectionDesignManager.BUILDCOL) {
-            // Just run the buildcol command.
-            DebugStream.println("Just want to run buildcol.pl");
-            prepareForBuild();
-            Gatherer.c_man.buildCollection();
-            }
-            else if (rebuildTypeRequired == CollectionDesignManager.ALL) {
-            // Do both import and buildcol
-            DebugStream.println("Want to do a complete build");
+        Collection collection = Gatherer.c_man.getCollection();
+        String collection_name = collection.getName();
+
+        //set a static variable marking whether this is a "Complete" or "Minimal" build
+        CollectionDesignManager.setCompleteBuild( full_build_radio_button.isSelected() );
+
+        //do the import and build, skipping import if possible
+        if( !CollectionDesignManager.isCompleteBuild() &&
+            !collection.getMetadataChanged() && !collection.getFilesChanged() && Gatherer.c_man.imported() &&
+            CollectionDesignManager.getRebuildTypeRequired() <= CollectionDesignManager.BUILDCOL
+            ) {
+                // Just do build (no import)
+                DebugStream.println("Just want to run buildcol.pl");
+                prepareForBuild();
+                Gatherer.c_man.buildCollection();
+        }
+        else {
             prepareForBuild();
             Gatherer.c_man.importCollection(); //This starts the building process.
-            }
-            else {
-            //Nothing at all needs doing.
-            //This is bad HCI. Maybe should disable the build button in this situation?
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CreatePane.Minimal_Build_Not_Required"));
-            }
-        }
-        else {
-            //Do a complete build.
-            prepareForBuild();
-            Gatherer.c_man.importCollection(); //This starts the building process.
         }
         
-        //Re-setting the rebuildTypeRequired is handled by CollectionManager.processComplete(GShellEvent)
+        //Re-setting the rebuildTypeRequired is handled by CollectionManager.processComplete(GShellEvent)
     }