Merge pull request #5 from bowring/dev

Revisions Jan-Mar 2015

.gitignore

@@ -7,6 +7,11 @@ dependency-reduced-pom.xml
 
 # Generated
 *.txt
+*.html
+*.xml
+*.svg
+*.densityplotter
+*.csv
 
 # MACOS
 .DS_Store

README.md

@@ -1,2 +1,36 @@
 ET_Redux
-========
+===
+
+**ET_Redux** is the flagship cyber infrastructure product of [CIRDLES](http://cirdles.org),
+the Cyber Infrastructure Research and Development Lab for the Earth Sciences, 
+an undergraduate research
+lab at the College of Charleston in Charleston, South Carolina. **ET_Redux** was 
+previously known as U-Pb_Redux, but in January of 2015, was renamed to
+reflect its expanding functionality and its sponsor, EARTHTIME (EARTH-TIME.org).
+
+**ET_Redux** currently serves the ID-TIMS and LAICP-MS U-Pb geochronology communities
+as described [here](http://cirdles.org/sites/default/files/Downloads/ggge1933.pdf) and 
+[here](http://cirdles.org/sites/default/files/Downloads/ggge1932.pdf).
+
+We have recently received NSF funding to extend the architecture to Uranium series
+analyses, as explained 
+[here](http://earthcube.org/group/cyberinfrastructure-u-series-geochronologic-data). 
+
+As of March 2015, we are migrating our content from CIRDLES.org to this site, with
+the goal of stimulating community involvement.
+
+Getting Started for Users:
+---
+You will always find the latest release 
+[here](https://github.com/CIRDLES/ET_Redux/releases) - it consists of one file that can be 
+saved and executed from anywhere on your 64-bit machine - Unix, Linux, Mac, and Windows.
+Be sure you have the latest Java Runtime Environment (JRE), found 
+[here](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
+
+Getting Started for Developers:
+---
+Join Github by getting an account.  Fork the repository and explore the code.  We value
+your contributions, whether they are to the code, documentation, tests, help engine,
+issues, or planning.  If you want more involvement, please contact 
+[Jim Bowring](mailto://[email protected]).
+

pom.xml

@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--/*
+* pom.xml
+*
+* Copyright 2006-2015 James F. Bowring and www.Earth-Time.org
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cirdles</groupId>
     <artifactId>ET_Redux</artifactId>
     <name>ET_Redux</name>
-    <version>3.0.1</version>
+    <version>3.0.4</version>
     <description>Successor to U-Pb_Redux</description>
     <url>https://cirdles.org</url>
     <inceptionYear>2006</inceptionYear>
@@ -21,9 +38,11 @@
 
     <developers>
         <developer>
-            <name>James Bowring</name>
+            <name>James F. Bowring</name>
             <url>bowringj.people.cofc.edu</url>
+            <email>[email protected]</email>
             <organization>CIRDLES</organization>
+            <organizationUrl>https://www.cirdles.org/</organizationUrl>
         </developer>            
     </developers>
 
@@ -58,7 +77,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>14.0.1</version>
+            <version>17.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
@@ -162,6 +181,31 @@
             <artifactId>batik-transcoder</artifactId>
             <version>1.7</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.jimfs</groupId>
+            <artifactId>jimfs</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient-cache</artifactId>
+            <version>4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>fluent-hc</artifactId>
+            <version>4.4</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/org/earthtime/ETRedux.java

@@ -44,12 +44,12 @@ public class ETRedux {
     /**
      * Version 3.0.0 initiates switch to ET_Redux from U-Pb_Redux
      */
-    public static String VERSION = "3.0.1";
+    public static String VERSION = "3.0.4";
 
     /**
      *
      */
-    public static String RELEASE_DATE = "22 January 2015";
+    public static String RELEASE_DATE = "22 March 2015";
 
     /**
      * Creates a new instance of UPbRedux
@@ -114,7 +114,7 @@ public static void main(String[] args) {
 //                File reduxFile = new File(evt.getFilename());
 //                JOptionPane.showMessageDialog(null,
 //                        new String[]{evt.getFilename()},
-//                        "U-Pb Redux Warning",
+//                        "ET Redux Warning",
 //                        JOptionPane.WARNING_MESSAGE);
 //                if (reduxFile.exists()) {
 //                    new ETRedux(reduxFile);

src/main/java/org/earthtime/ETReduxFrame.form

@@ -111,12 +111,22 @@
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="exportProjectSamples">
               <Properties>
-                <Property name="text" type="java.lang.String" value="Export Project Samples"/>
+                <Property name="text" type="java.lang.String" value="Export Project Samples to Local Folder"/>
+                <Property name="enabled" type="boolean" value="false"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="exportProjectSamplesActionPerformed"/>
               </Events>
             </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="exportProjectSamplesToGeochron">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Export Project Samples to Geochron"/>
+                <Property name="enabled" type="boolean" value="false"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="exportProjectSamplesToGeochronActionPerformed"/>
+              </Events>
+            </MenuItem>
             <MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator10">
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="openProjectFile_menuItem">
@@ -623,7 +633,7 @@
           <SubComponents>
             <MenuItem class="javax.swing.JMenuItem" name="visitCIRDLES">
               <Properties>
-                <Property name="text" type="java.lang.String" value="CIRDLES"/>
+                <Property name="text" type="java.lang.String" value="CIRDLES.org"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="visitCIRDLESActionPerformed"/>
@@ -639,15 +649,15 @@
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="visitGeochron">
               <Properties>
-                <Property name="text" type="java.lang.String" value="Geochron"/>
+                <Property name="text" type="java.lang.String" value="Geochron.org"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="visitGeochronActionPerformed"/>
               </Events>
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="visitGeoSamplesOrg">
               <Properties>
-                <Property name="text" type="java.lang.String" value="SESAR (IGSN)"/>
+                <Property name="text" type="java.lang.String" value="SESAR (geoSamples.org)"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="visitGeoSamplesOrgActionPerformed"/>
@@ -681,6 +691,14 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="writeCSVFileOfGenericUPbIsotopicLegacyDataSampleFieldNames_AActionPerformed"/>
                   </Events>
                 </MenuItem>
+                <MenuItem class="javax.swing.JMenuItem" name="writeCSVFileOfProjectLegacyDataSampleFieldNames_UCSB_LASS_A">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="Open CSV File of UPb Isotopic Legacy Data Sample Field Names UCSB LASS (A)"/>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="writeCSVFileOfProjectLegacyDataSampleFieldNames_UCSB_LASS_AActionPerformed"/>
+                  </Events>
+                </MenuItem>
               </SubComponents>
             </Menu>
             <Menu class="javax.swing.JMenu" name="templatesForLegacySample_menu">