move Language to de.metas.i18n package

metasfresh/metasfresh#1517
metasfresh · May 12, 2017 · 732916e · 732916e
1 parent f5b4729
commit 732916e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/de/metas/ui/web/session/InternalUserSessionData.java b/src/main/java/de/metas/ui/web/session/InternalUserSessionData.java
@@ -6,7 +6,6 @@
 import java.util.Properties;
 
 import org.compiere.util.Env;
-import org.compiere.util.Language;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
@@ -19,6 +18,7 @@
 
 import com.google.common.base.MoreObjects;
 
+import de.metas.i18n.Language;
 import de.metas.ui.web.base.session.UserPreference;
 
 /*

diff --git a/src/main/java/de/metas/ui/web/session/UserSession.java b/src/main/java/de/metas/ui/web/session/UserSession.java
@@ -11,13 +11,13 @@
 import org.compiere.util.Env;
 import org.compiere.util.Evaluatee;
 import org.compiere.util.Evaluatees;
-import org.compiere.util.Language;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 
+import de.metas.i18n.Language;
 import de.metas.logging.LogManager;
 import de.metas.ui.web.base.session.UserPreference;
 import de.metas.ui.web.exceptions.DeprecatedRestAPINotAllowedException;

diff --git a/src/main/java/de/metas/ui/web/session/UserSessionRestController.java b/src/main/java/de/metas/ui/web/session/UserSessionRestController.java
@@ -1,13 +1,13 @@
 package de.metas.ui.web.session;
 
-import org.compiere.util.Language;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import de.metas.i18n.Language;
 import de.metas.ui.web.config.WebConfig;
 import de.metas.ui.web.session.json.JSONUserSession;
 import de.metas.ui.web.window.datatypes.json.JSONLookupValue;

diff --git a/src/main/java/de/metas/ui/web/session/json/JSONUserSession.java b/src/main/java/de/metas/ui/web/session/json/JSONUserSession.java
@@ -1,12 +1,11 @@
 package de.metas.ui.web.session.json;
 
-import org.compiere.util.Language;
-
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import de.metas.i18n.Language;
 import de.metas.ui.web.session.UserSession;
 import de.metas.ui.web.window.datatypes.json.JSONDate;
 import de.metas.ui.web.window.datatypes.json.JSONLookupValue;

diff --git a/.../metas/ui/web/window/descriptor/factory/standard/GenericDocumentSummaryValueProvider.java b/.../metas/ui/web/window/descriptor/factory/standard/GenericDocumentSummaryValueProvider.java
@@ -13,13 +13,13 @@
 import org.compiere.model.ILookupDisplayColumn;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
-import org.compiere.util.Language;
 import org.slf4j.Logger;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
+import de.metas.i18n.Language;
 import de.metas.logging.LogManager;
 import de.metas.printing.esb.base.util.Check;
 import de.metas.ui.web.window.WindowConstants;