Text HashDataInput

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@24 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

5 files changed, 128 insertions, 23 deletions

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
index 0ad09c70..5175b45f 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
@@ -29,15 +29,22 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.swing.GroupLayout;
@@ -48,6 +55,8 @@ import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileFilter;
@@ -677,11 +686,44 @@ public class BKUGUI implements BKUGUIFacade {
 
                 if (signedReferences != null && signedReferences.size() == 1) {
 
-                    HashDataInput signedRef = signedReferences.get(0);
-//                    if ("text/plain".equals(signedRef.getMimeType())) {
-//                    } else {
+                    final HashDataInput signedRef = signedReferences.get(0);
+                    if ("text/plain".equals(signedRef.getMimeType())) {
+                        //TODO get encoding from mimetype
+                        //read directly to byte[] since hashDataIS is backed by byte[] ?
+                        ByteArrayOutputStream baos = null;
+                        try {
+                            String refId = signedRef.getReferenceId();
+                            InputStream hashDataIS = signedRef.getHashDataInput();
+                            if (hashDataIS == null) {
+                                showErrorDialog("Failed to obtain HashDataInput for reference " + refId, okListener, okCommand);
+                            } else {
+                                baos = new ByteArrayOutputStream(hashDataIS.available());
+                                int c;
+                                while ((c = hashDataIS.read()) != -1) {
+                                    baos.write(c);
+                                }
+                                String text = baos.toString("UTF-8");
+
+                                ActionListener al = new ActionListener() {
+
+                                    @Override
+                                    public void actionPerformed(ActionEvent e) {
+                                        showSaveHashDataInputDialog(signedRef, okListener, okCommand);
+                                    }
+                                };
+                                showPlainTextHashDataInputDialog(text, refId, okListener, okCommand, al, "save");
+                            }
+                        } catch (IOException ex) {
+                            showErrorDialog("Failed to read HashDataInput for reference " + signedRef.getReferenceId() + ": " + ex.getMessage(), okListener, okCommand);
+                        } finally {
+                            try {
+                                baos.close();
+                            } catch (IOException ex) {
+                            }
+                        }
+                    } else {
                         showSaveHashDataInputDialog(signedRef, okListener, okCommand);
-//                    }
+                    }
 
                 } else {
                     mainPanel.removeAll();
@@ -723,7 +765,66 @@ public class BKUGUI implements BKUGUIFacade {
         });
     }
 
-    
+    private void showPlainTextHashDataInputDialog(String text, String refId, ActionListener cancelListener, String cancelCommand, ActionListener saveListener, String saveCommand) {
+        mainPanel.removeAll();
+        buttonPanel.removeAll();
+
+        titleLabel.setText(messages.getString(TITLE_HASHDATA));
+
+        JLabel refIdLabel = new JLabel();
+        refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+        String refIdLabelPattern = messages.getString(MESSAGE_HASHDATA);
+        refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[] {refId} ));
+
+        JScrollPane hashDataScrollPane = new JScrollPane();
+        JTextArea hashDataTextArea = new JTextArea(text);
+        hashDataTextArea.setEditable(false);
+        hashDataTextArea.setColumns(20);
+        hashDataTextArea.setRows(3);
+        hashDataScrollPane.setViewportView(hashDataTextArea);
+
+        
+        JButton cancelButton = new JButton();
+        cancelButton.setFont(cancelButton.getFont());
+        cancelButton.setText(messages.getString(BUTTON_CANCEL));
+        cancelButton.setActionCommand(cancelCommand);
+        cancelButton.addActionListener(cancelListener);
+
+        JButton saveButton = new JButton();
+        saveButton.setFont(saveButton.getFont());
+        saveButton.setText(messages.getString(BUTTON_SAVE));
+        saveButton.setActionCommand(saveCommand);
+        saveButton.addActionListener(saveListener);
+
+        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+        mainPanel.setLayout(mainPanelLayout);
+
+        mainPanelLayout.setHorizontalGroup(
+          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addGroup(mainPanelLayout.createSequentialGroup()
+          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addComponent(refIdLabel)
+          .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
+          .addContainerGap()));
+          
+        mainPanelLayout.setVerticalGroup(
+          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addGroup(mainPanelLayout.createSequentialGroup()
+          .addComponent(refIdLabel)
+          .addGap(refIdLabel.getFont().getSize())
+          .addComponent(hashDataScrollPane)
+          .addGap(refIdLabel.getFont().getSize())));
+                
+        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+        buttonPanel.setLayout(buttonPanelLayout);
+
+        buttonPanelLayout.setHorizontalGroup(
+          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+        buttonPanelLayout.setVerticalGroup(
+          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
+
+        contentPanel.validate();
+    }
 
     private void showSaveHashDataInputDialog(HashDataInput signedRef, ActionListener okListener, String okCommand) {
         String dir = System.getProperty("user.home");
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
index a251be55..e2f478c9 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
@@ -86,7 +86,7 @@ public class BKUGUIWorker implements Runnable {
 
                         @Override
                         public String getMimeType() {
-                            return "text/xml";
+                            return "text/plain";
                         }
 
                         @Override
@@ -104,13 +104,13 @@ public class BKUGUIWorker implements Runnable {
 //
 //        Thread.sleep(2000);
         
-            gui.showInsertCardDialog(cancelListener, "cancel");
-            
-            Thread.sleep(2000);
-            
-            gui.showCardNotSupportedDialog(cancelListener, "cancel");
-            
-            Thread.sleep(2000);
+//            gui.showInsertCardDialog(cancelListener, "cancel");
+//            
+//            Thread.sleep(2000);
+//            
+//            gui.showCardNotSupportedDialog(cancelListener, "cancel");
+//            
+//            Thread.sleep(2000);
 
 //            PINSpec cardPinSpec = new PINSpec(4, 4, "[0-9]", "Karten-PIN");
 //            
@@ -119,19 +119,23 @@ public class BKUGUIWorker implements Runnable {
 //            Thread.sleep(2000);
 //
             
-//            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
-//
-//            Thread.sleep(2000);
-//            
-//            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
-//
-//            Thread.sleep(2000);
+            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+
+            Thread.sleep(2000);
+            
+            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+
+            Thread.sleep(2000);
 ////            
 //            gui.showErrorDialog("Testfehler occured", null, null);
 //            
 //            Thread.sleep(2000);
 //            
 //            gui.showErrorDialog("Testfehler occured"); 
+            
+            
+//            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
+//            Thread.sleep(2000);
 
         } catch (InterruptedException ex) {
             ex.printStackTrace();
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
index 9601d39c..d206913d 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
@@ -95,7 +95,7 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
         currentHashDataInput = null;
         for (STALRequest request : requests) {
             if (request instanceof SignRequest) {
-                log.trace("Received SignRequest, keep HashDataInput callback.");
+                log.trace("Received SignRequest, keep HashDataInput.");
                 currentHashDataInput = ((SignRequest) request).getHashDataInput();
                 break;
             } else if (request instanceof QuitRequest) {
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index f0df22ea..f4cdc7d2 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -1,4 +1,4 @@
-/*
+    /*
  * Copyright 2008 Federal Chancellery Austria and
  * Graz University of Technology
  *
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 2fe77c5d..1f84300a 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -146,7 +146,7 @@ public class SignRequestHandler extends AbstractRequestHandler implements
                 if (signedInfo != null) {
                     try {
                         gui.showWaitDialog(null);
-                        if (hashDataInputs == null) {
+                        if (hashDataInputs == null || hashDataInputs.size() == 0) {
                             hashDataInputs = getHashDataInputs(signedInfo.getReference());
                         }
                         gui.showHashDataInputDialog(hashDataInputs, this, "ok");