From 79764e9e4debea51884177dd0a4936aa82c2457a Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 10 Aug 2011 08:02:15 +0000 Subject: Rename (rexep -> regexp) git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@950 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java | 6 +++--- .../src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java | 12 ++++++------ smcc/src/main/java/at/gv/egiz/smcc/PinInfo.java | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java index 7573da2b..132509ff 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java @@ -547,7 +547,7 @@ public class BKUGUIImpl implements BKUGUIFacade { pinField.setText(""); pinField.setName("PINField"); pinField.setDocument(new PINDocument(pinSpec.getMinLength(), - pinSpec.getMaxLength(), pinSpec.getRexepPattern(), + pinSpec.getMaxLength(), pinSpec.getRegexpPattern(), okButton)); pinField.setActionCommand(okCommand); pinField.addActionListener(new ActionListener() { @@ -1413,7 +1413,7 @@ public class BKUGUIImpl implements BKUGUIFacade { pinField.setText(""); pinField.setName("PINField"); pinField.setDocument(new PINDocument(pinSpec.getMinLength(), - pinSpec.getMaxLength(), pinSpec.getRexepPattern(), + pinSpec.getMaxLength(), pinSpec.getRegexpPattern(), signButton)); pinField.setActionCommand(signCommand); pinField.addActionListener(new ActionListener() { @@ -1906,7 +1906,7 @@ public class BKUGUIImpl implements BKUGUIFacade { ActionListener closeListener, String closeCommand) throws FontProviderException { - log.debug("[{}] Show secure viewer."); + log.debug("[{}] Show secure viewer.", Thread.currentThread().getName()); secureViewer = new SecureViewerDialog(null, messages, closeListener, closeCommand, fontProvider, helpListener, getResizeFactor()); diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java index 362a4364..32fe207c 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java @@ -584,15 +584,15 @@ public class PINManagementGUI extends CardMgmtGUI implements ExtendedPinDocument oldPinDocument = new ExtendedPinDocument( pinSpec.getMinLength(), pinSpec .getMaxLength(), pinSpec - .getRexepPattern(), okButton); + .getRegexpPattern(), okButton); ComparePinDocument newPinDocument = new ComparePinDocument( pinSpec.getRecMinLength(), pinSpec .getRecMaxLength(), pinSpec - .getRexepPattern(), okButton); + .getRegexpPattern(), okButton); ComparePinDocument confirmPinDocument = new ComparePinDocument( pinSpec.getRecMinLength(), pinSpec .getRecMaxLength(), pinSpec - .getRexepPattern(), okButton); + .getRegexpPattern(), okButton); oldPinDocument.newPIN = newPinDocument; oldPinDocument.confirmPIN = confirmPinDocument; @@ -613,11 +613,11 @@ public class PINManagementGUI extends CardMgmtGUI implements ComparePinDocument newPinDocument = new ComparePinDocument( pinSpec.getRecMinLength(), pinSpec .getRecMaxLength(), pinSpec - .getRexepPattern(), okButton); + .getRegexpPattern(), okButton); ComparePinDocument confirmPinDocument = new ComparePinDocument( pinSpec.getRecMinLength(), pinSpec .getRecMaxLength(), pinSpec - .getRexepPattern(), okButton); + .getRegexpPattern(), okButton); newPinDocument.compareTo = confirmPinDocument; confirmPinDocument.compareTo = newPinDocument; @@ -631,7 +631,7 @@ public class PINManagementGUI extends CardMgmtGUI implements // VERIFY pinField.setDocument(new PINDocument(pinSpec .getMinLength(), pinSpec.getMaxLength(), - pinSpec.getRexepPattern(), okButton)); + pinSpec.getRegexpPattern(), okButton)); primaryFocusHolder = pinField; } diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PinInfo.java b/smcc/src/main/java/at/gv/egiz/smcc/PinInfo.java index 107cd18e..51a7a5ef 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/PinInfo.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/PinInfo.java @@ -59,7 +59,7 @@ public class PinInfo { /** * The regular expression pattern of a single PIN digit or character. */ - protected final String rexepPattern; + protected final String regexpPattern; /** * The name of the corresponding resource bundle. @@ -101,18 +101,18 @@ public class PinInfo { * * @param minLenght the minimum length of the PIN * @param maxLength the maximum length of the PIN, or -1 if there is no maximum length - * @param rexepPattern the regular expression pattern of a single PIN digit or character + * @param regexpPattern the regular expression pattern of a single PIN digit or character * @param resourceBundleName the name of a ResourceBundle for this PIN * @param resourceKey the key to look up the (localized) name of this PIN * @param kid the key id of the PIN * @param contextAID the AID the KID is valid in */ - public PinInfo(int minLenght, int maxLength, String rexepPattern, + public PinInfo(int minLenght, int maxLength, String regexpPattern, String resourceBundleName, String resourceKey, byte kid, byte[] contextAID, int maxRetries) { this.minLength = minLenght; this.maxLength = maxLength; - this.rexepPattern = rexepPattern; + this.regexpPattern = regexpPattern; this.resourceBundleName = resourceBundleName; this.nameKey = resourceKey + ".name"; this.kid = kid; @@ -213,8 +213,8 @@ public class PinInfo { /** * @return the regular expression pattern of one single digit or character */ - public String getRexepPattern() { - return rexepPattern; + public String getRegexpPattern() { + return regexpPattern; } /** -- cgit v1.2.3