From 5a45508c63ad07606fa39ac8c773d46ada353acf Mon Sep 17 00:00:00 2001 From: clemenso Date: Tue, 16 Jun 2009 16:25:17 +0000 Subject: tray icon on startup, messages git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@364 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- BKUWebStart/pom.xml | 2 +- .../java/at/gv/egiz/bku/webstart/BKULauncher.java | 10 ++- BKUWebStart/src/main/jnlp/resources/version.xml | 77 ---------------------- BKUWebStart/src/main/jnlp/template.xml | 6 +- BKUWebStart/src/main/jnlp/template_dev.xml | 39 +++++++++++ .../gv/egiz/bku/webstart/ui/UIMessages.properties | 10 +-- 6 files changed, 57 insertions(+), 87 deletions(-) create mode 100644 BKUWebStart/src/main/jnlp/template_dev.xml (limited to 'BKUWebStart') diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index ec5fd976..25683dba 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -15,7 +15,7 @@ |--> 1.0.3-SNAPSHOT http://mocca.egovlabs.gv.at/ - Web Start Bürgerkartenumgebung (MOCCA-lokal) + Bürgerkartenumgebung (MOCCA Web Start) diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java index 3d09fb00..b1fc29be 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/BKULauncher.java @@ -64,6 +64,8 @@ public class BKULauncher implements BKUControllerInterface { /** resource bundle messages */ public static final String GREETING_CAPTION = "Greetings.Caption"; public static final String GREETING_MESSAGE = "Greetings.Message"; + public static final String STARTUP_CAPTION = "Startup.Caption"; + public static final String STARTUP_MESSAGE = "Startup.Message"; public static final String VERSION_FILE = ".version"; private static Log log = LogFactory.getLog(BKULauncher.class); private ResourceBundle resourceBundle = null; @@ -204,7 +206,7 @@ public class BKULauncher implements BKUControllerInterface { } TrayIconDialog.getInstance().init(resourceBundle); TrayIconDialog.getInstance().setShutdownHook(this); - TrayIconDialog.getInstance().displayInfo(GREETING_CAPTION, GREETING_MESSAGE); +// TrayIconDialog.getInstance().displayInfo(GREETING_CAPTION, GREETING_MESSAGE); } private void initStart() { @@ -277,8 +279,12 @@ public class BKULauncher implements BKUControllerInterface { File configDir = new File(System.getProperty("user.home") + '/' + CONFIG_DIR); boolean installCert = launcher.ensureConfig(configDir); - launcher.startUpServer(); launcher.initTrayIcon(); + TrayIconDialog.getInstance().displayInfo(STARTUP_CAPTION, STARTUP_MESSAGE); + launcher.startUpServer(); + TrayIconDialog.getInstance().displayInfo(GREETING_CAPTION, GREETING_MESSAGE); + +// launcher.initTrayIcon(); launcher.initFinished(installCert); } catch (Exception e) { log.fatal("Failed to launch BKU: " + e.getMessage(), e); diff --git a/BKUWebStart/src/main/jnlp/resources/version.xml b/BKUWebStart/src/main/jnlp/resources/version.xml index a5b10b47..197c05b5 100644 --- a/BKUWebStart/src/main/jnlp/resources/version.xml +++ b/BKUWebStart/src/main/jnlp/resources/version.xml @@ -15,27 +15,6 @@ commons-logging-1.0.4.jar - @@ -74,13 +53,6 @@ iaik_xsect-1.14.jar - @@ -125,34 +97,6 @@ stax-api-1.0-2.jar - @@ -161,26 +105,5 @@ utils-1.1.2-SNAPSHOT.jar - diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml index a355da77..07e1c28a 100644 --- a/BKUWebStart/src/main/jnlp/template.xml +++ b/BKUWebStart/src/main/jnlp/template.xml @@ -5,11 +5,11 @@ - $project.Name + $project.Name EarlyAccess $project.Organization.Name - $project.Description - $project.Description + $project.Description EarlyAccess + $project.Description EarlyAccess diff --git a/BKUWebStart/src/main/jnlp/template_dev.xml b/BKUWebStart/src/main/jnlp/template_dev.xml new file mode 100644 index 00000000..2d8e8133 --- /dev/null +++ b/BKUWebStart/src/main/jnlp/template_dev.xml @@ -0,0 +1,39 @@ + + + + + $project.Name + $project.Organization.Name + + $project.Description + $project.Description + + + + + + + +#if($offlineAllowed) + +#end + + + + +#if($allPermissions) + + + +#end + + + + + + + $dependencies + + + + \ No newline at end of file diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties index 873d03ef..6ee1a510 100644 --- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties +++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/ui/UIMessages.properties @@ -1,9 +1,11 @@ #-------- tray icon messages ------- -TrayMenu.Tooltip=MOCCA -TrayMenu.Shutdown=MOCCA Beenden +TrayMenu.Tooltip=B\u00FCrgerkartenumgebung (MOCCA Web Start) +TrayMenu.Shutdown=B\u00FCrgerkartenumgebung beenden -Greetings.Message=MOCCA up and running -Greetings.Caption=MOCCA Started +Startup.Message=B\u00FCrgerkartenumgebung wird gestartet... +Startup.Caption=B\u00FCrgerkartenumgebung (MOCCA Web Start) +Greetings.Message=B\u00FCrgerkartenumgebung erfolgreich gestartet +Greetings.Caption=B\u00FCrgerkartenumgebung (MOCCA Web Start) Message.RequestCaption=New Request Message.InfoboxReadRequest=Reading Infobox -- cgit v1.2.3