/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 2367

Added by Duane Costa over 19 years ago

Remove DOS end-of-line carriage returns.
Other minor formatting improvements to the code.

       String clipboardIdentifier = "";
       String clipboardRevision = "";
       String clipboardScope = "";
     	JButton copyButton;
     	JButton cutButton;
       JButton copyButton;
       JButton cutButton;
       String defaultDocumentType = "eml://ecoinformatics.org/eml-2.0.0";
       String defaultDocumentURL = "http://";
       String defaultHarvestList = "";
       String defaultIdentifier = "1";
       String defaultRevision = "1";
       String defaultScope = "dataset";
     	Document doc;
     	JScrollPane docPane;
       Document doc;
       JScrollPane docPane;
       JFileChooser fileChooser = new JFileChooser();
       File harvestListFile;
       boolean harvestListHasChanged = false;
     	JMenuBar menuBar;
       JMenuBar menuBar;
       final int numColumns = 6;
       final int numRows = 300;
     	JButton pasteButton;
     	JButton pasteDefaultsButton;
       JButton pasteButton;
       JButton pasteDefaultsButton;
       Properties properties;
       private String schemaLocation =
     //    "eml://ecoinformatics.org/harvestList ../../lib/harvester/harvestList.xsd";
         "eml://ecoinformatics.org/harvestList harvestList.xsd";
       int selectedRow = -1;
       final JTable table;
-...
        * Constructor for HarvestListEditor class.
        */
       public HarvestListEditor() {
     		super("Harvest List Editor");
         super("Harvest List Editor");
     		JPanel buttonPanel = new JPanel();
         JPanel buttonPanel = new JPanel();
         String[] fileItems =
                       new String[] {"New", "Open...", "Save", "Save As...", "Exit"};
     		JMenu fileMenu = new JMenu("File");
     		char[] fileShortCuts = {'N', 'O', 'S', 'A', 'X'};
         JMenu fileMenu = new JMenu("File");
         char[] fileShortCuts = {'N', 'O', 'S', 'A', 'X'};
         TableColumn tableColumn;
         loadProperties();
     		setSize(1000, 400);
     		setDefaultCloseOperation(EXIT_ON_CLOSE);
     		menuBar = new JMenuBar();
         setSize(1000, 400);
         setDefaultCloseOperation(EXIT_ON_CLOSE);
         menuBar = new JMenuBar();
         /*
          * Add menu items to the File menu
          */
     		newMenuItem.setAccelerator(KeyStroke.getKeyStroke('N',
     									                                     java.awt.Event.CTRL_MASK,
                                                            false));
     		newMenuItem.addActionListener(this);
     		fileMenu.add(newMenuItem);
         newMenuItem.setAccelerator(KeyStroke.getKeyStroke('N',
     									                  java.awt.Event.CTRL_MASK,
                                                           false));
         newMenuItem.addActionListener(this);
         fileMenu.add(newMenuItem);
     		openMenuItem.setAccelerator(KeyStroke.getKeyStroke('O',
     									                                     java.awt.Event.CTRL_MASK,
         openMenuItem.setAccelerator(KeyStroke.getKeyStroke('O',
     									                   java.awt.Event.CTRL_MASK,
                                                            false));
     		openMenuItem.addActionListener(this);
     		fileMenu.add(openMenuItem);
         openMenuItem.addActionListener(this);
         fileMenu.add(openMenuItem);
     		saveMenuItem.setAccelerator(KeyStroke.getKeyStroke('S',
     									                                     java.awt.Event.CTRL_MASK,
         saveMenuItem.setAccelerator(KeyStroke.getKeyStroke('S',
     									                   java.awt.Event.CTRL_MASK,
                                                            false));
     		saveMenuItem.addActionListener(this);
         saveMenuItem.addActionListener(this);
         saveMenuItem.setEnabled(false);
     		fileMenu.add(saveMenuItem);
         fileMenu.add(saveMenuItem);
     		saveAsMenuItem.setAccelerator(KeyStroke.getKeyStroke('A',
     									                                     java.awt.Event.CTRL_MASK,
         saveAsMenuItem.setAccelerator(KeyStroke.getKeyStroke('A',
     									                   java.awt.Event.CTRL_MASK,
                                                            false));
     		saveAsMenuItem.addActionListener(this);
     		fileMenu.add(saveAsMenuItem);
         saveAsMenuItem.addActionListener(this);
         fileMenu.add(saveAsMenuItem);
     		validateMenuItem.setAccelerator(KeyStroke.getKeyStroke('V',
     									                                     java.awt.Event.CTRL_MASK,
         validateMenuItem.setAccelerator(KeyStroke.getKeyStroke('V',
     									                   java.awt.Event.CTRL_MASK,
                                                            false));
     		validateMenuItem.addActionListener(this);
     		fileMenu.add(validateMenuItem);
         validateMenuItem.addActionListener(this);
         fileMenu.add(validateMenuItem);
     		exitMenuItem.setAccelerator(KeyStroke.getKeyStroke('X',
     									                                     java.awt.Event.CTRL_MASK,
         exitMenuItem.setAccelerator(KeyStroke.getKeyStroke('X',
     									                   java.awt.Event.CTRL_MASK,
                                                            false));
     		exitMenuItem.addActionListener(this);
     		fileMenu.add(exitMenuItem);
         exitMenuItem.addActionListener(this);
         fileMenu.add(exitMenuItem);
     		menuBar.add(fileMenu);      // Add the File menu to the menu bar
     		setJMenuBar(menuBar);       // Set the frame's menu bar to this menu bar
         menuBar.add(fileMenu);      // Add the File menu to the menu bar
         setJMenuBar(menuBar);       // Set the frame's menu bar to this menu bar
         //table = new JTable(numRows, numColumns);
         table = new JTable(new HarvestListTableModel());
-...
         copyButton.setEnabled(false);
         pasteButton.setEnabled(false);
         pasteDefaultsButton.setEnabled(false);
     		buttonPanel.add(cutButton);
     		buttonPanel.add(copyButton);
     		buttonPanel.add(pasteButton);
     		buttonPanel.add(pasteDefaultsButton);
     		buttonPanel.setOpaque(true);
     		getContentPane().add(buttonPanel, BorderLayout.SOUTH);
         buttonPanel.add(cutButton);
         buttonPanel.add(copyButton);
         buttonPanel.add(pasteButton);
         buttonPanel.add(pasteDefaultsButton);
         buttonPanel.setOpaque(true);
         getContentPane().add(buttonPanel, BorderLayout.SOUTH);
         // If the default Harvest List option has a value, and the file exists,
         // loads its contents.
-...
        * @param e   An ActionEvent object, determines the menu item that was
        *            selected.
        */
     	public void actionPerformed(ActionEvent e) {
     		if ((e.getActionCommand()).equals("New")) {
       public void actionPerformed(ActionEvent e) {
         if ((e.getActionCommand()).equals("New")) {
           fileNew();
+    		}
     		else if ((e.getActionCommand()).equals("Open...")) {
+        }
         else if ((e.getActionCommand()).equals("Open...")) {
           fileOpen();
+        }
         else if ((e.getActionCommand()).equals("Save")) {
           fileSave();
+        }
     		else if ((e.getActionCommand()).equals("Save As...")) {
         else if ((e.getActionCommand()).equals("Save As...")) {
           fileSaveAs();
+        }
     		else if ((e.getActionCommand()).equals("Validate")) {
         else if ((e.getActionCommand()).equals("Validate")) {
           fileValidate();
+        }
         else if ((e.getActionCommand()).equals("Exit")) {
           fileExit();
+        }
+    	}
+      }
       /**
-...
             defaultScope = properties.getProperty("defaultScope");
+          }
           catch (IOException ioe) {
             System.out.println("Error loading properties file: " + ioe.getMessage());
             System.out.println("Error loading properties file: " +
                                ioe.getMessage());
+          }
+        }
+      }
-...
        * @param out       the PrintWriter to write the Harvest List to
        */
       void writeHarvestList(PrintWriter out) {
           out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
           out.println("");
           out.println(
         out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
         out.println("");
         out.println(
            "<hrv:harvestList xmlns:hrv=\"eml://ecoinformatics.org/harvestList\" >");
           for (int i = 0; i < numRows; i++) {
             if (!isEmptyRow(i)) {
               writeRow(out, i);
+            }
         for (int i = 0; i < numRows; i++) {
           if (!isEmptyRow(i)) {
             writeRow(out, i);
+          }
+        }
           out.println("");
           out.println("</hrv:harvestList>");
           out.close();
         out.println("");
         out.println("</hrv:harvestList>");
         out.close();
+      }

src/edu/ucsb/nceas/metacat/harvesterClient/Harvester.java
90	90	catch (IOException e) {
91	91	System.out.println("Error in loading options: " + e.getMessage());
92	92	}
93
94	93	}
95	94
96	95

     /**
      *  HarvesterRegistrationLogin implements a servlet to login to the Harvester
      *  Registration servlet
      *  Registration servlet.
      */
     public class HarvesterRegistrationLogin extends HttpServlet {

     		try {
     			stmt = conn.createStatement();
     			stmt.executeUpdate("UPDATE HARVEST_SITE_SCHEDULE SET DATENEXTHARVEST = " +
     			stmt.executeUpdate(
                              "UPDATE HARVEST_SITE_SCHEDULE SET DATENEXTHARVEST = " +
                              nextHarvest +
                              " WHERE SITE_SCHEDULE_ID = " +
                              siteScheduleID);
     			stmt.executeUpdate("UPDATE HARVEST_SITE_SCHEDULE SET DATELASTHARVEST = " +
     			stmt.executeUpdate(
                              "UPDATE HARVEST_SITE_SCHEDULE SET DATELASTHARVEST = " +
                              lastHarvest +
                              " WHERE SITE_SCHEDULE_ID = " +
                              siteScheduleID);
-...
+        }
         catch (SAXException e) {
           harvester.addLogEntry(1, "SAXException: " + e.getMessage(),
                                 "ValidateHarvestListError", siteScheduleID, null, "");
                               "ValidateHarvestListError", siteScheduleID, null, "");
+        }
         catch (ClassNotFoundException e) {
           harvester.addLogEntry(1, "ClassNotFoundException: " + e.getMessage(),
                                 "ValidateHarvestListError", siteScheduleID, null, "");
                               "ValidateHarvestListError", siteScheduleID, null, "");
+        }
         catch (IOException e) {
           harvester.addLogEntry(1, "IOException: " + e.getMessage(),

      * HarvesterRegistration is a servlet that implements harvester registration.
      * The servlet reads parameters that were entered in a harvester registration
      * form, checks the validity of the values, stores the values in the database
      * by either inserting, updating, or removing a record in the
      * by either inserting, updating, or removing a record in the
      * HARVEST_SITE_SCHEDULE table.
+     *
      * @author    costa

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 2367

Added by Duane Costa over 19 years ago