1 files changed, 0 insertions, 127 deletions
diff --git a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Messages.java b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Messages.java
deleted file mode 100644
index d8f204ea..00000000
--- a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Messages.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2012 by A-SIT, Secure Information Technology Center Austria
- *
- * 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://joinup.ec.europa.eu/software/page/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.
- */
-package at.asit.pdfover.commons;
-
-import java.io.UnsupportedEncodingException;
-// Imports
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import javax.annotation.Nonnull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static at.asit.pdfover.commons.Constants.ISNOTNULL;
-
-
-/**
- * Localizes string messages for PDFOver GUI
- */
-public class Messages {
-
-	/**
-	 * SLF4J Logger instance
-	 **/
-	static final Logger log = LoggerFactory.getLogger(Messages.class);
-
-	private static final String BUNDLE_NAME = "at.asit.pdfover.gui.messages";
-
-	private static HashMap<Locale, ResourceBundle> bundles = new HashMap<>();
-
-	private static Locale currentLocale = getDefaultLocale();
-
-	private Messages() {
-	}
-
-	/**
-	 * Get the closest match to the system default Locale out of the supported locales
-	 * @return the default locale
-	 */
-	public static @Nonnull Locale getDefaultLocale() {
-		Locale ld = Locale.getDefault();
-		for (Locale l : Constants.SUPPORTED_LOCALES) {
-			if (l.equals(ld) || l.getLanguage().equals(ld.getLanguage()))
-				return l;
-		}
-		return ISNOTNULL(Constants.SUPPORTED_LOCALES[0]);
-	}
-
-	/**
-	 * Sets the currently used locals
-	 * @param locale
-	 */
-	public static void setLocale(Locale locale) {
-		currentLocale = locale;
-	}
-
-	private static ResourceBundle getBundle(Locale locale) {
-		if(!bundles.containsKey(locale)) {
-			log.debug("Loading resource bundle for {}", locale);
-			ResourceBundle tmp = null;
-			try {
-				tmp = ResourceBundle.getBundle(BUNDLE_NAME, locale);
-				log.debug("Received bundle for {}", tmp.getLocale());
-			} catch(Exception e) {
-				log.error("NO RESOURCE BUNDLE FOR {} {}", locale, e);
-				tmp = ResourceBundle.getBundle(BUNDLE_NAME);
-			}
-			if(tmp == null) {
-				log.error("NO RESOURCE BUNDLE FOR {}", locale);
-				tmp = ResourceBundle.getBundle(BUNDLE_NAME);
-			}
-			bundles.put(locale, tmp);
-			return tmp;
-		}
-		return bundles.get(locale);
-	}
-
-	/**
-	 * Gets the localized message
-	 * @param key
-	 * @return the localized message
-	 */
-	public static @Nonnull String getString(String key) {
-		return getString(key, currentLocale);
-	}
-
-	/**
-	 * Gets the localized message
-	 * @param key the key
-	 * @param locale the locale to use
-	 * @return the localized message
-	 */
-	public static @Nonnull String getString(String key, Locale locale) {
-		try {
-			String value = ISNOTNULL(getBundle(locale).getString(key));
-
-			/* DIRTY HACK: this recognizes java 8 ("1.8") and older; these versions read .properties files as ISO-8859-1 instead of UTF-8 */
-			if (System.getProperty("java.version").startsWith("1."))
-				try { value = new String(value.getBytes("ISO-8859-1"), "UTF-8"); } catch (UnsupportedEncodingException e) {}
-
-			log.trace("[{}] {}: {} -> {}", new Object[]{System.getProperty("java.version"), currentLocale, key, value});
-			return value;
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-
-	public static @Nonnull String formatString(String key, Object... values) {
-		return ISNOTNULL(String.format(getString(key), values));
-	}
-}