From 5fee0140aaac59349038864fe2ba4aab0f07787c Mon Sep 17 00:00:00 2001
From: Cristina Alvarino <cristina.alvarino@comtecsf.es>
Date: Mon, 4 Jul 2011 11:49:49 +0200
Subject: [PATCH] Move entity Language to package
 org.navalplanner.business.settings.entities

---
 .../business/{users => settings}/entities/Language.java     | 2 +-
 .../java/org/navalplanner/business/users/entities/User.java | 1 +
 .../org/navalplanner/business/users/entities/Users.hbm.xml  | 2 +-
 .../org/navalplanner/web/users/settings/ISettingsModel.java | 3 ++-
 .../navalplanner/web/users/settings/SettingsController.java | 6 +++---
 .../org/navalplanner/web/users/settings/SettingsModel.java  | 4 +---
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename navalplanner-business/src/main/java/org/navalplanner/business/{users => settings}/entities/Language.java (96%)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Language.java b/navalplanner-business/src/main/java/org/navalplanner/business/settings/entities/Language.java
similarity index 96%
rename from navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Language.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/settings/entities/Language.java
index 474c5668f..295be7590 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Language.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/settings/entities/Language.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.users.entities;
+package org.navalplanner.business.settings.entities;
 
 import static org.navalplanner.business.i18n.I18nHelper._;
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
index b13c58f30..a0817c61d 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
@@ -30,6 +30,7 @@ import org.navalplanner.business.common.BaseEntity;
 import org.navalplanner.business.common.Registry;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.scenarios.entities.Scenario;
+import org.navalplanner.business.settings.entities.Language;
 import org.navalplanner.business.users.daos.IUserDAO;
 
 /**
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml
index 5701d5437..acb6d26b6 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml
@@ -25,7 +25,7 @@
         <property name="disabled"/>
         <property name="applicationLanguage" column="application_language">
             <type name="org.hibernate.type.EnumType">
-                <param name="enumClass">org.navalplanner.business.users.entities.Language</param>
+                <param name="enumClass">org.navalplanner.business.settings.entities.Language</param>
             </type>
         </property>
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
index cae908e17..c8ff07e4c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
@@ -19,7 +19,8 @@
 package org.navalplanner.web.users.settings;
 
 import org.navalplanner.business.common.exceptions.ValidationException;
-import org.navalplanner.business.users.entities.Language;
+import org.navalplanner.business.settings.entities.Language;
+
 
 /**
  * Model for UI operations related to user settings
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
index 17040bdc2..af81f41ac 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
@@ -22,15 +22,15 @@ package org.navalplanner.web.users.settings;
 import static org.navalplanner.web.I18nHelper._;
 
 import org.navalplanner.business.common.exceptions.ValidationException;
-import org.navalplanner.business.users.entities.Language;
+import org.navalplanner.business.settings.entities.Language;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
 import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zk.ui.WrongValueException;
-import org.zkoss.zul.ListitemRenderer;
+import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Constraint;
+import org.zkoss.zul.ListitemRenderer;
 import org.zkoss.zul.Textbox;
 
 /**
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
index 7ddc8933f..0686a5260 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
@@ -21,18 +21,16 @@ package org.navalplanner.web.users.settings;
 
 import org.apache.commons.lang.Validate;
 import org.navalplanner.business.common.Configuration;
-import org.navalplanner.business.common.Registry;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
+import org.navalplanner.business.settings.entities.Language;
 import org.navalplanner.business.users.daos.IUserDAO;
-import org.navalplanner.business.users.entities.Language;
 import org.navalplanner.business.users.entities.Profile;
 import org.navalplanner.business.users.entities.User;
 import org.navalplanner.business.users.entities.UserRole;
 import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification;
 import org.navalplanner.web.security.SecurityUtils;
 import org.navalplanner.web.users.PasswordUtil;
-import org.navalplanner.web.users.bootstrap.MandatoryUser;
 import org.navalplanner.web.users.services.IDBPasswordEncoderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;