summaryrefslogtreecommitdiff
path: root/smcc/src/main/java
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-09-02 16:01:17 +0000
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-09-02 16:01:17 +0000
commit89888f9f230c98bde926e849d5e42ed92da10c0d (patch)
treeac115c56701b57e8b544e0d9628223bb605285eb /smcc/src/main/java
parent7b127caba3ddc39a5a70628c831953bb870f4b52 (diff)
downloadmocca-89888f9f230c98bde926e849d5e42ed92da10c0d.tar.gz
mocca-89888f9f230c98bde926e849d5e42ed92da10c0d.tar.bz2
mocca-89888f9f230c98bde926e849d5e42ed92da10c0d.zip
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
Diffstat (limited to 'smcc/src/main/java')
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/AbstractISCard.java16
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java3
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/cio/CIODirectoryFile.java1
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java2
4 files changed, 7 insertions, 15 deletions
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractISCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractISCard.java
index 7a1c6a66..82c0e867 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractISCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractISCard.java
@@ -34,15 +34,12 @@ import javax.smartcardio.CardException;
import javax.smartcardio.CommandAPDU;
import javax.smartcardio.ResponseAPDU;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import at.gv.egiz.smcc.util.TLV;
public abstract class AbstractISCard extends AbstractSignatureCard implements
SignatureCard {
- private final Logger log = LoggerFactory.getLogger(AbstractISCard.class);
+// private final Logger log = LoggerFactory.getLogger(AbstractISCard.class);
protected static final byte[] OID = new byte[] { (byte) 0x30, (byte) 0x21, (byte) 0x30,
(byte) 0x09, (byte) 0x06, (byte) 0x05, (byte) 0x2b,
@@ -148,12 +145,11 @@ public abstract class AbstractISCard extends AbstractSignatureCard implements
"Cannot retrieve enduser certificate.", e);
}
- if (cert == null) {
-
- log.error("Retrieved certificate is null.");
- throw new SignatureCardException(
- "Cannot retrieve enduser certificate.");
- }
+// if (cert == null ) {
+// log.error("Retrieved certificate is null.");
+// throw new SignatureCardException(
+// "Cannot retrieve enduser certificate.");
+// }
return cert;
}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index cad7ecf0..0104cdb3 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -27,7 +27,6 @@ package at.gv.egiz.smcc;
import at.gv.egiz.smcc.reader.CardReader;
import at.gv.egiz.smcc.reader.ReaderFactory;
import java.util.Locale;
-import java.util.ResourceBundle;
import javax.smartcardio.Card;
import javax.smartcardio.CardChannel;
@@ -41,7 +40,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
private final Logger log = LoggerFactory.getLogger(AbstractSignatureCard.class);
- private Locale locale = Locale.getDefault();
+ protected Locale locale = Locale.getDefault();
private Card card_;
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/cio/CIODirectoryFile.java b/smcc/src/main/java/at/gv/egiz/smcc/cio/CIODirectoryFile.java
index c267fe79..8fc1b099 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/cio/CIODirectoryFile.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/cio/CIODirectoryFile.java
@@ -27,7 +27,6 @@ package at.gv.egiz.smcc.cio;
import at.gv.egiz.smcc.SignatureCardException;
import at.gv.egiz.smcc.util.ISO7816Utils;
-import at.gv.egiz.smcc.util.TLVSequence;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java b/smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java
index 89027bf0..a1801da5 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java
@@ -31,8 +31,6 @@ package at.gv.egiz.smcc.conf;
*/
public class SMCCConfiguration {
- private static final long serialVersionUID = 1L;
-
boolean disablePinpad;
/**