From 2476bca83442dbce0d3dfce744e9c320ce802a4e Mon Sep 17 00:00:00 2001 From: tkellner Date: Mon, 2 Apr 2012 16:39:06 +0000 Subject: Renamed PersonIdentityLink to IdentityLink git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1046 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../gv/egiz/bku/webstart/IdentityLinkInvoker.java | 75 ++++++++++++++++++++++ .../java/at/gv/egiz/bku/webstart/Launcher.java | 4 +- .../bku/webstart/PersonIdentityLinkInvoker.java | 75 ---------------------- .../bku/webstart/gui/BKUControllerInterface.java | 2 +- .../at/gv/egiz/bku/webstart/gui/MOCCAIcon.java | 4 +- 5 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java delete mode 100644 BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PersonIdentityLinkInvoker.java (limited to 'BKUWebStart') diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java new file mode 100644 index 00000000..9709a01f --- /dev/null +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java @@ -0,0 +1,75 @@ +/* + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://www.osor.eu/eupl/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text + * file for details on the various modules and licenses. + * The "NOTICE" text file is part of the distribution. Any derivative works + * that you distribute must include a readable copy of the "NOTICE" text file. + */ + + +package at.gv.egiz.bku.webstart; + +import java.io.IOException; +import java.net.HttpURLConnection; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egiz.bku.webstart.gui.StatusNotifier; + +/** + * + * @author Andreas Fitzek + */ +public class IdentityLinkInvoker implements Runnable { + + private static final Logger log = LoggerFactory.getLogger(IdentityLinkInvoker.class); + + private StatusNotifier status; + + public IdentityLinkInvoker(StatusNotifier status) { + this.status = status; + } + + @Override + public void run() { + HttpURLConnection connection = null; + try { + log.debug("Connecting to: " + Launcher.IDENTITY_LINK_URL); + + connection = (HttpURLConnection) Launcher.IDENTITY_LINK_URL.openConnection(); + + connection.setRequestMethod("GET"); + connection.setReadTimeout(0); + connection.connect(); + + if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) { + log.debug("identity link dialog returned"); + } else { + log.error("unexpected response from identity link: " + connection.getResponseMessage()); + } + } catch (IOException ex) { + log.error("Failed to connect to identity link", ex); + status.error(StatusNotifier.ERROR_IDENTITY_LINK); + } finally { + if (connection != null) { + connection.disconnect(); + } + } + } +} 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/PersonIdentityLinkInvoker.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PersonIdentityLinkInvoker.java deleted file mode 100644 index 249d7a15..00000000 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PersonIdentityLinkInvoker.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2011 by Graz University of Technology, Austria - * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint - * initiative of the Federal Chancellery Austria and Graz University of Technology. - * - * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by - * the European Commission - subsequent versions of the EUPL (the "Licence"); - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * http://www.osor.eu/eupl/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * - * This product combines work with different licenses. See the "NOTICE" text - * file for details on the various modules and licenses. - * The "NOTICE" text file is part of the distribution. Any derivative works - * that you distribute must include a readable copy of the "NOTICE" text file. - */ - - -package at.gv.egiz.bku.webstart; - -import java.io.IOException; -import java.net.HttpURLConnection; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.bku.webstart.gui.StatusNotifier; - -/** - * - * @author Andreas Fitzek - */ -public class PersonIdentityLinkInvoker implements Runnable { - - private static final Logger log = LoggerFactory.getLogger(PersonIdentityLinkInvoker.class); - - private StatusNotifier status; - - public PersonIdentityLinkInvoker(StatusNotifier status) { - this.status = status; - } - - @Override - public void run() { - HttpURLConnection connection = null; - try { - log.info("Connecting to: " + Launcher.IDENTITY_LINK_URL); - - connection = (HttpURLConnection) Launcher.IDENTITY_LINK_URL.openConnection(); - - connection.setRequestMethod("GET"); - connection.setReadTimeout(0); - connection.connect(); - - if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) { - log.info("person identity link dialog returned"); - } else { - log.error("unexpected response from person identity link: " + connection.getResponseMessage()); - } - } catch (IOException ex) { - log.error("Failed to connect to person identity link", ex); - status.error(StatusNotifier.ERROR_IDENTITY_LINK); - } finally { - if (connection != null) { - connection.disconnect(); - } - } - } -} 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: -- cgit v1.2.3