From 1eb93f7eccf3d06618794d508104d6a75d0920a4 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 20 Jul 2017 19:43:41 +0200
Subject: [PATCH] fix locale

---
 web/src/main/java/de/hsadmin/rpc/ModulesManager.java | 2 +-
 web/src/main/java/de/hsadmin/web/HSAdminUI.java      | 2 +-
 web/src/main/java/de/hsadmin/web/MainWindow.java     | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/src/main/java/de/hsadmin/rpc/ModulesManager.java b/web/src/main/java/de/hsadmin/rpc/ModulesManager.java
index 3015ce7..9911faf 100644
--- a/web/src/main/java/de/hsadmin/rpc/ModulesManager.java
+++ b/web/src/main/java/de/hsadmin/rpc/ModulesManager.java
@@ -66,13 +66,13 @@ public class ModulesManager implements Serializable {
 			public List<Map<String, Object>> search(final String runAsUser, final String ticket, final Map<String, String> whereParams) throws XmlRpcException 
 			{
 				LOG.info("RPC Call: " + moduleName + ".search - user " + runAsUser);
+				final List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
 				final XmlRpcClient rpcClient = rpcClient(moduleName);
 				final List<Object> xmlRpcParamsList = new ArrayList<Object>();
 				xmlRpcParamsList.add(runAsUser);
 				xmlRpcParamsList.add(ticket);
 				xmlRpcParamsList.add(whereParams);
 				final Object[] rpcResult = (Object[]) rpcClient.execute(moduleName + ".search", xmlRpcParamsList);
-				final List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
 				for (final Object obj : rpcResult) {
 					if (obj instanceof Map) {
 						resultList.add((Map<String, Object>) obj);
diff --git a/web/src/main/java/de/hsadmin/web/HSAdminUI.java b/web/src/main/java/de/hsadmin/web/HSAdminUI.java
index 7cd2a65..5942612 100644
--- a/web/src/main/java/de/hsadmin/web/HSAdminUI.java
+++ b/web/src/main/java/de/hsadmin/web/HSAdminUI.java
@@ -59,6 +59,6 @@ public class HSAdminUI extends UI {
 	}
 
 	public void setGrantingTicket(String grantingTicket, String username) {
-		layout.addComponent(new MainWindow(ticketService, grantingTicket, username));
+		layout.addComponent(new MainWindow(getUI().getLocale(), ticketService, grantingTicket, username));
 	}
 }
diff --git a/web/src/main/java/de/hsadmin/web/MainWindow.java b/web/src/main/java/de/hsadmin/web/MainWindow.java
index c38ad57..c7a0fa7 100644
--- a/web/src/main/java/de/hsadmin/web/MainWindow.java
+++ b/web/src/main/java/de/hsadmin/web/MainWindow.java
@@ -3,6 +3,7 @@ package de.hsadmin.web;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -36,11 +37,11 @@ public class MainWindow extends CustomComponent implements HSAdminSession {
 	private ModulesManager modulesManager;
 	private AbstractSplitPanel content;
 	
-	public MainWindow(final TicketService ticketService, final String grantingTicket, final String username) {
+	public MainWindow(final Locale locale, final TicketService ticketService, final String grantingTicket, final String username) {
 		this.ticketService = ticketService;
 		this.grantingTicket = grantingTicket;
 		this.username = username;
-		this.i18n = I18N.loc(getUI().getLocale());
+		this.i18n = I18N.loc(locale);
 		
 		setSizeFull();
 		final Panel mainPanel = new Panel();