Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig

# Conflicts:
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java

1 files changed, 26 insertions, 23 deletions

diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCVerificationResult.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCVerificationResult.java
index a350f18..a29b5c2 100644
--- a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCVerificationResult.java
+++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCVerificationResult.java
@@ -1,40 +1,43 @@
 package at.gv.egiz.asic.api;
 
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import at.gv.egiz.asic.impl.AsicSignedFilesContainer;
+import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
+import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
+
 /**
  * Created by Andreas Fitzek on 6/16/16.
  */
 public class ASiCVerificationResult {
 
-    private List<String> signedFiles = new ArrayList<String>();
+  private List<AsicSignedFilesContainer> signedFiles = new ArrayList<>();
 
-    private VerifyCMSSignatureResponse cmsResult = null;
-    private VerifyXMLSignatureResponse xmlResult = null;
+  private VerifyCMSSignatureResponse cmsResult = null;
+  private VerifyXMLSignatureResponse xmlResult = null;
 
-    public ASiCVerificationResult(List<String> references, VerifyCMSSignatureResponse cmsResult) {
-        this.signedFiles = references;
-        this.cmsResult = cmsResult;
-    }
+  public ASiCVerificationResult(List<AsicSignedFilesContainer> references,
+      VerifyCMSSignatureResponse cmsResult) {
+    this.signedFiles = references;
+    this.cmsResult = cmsResult;
+  }
 
-    public ASiCVerificationResult(List<String> references, VerifyXMLSignatureResponse xmlResult) {
-        this.signedFiles = references;
-        this.xmlResult = xmlResult;
-    }
+  public ASiCVerificationResult(List<AsicSignedFilesContainer> references,
+      VerifyXMLSignatureResponse xmlResult) {
+    this.signedFiles = references;
+    this.xmlResult = xmlResult;
+  }
 
-    public List<String> getSignedFiles() {
-        return signedFiles;
-    }
+  public List<AsicSignedFilesContainer> getSignedFiles() {
+    return signedFiles;
+  }
 
-    public VerifyXMLSignatureResponse getXmlResult() {
-        return xmlResult;
-    }
+  public VerifyXMLSignatureResponse getXmlResult() {
+    return xmlResult;
+  }
 
-    public VerifyCMSSignatureResponse getCmsResult() {
-        return cmsResult;
-    }
+  public VerifyCMSSignatureResponse getCmsResult() {
+    return cmsResult;
+  }
 }