diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IPredicate.java b/ganttzk/src/main/java/org/zkoss/ganttz/IPredicate.java similarity index 96% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IPredicate.java rename to ganttzk/src/main/java/org/zkoss/ganttz/IPredicate.java index 17fb3cd0c..ac1d316b5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IPredicate.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/IPredicate.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.web.orders; +package org.zkoss.ganttz; /** * Classes implementing this interface check if object matches a given diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java index aebff5db5..5b1e4e78f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java @@ -36,6 +36,7 @@ import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.CriterionType; import org.navalplanner.business.templates.entities.OrderElementTemplate; import org.navalplanner.business.templates.entities.OrderTemplate; +import org.zkoss.ganttz.IPredicate; /** * Contract for {@link OrderModel}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java index c19152cdc..d65d59268 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java @@ -25,6 +25,7 @@ import java.util.Set; import org.navalplanner.business.labels.entities.Label; import org.navalplanner.business.orders.entities.OrderElement; +import org.zkoss.ganttz.IPredicate; /** * Checks if {@link Label} from {@link OrderElement} matches attribute label diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementPredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementPredicate.java index dacf601c2..c724d048a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementPredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementPredicate.java @@ -31,6 +31,7 @@ import org.navalplanner.business.requirements.entities.CriterionRequirement; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.web.common.components.finders.FilterPair; import org.navalplanner.web.common.components.finders.OrderElementFilterEnum; +import org.zkoss.ganttz.IPredicate; /** * Checks if {@link OrderElement} matches with the different filters. diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java index 0650e9fb2..0bdf551a3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java @@ -48,6 +48,7 @@ import org.navalplanner.web.orders.assigntemplates.TemplateFinderPopup; import org.navalplanner.web.orders.assigntemplates.TemplateFinderPopup.IOnResult; import org.navalplanner.web.templates.IOrderTemplatesControllerEntryPoints; import org.navalplanner.web.tree.TreeController; +import org.zkoss.ganttz.IPredicate; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.WrongValueException; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java index 47172223a..b1ab30e91 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java @@ -81,6 +81,7 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.zkoss.ganttz.IPredicate; /** * Model for UI operations related to {@link Order}.
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java index 2d0a959bf..45a80b0f1 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java @@ -34,6 +34,7 @@ import org.navalplanner.business.workreports.entities.WorkReport; import org.navalplanner.business.workreports.entities.WorkReportType; import org.navalplanner.web.common.components.finders.FilterPair; import org.navalplanner.web.common.components.finders.OrderFilterEnum; +import org.zkoss.ganttz.IPredicate; /** * Checks if {@link WorkReportType}, the start date and finish date from diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPredicate.java index 2ce241a41..1ee78eb52 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPredicate.java @@ -6,8 +6,8 @@ import java.util.List; import org.navalplanner.business.orders.entities.Order; import org.navalplanner.business.planner.entities.TaskGroup; import org.navalplanner.web.common.components.finders.FilterPair; -import org.navalplanner.web.orders.IPredicate; import org.navalplanner.web.orders.OrderPredicate; +import org.zkoss.ganttz.IPredicate; /** * Checks if {@link Order}, the start date and finish date from associated diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java index 17823e533..2e1856ea5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java @@ -32,11 +32,11 @@ import org.apache.commons.lang.Validate; import org.navalplanner.business.planner.entities.TaskElement; import org.navalplanner.web.common.components.bandboxsearch.BandboxMultipleSearch; import org.navalplanner.web.common.components.finders.FilterPair; -import org.navalplanner.web.orders.IPredicate; import org.navalplanner.web.planner.CompanyPredicate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; +import org.zkoss.ganttz.IPredicate; import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.extensions.ICommandOnTask; import org.zkoss.ganttz.resourceload.ScriptsRequiredByResourceLoadPanel; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index c3e0958e0..e3d7987a6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -60,7 +60,6 @@ import org.navalplanner.business.users.daos.IUserDAO; import org.navalplanner.business.users.entities.User; import org.navalplanner.business.workreports.daos.IWorkReportLineDAO; import org.navalplanner.business.workreports.entities.WorkReportLine; -import org.navalplanner.web.orders.IPredicate; import org.navalplanner.web.planner.ITaskElementAdapter; import org.navalplanner.web.planner.chart.Chart; import org.navalplanner.web.planner.chart.ChartFiller; @@ -80,6 +79,7 @@ import org.zkforge.timeplot.Plotinfo; import org.zkforge.timeplot.Timeplot; import org.zkforge.timeplot.geometry.TimeGeometry; import org.zkforge.timeplot.geometry.ValueGeometry; +import org.zkoss.ganttz.IPredicate; import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.adapters.IStructureNavigator; import org.zkoss.ganttz.adapters.PlannerConfiguration; @@ -180,7 +180,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { public void setConfigurationToPlanner(Planner planner, Collection> additional, ICommandOnTask doubleClickCommand, - IPredicate predicate) { + IPredicate predicate) { PlannerConfiguration configuration = createConfiguration(predicate); Tabbox chartComponent = new Tabbox(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java index d39abc8da..d0b1364f6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java @@ -23,7 +23,7 @@ package org.navalplanner.web.planner.company; import java.util.Collection; import org.navalplanner.business.planner.entities.TaskElement; -import org.navalplanner.web.orders.IPredicate; +import org.zkoss.ganttz.IPredicate; import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.extensions.ICommandOnTask; @@ -43,7 +43,6 @@ public interface ICompanyPlanningModel { public void setConfigurationToPlanner(Planner planner, Collection> additional, - ICommandOnTask doubleClickCommand, - IPredicate predicate); + ICommandOnTask doubleClickCommand, IPredicate predicate); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java index 7faefe562..b900f6e6d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java @@ -35,7 +35,7 @@ import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.resources.entities.Worker; import org.navalplanner.web.common.components.finders.FilterPair; import org.navalplanner.web.common.components.finders.ResourceFilterEnum; -import org.navalplanner.web.orders.IPredicate; +import org.zkoss.ganttz.IPredicate; /** * Checks if {@link Resource} matches with this predicate. diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java index 9913c671c..799b94cef 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java @@ -35,7 +35,7 @@ import org.navalplanner.business.workreports.entities.WorkReportLine; import org.navalplanner.business.workreports.entities.WorkReportType; import org.navalplanner.business.workreports.valueobjects.DescriptionField; import org.navalplanner.business.workreports.valueobjects.DescriptionValue; -import org.navalplanner.web.orders.IPredicate; +import org.zkoss.ganttz.IPredicate; /** * Contract for {@link WorkRerportType} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index 63da231ab..7d736bd9e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -53,7 +53,7 @@ import org.navalplanner.web.common.components.NewDataSortableColumn; import org.navalplanner.web.common.components.NewDataSortableGrid; import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry; import org.navalplanner.web.common.entrypoints.URLHandler; -import org.navalplanner.web.orders.IPredicate; +import org.zkoss.ganttz.IPredicate; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.event.Event; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportLinePredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportLinePredicate.java index 8930bf369..7b5fe34c3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportLinePredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportLinePredicate.java @@ -27,7 +27,7 @@ import org.navalplanner.business.costcategories.entities.TypeOfWorkHours; import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.workreports.entities.WorkReportLine; -import org.navalplanner.web.orders.IPredicate; +import org.zkoss.ganttz.IPredicate; /** * Checks if {@link WorkReportLine} matches the constraints diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java index 7a357a56f..592f3d47f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java @@ -46,12 +46,12 @@ import org.navalplanner.business.workreports.entities.WorkReportLine; import org.navalplanner.business.workreports.entities.WorkReportType; import org.navalplanner.business.workreports.valueobjects.DescriptionField; import org.navalplanner.business.workreports.valueobjects.DescriptionValue; -import org.navalplanner.web.orders.IPredicate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.zkoss.ganttz.IPredicate; /** * Model for UI operations related to {@link WorkReport}. diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportPredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportPredicate.java index 920bf7673..a97cd0a21 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportPredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportPredicate.java @@ -24,7 +24,7 @@ import java.util.Date; import org.navalplanner.business.workreports.entities.WorkReport; import org.navalplanner.business.workreports.entities.WorkReportType; -import org.navalplanner.web.orders.IPredicate; +import org.zkoss.ganttz.IPredicate; /** * Checks if {@link WorkReportType}, the start date and finish date from