Fix bugs to address #110 and 109.

Author: timronan

src/main/java/edu/iris/dmc/CommandLine.java

@@ -171,10 +171,10 @@ public static CommandLine parse(String[] args) throws CommandLineParseException
 							    .map(Integer::parseInt).mapToInt(item -> item).toArray();
 					    i = i + 1;
 				    }
-				} else if ("--show-rules".equalsIgnoreCase(arg)) {
-					commandLine.showRules = true;
-				} else if ("--show-units".equalsIgnoreCase(arg)) {
-					commandLine.showUnits = true;
+				} else if ("--rules".equalsIgnoreCase(arg)) {
+					throw new CommandLineParseException(String.format("--rules must be the only input argument. "));
+				} else if ("--units".equalsIgnoreCase(arg)) {
+					throw new CommandLineParseException(String.format("--units must be the only input argument. "));
 				} else if ("--continue-on-error".equalsIgnoreCase(arg)) {
 					commandLine.setContinueError(true);
 					//commandLine.continueError = true;

src/main/java/edu/iris/dmc/station/conditions/InstrumentCodeUnitsCondition.java

@@ -6,6 +6,7 @@
 import edu.iris.dmc.fdsn.station.model.Station;
 import edu.iris.dmc.station.exceptions.StationxmlException;
 import edu.iris.dmc.station.rules.Message;
+import edu.iris.dmc.station.rules.NestedMessage;
 import edu.iris.dmc.station.rules.Result;
 
 public class InstrumentCodeUnitsCondition extends AbstractCondition {
@@ -27,6 +28,8 @@ public Message evaluate(Station station) {
 
 	@Override
 	public Message evaluate(Channel channel) {
+		NestedMessage nestedMessage = new NestedMessage();
+		boolean returnmessage = false;
 		String inputUnit ="";
 		String code = channel.getCode();
 		try {
@@ -69,17 +72,23 @@ public Message evaluate(Channel channel) {
 
 		if("HLMN".indexOf(code.charAt(1)) >=0 | "hlmn".indexOf(code.charAt(1)) >=0) {
 			if(!inputUnit.toLowerCase().contains("m/s")) {
-			return Result.warning("Instument code " +code.charAt(1)+" should have stage 1 input units similar to *m/s*");
-		    }
+				nestedMessage.add(Result.warning("Instrument code " +code.charAt(1)+" should have stage 1 input units similar to *m/s* but input units are "+inputUnit));
+				returnmessage=true;
+			}
 			if(!outputUnit.toLowerCase().contains("count")) {
-			return Result.warning("Instument code " +code.charAt(1)+ " should have stage last output units similar to count*");
-		    }
+				nestedMessage.add(Result.warning("Instrument code " +code.charAt(1)+ " should have stage last output units similar to count* but output units are "+outputUnit));
+				returnmessage=true;
+			}
 
 		}
 		}catch(Exception e) {	
 
 		}
-     	return Result.success();
+		if(returnmessage==true) {
+			   return nestedMessage;
+			}else {
+			   return Result.success();
+			}
     }
 
 }

src/test/java/edu/iris/dmc/station/RuleEngineServiceTest.java

@@ -210,7 +210,7 @@ public void rule321() throws Exception {
 
 		Set<Message> s = m.get(321);
 		assertNotNull(s);
-		assertEquals(1, s.size());
+		assertEquals(2, s.size());
 		Message message = s.iterator().next();
 		assertEquals(321, message.getRule().getId());
 	}

src/test/java/edu/iris/dmc/station/conditions/Condition321Test.java

@@ -14,6 +14,7 @@
 import edu.iris.dmc.fdsn.station.model.Station;
 import edu.iris.dmc.station.RuleEngineServiceTest;
 import edu.iris.dmc.station.rules.Message;
+import edu.iris.dmc.station.rules.NestedMessage;
 
 public class Condition321Test {
 
@@ -35,8 +36,13 @@ public void azimuthfail() throws Exception {
 
 			InstrumentCodeUnitsCondition condition = new InstrumentCodeUnitsCondition(true, "");
 			Message result = condition.evaluate(c);
-			System.out.println(result);
-			assertTrue(result instanceof edu.iris.dmc.station.rules.Warning);
+			NestedMessage nestedMessage=(NestedMessage)result;
+			System.out.println(nestedMessage.getNestedMessages().get(0).getDescription());
+			System.out.println(nestedMessage.getNestedMessages().get(1).getDescription());
+
+ 			assertTrue(nestedMessage.getNestedMessages().get(0).getDescription().contains("Instrument code H should have stage 1 input units similar to *m/s* but input units are PA"));
+ 			assertTrue(nestedMessage.getNestedMessages().get(1).getDescription().contains("Instrument code H should have stage last output units similar to count* but output units are m/s"));
+
 		}
 
 	}

src/test/resources/F1_321.xml

@@ -25,7 +25,6 @@
     <Longitude>-122.31332</Longitude>
     <Elevation>225.879999</Elevation>
     <Depth>0</Depth>
-    <Azimuth>325</Azimuth>
     <Dip>0</Dip>
     <Type>CONTINUOUS</Type>
     <Type>GEOPHYSICAL</Type>