From c9cb97043645dadfbd33a75f14df4b133ebec5f4 Mon Sep 17 00:00:00 2001
From: Cristina Alvarino <cristina.alvarino@comtecsf.es>
Date: Thu, 30 Jun 2011 13:46:05 +0200
Subject: [PATCH] Move classes and settings.zul to new package

FEA: ItEr75S07UserSettings
---
 .../org/navalplanner/web/common/CustomMenuController.java     | 2 +-
 .../navalplanner/web/users/{ => settings}/ISettingsModel.java | 2 +-
 .../web/users/{ => settings}/SettingsController.java          | 2 +-
 .../navalplanner/web/users/{ => settings}/SettingsModel.java  | 4 ++--
 .../src/main/webapp/{users => settings}/settings.zul          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename navalplanner-webapp/src/main/java/org/navalplanner/web/users/{ => settings}/ISettingsModel.java (97%)
 rename navalplanner-webapp/src/main/java/org/navalplanner/web/users/{ => settings}/SettingsController.java (99%)
 rename navalplanner-webapp/src/main/java/org/navalplanner/web/users/{ => settings}/SettingsModel.java (97%)
 rename navalplanner-webapp/src/main/webapp/{users => settings}/settings.zul (98%)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
index 7678c4d23..716d9ec62 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
@@ -340,7 +340,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
             subItem(_("Materials Needs At Date"),"/reports/timeLineMaterialReport.zul","15-informes.html"));
 
         topItem(_("My account"), "", "",
-                subItem(_("Settings"), "/users/settings.zul", ""));
+                subItem(_("Settings"), "/settings/settings.zul", ""));
     }
 
     private Vbox getRegisteredItemsInsertionPoint() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
index 1f3aee65c..ee9c9334b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ISettingsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.navalplanner.web.users;
+package org.navalplanner.web.users.settings;
 
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.users.entities.Language;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
similarity index 99%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
index a6acf5edd..4ea09d9ea 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.users;
+package org.navalplanner.web.users.settings;
 
 import static org.navalplanner.web.I18nHelper._;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
index 39f77ace6..13177865b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/SettingsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.navalplanner.web.users;
+package org.navalplanner.web.users.settings;
 
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
@@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
-@OnConcurrentModification(goToPage = "/users/settings.zul")
+@OnConcurrentModification(goToPage = "/settings/settings.zul")
 public class SettingsModel implements ISettingsModel {
 
     @Autowired
diff --git a/navalplanner-webapp/src/main/webapp/users/settings.zul b/navalplanner-webapp/src/main/webapp/settings/settings.zul
similarity index 98%
rename from navalplanner-webapp/src/main/webapp/users/settings.zul
rename to navalplanner-webapp/src/main/webapp/settings/settings.zul
index 2e41c162a..a36ae5daf 100644
--- a/navalplanner-webapp/src/main/webapp/users/settings.zul
+++ b/navalplanner-webapp/src/main/webapp/settings/settings.zul
@@ -29,7 +29,7 @@
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <zk>
     <window id="settingsWindow" self="@{define(content)}"
-        apply="org.navalplanner.web.users.SettingsController"
+        apply="org.navalplanner.web.users.settings.SettingsController"
         title="${i18n:_('User settings')}">
 
         <vbox id="messagesContainer" />