diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml index 5ae5d90a9..62e71b725 100644 --- a/debian/maven-settings.xml +++ b/debian/maven-settings.xml @@ -1,9 +1,9 @@ + xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 + http://maven.apache.org/xsd/settings-1.0.0.xsd"> - - ${env.CURDIR}/debian/maven-repo + + ${env.CURDIR}/debian/maven-repo diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml index 65c70da24..4e9ff47f5 100755 --- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml +++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml @@ -1,38 +1,38 @@ - ganttz - xul/html + ganttz + xul/html - zul - xul + zul + xul - - import org.zkoss.ganttz.*; + + import org.zkoss.ganttz.*; - - planner - org.zkoss.ganttz.Planner + + planner + org.zkoss.ganttz.Planner ganttz.Planner ~./ganttz/zul/plannerLayout.zul - - + + - - tabSwitcher - org.zkoss.ganttz.TabSwitcher - ~./ganttz/zul/tabSwitcher.zul - + + tabSwitcher + org.zkoss.ganttz.TabSwitcher + ~./ganttz/zul/tabSwitcher.zul + - - resourcesLoadPanel - org.zkoss.ganttz.resourceload.ResourcesLoadPanel - ~./ganttz/zul/resourcesLoadLayout.zul - + + resourcesLoadPanel + org.zkoss.ganttz.resourceload.ResourcesLoadPanel + ~./ganttz/zul/resourcesLoadLayout.zul + resourcesLoadList @@ -52,43 +52,43 @@ - - leftPane - org.zkoss.ganttz.LeftPane - ~./ganttz/zul/leftPane.zul - + + leftPane + org.zkoss.ganttz.LeftPane + ~./ganttz/zul/leftPane.zul + - - leftTasksTree - org.zkoss.ganttz.LeftTasksTree - ~./ganttz/zul/leftTasksTree.zul - + + leftTasksTree + org.zkoss.ganttz.LeftTasksTree + ~./ganttz/zul/leftTasksTree.zul + - - ganttpanel - org.zkoss.ganttz.GanttPanel + + ganttpanel + org.zkoss.ganttz.GanttPanel ganttz.GanttPanel - - default - + + default + mold/gantt-panel.js - - + + - - resourceload - org.zkoss.ganttz.resourceload.ResourceLoadComponent - + + resourceload + org.zkoss.ganttz.resourceload.ResourceLoadComponent + ganttz.resourceload.ResourceLoadComponent - - default + + default mold/resource-load-component.js - - - + + + - + taskRow org.zkoss.ganttz.TaskRow ganttz.TaskRow @@ -99,16 +99,16 @@ - - task - org.zkoss.ganttz.TaskComponent + + task + org.zkoss.ganttz.TaskComponent ganttz.TaskComponent - - default - + + default + mold/task-component.js - - + + milestone @@ -122,64 +122,64 @@ - - taskcontainer - org.zkoss.ganttz.TaskContainerComponent - + + taskcontainer + org.zkoss.ganttz.TaskContainerComponent + ganttz.TaskContainerComponent - - default + + default mold/task-container.js - - - + + + - - tasklist - org.zkoss.ganttz.TaskList + + tasklist + org.zkoss.ganttz.TaskList ganttz.TaskList - - default - + + default + mold/task-list.js - - + + - - dependencylist - org.zkoss.ganttz.DependencyList + + dependencylist + org.zkoss.ganttz.DependencyList ganttz.DependencyList - - default - + + default + mold/dependency-list.js - - + + - - dependency - org.zkoss.ganttz.DependencyComponent - + + dependency + org.zkoss.ganttz.DependencyComponent + ganttz.DependencyComponent - - default + + default mold/dependency-component.js - - - + + + - - timetracker - org.zkoss.ganttz.timetracker.TimeTrackerComponent - ganttz.TimeTracker + + timetracker + org.zkoss.ganttz.timetracker.TimeTrackerComponent + ganttz.TimeTracker ~./ganttz/zul/timetracker/timetracker.zul - + - - timeTrackedTable - org.zkoss.ganttz.timetracker.TimeTrackedTable - ~./ganttz/zul/timetracker/timetrackedtable.zul - + + timeTrackedTable + org.zkoss.ganttz.timetracker.TimeTrackedTable + ~./ganttz/zul/timetracker/timetrackedtable.zul + diff --git a/navalplanner-business/pom.xml b/navalplanner-business/pom.xml index 44235cc6c..c9e11ffed 100644 --- a/navalplanner-business/pom.xml +++ b/navalplanner-business/pom.xml @@ -125,15 +125,15 @@ - liquibase-update - - true - - - - + liquibase-update + + true + + + + org.liquibase - liquibase-maven-plugin + liquibase-maven-plugin 2.0-rc7 @@ -147,21 +147,21 @@ - - - - + + + + - liquibase-updatesql - - false - - - - + liquibase-updatesql + + false + + + + org.liquibase - liquibase-maven-plugin + liquibase-maven-plugin 2.0-rc7 @@ -175,10 +175,10 @@ - - - - + + + + diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java index a023e123d..3aa600224 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java @@ -529,12 +529,12 @@ public class CriterionType extends IntegrationEntity implements .checkChildrenAssignedToAnyResource(this))); } - @NotNull(message = "last criterion sequence code not specified") - public Integer getLastCriterionSequenceCode() { - return lastCriterionSequenceCode; - } + @NotNull(message = "last criterion sequence code not specified") + public Integer getLastCriterionSequenceCode() { + return lastCriterionSequenceCode; + } - public void incrementLastCriterionSequenceCode() { + public void incrementLastCriterionSequenceCode() { if (this.lastCriterionSequenceCode == null) { this.lastCriterionSequenceCode = 0; } 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 5eca45125..b13c58f30 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 @@ -244,20 +244,20 @@ public class User extends BaseEntity { this.expandCompanyPlanningViewCharts = expandCompanyPlanningViewCharts; } - public String getFirstName() { - return firstName; - } + public String getFirstName() { + return firstName; + } - public void setFirstName(String firstName) { - this.firstName = firstName; - } + public void setFirstName(String firstName) { + this.firstName = firstName; + } - public String getLastName() { - return lastName; - } + public String getLastName() { + return lastName; + } - public void setLastName(String lastName) { - this.lastName = lastName; - } + public void setLastName(String lastName) { + this.lastName = lastName; + } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java index 12bea6d72..4f31180f6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java @@ -57,12 +57,12 @@ public class WorkReportDAO extends IntegrationEntityDAO @Autowired private IOrderDAO orderDAO; - @SuppressWarnings("unchecked") - @Override - public List getAllByWorkReportType(WorkReportType workReportType) { - final Criteria criteria = getSession().createCriteria(WorkReport.class); - return criteria.add(Restrictions.eq("workReportType", workReportType)).list(); - } + @SuppressWarnings("unchecked") + @Override + public List getAllByWorkReportType(WorkReportType workReportType) { + final Criteria criteria = getSession().createCriteria(WorkReport.class); + return criteria.add(Restrictions.eq("workReportType", workReportType)).list(); + } @Override public List getAll() { diff --git a/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml b/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml index 252703ca2..04567e926 100644 --- a/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml +++ b/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml @@ -127,16 +127,16 @@ class="org.navalplanner.business.orders.entities.CriterionRequirementOrderElementHandler" factory-method="getInstance" /> - - ${project.version} + ${project.version} - diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml index 95d5f7887..e8a40358a 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml @@ -20,7 +20,7 @@ - diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml index 66925f8b5..4eb9c5601 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml @@ -13,7 +13,7 @@ - diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml index 16e2d7346..110c5e15c 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml @@ -13,13 +13,13 @@ - - - + + + - + diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml index 500cdcb8b..dfd966859 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml @@ -64,7 +64,7 @@ - @@ -97,9 +97,9 @@ - - - + + + diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml index ec1a3da79..f5a73b8e5 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml @@ -221,9 +221,9 @@ - - task - + + task + context, - TaskElement taskElement) { - editTaskUtilities.reattach(taskElement); + @Override + public void doAction(IContextWithPlannerTask context, + TaskElement taskElement) { + editTaskUtilities.reattach(taskElement); - if (isApplicableTo(taskElement)) { - Task task = (Task) taskElement; - if (task.isSubcontracted()) { - editTaskController.showEditFormSubcontract(context, task, - planningState); - } else { - editTaskController.showEditFormResourceAllocation(context, - task, planningState); - } - } - } + if (isApplicableTo(taskElement)) { + Task task = (Task) taskElement; + if (task.isSubcontracted()) { + editTaskController.showEditFormSubcontract(context, task, + planningState); + } else { + editTaskController.showEditFormResourceAllocation(context, + task, planningState); + } + } + } @Override public String getName() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java index e85772750..fb32cc548 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java @@ -54,7 +54,7 @@ public class SubcontractCommand implements ISubcontractCommand { @Override public String getIcon() { - return "/common/img/ico_subcontract.png"; + return "/common/img/ico_subcontract.png"; } @Override diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java index 84cc25b76..a216f72d0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java @@ -81,7 +81,7 @@ public class CutyPrint { private static int TASK_HEIGHT = 25; private static int PRINT_VERTICAL_PADDING = 50; - private static int PRINT_VERTICAL_SPACING = 160; + private static int PRINT_VERTICAL_SPACING = 160; public static void print(Order order) { print("/planner/index.zul", entryPointForShowingOrder(order), @@ -186,10 +186,10 @@ public class CutyPrint { minWidthForTaskNameColumn); captureString += " --min-width=" + plannerWidth; - int plannerHeight = (expanded ? planner.getAllTasksNumber() : planner - .getTaskNumber()) * TASK_HEIGHT + PRINT_VERTICAL_SPACING; + int plannerHeight = (expanded ? planner.getAllTasksNumber() : planner + .getTaskNumber()) * TASK_HEIGHT + PRINT_VERTICAL_SPACING; - captureString += " --min-height=" + plannerHeight; + captureString += " --min-height=" + plannerHeight; // Static width and time delay parameters (FIX) 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 ee9c9334b..4a547b91e 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 @@ -50,12 +50,12 @@ public interface ISettingsModel { boolean isExpandCompanyPlanningViewCharts(); - void setLastName(String lastName); + void setLastName(String lastName); - String getLastName(); + String getLastName(); - void setFirstName(String firstName); + void setFirstName(String firstName); - String getFirstName(); + String getFirstName(); } 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 4ea09d9ea..c2f912193 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 @@ -126,20 +126,20 @@ public class SettingsController extends GenericForwardComposer { return settingsModel.isExpandResourceLoadViewCharts(); } - public String getFirstName() { - return settingsModel.getFirstName(); - } + public String getFirstName() { + return settingsModel.getFirstName(); + } - public void setFirstName(String firstName) { - settingsModel.setFirstName(firstName); - } + public void setFirstName(String firstName) { + settingsModel.setFirstName(firstName); + } - public String getLastName() { - return settingsModel.getLastName(); - } + public String getLastName() { + return settingsModel.getLastName(); + } - public void setLastName(String lastName) { - settingsModel.setLastName(lastName); - } + public void setLastName(String lastName) { + settingsModel.setLastName(lastName); + } } 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 13177865b..9e1dbf23c 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 @@ -145,28 +145,28 @@ public class SettingsModel implements ISettingsModel { } } - @Override - public String getFirstName() { - return user.getFirstName(); - } + @Override + public String getFirstName() { + return user.getFirstName(); + } - @Override - public void setFirstName(String firstName) { - if (user != null) { - user.setFirstName(firstName); - } - } + @Override + public void setFirstName(String firstName) { + if (user != null) { + user.setFirstName(firstName); + } + } - @Override - public String getLastName() { - return user.getLastName(); - } + @Override + public String getLastName() { + return user.getLastName(); + } - @Override - public void setLastName(String lastName) { - if (user != null) { - user.setLastName(lastName); - } - } + @Override + public void setLastName(String lastName) { + if (user != null) { + user.setLastName(lastName); + } + } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java index 1d06d758f..7fde3e7cd 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java @@ -156,7 +156,7 @@ public abstract class GenericRESTService - ThreadLocal Synchronization Listener - org.zkoss.zkplus.util.ThreadLocalListener + ThreadLocal Synchronization Listener + org.zkoss.zkplus.util.ThreadLocalListener - - ThreadLocal - - org.springframework.security.context.ThreadLocalSecurityContextHolderStrategy=contextHolder - - + + ThreadLocal + + org.springframework.security.context.ThreadLocalSecurityContextHolderStrategy=contextHolder + + diff --git a/navalplanner-webapp/src/main/webapp/common/components/i18n.zul b/navalplanner-webapp/src/main/webapp/common/components/i18n.zul index 69b5a4cf9..2d4727024 100644 --- a/navalplanner-webapp/src/main/webapp/common/components/i18n.zul +++ b/navalplanner-webapp/src/main/webapp/common/components/i18n.zul @@ -20,10 +20,10 @@ --> - - + + - diff --git a/navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul b/navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul index 5077bcc59..ef0c824c8 100644 --- a/navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul +++ b/navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul @@ -27,7 +27,7 @@