diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e7f90c6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/target/
-<<<<<<< HEAD
-=======
-.classpath
-.project
-.settings
->>>>>>> branch 'master' of https://github.com/iris-edu/stationxml-validator.git
diff --git a/pom.xml b/pom.xml
index 05e185b..e10b31d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
edu.iris.dmc
stationxml-validator
jar
- 1.7.4
+ 1.7.5
FDSN StationXML Validator
http://maven.apache.org
Converts seismological metadata between dataless seed and FDSN StationXML file formats.
diff --git a/src/main/java/edu/iris/dmc/station/conditions/SensorCondition.java b/src/main/java/edu/iris/dmc/station/conditions/SensorCondition.java
index e843d26..7c4120c 100644
--- a/src/main/java/edu/iris/dmc/station/conditions/SensorCondition.java
+++ b/src/main/java/edu/iris/dmc/station/conditions/SensorCondition.java
@@ -30,12 +30,12 @@ public Message evaluate(Channel channel) {
}
Equipment equipment = channel.getSensor();
- if (this.required) {
+ if (this.required) {
if (equipment == null) {
- return Result.error("expected equipment/sensor but was null");
+ return Result.warning("expected equipment/sensor but was null");
}else{
if (equipment.getDescription() == null||equipment.getDescription().trim().isEmpty()) {
- return Result.error("expected equipment/sensor description but was null");
+ return Result.warning("expected equipment/sensor description but was null");
}
}
}
diff --git a/src/test/java/edu/iris/dmc/station/conditions/Condition304Test.java b/src/test/java/edu/iris/dmc/station/conditions/Condition304Test.java
index 51db6bb..e1a16ef 100644
--- a/src/test/java/edu/iris/dmc/station/conditions/Condition304Test.java
+++ b/src/test/java/edu/iris/dmc/station/conditions/Condition304Test.java
@@ -36,7 +36,9 @@ public void fail() throws Exception {
SensorCondition condition = new SensorCondition(true, "");
Message result = condition.evaluate(c);
- assertTrue(result instanceof edu.iris.dmc.station.rules.Error);
+
+ System.out.print(result);
+ assertTrue(result instanceof edu.iris.dmc.station.rules.Warning);
}
}
diff --git a/src/test/java/edu/iris/dmc/station/conditions/SensorCondition304Test.java b/src/test/java/edu/iris/dmc/station/conditions/SensorCondition304Test.java
index ac799f0..a1dec13 100644
--- a/src/test/java/edu/iris/dmc/station/conditions/SensorCondition304Test.java
+++ b/src/test/java/edu/iris/dmc/station/conditions/SensorCondition304Test.java
@@ -36,7 +36,7 @@ public void fail() throws Exception {
SensorCondition condition = new SensorCondition(true, "");
Message result = condition.evaluate(c);
- assertTrue(result instanceof edu.iris.dmc.station.rules.Error);
+ assertTrue(result instanceof edu.iris.dmc.station.rules.Warning);
}
}