Merge pull request #81 from dnorgaard-usgs/master

hande SCNL with space delimiters
usgs · Jul 26, 2018 · 2ff2b31 · 2ff2b31
2 parents ac7ff56 + 26bbab4
commit 2ff2b31
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>gov.usgs.volcanoes</groupId>
 	<artifactId>volcano-core</artifactId>
-	<version>1.4.8</version>
+	<version>1.4.9</version>
 	<packaging>jar</packaging>
 
 	<name>volcano-core</name>

diff --git a/src/main/java/gov/usgs/volcanoes/core/data/Scnl.java b/src/main/java/gov/usgs/volcanoes/core/data/Scnl.java
@@ -146,6 +146,9 @@ public String toString(String delimiter) {
    * @throws UtilException when string cannot be parsed
    */
   public static Scnl parse(String scnlString) throws UtilException {
+    if (scnlString.indexOf("$") == -1) {
+      return Scnl.parse(scnlString, " ");
+    }
     return Scnl.parse(scnlString, DELIMITER);
   }
 

diff --git a/src/test/java/gov/usgs/volcanoes/core/args/parser/ScnlParserTest.java b/src/test/java/gov/usgs/volcanoes/core/args/parser/ScnlParserTest.java
@@ -2,13 +2,11 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
-
 import com.martiansoftware.jsap.ParseException;
 
-import gov.usgs.volcanoes.core.args.parser.ScnlParser;
 import gov.usgs.volcanoes.core.data.Scnl;
-import gov.usgs.volcanoes.core.data.ScnlTest;
+
+import org.junit.Test;
 
 /**
  * 
@@ -65,6 +63,6 @@ public void when_givenScn_return_scn() throws ParseException {
    */
   @Test(expected = ParseException.class)
   public void when_givenBadScnl_then_throwHelpfulException() throws ParseException {
-    parser.parse("not a SCNL");
+    parser.parse("not-a-SCNL");
   }
 }