Changeset 30701

Timestamp:

2016-08-12T19:47:27+12:00 (8 years ago)

Author:

ak19

Message:

All the changes to get the new collectionConfig.xml Editor (ConfigFileEditor.java) to work.

Location:

main/trunk/gli

Files:

• classes/dictionary.properties (modified) (3 diffs)
• src/org/greenstone/gatherer/gui/ConfigFileEditor.java (added)
• src/org/greenstone/gatherer/gui/GUIManager.java (modified) (2 diffs)
• src/org/greenstone/gatherer/gui/MenuBar.java (modified) (3 diffs)
• src/org/greenstone/gatherer/util/Utility.java (modified) (1 diff)
• src/org/greenstone/gatherer/util/XMLTools.java (modified) (4 diffs)

main/trunk/gli/classes/dictionary.properties

@@ -648 +648 @@
 General.Redo:Redo
 General.Redo_Tooltip:Restore the last undo
+General.Save:Save
 General.Undo:Undo
 General.Undo_Tooltip:Undo the last edit
@@ -769 +770 @@
 Menu.Edit_Cut:Cut ({0}-x)
 Menu.Edit_Paste:Paste ({0}-v)
+Menu.Edit_Config:Edit collectionConfig.xml
 Menu.Expand:Open Folder
 Menu.Explode_Metadata_Database:Explode metadata database
@@ -962 +964 @@
 FormatConversionDialog.XHTML_Tidy_Tooltip:Will run HTML Tidy over the Greenstone3 format statement to try to fix up obvious XHTML errors.
 FormatConversionDialog.XML_Still_Invalid:XML is still invalid.
+
+#***** ConfigFileEditor *****
+ConfigFileEditor.Tooltip:Greenstone 3 collection configuration XML editor.
+ConfigFileEditor.Save_Tooltip:Save changes and close.
+ConfigFileEditor.Cancel_Tooltip:Close without saving.
 
 #**********************

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

@@ -257 +257 @@
         DebugStream.println(cce.toString());
         }
+    }
+    else if(esrc == menu_bar.edit_config) {    
+        if(Gatherer.c_man.getCollection() != null) {
+        //JOptionPane.showMessageDialog(this, "Not yet implemented", "Edit config", JOptionPane.INFORMATION_MESSAGE);
+        ConfigFileEditor configEditor = new ConfigFileEditor();
+        configEditor.setVisible(true);
+        configEditor.setSize(900,700);
+        
+        }      
     }
 
@@ -1133 +1142 @@
         }
         }
+        else if(e.getSource() == menu_bar.edit) { // someone clicked the toplevel Edit menu
+        // gray out the Edit Config File menu if there's no collection currently open.
+        if(Gatherer.c_man.getCollection() == null) {
+            menu_bar.edit_config.setEnabled(false);
+        }
+        else { // don't forget to reenable the Edit ConfigXML menu item when applicable
+            menu_bar.edit_config.setEnabled(true);
+        }
+        }
+
     }
     }

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

@@ -76 +76 @@
     public JMenuItem edit_cut;
     public JMenuItem edit_paste;
+    public JMenuItem edit_config;
     public JMenuItem help_general;
     public JMenuItem help_download;
@@ -162 +163 @@
     edit.setText(Dictionary.get("Menu.Edit"));
     edit.setComponentOrientation(Dictionary.getOrientation());
-
     String modkey = "ctrl";
     if(Utility.isMac()) { // on Mac, we now use the Apple key instead of Ctrl for GLI/GEMS edit shortcuts
@@ -182 +182 @@
     edit_paste.addActionListener(Gatherer.g_man);
     edit_paste.setComponentOrientation(Dictionary.getOrientation());
+
     // Layout (edit menu)
     edit.add(edit_cut);
     edit.add(edit_copy);
     edit.add(edit_paste);
+
+    // if GS3, then we have a menu item that allows editing of config files
+    if(Gatherer.GS3) {   
+
+        edit_config = new JMenuItem(Dictionary.get("Menu.Edit_Config"));
+        // handle the actual Edit > ColConfig.xml menu item
+        edit_config.addActionListener(Gatherer.g_man);
+        edit_config.setComponentOrientation(Dictionary.getOrientation());
+        edit.add(edit_config);
+        // The Edit menu itself now listens, in order to gray out the
+        // Edit > collectionConfig.xml option when no collection is open
+        // (JMenu doesn't work with ActionListener only with MenuListener, see
+        // http://stackoverflow.com/questions/9862165/jmenu-actionlistener)
+        edit.addMenuListener(menu_listener);
+
+    }
 
     // Help menu

main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -74 +74 @@
     static final public String PERL_EXECUTABLE_WINDOWS = "Perl.exe";
 
+
+    /** 
+     * Reads in a text file and returns the contents as a String
+     */
+    static public String readFile(File file) {
+    BufferedReader fin = null;
+    StringBuffer contents = new StringBuffer();
+    
+    try {
+        fin = new BufferedReader(new FileReader(file));
+        String line = null;
+        while((line = fin.readLine()) != null) {
+        contents.append(line);
+        contents.append("\n");
+        }
+    } catch(IOException e) {
+        System.err.println("*** Could not read in file: " + file.toString());
+        System.err.println("*** Exception occurred: " + e.getMessage());
+    } finally {
+        try {
+        if(fin != null) {
+            fin.close();
+            fin = null;
+        }
+        } catch(IOException ioe) {
+        fin = null;
+        
+        }
+    }
+
+    return contents.toString();
+    }
 
     /**

main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java

@@ -13 +13 @@
 import java.io.IOException;
 import java.io.StringReader;
+import java.io.StringWriter; // for elementToString()
 
 // SAX
@@ -28 +29 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+// for elementToString():
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 
@@ -523 +530 @@
         if (xml_file.exists() == false)
         {
+            System.err.println("@@@ file " + xml_file + " does not exist.");
             return null;
         }
@@ -1224 +1232 @@
         }
     }
+
+
+    
+    // This method will convert an Element to a String too, like xmlNodeToString() above.
+    // But for a document root element (doc.getDocumentElement()), this method will additionally
+    // return its processing instruction line at the start (<?xml ... ?>).
+    // This method copied into GLI from src/java/org/greenstone/gsdl3/util/GSXML.java
+    public static String elementToString(Element e, boolean indent)
+    {
+    String str = "";
+    try
+        {
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer trans = tf.newTransformer();
+        StringWriter sw = new StringWriter();
+        if (indent)
+            {
+            trans.setOutputProperty(OutputKeys.INDENT, "yes");
+            }
+        else
+            {
+            trans.setOutputProperty(OutputKeys.INDENT, "no");
+            }
+        trans.transform(new DOMSource(e), new StreamResult(sw));
+        str += sw.toString();
+        }
+    catch (Exception ex)
+        {
+        str += "Exception: couldn't write " + e + " to log";
+        }
+    finally
+        {
+        return str;
+        }
+    }
 }