summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java8
-rw-r--r--BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkBKUWorker.java16
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java (renamed from BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java)30
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java (renamed from BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUIFacade.java)4
-rw-r--r--BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties6
-rw-r--r--BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java6
-rw-r--r--BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalIdentityLinkSTALFactory.java8
-rw-r--r--BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java4
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java (renamed from BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PersonIdentityLinkInvoker.java)14
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java4
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/BKUControllerInterface.java2
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java4
-rw-r--r--STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkRequest.java (renamed from STALExt/src/main/java/at/gv/egiz/stal/ext/PersonIdentityLinkRequest.java)4
-rw-r--r--STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkResponse.java (renamed from STALExt/src/main/java/at/gv/egiz/stal/ext/PersonIdentityLinkResponse.java)2
-rw-r--r--smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java14
-rw-r--r--smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java (renamed from smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PersonIdentityLinkRequestHandler.java)36
16 files changed, 81 insertions, 81 deletions
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java
index 08193603..279a16fa 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java
@@ -30,8 +30,8 @@ import java.util.Locale;
import at.gv.egiz.bku.gui.BKUGUIFacade;
import at.gv.egiz.bku.gui.HelpListener;
-import at.gv.egiz.bku.gui.PersonIdentityLinkGUI;
-import at.gv.egiz.bku.gui.PersonIdentityLinkGUIFacade;
+import at.gv.egiz.bku.gui.IdentityLinkGUI;
+import at.gv.egiz.bku.gui.IdentityLinkGUIFacade;
import at.gv.egiz.bku.gui.SwitchFocusListener;
import at.gv.egiz.bku.gui.viewer.FontProvider;
@@ -47,13 +47,13 @@ private static final long serialVersionUID = 1L;
BKUGUIFacade.Style guiStyle, URL backgroundImgURL,
FontProvider fontProvider, HelpListener helpListener,
SwitchFocusListener switchFocusListener) {
- return new PersonIdentityLinkGUI(contentPane, locale,
+ return new IdentityLinkGUI(contentPane, locale,
backgroundImgURL, fontProvider, helpListener,
switchFocusListener);
}
@Override
protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) {
- return new IdentityLinkBKUWorker(applet, (PersonIdentityLinkGUIFacade) gui);
+ return new IdentityLinkBKUWorker(applet, (IdentityLinkGUIFacade) gui);
}
}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkBKUWorker.java
index 5a76e935..8ede2be1 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkBKUWorker.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkBKUWorker.java
@@ -31,24 +31,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import at.gv.egiz.bku.gui.BKUGUIFacade;
-import at.gv.egiz.bku.gui.PersonIdentityLinkGUIFacade;
-import at.gv.egiz.bku.smccstal.PersonIdentityLinkRequestHandler;
+import at.gv.egiz.bku.gui.IdentityLinkGUIFacade;
+import at.gv.egiz.bku.smccstal.IdentityLinkRequestHandler;
import at.gv.egiz.stal.ErrorResponse;
import at.gv.egiz.stal.InfoboxReadRequest;
import at.gv.egiz.stal.QuitRequest;
import at.gv.egiz.stal.STALResponse;
import at.gv.egiz.stal.SignRequest;
-import at.gv.egiz.stal.ext.PersonIdentityLinkRequest;
-import at.gv.egiz.stal.ext.PersonIdentityLinkResponse;
+import at.gv.egiz.stal.ext.IdentityLinkRequest;
+import at.gv.egiz.stal.ext.IdentityLinkResponse;
public class IdentityLinkBKUWorker extends AppletBKUWorker {
private final Logger log = LoggerFactory.getLogger(IdentityLinkBKUWorker.class);
- public IdentityLinkBKUWorker(BKUApplet applet, PersonIdentityLinkGUIFacade gui) {
+ public IdentityLinkBKUWorker(BKUApplet applet, IdentityLinkGUIFacade gui) {
super(applet, gui);
removeRequestHandler(InfoboxReadRequest.class);
removeRequestHandler(SignRequest.class);
- addRequestHandler(PersonIdentityLinkRequest.class, new PersonIdentityLinkRequestHandler());
+ addRequestHandler(IdentityLinkRequest.class, new IdentityLinkRequestHandler());
}
@Override
@@ -59,12 +59,12 @@ public class IdentityLinkBKUWorker extends AppletBKUWorker {
try {
- List<STALResponse> responses = handleRequest(Collections.singletonList(new PersonIdentityLinkRequest()));
+ List<STALResponse> responses = handleRequest(Collections.singletonList(new IdentityLinkRequest()));
handleRequest(Collections.singletonList(new QuitRequest()));
if (responses.size() == 1) {
STALResponse response = responses.get(0);
- if (response instanceof PersonIdentityLinkResponse) {
+ if (response instanceof IdentityLinkResponse) {
log.info("Identity Link dialog terminated.");
} else if (response instanceof ErrorResponse) {
log.info("Identity Link dialog terminated with error.");
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java
index 32259746..378395eb 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java
@@ -43,15 +43,15 @@ import org.slf4j.LoggerFactory;
import at.gv.egiz.bku.gui.viewer.FontProvider;
/**
- * Implements GUI for the person identity link informations
+ * Implements GUI for the identity link informations
*
* @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
*/
-public class PersonIdentityLinkGUI extends CardMgmtGUI implements
- PersonIdentityLinkGUIFacade {
+public class IdentityLinkGUI extends CardMgmtGUI implements
+ IdentityLinkGUIFacade {
private final Logger log = LoggerFactory
- .getLogger(PersonIdentityLinkGUI.class);
+ .getLogger(IdentityLinkGUI.class);
protected JLabel mgmtLabel;
@@ -65,7 +65,7 @@ public class PersonIdentityLinkGUI extends CardMgmtGUI implements
protected JButton activateButton;
- public PersonIdentityLinkGUI(Container contentPane, Locale locale, URL backgroundImgURL, FontProvider fontProvider,
+ public IdentityLinkGUI(Container contentPane, Locale locale, URL backgroundImgURL, FontProvider fontProvider,
HelpListener helpListener, SwitchFocusListener switchFocusListener) {
super(contentPane, locale, Style.advanced, backgroundImgURL, fontProvider,
helpListener, switchFocusListener);
@@ -74,19 +74,19 @@ public class PersonIdentityLinkGUI extends CardMgmtGUI implements
}
@Override
- public void showPersonIdentityLinkInformationDialog(
+ public void showIdentityLinkInformationDialog(
final ActionListener activateListener,
final String actionCommand,
final String firstName,
final String surName,
final String birthdate) {
- log.debug("Scheduling Person Identity Link dialog.");
+ log.debug("Scheduling Identity Link dialog.");
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- log.debug("Show Person Identity Link dialog.");
+ log.debug("Show Identity Link dialog.");
mainPanel.removeAll();
buttonPanel.removeAll();
@@ -96,10 +96,10 @@ public class PersonIdentityLinkGUI extends CardMgmtGUI implements
mgmtLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
if (renderHeaderPanel) {
- titleLabel.setText(getMessage(PersonIdentityLinkGUIFacade.TITLE_IDENITY));
- mgmtLabel.setText(getMessage(PersonIdentityLinkGUIFacade.MESSAGE_IDENITY));
+ titleLabel.setText(getMessage(IdentityLinkGUIFacade.TITLE_IDENITY));
+ mgmtLabel.setText(getMessage(IdentityLinkGUIFacade.MESSAGE_IDENITY));
} else {
- mgmtLabel.setText(getMessage(PersonIdentityLinkGUIFacade.TITLE_IDENITY));
+ mgmtLabel.setText(getMessage(IdentityLinkGUIFacade.TITLE_IDENITY));
}
activateButton.setFont(activateButton.getFont().deriveFont(
@@ -111,12 +111,12 @@ public class PersonIdentityLinkGUI extends CardMgmtGUI implements
activateButton.setText(getMessage(BUTTON_CLOSE));
firstNameLabel_description = new JLabel();
- firstNameLabel_description.setText(getMessage(PersonIdentityLinkGUIFacade.FIRSTNAME));
+ firstNameLabel_description.setText(getMessage(IdentityLinkGUIFacade.FIRSTNAME));
lastNameLabel_description = new JLabel();
- lastNameLabel_description.setText(getMessage(PersonIdentityLinkGUIFacade.LASTNAME));
+ lastNameLabel_description.setText(getMessage(IdentityLinkGUIFacade.LASTNAME));
birthdateLabel_description = new JLabel();
- birthdateLabel_description.setText(getMessage(PersonIdentityLinkGUIFacade.DATEOFBIRTH));
+ birthdateLabel_description.setText(getMessage(IdentityLinkGUIFacade.DATEOFBIRTH));
firstNameLabel = new JLabel();
@@ -137,7 +137,7 @@ public class PersonIdentityLinkGUI extends CardMgmtGUI implements
birthdateLabel.setFont(birthdateLabel.getFont().deriveFont(
birthdateLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
- updateMethodToRunAtResize("at.gv.egiz.bku.gui.PersonIdentityLinkGUI", "renderContentAndButtons");
+ updateMethodToRunAtResize("at.gv.egiz.bku.gui.IdentityLinkGUI", "renderContentAndButtons");
renderContentAndButtons();
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java
index d0332284..2b96dc6e 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUIFacade.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java
@@ -30,7 +30,7 @@ import java.awt.event.ActionListener;
*
* @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
*/
-public interface PersonIdentityLinkGUIFacade extends BKUGUIFacade {
+public interface IdentityLinkGUIFacade extends BKUGUIFacade {
public static final String FIRSTNAME = "identity.firstname";
public static final String DATEOFBIRTH = "identity.dateofbirth";
@@ -47,7 +47,7 @@ public interface PersonIdentityLinkGUIFacade extends BKUGUIFacade {
* @param firstName
* @param surName
*/
- public void showPersonIdentityLinkInformationDialog(
+ public void showIdentityLinkInformationDialog(
ActionListener activateListener,
String actionCommand,
String firstName,
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index 764e678b..64906c24 100644
--- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -28,14 +28,14 @@ title.unblock.pin=<html>Unblock PIN</html>
title.activate.success=<html>Success</html>
title.change.success=<html>Success</html>
title.unblock.success=<html>Success</html>
-title.identity=<html>Person Identity Link</html>
+title.identity=<html>Identity Link</html>
title.certificate.save=<html>Save certificate</html>
title.get.certificate=<html>Save certificates</html>
title.hardwareinfo = <html>Hardware Information</html>
# removed message.* prefix to reuse keys as help keys
pin.mgmt=<html>{0} PINs available
-identity.msg=<html>The person identity link
+identity.msg=<html>The identity link
identity.button=<html>Cancel</html>
identity.firstname=<html>First name</html>
identity.dateofbirth=<html>Date of birth</html>
@@ -101,7 +101,7 @@ err.pin.format=<html>Invalid {0} length, {1} digit(s) required.</html>
err.pin.confirmation=<html>{0} and confirmation do not match.</html>
err.pin.operation.aborted=<html>The operation on {0} was aborted.</html>
err.unsupported.card=<html>This card is not supported</html>
-err.infobox.invalid=<html>Unable to interpret person identity link</html>
+err.infobox.invalid=<html>Unable to interpret identity link</html>
status.not.active=NOT ACTIVE
status.active=ACTIVE
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
index 27a5d8ca..7947c117 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
@@ -29,13 +29,13 @@ import at.gv.egiz.bku.smccstal.AbstractBKUWorker;
import at.gv.egiz.bku.smccstal.GETCertificateRequestHandler;
import at.gv.egiz.bku.smccstal.GETHardwareInfoRequestHandler;
import at.gv.egiz.bku.smccstal.PINManagementRequestHandler;
-import at.gv.egiz.bku.smccstal.PersonIdentityLinkRequestHandler;
+import at.gv.egiz.bku.smccstal.IdentityLinkRequestHandler;
import at.gv.egiz.stal.QuitRequest;
import at.gv.egiz.stal.STALRequest;
import at.gv.egiz.stal.STALResponse;
import at.gv.egiz.stal.SignRequest;
-import at.gv.egiz.stal.ext.PersonIdentityLinkRequest;
+import at.gv.egiz.stal.ext.IdentityLinkRequest;
import at.gv.egiz.stal.ext.GETCertificateRequest;
import at.gv.egiz.stal.ext.GETHardwareInfoRequest;
import at.gv.egiz.stal.ext.PINManagementRequest;
@@ -56,7 +56,7 @@ public class LocalBKUWorker extends AbstractBKUWorker {
addRequestHandler(SignRequest.class,
new LocalSignRequestHandler(new LocalSecureViewer(gui)));
addRequestHandler(PINManagementRequest.class, new PINManagementRequestHandler());
- addRequestHandler(PersonIdentityLinkRequest.class, new PersonIdentityLinkRequestHandler());
+ addRequestHandler(IdentityLinkRequest.class, new IdentityLinkRequestHandler());
addRequestHandler(GETCertificateRequest.class, new GETCertificateRequestHandler());
addRequestHandler(GETHardwareInfoRequest.class, new GETHardwareInfoRequestHandler());
}
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalIdentityLinkSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalIdentityLinkSTALFactory.java
index c64f029c..8dc0ad50 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalIdentityLinkSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalIdentityLinkSTALFactory.java
@@ -37,8 +37,8 @@ import org.slf4j.LoggerFactory;
import at.gv.egiz.bku.gui.BKUGUIFacade;
import at.gv.egiz.bku.gui.BKUIcons;
-import at.gv.egiz.bku.gui.PersonIdentityLinkGUI;
-import at.gv.egiz.bku.gui.PersonIdentityLinkGUIFacade;
+import at.gv.egiz.bku.gui.IdentityLinkGUI;
+import at.gv.egiz.bku.gui.IdentityLinkGUIFacade;
import at.gv.egiz.bku.local.gui.GUIProxy;
import at.gv.egiz.bku.local.gui.LocalHelpListener;
import at.gv.egiz.bku.viewer.ResourceFontLoader;
@@ -78,13 +78,13 @@ public class LocalIdentityLinkSTALFactory implements STALFactory {
} else {
log.warn("No HELP URL configured, help system disabled.");
}
- PersonIdentityLinkGUIFacade gui = new PersonIdentityLinkGUI(dialog.getContentPane(),
+ IdentityLinkGUIFacade gui = new IdentityLinkGUI(dialog.getContentPane(),
dialog.getLocale(),
null,
new ResourceFontLoader(),
helpListener,
null);
- BKUGUIFacade proxy = (BKUGUIFacade) GUIProxy.newInstance(gui, dialog, new Class[] { PersonIdentityLinkGUIFacade.class} );
+ BKUGUIFacade proxy = (BKUGUIFacade) GUIProxy.newInstance(gui, dialog, new Class[] { IdentityLinkGUIFacade.class} );
stal = new LocalBKUWorker(proxy, dialog);
dialog.setPreferredSize(PREFERRED_SIZE);
dialog.pack();
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java
index 31c78cb0..197f868b 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java
@@ -41,7 +41,7 @@ import at.gv.egiz.bku.local.stal.LocalIdentityLinkSTALFactory;
import at.gv.egiz.stal.QuitRequest;
import at.gv.egiz.stal.STAL;
import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.PersonIdentityLinkRequest;
+import at.gv.egiz.stal.ext.IdentityLinkRequest;
/**
* IdentityLink BKU Worker for non-applet version
@@ -86,7 +86,7 @@ public class IdentityLinkServlet extends HttpServlet {
HttpServletResponse response) throws ServletException, IOException {
log.info("processRequest: IdentityLinkServlet");
STAL pinMgmtSTAL = stalFactory.createSTAL();
- List<STALResponse> stalResps = pinMgmtSTAL.handleRequest(Collections.singletonList(new PersonIdentityLinkRequest()));
+ List<STALResponse> stalResps = pinMgmtSTAL.handleRequest(Collections.singletonList(new IdentityLinkRequest()));
log.debug("Received STAL reponse {}.", stalResps.get(0).getClass());
pinMgmtSTAL.handleRequest(Collections.singletonList(new QuitRequest()));
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PersonIdentityLinkInvoker.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java
index 249d7a15..9709a01f 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PersonIdentityLinkInvoker.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java
@@ -36,13 +36,13 @@ import at.gv.egiz.bku.webstart.gui.StatusNotifier;
*
* @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
*/
-public class PersonIdentityLinkInvoker implements Runnable {
+public class IdentityLinkInvoker implements Runnable {
- private static final Logger log = LoggerFactory.getLogger(PersonIdentityLinkInvoker.class);
+ private static final Logger log = LoggerFactory.getLogger(IdentityLinkInvoker.class);
private StatusNotifier status;
- public PersonIdentityLinkInvoker(StatusNotifier status) {
+ public IdentityLinkInvoker(StatusNotifier status) {
this.status = status;
}
@@ -50,7 +50,7 @@ public class PersonIdentityLinkInvoker implements Runnable {
public void run() {
HttpURLConnection connection = null;
try {
- log.info("Connecting to: " + Launcher.IDENTITY_LINK_URL);
+ log.debug("Connecting to: " + Launcher.IDENTITY_LINK_URL);
connection = (HttpURLConnection) Launcher.IDENTITY_LINK_URL.openConnection();
@@ -59,12 +59,12 @@ public class PersonIdentityLinkInvoker implements Runnable {
connection.connect();
if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
- log.info("person identity link dialog returned");
+ log.debug("identity link dialog returned");
} else {
- log.error("unexpected response from person identity link: " + connection.getResponseMessage());
+ log.error("unexpected response from identity link: " + connection.getResponseMessage());
}
} catch (IOException ex) {
- log.error("Failed to connect to person identity link", ex);
+ log.error("Failed to connect to identity link", ex);
status.error(StatusNotifier.ERROR_IDENTITY_LINK);
} finally {
if (connection != null) {
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
index 0e510e2f..4cf5ed1f 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
@@ -321,8 +321,8 @@ public class Launcher implements BKUControllerInterface {
}
@Override
- public void personIdentityLink(Locale locale) {
- new Thread(new PersonIdentityLinkInvoker(status)).start();
+ public void getIdentityLink(Locale locale) {
+ new Thread(new IdentityLinkInvoker(status)).start();
}
@Override
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/BKUControllerInterface.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/BKUControllerInterface.java
index 8c05f137..48704a3c 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/BKUControllerInterface.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/BKUControllerInterface.java
@@ -38,7 +38,7 @@ public interface BKUControllerInterface {
public void getCertificate(Locale locale);
- public void personIdentityLink(Locale locale);
+ public void getIdentityLink(Locale locale);
public void hardwareInfo(Locale locale);
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java
index f0b60877..eaf2bee5 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/MOCCAIcon.java
@@ -274,8 +274,8 @@ public class MOCCAIcon implements StatusNotifier, ActionListener, ItemListener {
break;
case IDENTITYLINK_COMMAND:
- log.debug("person identity link dialog requested via tray menu");
- controller.personIdentityLink(messages.getLocale());
+ log.debug("identity link dialog requested via tray menu");
+ controller.getIdentityLink(messages.getLocale());
break;
default:
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/PersonIdentityLinkRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkRequest.java
index 17aba1ad..65f0b3fe 100644
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/PersonIdentityLinkRequest.java
+++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkRequest.java
@@ -28,10 +28,10 @@ import at.gv.egiz.stal.STALRequest;
/**
- * Dummy STAL request to trigger display of person identity link.
+ * Dummy STAL request to trigger display of identity link.
*
* @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
*/
-public class PersonIdentityLinkRequest extends STALRequest {
+public class IdentityLinkRequest extends STALRequest {
}
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/PersonIdentityLinkResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkResponse.java
index fb7fd721..8d1d25d5 100644
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/PersonIdentityLinkResponse.java
+++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkResponse.java
@@ -29,6 +29,6 @@ import at.gv.egiz.stal.STALResponse;
*
* @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
*/
-public class PersonIdentityLinkResponse extends STALResponse {
+public class IdentityLinkResponse extends STALResponse {
}
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java
index b1aa9326..6fbeda1d 100644
--- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java
@@ -35,7 +35,7 @@ public class IdentityLinkExtractor {
private static final Logger log = LoggerFactory.getLogger(IdentityLinkExtractor.class);
- private static ASN1 getPersonData(ASN1 identityLink) throws IOException
+ private static ASN1 getData(ASN1 identityLink) throws IOException
{
if(identityLink.getSize() > 4 )
{
@@ -54,9 +54,9 @@ public class IdentityLinkExtractor {
}
}
- public static String getPersonFirstName(ASN1 identityLink) throws IOException
+ public static String getFirstName(ASN1 identityLink) throws IOException
{
- ASN1 personData = getPersonData(identityLink);
+ ASN1 personData = getData(identityLink);
if(personData != null)
{
return personData.getElementAt(1).gvString();
@@ -64,9 +64,9 @@ public class IdentityLinkExtractor {
return null;
}
- public static String getPersonLastName(ASN1 identityLink) throws IOException
+ public static String getLastName(ASN1 identityLink) throws IOException
{
- ASN1 personData = getPersonData(identityLink);
+ ASN1 personData = getData(identityLink);
if(personData != null)
{
return personData.getElementAt(2).gvString();
@@ -74,9 +74,9 @@ public class IdentityLinkExtractor {
return null;
}
- public static String getPersonDateOfBirth(ASN1 identityLink) throws IOException
+ public static String getDateOfBirth(ASN1 identityLink) throws IOException
{
- ASN1 personData = getPersonData(identityLink);
+ ASN1 personData = getData(identityLink);
if(personData != null)
{
return personData.getElementAt(3).gvString();
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PersonIdentityLinkRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java
index d8873f77..9ba63a89 100644
--- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PersonIdentityLinkRequestHandler.java
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java
@@ -31,26 +31,26 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import at.gv.egiz.bku.gui.PINManagementGUIFacade;
-import at.gv.egiz.bku.gui.PersonIdentityLinkGUIFacade;
+import at.gv.egiz.bku.gui.IdentityLinkGUIFacade;
import at.gv.egiz.bku.pin.gui.VerifyPINGUI;
import at.gv.egiz.smcc.SignatureCardException;
import at.gv.egiz.stal.ErrorResponse;
import at.gv.egiz.stal.STALRequest;
import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.PersonIdentityLinkRequest;
-import at.gv.egiz.stal.ext.PersonIdentityLinkResponse;
+import at.gv.egiz.stal.ext.IdentityLinkRequest;
+import at.gv.egiz.stal.ext.IdentityLinkResponse;
/**
*
* @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
*/
-public class PersonIdentityLinkRequestHandler extends AbstractRequestHandler {
+public class IdentityLinkRequestHandler extends AbstractRequestHandler {
private final static String IdentityInfoBox = "IdentityLink";
- private final Logger log = LoggerFactory.getLogger(PersonIdentityLinkRequestHandler.class);
+ private final Logger log = LoggerFactory.getLogger(IdentityLinkRequestHandler.class);
- //PersonIdentityLinkGUIFacade person_gui = (PersonIdentityLinkGUIFacade) this.gui;
+ //IdentityLinkGUIFacade il_gui = (IdentityLinkGUIFacade) this.gui;
@Override
public boolean requireCard() {
@@ -60,7 +60,7 @@ public class PersonIdentityLinkRequestHandler extends AbstractRequestHandler {
@Override
public STALResponse handleRequest(STALRequest request)
throws InterruptedException {
- if(request instanceof PersonIdentityLinkRequest)
+ if(request instanceof IdentityLinkRequest)
{
try
{
@@ -68,32 +68,32 @@ public class PersonIdentityLinkRequestHandler extends AbstractRequestHandler {
ASN1 identity_object = new ASN1(identity_asn1);
- String firstname = IdentityLinkExtractor.getPersonFirstName(identity_object);
- String lastname = IdentityLinkExtractor.getPersonLastName(identity_object);
- String dateofBirth = IdentityLinkExtractor.getPersonDateOfBirth(identity_object);
+ String firstname = IdentityLinkExtractor.getFirstName(identity_object);
+ String lastname = IdentityLinkExtractor.getLastName(identity_object);
+ String dateofBirth = IdentityLinkExtractor.getDateOfBirth(identity_object);
// TODO: correct error handling ...
- PersonIdentityLinkGUIFacade person_gui = null;
+ IdentityLinkGUIFacade il_gui = null;
- if(gui instanceof PersonIdentityLinkGUIFacade)
+ if(gui instanceof IdentityLinkGUIFacade)
{
- person_gui = (PersonIdentityLinkGUIFacade) gui;
+ il_gui = (IdentityLinkGUIFacade) gui;
}
- if(person_gui == null)
+ if(il_gui == null)
{
- log.warn("Failed to cast gui to PersonIdentityLinkGUIFacade!");
+ log.warn("Failed to cast gui to IdentityLinkGUIFacade!");
return new ErrorResponse(1000);
}
- person_gui.showPersonIdentityLinkInformationDialog(this, "ok_action",
+ il_gui.showIdentityLinkInformationDialog(this, "ok_action",
firstname,
lastname,
dateofBirth);
waitForAction();
- return new PersonIdentityLinkResponse();
+ return new IdentityLinkResponse();
}
catch(SignatureCardException ex)
{
@@ -104,7 +104,7 @@ public class PersonIdentityLinkRequestHandler extends AbstractRequestHandler {
return new ErrorResponse(1000);
} catch (IOException ex) {
log.error(ex.getMessage(), ex);
- gui.showErrorDialog(PersonIdentityLinkGUIFacade.ERR_INFOBOX_INVALID,
+ gui.showErrorDialog(IdentityLinkGUIFacade.ERR_INFOBOX_INVALID,
null, this, "cancel");
waitForAction();
return new ErrorResponse(1000);