Changeset 37699

Timestamp:

2023-04-21T18:46:30+12:00 (12 months ago)

Author:

anupama

Message:

Related to commits r 37690, 37691 (and 37698). 1. Shifted the section that calls moveAnyKeepOldToArchives() to before the SpecialCharacter is added to start of the build log, it made no difference to a Cancel press appearing in the end as an Error message and error status value (not a fatal issue, and has always worked this way in GLI). 2. Calling document.appendLine directly instead of calling shell.fireMessage() to add informative statemenst when moving archives_keepold to archives in moveAnyKeepOldToArchives(). This is because fireMessage prepends a propt starting import.pl to the messages displayed, which implies that my messages are emanating from import.pl, which is not correct (they are GLI code, after import.pl has been cancelled/on error). 3. Added useful debug statement back in, commented out, should we need to debug even status and type again.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java (modified) (4 diffs)

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

@@ -623 +623 @@
         simple_cancel_button.setEnabled(false);
         simple_preview_button.setEnabled(been_built);
-        if(event.getStatus() == GShell.CANCELLED) {
-        document.setSpecialCharacter(OptionsPane.CANCELLED);
-        }
-        else {
-        document.setSpecialCharacter(OptionsPane.UNSUCCESSFUL);
-        }
-
+
+        
         // If import was cancelled OR an error occurred, move any archives_keepold to archives
         if(event.getType() == GShell.IMPORT &&
            (event.getStatus() == GShell.CANCELLED || event.getStatus() == GShell.ERROR)) {
+
+        //System.err.println("processComplete(), got status: " + event.getStatus()
+        //+ " - build type: " + event.getType());
+        
         moveAnyKeepOldToArchives();
         }
+        
+        if(event.getStatus() == GShell.CANCELLED) {
+        document.setSpecialCharacter(OptionsPane.CANCELLED);
+        }
+        else {
+        document.setSpecialCharacter(OptionsPane.UNSUCCESSFUL);
+        }
+
         
         options_pane.resetFileEntry();
@@ -654 +661 @@
         if(archives_keepold_dir.exists()) {
         String statusMsg = "archives_keepold folder detected. Attempting to restore it as archives...";
-        //log_textarea.setCaretPosition(document.getLengthToNearestLine());
-        //document.appendLine(statusMsg);
-        System.err.println(statusMsg);
-        this.shell.fireMessage(statusMsg);
+        log_textarea.setCaretPosition(document.getLengthToNearestLine());       
+        //System.err.println(statusMsg);
+        document.appendLine(statusMsg); //this.shell.fireMessage(statusMsg);
         
         String archives = CollectionManager.getLoadedCollectionArchivesDirectoryPath();
@@ -669 +675 @@
             statusMsg = "Failed to delete " + archives_dir
             + "  in attempt to rename archives_keepold to archives";
-            System.err.println(statusMsg);
-            this.shell.fireMessage(statusMsg);
+            //System.err.println(statusMsg);            
+            document.appendLine(statusMsg); //this.shell.fireMessage(statusMsg);
         }     
 
@@ -678 +684 @@
             statusMsg = "Failed to rename " + archives_keepold_dir
                 + "\n  to " + archives_dir;
-            System.err.println(statusMsg);
-            this.shell.fireMessage(statusMsg);
+            //System.err.println(statusMsg);            
+            document.appendLine(statusMsg); //this.shell.fireMessage(statusMsg);
             }
-        }       
+        }
+
+        // repeating what CreatePane::message() does (called by GShell::firemessage())
+        log_textarea.setCaretPosition(document.getLengthToNearestLine());
         }
     }