diff --git a/.gitignore b/.gitignore index ee89af192..30e4e2393 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ navalplanner-webapp/target navalplanner-business/target navalplanner-gantt-zk/target +ganttzk-demo-webapp/target +ganttzk/target # ignore eclipse configuration files .classpath @@ -14,3 +16,4 @@ navalplanner-gantt-zk/target #ignore backup files *~ \#*\# +*MF diff --git a/navalplanner-gantt-zk/pom.xml b/ganttzk/pom.xml similarity index 88% rename from navalplanner-gantt-zk/pom.xml rename to ganttzk/pom.xml index 8ffde6340..9039a77c2 100644 --- a/navalplanner-gantt-zk/pom.xml +++ b/ganttzk/pom.xml @@ -1,14 +1,14 @@ - - + 4.0.0 org.navalplanner navalplanner 1.0.0 - navalplanner-gantt-zk + ganttzk jar Naval Planner ZK Components Module @@ -42,7 +42,7 @@ org.jgrapht - jgrapht-jdk1.5 + jgrapht-jdk1.5 @@ -50,5 +50,5 @@ junit - + diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/CommandContextualized.java b/ganttzk/src/main/java/org/zkoss/ganttz/CommandContextualized.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/CommandContextualized.java rename to ganttzk/src/main/java/org/zkoss/ganttz/CommandContextualized.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/CommandOnTaskContextualized.java b/ganttzk/src/main/java/org/zkoss/ganttz/CommandOnTaskContextualized.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/CommandOnTaskContextualized.java rename to ganttzk/src/main/java/org/zkoss/ganttz/CommandOnTaskContextualized.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DatesMapperOnInterval.java b/ganttzk/src/main/java/org/zkoss/ganttz/DatesMapperOnInterval.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DatesMapperOnInterval.java rename to ganttzk/src/main/java/org/zkoss/ganttz/DatesMapperOnInterval.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java similarity index 99% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyComponent.java rename to ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java index 02911484b..d51a7b553 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java @@ -11,7 +11,7 @@ import org.zkoss.zk.ui.ext.AfterCompose; import org.zkoss.zul.impl.XulElement; /** - * + * * @author Francisco Javier Moran Rúa * @author Lorenzo Tilve Álvaro */ diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java rename to ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java rename to ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java rename to ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/IDatesMapper.java b/ganttzk/src/main/java/org/zkoss/ganttz/IDatesMapper.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/IDatesMapper.java rename to ganttzk/src/main/java/org/zkoss/ganttz/IDatesMapper.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/IDependencyAddedListener.java b/ganttzk/src/main/java/org/zkoss/ganttz/IDependencyAddedListener.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/IDependencyAddedListener.java rename to ganttzk/src/main/java/org/zkoss/ganttz/IDependencyAddedListener.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/IDependencyRemovedListener.java b/ganttzk/src/main/java/org/zkoss/ganttz/IDependencyRemovedListener.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/IDependencyRemovedListener.java rename to ganttzk/src/main/java/org/zkoss/ganttz/IDependencyRemovedListener.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftPane.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftPane.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftPane.java rename to ganttzk/src/main/java/org/zkoss/ganttz/LeftPane.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java rename to ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java rename to ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java rename to ganttzk/src/main/java/org/zkoss/ganttz/Planner.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ResourceLoadComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadComponent.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ResourceLoadComponent.java rename to ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadComponent.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ResourceLoadList.java b/ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadList.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ResourceLoadList.java rename to ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadList.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java rename to ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskAssigmentMoveCommand.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskAssigmentMoveCommand.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskAssigmentMoveCommand.java rename to ganttzk/src/main/java/org/zkoss/ganttz/TaskAssigmentMoveCommand.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskComponent.java rename to ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java rename to ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java rename to ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java rename to ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java b/ganttzk/src/main/java/org/zkoss/ganttz/TimeTracker.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java rename to ganttzk/src/main/java/org/zkoss/ganttz/TimeTracker.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java rename to ganttzk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/DomainDependency.java b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/DomainDependency.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/DomainDependency.java rename to ganttzk/src/main/java/org/zkoss/ganttz/adapters/DomainDependency.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java rename to ganttzk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IDomainAndBeansMapper.java b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/IDomainAndBeansMapper.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IDomainAndBeansMapper.java rename to ganttzk/src/main/java/org/zkoss/ganttz/adapters/IDomainAndBeansMapper.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IStructureNavigator.java b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/IStructureNavigator.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IStructureNavigator.java rename to ganttzk/src/main/java/org/zkoss/ganttz/adapters/IStructureNavigator.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java rename to ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/Dependency.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Dependency.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/Dependency.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/Dependency.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DependencyType.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DependencyType.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DependencyType.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/DependencyType.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/Position.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Position.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/Position.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/Position.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ResourceLoad.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/ResourceLoad.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ResourceLoad.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/ResourceLoad.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ResourceLoadLevel.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/ResourceLoadLevel.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ResourceLoadLevel.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/ResourceLoadLevel.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/Task.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskLeaf.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskLeaf.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskLeaf.java rename to ganttzk/src/main/java/org/zkoss/ganttz/data/TaskLeaf.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java rename to ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java rename to ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ICommand.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ICommand.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ICommand.java rename to ganttzk/src/main/java/org/zkoss/ganttz/extensions/ICommand.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ICommandOnTask.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ICommandOnTask.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ICommandOnTask.java rename to ganttzk/src/main/java/org/zkoss/ganttz/extensions/ICommandOnTask.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/IContext.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContext.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/IContext.java rename to ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContext.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/IContextWithPlannerTask.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContextWithPlannerTask.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/IContextWithPlannerTask.java rename to ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContextWithPlannerTask.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/Interval.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/Interval.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/MutableTreeModel.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/MutableTreeModel.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/MutableTreeModel.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/MutableTreeModel.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/WeakReferencedListeners.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/WeakReferencedListeners.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/WeakReferencedListeners.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/WeakReferencedListeners.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFiveTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFiveTimeTrackerState.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFiveTimeTrackerState.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFiveTimeTrackerState.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFourTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFourTimeTrackerState.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFourTimeTrackerState.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFourTimeTrackerState.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailOneTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailOneTimeTrackerState.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailOneTimeTrackerState.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailOneTimeTrackerState.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailThreeTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailThreeTimeTrackerState.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailThreeTimeTrackerState.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailThreeTimeTrackerState.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailTwoTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailTwoTimeTrackerState.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/DetailTwoTimeTrackerState.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailTwoTimeTrackerState.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/IZoomLevelChangedListener.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/IZoomLevelChangedListener.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/IZoomLevelChangedListener.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/IZoomLevelChangedListener.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerState.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerState.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerState.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerStateUsingJodaTime.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerStateUsingJodaTime.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerStateUsingJodaTime.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerStateUsingJodaTime.java diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/ZoomLevel.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/ZoomLevel.java similarity index 100% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/zoom/ZoomLevel.java rename to ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/ZoomLevel.java diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml new file mode 100755 index 000000000..9c9f87581 --- /dev/null +++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml @@ -0,0 +1,120 @@ + + + + ganttz + xul/html + + zul + xul + + + import org.zkoss.ganttz.*; + + + + planner + org.zkoss.ganttz.Planner + + default + ~./ganttz/planner.dsp + + + + + resourcesLoadPanel + org.zkoss.ganttz.ResourcesLoadPanel + + default + ~./ganttz/resourcesLoadPanel.dsp + + + + + leftPane + org.zkoss.ganttz.LeftPane + ~./ganttz/zul/leftPane.zul + + + + leftTasksTree + org.zkoss.ganttz.LeftTasksTree + ~./ganttz/zul/leftTasksTree.zul + + + + ganttpanel + org.zkoss.ganttz.GanttPanel + + default + ~./ganttz/ganttpanel.dsp + + + + + resourceload + org.zkoss.ganttz.ResourceLoadComponent + + + default + ~./ganttz/resourceload.dsp + + + + + task + org.zkoss.ganttz.TaskComponent + + default + ~./ganttz/task.dsp + + + + + taskcontainer + org.zkoss.ganttz.TaskContainerComponent + + + default + ~./ganttz/taskcontainer.dsp + + + + + tasklist + org.zkoss.ganttz.TaskList + + default + ~./ganttz/tasklist.dsp + + + + + dependencylist + org.zkoss.ganttz.DependencyList + + default + ~./ganttz/dependencylist.dsp + + + + + dependency + org.zkoss.ganttz.DependencyComponent + + + default + ~./ganttz/dependency.dsp + + + + + timetracker + org.zkoss.ganttz.TimeTracker + ~./ganttz/zul/timetracker.zul + + detailLevel + 1 + + + + \ No newline at end of file diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/css/task.css.dsp b/ganttzk/src/main/resources/web/ganttz/css/task.css.dsp similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/css/task.css.dsp rename to ganttzk/src/main/resources/web/ganttz/css/task.css.dsp diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp b/ganttzk/src/main/resources/web/ganttz/dependency.dsp similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/dependency.dsp rename to ganttzk/src/main/resources/web/ganttz/dependency.dsp diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependencylist.dsp b/ganttzk/src/main/resources/web/ganttz/dependencylist.dsp similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/dependencylist.dsp rename to ganttzk/src/main/resources/web/ganttz/dependencylist.dsp diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/ganttpanel.dsp b/ganttzk/src/main/resources/web/ganttz/ganttpanel.dsp similarity index 94% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/ganttpanel.dsp rename to ganttzk/src/main/resources/web/ganttz/ganttpanel.dsp index 9adad452d..92ee9cda7 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/ganttpanel.dsp +++ b/ganttzk/src/main/resources/web/ganttz/ganttpanel.dsp @@ -3,7 +3,7 @@ -
+
${z:redraw(child, null)} @@ -16,4 +16,4 @@
-
\ No newline at end of file +
diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/arrow.png b/ganttzk/src/main/resources/web/ganttz/img/arrow.png similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/arrow.png rename to ganttzk/src/main/resources/web/ganttz/img/arrow.png diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/arrow2.png b/ganttzk/src/main/resources/web/ganttz/img/arrow2.png similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/arrow2.png rename to ganttzk/src/main/resources/web/ganttz/img/arrow2.png diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/arrow3.png b/ganttzk/src/main/resources/web/ganttz/img/arrow3.png similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/arrow3.png rename to ganttzk/src/main/resources/web/ganttz/img/arrow3.png diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/arrow4.png b/ganttzk/src/main/resources/web/ganttz/img/arrow4.png similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/arrow4.png rename to ganttzk/src/main/resources/web/ganttz/img/arrow4.png diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/group_left.png b/ganttzk/src/main/resources/web/ganttz/img/group_left.png similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/group_left.png rename to ganttzk/src/main/resources/web/ganttz/img/group_left.png diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/group_right.png b/ganttzk/src/main/resources/web/ganttz/img/group_right.png similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/group_right.png rename to ganttzk/src/main/resources/web/ganttz/img/group_right.png diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/pixel.gif b/ganttzk/src/main/resources/web/ganttz/img/pixel.gif similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/pixel.gif rename to ganttzk/src/main/resources/web/ganttz/img/pixel.gif diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/watermark_today.png b/ganttzk/src/main/resources/web/ganttz/img/watermark_today.png similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/watermark_today.png rename to ganttzk/src/main/resources/web/ganttz/img/watermark_today.png diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/zoom_in.gif b/ganttzk/src/main/resources/web/ganttz/img/zoom_in.gif similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/zoom_in.gif rename to ganttzk/src/main/resources/web/ganttz/img/zoom_in.gif diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/img/zoom_out.gif b/ganttzk/src/main/resources/web/ganttz/img/zoom_out.gif similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/img/zoom_out.gif rename to ganttzk/src/main/resources/web/ganttz/img/zoom_out.gif diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/planner.dsp b/ganttzk/src/main/resources/web/ganttz/planner.dsp similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/planner.dsp rename to ganttzk/src/main/resources/web/ganttz/planner.dsp diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/resourceload.dsp b/ganttzk/src/main/resources/web/ganttz/resourceload.dsp similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/resourceload.dsp rename to ganttzk/src/main/resources/web/ganttz/resourceload.dsp diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/resourcesLoadPanel.dsp b/ganttzk/src/main/resources/web/ganttz/resourcesLoadPanel.dsp similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/resourcesLoadPanel.dsp rename to ganttzk/src/main/resources/web/ganttz/resourcesLoadPanel.dsp diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/task.dsp b/ganttzk/src/main/resources/web/ganttz/task.dsp similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/task.dsp rename to ganttzk/src/main/resources/web/ganttz/task.dsp diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/taskcontainer.dsp b/ganttzk/src/main/resources/web/ganttz/taskcontainer.dsp similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/taskcontainer.dsp rename to ganttzk/src/main/resources/web/ganttz/taskcontainer.dsp diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp b/ganttzk/src/main/resources/web/ganttz/tasklist.dsp similarity index 97% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp rename to ganttzk/src/main/resources/web/ganttz/tasklist.dsp index 594c3f71f..9aa2fb33d 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp +++ b/ganttzk/src/main/resources/web/ganttz/tasklist.dsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %> <%@ taglib uri="http://www.zkoss.org/dsp/zk/core" prefix="z" %> - + diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftPane.zul b/ganttzk/src/main/resources/web/ganttz/zul/leftPane.zul similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftPane.zul rename to ganttzk/src/main/resources/web/ganttz/zul/leftPane.zul diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftTasksTree.zul b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftTasksTree.zul rename to ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul rename to ganttzk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/timetracker.zul b/ganttzk/src/main/resources/web/ganttz/zul/timetracker.zul similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/timetracker.zul rename to ganttzk/src/main/resources/web/ganttz/zul/timetracker.zul diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependency.js b/ganttzk/src/main/resources/web/js/ganttz/dependency.js similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependency.js rename to ganttzk/src/main/resources/web/js/ganttz/dependency.js diff --git a/ganttzk/src/main/resources/web/js/ganttz/dependencylist.js b/ganttzk/src/main/resources/web/js/ganttz/dependencylist.js new file mode 100644 index 000000000..5637d1cc7 --- /dev/null +++ b/ganttzk/src/main/resources/web/js/ganttz/dependencylist.js @@ -0,0 +1,4 @@ +zkDependencylist = {}; + +zkDependencylist.init = function (cmp) { +} diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/ganttpanel.js b/ganttzk/src/main/resources/web/js/ganttz/ganttpanel.js similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/js/ganttz/ganttpanel.js rename to ganttzk/src/main/resources/web/js/ganttz/ganttpanel.js diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/planner.js b/ganttzk/src/main/resources/web/js/ganttz/planner.js similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/js/ganttz/planner.js rename to ganttzk/src/main/resources/web/js/ganttz/planner.js diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/resourcesloadpanel.js b/ganttzk/src/main/resources/web/js/ganttz/resourcesloadpanel.js similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/js/ganttz/resourcesloadpanel.js rename to ganttzk/src/main/resources/web/js/ganttz/resourcesloadpanel.js diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/task.js b/ganttzk/src/main/resources/web/js/ganttz/task.js similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/js/ganttz/task.js rename to ganttzk/src/main/resources/web/js/ganttz/task.js diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/taskcontainer.js b/ganttzk/src/main/resources/web/js/ganttz/taskcontainer.js similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/js/ganttz/taskcontainer.js rename to ganttzk/src/main/resources/web/js/ganttz/taskcontainer.js diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/taskdetails.js b/ganttzk/src/main/resources/web/js/ganttz/taskdetails.js similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/js/ganttz/taskdetails.js rename to ganttzk/src/main/resources/web/js/ganttz/taskdetails.js diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js rename to ganttzk/src/main/resources/web/js/ganttz/tasklist.js diff --git a/navalplanner-gantt-zk/src/test/java/org/zkoss/ganttz/util/MutableTreeModelTest.java b/ganttzk/src/test/java/org/zkoss/ganttz/util/MutableTreeModelTest.java similarity index 100% rename from navalplanner-gantt-zk/src/test/java/org/zkoss/ganttz/util/MutableTreeModelTest.java rename to ganttzk/src/test/java/org/zkoss/ganttz/util/MutableTreeModelTest.java diff --git a/navalplanner-gantt-zk/src/main/resources/metainfo/zk/lang-addon.xml b/navalplanner-gantt-zk/src/main/resources/metainfo/zk/lang-addon.xml deleted file mode 100755 index 3afa04a4f..000000000 --- a/navalplanner-gantt-zk/src/main/resources/metainfo/zk/lang-addon.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - ganttz - xul/html - - zul - xul - - - import org.zkoss.ganttz.*; - - - - planner - org.zkoss.ganttz.Planner - - default - ~./ganttz/planner.dsp - - - - - resourcesLoadPanel - org.zkoss.ganttz.ResourcesLoadPanel - - default - ~./ganttz/resourcesLoadPanel.dsp - - - - - leftPane - org.zkoss.ganttz.LeftPane - ~./ganttz/zul/leftPane.zul - - - - leftTasksTree - org.zkoss.ganttz.LeftTasksTree - ~./ganttz/zul/leftTasksTree.zul - - - - ganttpanel - org.zkoss.ganttz.GanttPanel - - default - ~./ganttz/ganttpanel.dsp - - - - - resourceload - org.zkoss.ganttz.ResourceLoadComponent - - default - ~./ganttz/resourceload.dsp - - - - - task - org.zkoss.ganttz.TaskComponent - - default - ~./ganttz/task.dsp - - - - - taskcontainer - org.zkoss.ganttz.TaskContainerComponent - - default - ~./ganttz/taskcontainer.dsp - - - - - tasklist - org.zkoss.ganttz.TaskList - - default - ~./ganttz/tasklist.dsp - - - - - dependencylist - org.zkoss.ganttz.DependencyList - - default - ~./ganttz/dependencylist.dsp - - - - - dependency - org.zkoss.ganttz.DependencyComponent - - default - ~./ganttz/dependency.dsp - - - - - timetracker - org.zkoss.ganttz.TimeTracker - ~./ganttz/zul/timetracker.zul - - detailLevel - 1 - - - - diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependencylist.js b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependencylist.js deleted file mode 100644 index 1643385c2..000000000 --- a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/dependencylist.js +++ /dev/null @@ -1,4 +0,0 @@ -zkDependencylist = {}; - -zkDependencylist.init = function (cmp) { -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index e1dcad7f8..c379f7669 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ navalplanner-business - navalplanner-gantt-zk + ganttzk navalplanner-webapp ganttzk-demo-webapp