javadoc an cleanup of unneeded code (mainly already out-commented)

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@690 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 6 insertions, 113 deletions

diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java
index 938f7bf..fbfbcab 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java
@@ -19,7 +19,6 @@ package at.gv.egiz.pdfas.web.servlets;
 

 import java.io.IOException;

 import java.io.UnsupportedEncodingException;

-import java.net.URL;

 import java.util.Arrays;

 import java.util.Iterator;

 import java.util.List;

@@ -51,7 +50,6 @@ import at.gv.egiz.pdfas.web.FormFields;
 import at.gv.egiz.pdfas.web.helper.ApiHelper;

 import at.gv.egiz.pdfas.web.helper.LocalRequestHelper;

 import at.gv.egiz.pdfas.web.helper.WebSettingsReader;

-import at.gv.egiz.pdfas.web.helper.WebUtils;

 import at.gv.egiz.pdfas.web.io.ByteArrayPdfDataSource;

 import at.gv.egiz.pdfas.web.io.TextDataSource;

 import at.gv.egiz.pdfas.web.session.SessionAttributes;

@@ -103,12 +101,12 @@ public class VerifyServlet extends HttpServlet
    */

   public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException

   {

-	    // for performance measurement

-	    long startTime = 0; 

-	    long fileSize = 0;

-	    if (log.isInfoEnabled()) {

-	    	startTime = System.currentTimeMillis();    	

-	    }

+    // for performance measurement

+    long startTime = 0; 

+    if (log.isInfoEnabled()) {

+    	startTime = System.currentTimeMillis();    	

+    }

+    

     try

     {

       UploadedData ud = retrieveUploadedDataFromRequest(request);

@@ -130,21 +128,11 @@ public class VerifyServlet extends HttpServlet
       AnalyzeResult analyzeResult = pdfAs.analyze(analyzeParameters);

       si.analyzeResult = analyzeResult;

       

-      // List signature_holders = extractSignatureHoldersFromFile(ud.file_name,

-      // ud.file_data);

-//      List signature_holders = extractSignatureHolders(ud.dataSource);

-//      

-//      TempDirHelper.storeTextSignatureHoldersIfApplicable(signature_holders, "_textholder.utf8.txt");

-//

-//      si.signature_holders = signature_holders;

-

       request.getSession().setAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION, si);

 

       if (ud.preview)

       {

         dispatch(request, response, "/jsp/verifylist.jsp");

-        // VerifyPreview.formatPreview(signature_holders, connector, request,

-        // response);

       }

       else

       {

@@ -156,12 +144,6 @@ public class VerifyServlet extends HttpServlet
           return;

         }

 

-//        String host = request.getServerName();

-        // TODO still required for old communication with MOA-SS/SP

-//        URL loc_ref_URL = new URL(WebUtils.addJSessionID(LocalRequestHelper.getLocalContextAddress(request, response) + "/RetrieveSignatureData", request));

-//        URL loc_ref_URL = new URL(WebUtils.buildRetrieveSignatureDataURL(request, response));

-//        String loc_ref_url = response.encodeURL(loc_ref_URL.toString());

-

         VerifyAfterAnalysisParameters verifyAfterAnalysisParameters = new VerifyAfterAnalysisParameters();

         verifyAfterAnalysisParameters.setAnalyzeResult(si.analyzeResult);

         verifyAfterAnalysisParameters.setSignatureDevice(si.connector);

@@ -243,12 +225,6 @@ public class VerifyServlet extends HttpServlet
           continue;

         }

 

-        // if (item.getFieldName().equals(FormFields.FIELD_MODE))

-        // {

-        // mode_fi = item;

-        // continue;

-        // }

-

         if (item.getFieldName().equals(FormFields.FIELD_PREVIEW))

         {

           preview_fi = item;

@@ -266,13 +242,6 @@ public class VerifyServlet extends HttpServlet
 

     String connector = connector_fi.getString("UTF-8"); //$NON-NLS-1$

 

-    // String mode = mode_fi.getString("UTF-8");

-    // if (!mode.equals(FormFields.VALUE_MODE_BINARY) &&

-    // !mode.equals(FormFields.VALUE_MODE_TEXTUAL))

-    // {

-    // throw new ServletException("The mode '" + mode + "' is unrecognized.");

-    // }

-

     String preview_str = preview_fi.getString("UTF-8"); //$NON-NLS-1$

     if (!preview_str.equals(FormFields.VALUE_TRUE) && !preview_str.equals(FormFields.VALUE_FALSE))

     {

@@ -311,17 +280,6 @@ public class VerifyServlet extends HttpServlet
     if ((upload_fi.getContentType() != null ) && ((upload_fi.getContentType().startsWith("application/pdf") || upload_fi.getContentType().startsWith("application/x-download") )))

     {

        return new ByteArrayPdfDataSource(upload_fi.get());

-//      try

-//      {

-//        String fileNameSuffix = TempDirHelper.extractFileNameSuffix(upload_fi.getName());

-//        PdfDataSource pdfDataSource = TempDirHelper.placePdfIntoTempDir(upload_fi.getInputStream(), fileNameSuffix);

-//        return pdfDataSource;

-//      }

-//      catch (IOException e)

-//      {

-//        throw new PDFDocumentException(201, "The document could not be placed in the temp dir.", e); //$NON-NLS-1$

-//      }

-      // byte[] document_bytes = upload_fi.get();

     }

 

     try

@@ -336,70 +294,6 @@ public class VerifyServlet extends HttpServlet
       throw new PDFDocumentException(201, e);

     }

   }

-//

-//  protected List extractSignatureHolders(DataSource dataSource) throws PresentableException

-//  {

-//    VerificationFilterParameters parameters = SettingsHelper.readVerificationFilterParametersFromSettings();

-//

-//    ExtractionStage es = new ExtractionStage();

-//    List signature_holders = es.extractSignatureHolders(dataSource, parameters);

-//

-//    // filter out NoSignatureHolders that are possibly present due to the direct call method extractSignatureHolders() 

-//    List filtered_signature_holders = new ArrayList();

-//    Iterator it = signature_holders.iterator();

-//    while(it.hasNext()) {

-//      SignatureHolder current = (SignatureHolder) it.next();

-//      if(!(current instanceof NoSignatureHolder)) {

-//        filtered_signature_holders.add(current);

-//      }

-//    }

-//    

-//    if (filtered_signature_holders.size() == 0)

-//    {

-//      throw new PDFDocumentException(ErrorCode.DOCUMENT_NOT_SIGNED, "PDF document not signed."); //$NON-NLS-1$

-//    }

-//

-//    return filtered_signature_holders;

-//  }

-

-  // TODO obsolete method - remove

-  // protected List extractSignatureHoldersFromFile(String file_name, byte[]

-  // data) throws UnsupportedEncodingException, PresentableException

-  // {

-  // VerificationFilterParameters parameters = new

-  // VerificationFilterParametersImpl(false, false, true);

-  // ExtractionStage es = new ExtractionStage();

-  // // VerificationFilter vf = new VerificationFilter();

-  // List signature_holders = null;

-  //

-  // String extension = extractExtension(file_name);

-  //

-  // String raw_text = null;

-  // if (file_name == null || (extension != null && extension.equals("txt")))

-  // //$NON-NLS-1$

-  // {

-  // raw_text = new String(data, "UTF-8"); //$NON-NLS-1$

-  //

-  // signature_holders = es.extractSignatureHolders(new

-  // TextDataSourceImpl(raw_text), parameters);

-  // // signature_holders = vf.extractSignaturesFromPlainText(raw_text);

-  // }

-  // else

-  // {

-  // signature_holders = es.extractSignatureHolders(new

-  // ByteArrayPdfDataSourceImpl(data), parameters);

-  //

-  // // signature_holders = vf.extractSignaturesFromPdf(data);

-  // }

-  //

-  // if (signature_holders.size() == 0)

-  // {

-  // throw new PDFDocumentException(206, "PDF document not signed.");

-  // //$NON-NLS-1$

-  // }

-  //

-  // return signature_holders;

-  // }

 

   /**

    * Extracts the extension from a file name string.

@@ -438,7 +332,6 @@ public class VerifyServlet extends HttpServlet
     protected String file_name = null;

 

     protected DataSource dataSource = null;

-    // protected byte[] file_data = null;

   }

   

   /**