From ca6b1ea55e6f421d6e650b166479da6e4aa5164f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Fri, 2 Oct 2009 19:33:38 +0200 Subject: [PATCH] ItEr28S06CUAsignacionGrupoRecursosAPlanificacionItEr27S06: TimeTrackedTableWithLeftPane is no longer a zk component --- .../TimeTrackedTableWithLeftPane.java | 6 +--- .../main/resources/metainfo/zk/lang-addon.xml | 9 ----- .../ganttz/timetrackedTableWithLeftPane.dsp | 33 ------------------- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 ganttzk/src/main/resources/web/ganttz/timetrackedTableWithLeftPane.dsp diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java index 34a7a2f6e..884aed2d0 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java @@ -29,13 +29,12 @@ import org.zkoss.ganttz.timetracker.zoom.DetailItem; import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; import org.zkoss.zul.Columns; -import org.zkoss.zul.Div; import org.zkoss.zul.Grid; import org.zkoss.zul.ListModel; import org.zkoss.zul.ListModelList; import org.zkoss.zul.api.Column; -public class TimeTrackedTableWithLeftPane extends Div { +public class TimeTrackedTableWithLeftPane { private final TimeTrackedTable timeTrackedTable; private Grid leftPane; @@ -63,8 +62,6 @@ public class TimeTrackedTableWithLeftPane extends Div { leftPane.appendChild(createColumns(leftPaneColumns)); leftPane.setRowRenderer(OnColumnsRowRenderer.create( leftPaneCellRenderer, leftPaneColumns)); - appendChild(leftPane); - appendChild(timeTrackedTable); loadModelForLeftPane(); } @@ -121,7 +118,6 @@ public class TimeTrackedTableWithLeftPane extends Div { private boolean afterComposeCalled = false; public TimeTrackedTable getTimeTrackedTable() { - if (!afterComposeCalled) { timeTrackedTable.afterCompose(); afterComposeCalled = true; diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml index 8fdd09532..48a29dab6 100755 --- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml +++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml @@ -138,15 +138,6 @@ ~./ganttz/zul/timetracker/timetrackedtable.zul - - timetrackedTableWithLeftPane - org.zkoss.ganttz.timetracker.TimeTrackedTableWithLeftPane - - default - ~./ganttz/timetrackedTableWithLeftPane.dsp - - - scripts org.zkoss.ganttz.util.script.ScriptsComponent diff --git a/ganttzk/src/main/resources/web/ganttz/timetrackedTableWithLeftPane.dsp b/ganttzk/src/main/resources/web/ganttz/timetrackedTableWithLeftPane.dsp deleted file mode 100644 index 564990984..000000000 --- a/ganttzk/src/main/resources/web/ganttz/timetrackedTableWithLeftPane.dsp +++ /dev/null @@ -1,33 +0,0 @@ - - -<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %> -<%@ taglib uri="http://www.zkoss.org/dsp/zk/core" prefix="z" %> - - - -
-
- ${z:redraw(self.leftPane, null)} -
- ${z:redraw(self.timeTrackedTable, null)} -
\ No newline at end of file