Housekeeping

 * Generic types parameterized
 * SupressWarnings annotations added where parameterization impossible
 * Unused members commented out
 * SerialVersionUID added/removed where necessary
 * Superfluous imports removed
 * Other small changed to get rid of some compiler/validator warnings

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

3 files changed, 50 insertions, 48 deletions

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java
index 4e1497c9..2b633139 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java
@@ -26,7 +26,6 @@
 package at.gv.egiz.bku.gui.html;
 
 import javax.swing.text.Element;
-import javax.swing.text.html.HTML;
 import javax.swing.text.html.ImageView;
 
 /**
@@ -58,18 +57,18 @@ import javax.swing.text.html.ImageView;
 //      return super.getImage();
 //    }
     
-    /**
-     * check whether this URL corresponds to the data URI scheme 
-     * (and the referenced content is directly included in the document).
-     * @return
-     */
-    private boolean isDataURI() {
-      String src = (String)getElement().getAttributes().
-                             getAttribute(HTML.Attribute.SRC);
-      if (src == null) {
-        return false;
-      }
-
-      return src.toLowerCase().startsWith("data");
-    }
+//    /**
+//     * check whether this URL corresponds to the data URI scheme 
+//     * (and the referenced content is directly included in the document).
+//     * @return
+//     */
+//    private boolean isDataURI() {
+//      String src = (String)getElement().getAttributes().
+//                             getAttribute(HTML.Attribute.SRC);
+//      if (src == null) {
+//        return false;
+//      }
+//
+//      return src.toLowerCase().startsWith("data");
+//    }
   }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeTypes.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeTypes.java
index b1661f41..17316602 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeTypes.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeTypes.java
@@ -34,7 +34,9 @@ import java.util.Map;
  */
 public class MimeTypes {
 
-  private static final Map<String , String> FILE_EXTENSIONS = new HashMap<String, String>() {{
+  private static final Map<String , String> FILE_EXTENSIONS = new HashMap<String, String>() {
+    private static final long serialVersionUID = 1L;
+{
     put("application/msword", ".doc");
     put("application/octet-stream", ".bin");
     put("application/pdf", ".pdf");
@@ -44,7 +46,9 @@ public class MimeTypes {
     put("text/xml", ".xml");
   }};
 
-  private static final Map<String , String> DESCRIPTIONS = new HashMap<String, String>() {{
+  private static final Map<String , String> DESCRIPTIONS = new HashMap<String, String>() {
+    private static final long serialVersionUID = 1L;
+{
     put("application/msword", "mimetype.desc.doc");
     put("application/octet-stream", "mimetype.desc.bin");
     put("application/pdf", "mimetype.desc.pdf");
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 824c1219..36e5ea0d 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
@@ -49,7 +49,7 @@ public class BKUGUIWorker implements Runnable {
         try {
 
     final PinInfo signPinSpec = new SimplePinInfo(6, 10, "[0-9]", "Test-PIN", (byte) 0x81, null, PinInfo.UNKNOWN_RETRIES);
-    final PinInfo cardPinSpec = new SimplePinInfo(4, 4, "[0-9]", "Test-PIN", (byte) 0x01, null, PinInfo.UNKNOWN_RETRIES);
+//    final PinInfo cardPinSpec = new SimplePinInfo(4, 4, "[0-9]", "Test-PIN", (byte) 0x01, null, PinInfo.UNKNOWN_RETRIES);
 
 
     final ActionListener cancelListener = new ActionListener() {
@@ -58,13 +58,13 @@ public class BKUGUIWorker implements Runnable {
         System.out.println("CANCEL EVENT OCCURED: " + e);
       }
     };
-    ActionListener okListener = new ActionListener() {
-
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        System.out.println("OK EVENT OCCURED: " + e);
-      }
-    };
+//    ActionListener okListener = new ActionListener() {
+//
+//      @Override
+//      public void actionPerformed(ActionEvent e) {
+//        System.out.println("OK EVENT OCCURED: " + e);
+//      }
+//    };
     final ActionListener signListener = new ActionListener() {
 
       public void actionPerformed(ActionEvent e) {
@@ -89,29 +89,28 @@ public class BKUGUIWorker implements Runnable {
                 "UTF-8",
                 "file.txt");
         
-        HashDataInput signedRef2 = new ByteArrayHashDataInput(
-                "<xml>HashDataInput_002</xml>".getBytes(), 
-                "ref-id-000000002", 
-                "application/xhtml+xml", 
-                "UTF-8",
-                "file.xhtml");
-        
-        HashDataInput signedRef3 = new ByteArrayHashDataInput(
-                "<xml>HashDataInput_003</xml>".getBytes(), 
-                "ref-id-000000003", 
-                "application/xhtml+xml", 
-                "UTF-8",
-                "file2.xhtml");
-
-        HashDataInput signedRef4 = new ByteArrayHashDataInput(
-                "<xml>HashDataInput_004</xml>".getBytes(), 
-                "ref-id-000000004", 
-                "text/xml", 
-                "UTF-8",
-                "file.xml");
-
-        //
-        List<HashDataInput> signedRefs = new ArrayList();
+//        HashDataInput signedRef2 = new ByteArrayHashDataInput(
+//                "<xml>HashDataInput_002</xml>".getBytes(), 
+//                "ref-id-000000002", 
+//                "application/xhtml+xml", 
+//                "UTF-8",
+//                "file.xhtml");
+//        
+//        HashDataInput signedRef3 = new ByteArrayHashDataInput(
+//                "<xml>HashDataInput_003</xml>".getBytes(), 
+//                "ref-id-000000003", 
+//                "application/xhtml+xml", 
+//                "UTF-8",
+//                "file2.xhtml");
+//
+//        HashDataInput signedRef4 = new ByteArrayHashDataInput(
+//                "<xml>HashDataInput_004</xml>".getBytes(), 
+//                "ref-id-000000004", 
+//                "text/xml", 
+//                "UTF-8",
+//                "file.xml");
+
+        List<HashDataInput> signedRefs = new ArrayList<HashDataInput>();
         signedRefs.add(signedRef1);
 //                    signedRefs.add(signedRef2);
 //                    signedRefs.add(signedRef3);