Changeset 5403 for CMDIValidator

Timestamp:

06/27/14 23:52:41 (10 years ago)

Author:

Oliver Schonefeld

Message:

• prepare for pluggable report factory

Location:

CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator

Files:

• CMDIValidator.java (modified) (1 diff)
• CMDIWriteableValidationReport.java (modified) (2 diffs)
• CMDIWriteableValidatonReportImpl.java (modified) (6 diffs)

CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidator.java

@@ -616 +616 @@
                 logger.debug("validating file '{}' ({} bytes)",
                         file, file.length());
-                report = new CMDIWriteableValidatonReportImpl(file);
+                report = new CMDIWriteableValidatonReportImpl();
+                report.setFile(file);
                 stream = new TFileInputStream(file);
 

CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIWriteableValidationReport.java

@@ -17 +17 @@
 package eu.clarin.cmdi.validator;
 
+import java.io.File;
+
 public interface CMDIWriteableValidationReport extends CMDIValidationReport {
+
+    public void setFile(File file);
+    
     public void reportInfo(int line, int col, String message);
 
@@ -35 +40 @@
     public void reportError(int line, int col, String message, Throwable cause);
 
-} // interface CMDIValidatorWriteableResult
+} // interface CMDIWriteableValidationReport

CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIWriteableValidatonReportImpl.java

@@ -7 +7 @@
 
 final class CMDIWriteableValidatonReportImpl implements CMDIWriteableValidationReport {
-    private final File file;
+    private File file;
     private List<Message> messages;
     private Severity highestSeverity = Severity.INFO;
 
 
-    CMDIWriteableValidatonReportImpl(final File file) {
-        this.file = file;
-    }
-
-
     @Override
     public File getFile() {
         return file;
+    }
+
+
+    @Override
+    public void setFile(File file) {
+        this.file = file;
     }
 
@@ -58 +59 @@
     @Override
     public List<Message> getMessages() {
-        if (messages == null) {
+        if ((messages == null) && !messages.isEmpty()) {
             return Collections.emptyList();
         } else {
@@ -68 +69 @@
     @Override
     public Message getFirstMessage() {
-        return (messages != null) ? null : messages.get(0);
+        return ((messages != null) && !messages.isEmpty())
+                ? messages.get(0)
+                : null;
     }
 
@@ -78 +81 @@
         }
 
-        if (messages != null) {
+        if ((messages != null) && !messages.isEmpty()) {
             for (Message msg : messages) {
                 if (severity.equals(msg.getSeverity())) {
@@ -91 +94 @@
     @Override
     public int getMessageCount() {
-        return (messages != null) ? messages.size() : 0;
+        return ((messages != null) && !messages.isEmpty())
+                ? messages.size()
+                : 0;
     }
 
@@ -102 +107 @@
 
         int count = 0;
-        if (messages != null) {
+        if ((messages != null) && !messages.isEmpty()) {
             for (Message msg : messages) {
                 if (severity.equals(msg.getSeverity())) {