1.1-rc2

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

2 files changed, 11 insertions, 11 deletions

diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
index b6c5a8ca..23b71690 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
@@ -54,7 +54,7 @@ public abstract class AbstractBKUWorker extends AbstractSMCCSTAL implements Acti
       throw new NullPointerException("No BKU GUI provided");
     }
     this.gui = gui;
-    this.locale = gui.getLocale();
+//    this.locale = gui.getLocale();
     addRequestHandler(QuitRequest.class, this);
   }
 
@@ -149,7 +149,7 @@ public abstract class AbstractBKUWorker extends AbstractSMCCSTAL implements Acti
         }
         break;
       case SMCCHelper.CARD_FOUND:
-        signatureCard = smccHelper.getSignatureCard(locale);
+        signatureCard = smccHelper.getSignatureCard(gui.getLocale());
         return false;
       }
       smccHelper.update(3000);
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
index 0074860f..3691156e 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
+//import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -41,7 +41,7 @@ public abstract class AbstractSMCCSTAL implements STAL {
 
   public final static int DEFAULT_MAX_RETRIES = 1;
 
-  protected Locale locale = Locale.getDefault();
+//  protected Locale locale = Locale.getDefault();
   protected SignatureCard signatureCard = null;
   protected Map<String, SMCCSTALRequestHandler> handlerMap = new HashMap<String, SMCCSTALRequestHandler>();
 
@@ -159,13 +159,13 @@ public abstract class AbstractSMCCSTAL implements STAL {
     return handlerMap.get(request.getSimpleName());
   }
 
-  @Override
-  public void setLocale(Locale locale) {
-    if (locale == null) {
-      throw new NullPointerException("Locale must not be set to null");
-    }
-    this.locale = locale;
-  }
+//  @Override
+//  public void setLocale(Locale locale) {
+//    if (locale == null) {
+//      throw new NullPointerException("Locale must not be set to null");
+//    }
+//    this.locale = locale;
+//  }
 
   public void setMaxRetries(int maxRetries) {
     this.maxRetries = maxRetries;