From 35b64892bad13c846f19260311c7625d88cef7a1 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 5 Sep 2008 13:39:53 +0000
Subject: HashDataInput

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@23 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/stal/HashDataInput.java   | 22 ++++++++++++++++++++
 .../at/gv/egiz/stal/HashDataInputCallback.java     | 24 ----------------------
 .../src/main/java/at/gv/egiz/stal/SignRequest.java |  7 ++++---
 3 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 STAL/src/main/java/at/gv/egiz/stal/HashDataInput.java
 delete mode 100644 STAL/src/main/java/at/gv/egiz/stal/HashDataInputCallback.java

(limited to 'STAL/src/main')

diff --git a/STAL/src/main/java/at/gv/egiz/stal/HashDataInput.java b/STAL/src/main/java/at/gv/egiz/stal/HashDataInput.java
new file mode 100644
index 00000000..2d1e9ce6
--- /dev/null
+++ b/STAL/src/main/java/at/gv/egiz/stal/HashDataInput.java
@@ -0,0 +1,22 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.stal;
+
+import java.io.InputStream;
+
+/**
+ *
+ * @author clemens
+ */
+public interface HashDataInput {
+    
+    public String getReferenceId();
+    
+    public String getMimeType();
+    
+    public InputStream getHashDataInput();
+
+}
diff --git a/STAL/src/main/java/at/gv/egiz/stal/HashDataInputCallback.java b/STAL/src/main/java/at/gv/egiz/stal/HashDataInputCallback.java
deleted file mode 100644
index f1ccf937..00000000
--- a/STAL/src/main/java/at/gv/egiz/stal/HashDataInputCallback.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-* Copyright 2008 Federal Chancellery Austria and
-* Graz University of Technology
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package at.gv.egiz.stal;
-
-import java.io.InputStream;
-
-public interface HashDataInputCallback {
-
-    InputStream getHashDataInput(String referenceId);
-}
diff --git a/STAL/src/main/java/at/gv/egiz/stal/SignRequest.java b/STAL/src/main/java/at/gv/egiz/stal/SignRequest.java
index 8c996d2c..b1fea0fe 100644
--- a/STAL/src/main/java/at/gv/egiz/stal/SignRequest.java
+++ b/STAL/src/main/java/at/gv/egiz/stal/SignRequest.java
@@ -16,6 +16,7 @@
 */
 package at.gv.egiz.stal;
 
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -55,7 +56,7 @@ public class SignRequest
     @XmlElement(name = "SignedInfo", required = true)
     protected byte[] signedInfo;
     @XmlTransient
-    protected HashDataInputCallback hashData;
+    protected List<HashDataInput> hashData;
 
     /**
      * Gets the value of the keyIdentifier property.
@@ -103,11 +104,11 @@ public class SignRequest
         this.signedInfo = ((byte[]) value);
     }
 
-    public HashDataInputCallback getHashDataInput() {
+    public List<HashDataInput> getHashDataInput() {
         return hashData;
     }
 
-    public void setHashDataInput(HashDataInputCallback hashData) {
+    public void setHashDataInput(List<HashDataInput> hashData) {
         this.hashData = hashData;
     }
 }
-- 
cgit v1.2.3