From 333cd297b626726aeb207eaf46ed7c7cfb70db8e Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Tue, 27 Apr 2010 19:34:19 +0200
Subject: [PATCH]  ItEr56S09RFAspectosGraficosRecursoLimitantesItEr55S11: Moved
 LimitingResources components to navalplanner-webapp module

---
 .../main/resources/metainfo/zk/lang-addon.xml | 26 -------------------
 .../limitingresources/limitingresources.dsp   | 13 ----------
 .../LimitingDependencyComponent.java          |  0
 .../LimitingDependencyList.java               |  0
 .../LimitingResourceQueueModel.java           |  2 +-
 .../LimitingResourcesComponent.java           |  2 +-
 .../LimitingResourcesController.java          |  3 +--
 .../LimitingResourcesLeftPane.java            |  2 +-
 .../LimitingResourcesList.java                |  2 +-
 .../LimitingResourcesPanel.java               |  4 +--
 .../main/resources/metainfo/zk/lang-addon.xml | 26 ++++++++++++++++++-
 .../webapp}/limitingresources/leftPane.zul    |  0
 .../limitingresourceslist.dsp                 |  0
 .../src/main/webapp/planner/css/ganttzk.css   |  2 +-
 14 files changed, 33 insertions(+), 49 deletions(-)
 delete mode 100644 ganttzk/src/main/resources/web/ganttz/limitingresources/limitingresources.dsp
 rename {ganttzk/src/main/java/org/zkoss/ganttz => navalplanner-webapp/src/main/java/org/navalplanner/web}/limitingresources/LimitingDependencyComponent.java (100%)
 rename {ganttzk/src/main/java/org/zkoss/ganttz => navalplanner-webapp/src/main/java/org/navalplanner/web}/limitingresources/LimitingDependencyList.java (100%)
 rename {ganttzk/src/main/java/org/zkoss/ganttz => navalplanner-webapp/src/main/java/org/navalplanner/web}/limitingresources/LimitingResourcesComponent.java (99%)
 rename {ganttzk/src/main/java/org/zkoss/ganttz => navalplanner-webapp/src/main/java/org/navalplanner/web}/limitingresources/LimitingResourcesLeftPane.java (99%)
 rename {ganttzk/src/main/java/org/zkoss/ganttz => navalplanner-webapp/src/main/java/org/navalplanner/web}/limitingresources/LimitingResourcesList.java (98%)
 rename {ganttzk/src/main/java/org/zkoss/ganttz => navalplanner-webapp/src/main/java/org/navalplanner/web}/limitingresources/LimitingResourcesPanel.java (98%)
 rename {ganttzk/src/main/resources/web/ganttz => navalplanner-webapp/src/main/webapp}/limitingresources/leftPane.zul (100%)
 rename {ganttzk/src/main/resources/web/ganttz => navalplanner-webapp/src/main/webapp}/limitingresources/limitingresourceslist.dsp (100%)

diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
index f6b37d378..1217feebb 100755
--- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
+++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
@@ -49,22 +49,6 @@
     </component>
 
 
-    <component>
-        <component-name>LimitingResourcesList</component-name>
-        <component-class>org.zkoss.ganttz.limitingresources.LimitingResourcesList</component-class>
-        <mold>
-            <mold-name>default</mold-name>
-            <mold-uri>~./ganttz/limitingresources/limitingresourceslist.dsp</mold-uri>
-        </mold>
-    </component>
-
-    <component>
-        <component-name>LimitingResourcesLeftPane</component-name>
-        <component-class>org.zkoss.ganttz.limitingresources.LimitingResourcesLeftPane</component-class>
-        <macro-uri>~./ganttz/limitingresources/leftPane.zul</macro-uri>
-    </component>
-
-
 	<component>
 		<component-name>leftPane</component-name>
 		<component-class>org.zkoss.ganttz.LeftPane</component-class>
@@ -96,16 +80,6 @@
 		</mold>
 	</component>
 
-    <component>
-        <component-name>limitingresources</component-name><!-- Limiting resources queue -->
-        <component-class>org.zkoss.ganttz.limitingresources.LimitingResourcesComponent
-        </component-class>
-        <mold>
-            <mold-name>default</mold-name>
-            <mold-uri>~./ganttz/limitingresources/limitingresources.dsp</mold-uri>
-        </mold>
-    </component>
-
 
 	<component>
         <component-name>taskRow</component-name>
diff --git a/ganttzk/src/main/resources/web/ganttz/limitingresources/limitingresources.dsp b/ganttzk/src/main/resources/web/ganttz/limitingresources/limitingresources.dsp
deleted file mode 100644
index ddfe5a363..000000000
--- a/ganttzk/src/main/resources/web/ganttz/limitingresources/limitingresources.dsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
-<%@ taglib uri="http://www.zkoss.org/dsp/zk/core" prefix="z" %>
-
-<c:set var="self" value="${requestScope.arg.self}"/>
-
-<div id="${self.uuid}" class="row_resourceload resourcequeue-${self.resourceLoadType}"
-    z.autoz="true" ${self.outerAttrs}">
-    <span class="resourceload_name">${self.resourceLoadName}</span>
-    <c:forEach var="child" items="${self.children}">
-        ${z:redraw(child, null)}
-    </c:forEach>
-</div>
-
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingDependencyComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyComponent.java
similarity index 100%
rename from ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingDependencyComponent.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyComponent.java
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingDependencyList.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyList.java
similarity index 100%
rename from ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingDependencyList.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyList.java
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
index 6e8299540..3eed54153 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
@@ -209,7 +209,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
         List<LimitingResourceQueue> result = new ArrayList<LimitingResourceQueue>();
         for (Resource resource : allResources) {
             LimitingResourceQueue group = buildGroup(resource);
-            if (false || !group.isEmpty()) {
+            if (!group.isEmpty()) {
                 result.add(group);
             }
         }
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesComponent.java
similarity index 99%
rename from ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesComponent.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesComponent.java
index 1cfc87305..376f5c4ea 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesComponent.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesComponent.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.zkoss.ganttz.limitingresources;
+package org.navalplanner.web.limitingresources;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
index 59a499deb..53b4359a2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
@@ -28,13 +28,12 @@ import java.util.List;
 
 import org.apache.commons.lang.Validate;
 import org.navalplanner.business.orders.entities.Order;
+import org.navalplanner.web.limitingresources.LimitingResourcesPanel.IToolbarCommand;
 import org.navalplanner.web.planner.order.BankHolidaysMarker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
-import org.zkoss.ganttz.limitingresources.LimitingResourcesPanel;
-import org.zkoss.ganttz.limitingresources.LimitingResourcesPanel.IToolbarCommand;
 import org.zkoss.ganttz.resourceload.IFilterChangedListener;
 import org.zkoss.ganttz.timetracker.TimeTracker;
 import org.zkoss.ganttz.timetracker.zoom.SeveralModificators;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesLeftPane.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java
similarity index 99%
rename from ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesLeftPane.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java
index fc579410e..fdc21bc9d 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesLeftPane.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.zkoss.ganttz.limitingresources;
+package org.navalplanner.web.limitingresources;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesList.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesList.java
similarity index 98%
rename from ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesList.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesList.java
index e73622c1e..827047230 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesList.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesList.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.zkoss.ganttz.limitingresources;
+package org.navalplanner.web.limitingresources;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesPanel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
similarity index 98%
rename from ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesPanel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
index b7e3c34d5..388e6cfe4 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/limitingresources/LimitingResourcesPanel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.zkoss.ganttz.limitingresources;
+package org.navalplanner.web.limitingresources;
 
 import static org.zkoss.ganttz.i18n.I18nHelper._;
 
@@ -67,7 +67,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
 
     private TimeTracker timeTracker;
 
-    private LimitingDependencyList dependencyList;
+    // private LimitingDependencyList dependencyList;
 
     // private WeakReferencedListeners<IFilterChangedListener> zoomListeners =
     // WeakReferencedListeners.create();
diff --git a/navalplanner-webapp/src/main/resources/metainfo/zk/lang-addon.xml b/navalplanner-webapp/src/main/resources/metainfo/zk/lang-addon.xml
index c97372823..5b470cec4 100755
--- a/navalplanner-webapp/src/main/resources/metainfo/zk/lang-addon.xml
+++ b/navalplanner-webapp/src/main/resources/metainfo/zk/lang-addon.xml
@@ -84,9 +84,33 @@
 
     <component>
         <component-name>LimitingResourcesPanel</component-name>
-        <component-class>org.zkoss.ganttz.limitingresources.LimitingResourcesPanel</component-class>
+        <component-class>org.navalplanner.web.limitingresources.LimitingResourcesPanel</component-class>
             <macro-uri>/limitingresources/limitingResourcesLayout.zul</macro-uri>
     </component>
 
+    <component>
+        <component-name>LimitingResourcesList</component-name>
+        <component-class>org.navalplanner.web.limitingresources.LimitingResourcesList</component-class>
+        <mold>
+            <mold-name>default</mold-name>
+            <mold-uri>/limitingresources/limitingresourceslist.dsp</mold-uri>
+        </mold>
+    </component>
+
+    <component>
+        <component-name>LimitingResourcesLeftPane</component-name>
+        <component-class>org.navalplanner.web.limitingresources.LimitingResourcesLeftPane</component-class>
+        <macro-uri>/limitingresources/leftPane.zul</macro-uri>
+    </component>
+
+    <component>
+        <component-name>limitingresources</component-name><!-- Limiting resources queue -->
+        <component-class>org.navalplanner.web.limitingresources.LimitingResourcesComponent</component-class>
+        <mold>
+            <mold-name>default</mold-name>
+            <mold-uri>/limitingresources/limitingresources.dsp</mold-uri>
+        </mold>
+    </component>
+
 
 </language-addon>
diff --git a/ganttzk/src/main/resources/web/ganttz/limitingresources/leftPane.zul b/navalplanner-webapp/src/main/webapp/limitingresources/leftPane.zul
similarity index 100%
rename from ganttzk/src/main/resources/web/ganttz/limitingresources/leftPane.zul
rename to navalplanner-webapp/src/main/webapp/limitingresources/leftPane.zul
diff --git a/ganttzk/src/main/resources/web/ganttz/limitingresources/limitingresourceslist.dsp b/navalplanner-webapp/src/main/webapp/limitingresources/limitingresourceslist.dsp
similarity index 100%
rename from ganttzk/src/main/resources/web/ganttz/limitingresources/limitingresourceslist.dsp
rename to navalplanner-webapp/src/main/webapp/limitingresources/limitingresourceslist.dsp
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index a82357c17..5f0f3b5c8 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -506,7 +506,7 @@ tr.z-vbox-sep {
 }
 
 .resourceloadleftpane .icono img {
-    height: 18px;
+    height: 17px;
 }
 
 /* -- Upper taskpannel is hidden --*/