RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move entity Language to package org.navalplanner.business.settings.entities

Browse source
This commit is contained in:
Cristina Alvarino 2011-07-04 11:49:49 +02:00 • committed by Manuel Rego Casasnovas
parent d39e59effa
commit 5fee0140aa
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Language.java → navalplanner-business/src/main/java/org/navalplanner/business/settings/entities/Language.java
View file

@ -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._;

1
navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
View file

@ -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;
/**

2
navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml
View file

@ -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>

3
navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
View file

@ -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

6
navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
View file

@ -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;
/**

4
navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
View file

@ -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;