Author: heiko.braun(a)jboss.com Date: 2009-10-23 05:27:50 -0400 (Fri, 23 Oct 2009) New Revision: 850 Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingCallback.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css Log: BPMC-17: Paging support Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/BPMC.iws 2009-10-23 09:27:50 UTC (rev 850) @@ -92,7 +92,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java" line="248" class="org.jboss.bpm.console.client.model.DTOParser" package="org.jboss.bpm.console.client.model"> + <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java" line="159" class="org.jboss.bpm.console.client.common.IFrameWindowPanel" package="org.jboss.bpm.console.client.common"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -105,7 +105,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java" line="159" class="org.jboss.bpm.console.client.common.IFrameWindowPanel" package="org.jboss.bpm.console.client.common"> + <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java" line="264" class="org.jboss.bpm.console.client.process.DefinitionListView" package="org.jboss.bpm.console.client.process"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -118,7 +118,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java" line="244" class="org.jboss.bpm.console.client.process.DefinitionListView" package="org.jboss.bpm.console.client.process"> + <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java" line="92" class="org.jboss.bpm.console.client.ConsoleConfig" package="org.jboss.bpm.console.client"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -131,7 +131,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java" line="92" class="org.jboss.bpm.console.client.ConsoleConfig" package="org.jboss.bpm.console.client"> + <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java" line="177" class="Class at InstanceListView.java:177" package="org.jboss.bpm.console.client.process"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -216,17 +216,7 @@ </component> <component name="FileColors" enabled="false" enabledForTabs="false" /> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="EngineEditor.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="47" selection-start="2408" selection-end="2408" vertical-scroll-proportion="0.29473683"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -1093,14 +1083,14 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="374" y="56" width="1290" height="922" extended-state="0" /> - <editor active="true" /> + <frame x="328" y="52" width="1278" height="980" extended-state="0" /> + <editor active="false" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3182917" order="0" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3213995" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39290988" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27420667" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="8" /> @@ -1112,9 +1102,9 @@ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24878049" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24818695" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39290988" order="4" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39184597" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" order="8" /> @@ -1209,111 +1199,114 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingCallback.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="141" column="0" selection-start="4446" selection-end="4446" vertical-scroll-proportion="0.87580854"> + <state line="29" column="13" selection-start="1194" selection-end="1194" vertical-scroll-proportion="0.17286915"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> <provider selected="true" editor-type-id="text-editor"> - <state line="171" column="47" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.85511"> + <state line="336" column="42" selection-start="5185" selection-end="5185" vertical-scroll-proportion="0.72989196"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java"> + <entry file="jar:///Users/hbraun/.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/org/gwt/mosaic/ui/client/Caption.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="193" column="91" selection-start="6268" selection-end="6268" vertical-scroll-proportion="0.9028213"> + <state line="7" column="61" selection-start="458" selection-end="458" vertical-scroll-proportion="0.12631579"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="108" column="27" selection-start="3582" selection-end="3582" vertical-scroll-proportion="0.4184492"> + <state line="125" column="61" selection-start="3887" selection-end="3887" vertical-scroll-proportion="0.9779951"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Menu.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="46" selection-start="1812" selection-end="1812" vertical-scroll-proportion="0.20969856"> + <state line="271" column="38" selection-start="8886" selection-end="8886" vertical-scroll-proportion="0.6393643"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="162" column="40" selection-start="5566" selection-end="5566" vertical-scroll-proportion="0.47058824"> + <state line="231" column="50" selection-start="7357" selection-end="7357" vertical-scroll-proportion="0.6845966"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/EngineFacade.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="59" column="57" selection-start="2219" selection-end="2219" vertical-scroll-proportion="0.48645163"> + <state line="154" column="68" selection-start="5081" selection-end="5143" vertical-scroll-proportion="0.70537895"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessEnginePlugin.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="0" selection-start="1570" selection-end="1570" vertical-scroll-proportion="0.45419356"> - <folding /> + <state line="121" column="52" selection-start="3130" selection-end="3130" vertical-scroll-proportion="0.62064826"> + <folding> + <element signature="imports" expanded="true" /> + <element signature="class#2047:2242" expanded="false" /> + <element signature="class#2363:2547" expanded="false" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="48" column="26" selection-start="1969" selection-end="1969" vertical-scroll-proportion="-0.83157897"> + <state line="36" column="22" selection-start="1449" selection-end="1449" vertical-scroll-proportion="0.19207683"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ResourcePanel.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="84" column="30" selection-start="2575" selection-end="2575" vertical-scroll-proportion="0.7251613"> + <state line="209" column="31" selection-start="6845" selection-end="6865" vertical-scroll-proportion="0.41075796"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="197" column="39" selection-start="6220" selection-end="6220" vertical-scroll-proportion="0.84605265"> - <folding> - <element signature="method#onClick#0;class#2522:3433" expanded="false" /> - <element signature="class#3487:4346" expanded="false" /> - </folding> + <state line="78" column="51" selection-start="3017" selection-end="3017" vertical-scroll-proportion="-2.190709"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="71" column="38" selection-start="2530" selection-end="2530" vertical-scroll-proportion="0.64"> + <state line="111" column="54" selection-start="3501" selection-end="3501" vertical-scroll-proportion="0.6845966"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="10" column="55" selection-start="404" selection-end="404" vertical-scroll-proportion="0.20645161"> + <state line="127" column="49" selection-start="4184" selection-end="4184" vertical-scroll-proportion="0.7432763"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="300" column="14" selection-start="4533" selection-end="4533" vertical-scroll-proportion="0.58064514"> + <state line="46" column="6" selection-start="1992" selection-end="1992" vertical-scroll-proportion="-1.4083129"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="47" selection-start="2408" selection-end="2408" vertical-scroll-proportion="0.29473683"> - <folding /> + <state line="163" column="30" selection-start="5079" selection-end="5354" vertical-scroll-proportion="0.9608802"> + <folding> + <element signature="method#onChange#0;class#4249:4777" expanded="false" /> + </folding> </state> </provider> </entry> Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingCallback.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingCallback.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingCallback.java 2009-10-23 09:27:50 UTC (rev 850) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.common; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public interface PagingCallback +{ + void rev(); + void ffw(); +} Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java 2009-10-23 09:27:50 UTC (rev 850) @@ -0,0 +1,148 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.common; + +import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.PushButton; +import com.google.gwt.user.client.ui.Widget; +import org.gwt.mosaic.ui.client.Caption; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; + +import java.util.ArrayList; +import java.util.List; + +/** + * Cheap paging helper + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class PagingPanel extends LayoutPanel +{ + + private PagingCallback callback; + private int limit = 12; + private int page = 0; + + private boolean leftBounds = true; + private boolean rightBounds; + + private PushButton revBtn; + private PushButton ffwBtn; + + public PagingPanel(final PagingCallback callback) + { + super(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); + setStyleName("bpm-paging-panel"); + + this.callback = callback; + + revBtn = new PushButton(Caption.IMAGES.toolCollapseLeft().createImage(), + new ClickListener() + { + public void onClick(Widget widget) + { + page--; + rightBounds=false; + callback.rev(); + } + } + ); + this.add(revBtn); + + ffwBtn = new PushButton(Caption.IMAGES.toolCollapseRight().createImage(), + new ClickListener() + { + public void onClick(Widget widget) + { + page++; + leftBounds = false; + callback.ffw(); + } + } + ); + this.add(ffwBtn); + } + + public void reset() + { + leftBounds=true; + rightBounds=false; + page = 0; + } + + public List trim(List tmp) + { + List trimmed = new ArrayList(); + + int size = tmp.size(); + if(limit>=size) + { + trimmed = tmp; + rightBounds=true; + } + else + { + + // leftbounds + if(page<=0) + { + page=0; + leftBounds=true; + } + + int begin = 0; + int end = 0; + + // rightbounds + if(page*limit>=size) + { + begin = (page-1)*limit; + rightBounds=true; + } + else + begin = page*limit; + + if(begin+limit>=size) + { + end = size; + rightBounds=true; + } + else + end = begin+limit; + + // select range + int i=0; + for(Object o : tmp) + { + if(i>=begin && i<end) trimmed.add(o); + i++; + } + + } + + revBtn.setEnabled(!leftBounds); + ffwBtn.setEnabled(!rightBounds); + + return trimmed; + } +} Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2009-10-23 09:27:50 UTC (rev 850) @@ -25,6 +25,7 @@ import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.PushButton; import com.mvc4g.client.Controller; import com.mvc4g.client.Event; import org.gwt.mosaic.ui.client.ListBox; @@ -158,7 +159,7 @@ final ToolBar toolBar = new ToolBar(); toolBar.add( - new ToolButton("Refresh", new ClickListener() { + new PushButton("Refresh", new ClickListener() { public void onClick(Widget sender) { // force loading controller.handleEvent( @@ -169,10 +170,9 @@ ) ); - toolBar.addSeparator(); toolBar.add( - new ToolButton("Delete", new ClickListener() { + new PushButton("Delete", new ClickListener() { public void onClick(Widget sender) { DeploymentRef deploymentRef = getSelection(); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2009-10-23 09:27:50 UTC (rev 850) @@ -25,6 +25,7 @@ import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.PushButton; import com.mvc4g.client.Controller; import com.mvc4g.client.Event; import org.gwt.mosaic.ui.client.ListBox; @@ -159,7 +160,7 @@ // toolbar final ToolBar toolBar = new ToolBar(); toolBar.add( - new ToolButton("Refresh", new ClickListener() { + new PushButton("Refresh", new ClickListener() { public void onClick(Widget sender) { // force loading controller.handleEvent( @@ -170,10 +171,8 @@ ) ); - toolBar.addSeparator(); - toolBar.add( - new ToolButton("Execute", new ClickListener() { + new PushButton("Execute", new ClickListener() { public void onClick(Widget sender) { JobRef selection = getSelection(); if(null==selection) Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-10-23 09:27:50 UTC (rev 850) @@ -25,19 +25,22 @@ import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.PushButton; import com.mvc4g.client.Controller; import com.mvc4g.client.Event; import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.ToolBar; import org.gwt.mosaic.ui.client.ToolButton; -import org.gwt.mosaic.ui.client.DoubleClickListener; +import org.gwt.mosaic.ui.client.Caption; import org.gwt.mosaic.ui.client.layout.*; import org.gwt.mosaic.ui.client.list.DefaultListModel; -import org.gwt.mosaic.ui.client.list.ListModel; import org.jboss.bpm.console.client.common.AbstractView; +import org.jboss.bpm.console.client.common.PagingPanel; +import org.jboss.bpm.console.client.common.PagingCallback; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import java.util.ArrayList; import java.util.List; /** @@ -61,7 +64,8 @@ private int currentFilter = FILTER_NONE; private List<ProcessDefinitionRef> definitions = null; - + private PagingPanel pagingPanel; + public DefinitionListView() { super(); @@ -82,6 +86,7 @@ { if(!isInitialized) { + definitionList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); definitionList.setPadding(0); definitionList.setWidgetSpacing(0); @@ -96,7 +101,7 @@ // toolbar final ToolBar toolBar = new ToolBar(); toolBar.add( - new ToolButton("Refresh", new ClickListener() { + new PushButton("Refresh", new ClickListener() { public void onClick(Widget sender) { // force loading controller.handleEvent( @@ -141,9 +146,24 @@ toolBox.add(filterPanel, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); - this.definitionList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - this.definitionList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + definitionList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + definitionList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + pagingPanel = new PagingPanel( + new PagingCallback() + { + public void rev() + { + renderFiltered(); + } + public void ffw() + { + renderFiltered(); + } + } + ); + definitionList.add(pagingPanel,new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + // layout LayoutPanel layout = new LayoutPanel(new BorderLayout()); layout.add(definitionList, new BorderLayoutData(BorderLayout.Region.CENTER)); @@ -168,7 +188,6 @@ "Name", "Version", "Suspended" } ); - listBox.setCellRenderer(new ListBox.CellRenderer<ProcessDefinitionRef>() { public void renderCell(ListBox<ProcessDefinitionRef> listBox, int row, int column, @@ -226,7 +245,7 @@ public void update(List<ProcessDefinitionRef> definitions) { this.definitions = definitions; - + pagingPanel.reset(); renderFiltered(); } @@ -239,20 +258,24 @@ model.clear(); + List<ProcessDefinitionRef> tmp = new ArrayList<ProcessDefinitionRef>(); for(ProcessDefinitionRef def : definitions) { if(FILTER_NONE==currentFilter) { - model.add(def); + tmp.add(def); } else { boolean showSuspended = (FILTER_SUSPENDED==currentFilter); if(def.isSuspended()==showSuspended) - model.add(def); + tmp.add(def); } } + for(ProcessDefinitionRef def : (List<ProcessDefinitionRef>)pagingPanel.trim(tmp) ) + model.add(def); + if(listBox.getSelectedIndex()!=-1) listBox.setItemSelected(listBox.getSelectedIndex(), false); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-10-23 09:27:50 UTC (rev 850) @@ -22,10 +22,7 @@ package org.jboss.bpm.console.client.process; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.ui.ChangeListener; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.*; import com.mvc4g.client.Controller; import com.mvc4g.client.Event; import org.gwt.mosaic.ui.client.ListBox; @@ -35,9 +32,7 @@ import org.gwt.mosaic.ui.client.layout.*; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.common.AbstractView; -import org.jboss.bpm.console.client.common.IFrameWindowPanel; -import org.jboss.bpm.console.client.common.IFrameWindowCallback; +import org.jboss.bpm.console.client.common.*; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; @@ -73,6 +68,8 @@ private boolean isRiftsawInstance; + private PagingPanel pagingPanel; + public InstanceListView(ApplicationContext appContext) { super(); @@ -98,7 +95,7 @@ instanceList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); instanceList.setPadding(0); instanceList.setWidgetSpacing(0); - + listBox = new ListBox<ProcessInstanceRef>( new String[] { @@ -151,7 +148,7 @@ final ToolBar toolBar = new ToolBar(); toolBar.add( - new ToolButton("Refresh", new ClickListener() { + new PushButton("Refresh", new ClickListener() { public void onClick(Widget sender) { controller.handleEvent( new Event( @@ -164,10 +161,10 @@ ) ); - toolBar.addSeparator(); + toolBar.add( - new ToolButton("Start", new ClickListener() + new PushButton("Start", new ClickListener() { public void onClick(Widget sender) { @@ -199,7 +196,7 @@ } ); - iframeWindow.show(); + iframeWindow.show(); } else { @@ -223,10 +220,10 @@ }} ); - toolBar.addSeparator(); + toolBar.add( - new ToolButton("Terminate", new ClickListener() + new PushButton("Terminate", new ClickListener() { public void onClick(Widget sender) { @@ -263,10 +260,10 @@ ) ); - toolBar.addSeparator(); + toolBar.add( - new ToolButton("Delete", new ClickListener() + new PushButton("Delete", new ClickListener() { public void onClick(Widget sender) { @@ -312,20 +309,34 @@ instanceList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); instanceList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + pagingPanel = new PagingPanel( + new PagingCallback() + { + public void rev() + { + renderUpdate(); + } + + public void ffw() + { + renderUpdate(); + } + } + ); + instanceList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + // cached data? if(this.cachedInstances!=null) bindData(this.cachedInstances); // layout - LayoutPanel layout = new LayoutPanel(new BorderLayout()); + LayoutPanel layout = new LayoutPanel(new BorderLayout()); layout.add(instanceList, new BorderLayoutData(BorderLayout.Region.CENTER)); // details InstanceDetailView detailsView = new InstanceDetailView(appContext); controller.addView(InstanceDetailView.ID, detailsView); - controller.addAction(UpdateInstanceDetailAction.ID, new UpdateInstanceDetailAction()); - layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH,10,200)); this.add(layout); @@ -334,7 +345,7 @@ } } - + public ProcessInstanceRef getSelection() { ProcessInstanceRef selection = null; @@ -358,15 +369,20 @@ { this.currentDefinition = def; this.cachedInstances = instances; - + if(isInitialized()) pagingPanel.reset(); + renderUpdate(); + } + + private void renderUpdate() + { if(isInitialized()) { - bindData(instances); + bindData(this.cachedInstances); - // clear details + // clear details controller.handleEvent( new Event(UpdateInstanceDetailAction.ID, - new InstanceEvent(def, null) + new InstanceEvent(this.currentDefinition, null) ) ); @@ -379,7 +395,8 @@ (DefaultListModel<ProcessInstanceRef>) listBox.getModel(); model.clear(); - for(ProcessInstanceRef inst : instances) + List<ProcessInstanceRef> list = pagingPanel.trim(instances); + for(ProcessInstanceRef inst : list) { model.add(inst); } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java 2009-10-23 09:27:50 UTC (rev 850) @@ -62,6 +62,8 @@ public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) { + long start = System.currentTimeMillis(); + DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID); if(view!=null) // may not be initialized (lazy) { @@ -69,8 +71,9 @@ List<ProcessDefinitionRef> definitions = DTOParser.parseProcessDefinitions(json); view.update(definitions); + + ConsoleLog.info("Loaded " + definitions.size() + " process definitions in " +(System.currentTimeMillis()-start)+" ms"); - ConsoleLog.info("Loaded " + definitions.size() + " process definitions"); } } } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java 2009-10-23 09:27:50 UTC (rev 850) @@ -65,6 +65,8 @@ public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) { + final long start = System.currentTimeMillis(); + final ProcessDefinitionRef def = (ProcessDefinitionRef)event; JSONValue json = JSONParser.parse(response.getText()); @@ -72,7 +74,7 @@ InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID); view.update(def, instances); - ConsoleLog.info("Loaded " + instances.size() + " process instance(s)"); + ConsoleLog.info("Loaded " + instances.size() + " process instance(s) in "+(System.currentTimeMillis()-start)+" ms"); } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java 2009-10-23 09:27:50 UTC (rev 850) @@ -41,6 +41,7 @@ protected ListBox<TaskRef> listBox; protected boolean isInitialized; protected String identity; + protected List<TaskRef> cachedTasks; public AbstractTaskList() { Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-10-23 09:27:50 UTC (rev 850) @@ -24,18 +24,20 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.Widget; import com.mvc4g.client.Event; import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.MessageBox; import org.gwt.mosaic.ui.client.ToolBar; -import org.gwt.mosaic.ui.client.ToolButton; import org.gwt.mosaic.ui.client.layout.*; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.ApplicationContext; import org.jboss.bpm.console.client.ServerPlugins; import org.jboss.bpm.console.client.common.IFrameWindowCallback; import org.jboss.bpm.console.client.common.IFrameWindowPanel; +import org.jboss.bpm.console.client.common.PagingPanel; +import org.jboss.bpm.console.client.common.PagingCallback; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.client.task.events.DetailViewEvent; @@ -62,6 +64,8 @@ private boolean hasDispatcherPlugin; + private PagingPanel pagingPanel; + public AssignedTasksView(ApplicationContext appContext, TaskDetailView detailsView) { super(); @@ -136,7 +140,7 @@ final ToolBar toolBar = new ToolBar(); toolBar.add( - new ToolButton("Refresh", new ClickListener() { + new PushButton("Refresh", new ClickListener() { public void onClick(Widget sender) { // force loading controller.handleEvent( @@ -147,9 +151,8 @@ ) ); - toolBar.addSeparator(); - ToolButton viewBtn = new ToolButton("View", new ClickListener() + PushButton viewBtn = new PushButton("View", new ClickListener() { public void onClick(Widget sender) { @@ -192,10 +195,8 @@ ); toolBar.add(viewBtn); - toolBar.addSeparator(); - toolBar.add( - new ToolButton("Release", new ClickListener() { + new PushButton("Release", new ClickListener() { public void onClick(Widget sender) { TaskRef selection = getSelection(); @@ -225,6 +226,23 @@ this.taskList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); this.taskList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + pagingPanel = new PagingPanel( + new PagingCallback() + { + public void rev() + { + renderUpdate(); + } + + public void ffw() + { + renderUpdate(); + } + } + ); + + this.taskList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + LayoutPanel layout = new LayoutPanel(new BorderLayout()); layout.add(taskList, new BorderLayoutData(BorderLayout.Region.CENTER)); layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10 , 200)); @@ -242,9 +260,14 @@ public void update(String identity, List<TaskRef> tasks) { - this.identity = identity; + this.cachedTasks = tasks; + pagingPanel.reset(); + renderUpdate(); + } + private void renderUpdate() + { // lazy init initialize(); @@ -253,7 +276,8 @@ model.clear(); - for(TaskRef task : tasks) + List<TaskRef> trimmed = pagingPanel.trim(cachedTasks); + for(TaskRef task : trimmed) { if(TaskRef.STATE.ASSIGNED ==task.getCurrentState()) model.add(task); @@ -263,8 +287,9 @@ controller.handleEvent( new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null)) ); - + this.invalidate(); + } } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-10-23 09:27:50 UTC (rev 850) @@ -24,15 +24,17 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.Widget; import com.mvc4g.client.Event; import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.MessageBox; import org.gwt.mosaic.ui.client.ToolBar; -import org.gwt.mosaic.ui.client.ToolButton; import org.gwt.mosaic.ui.client.layout.*; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.common.PagingCallback; +import org.jboss.bpm.console.client.common.PagingPanel; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.client.task.events.DetailViewEvent; @@ -55,6 +57,8 @@ private SimpleDateFormat dateFormat = new SimpleDateFormat(); + private PagingPanel pagingPanel; + public OpenTasksView(ApplicationContext appContext, TaskDetailView detailView) { super(); @@ -132,7 +136,7 @@ final ToolBar toolBar = new ToolBar(); toolBar.add( - new ToolButton("Refresh", new ClickListener() { + new PushButton("Refresh", new ClickListener() { public void onClick(Widget sender) { // force loading controller.handleEvent( @@ -141,12 +145,10 @@ } } ) - ); + ); - toolBar.addSeparator(); - toolBar.add( - new ToolButton("Claim", new ClickListener() { + new PushButton("Claim", new ClickListener() { public void onClick(Widget sender) { TaskRef selection = getSelection(); @@ -174,6 +176,23 @@ this.taskList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); this.taskList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + pagingPanel = new PagingPanel( + new PagingCallback() + { + public void rev() + { + renderUpdate(); + } + + public void ffw() + { + renderUpdate(); + } + } + ); + + this.taskList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + // main layout LayoutPanel layout = new LayoutPanel(new BorderLayout()); layout.add(taskList, new BorderLayoutData(BorderLayout.Region.CENTER)); @@ -186,9 +205,14 @@ public void update(String identity, List<TaskRef> tasks) { - this.identity = identity; + this.cachedTasks = tasks; + pagingPanel.reset(); + renderUpdate(); + } + private void renderUpdate() + { // lazy init initialize(); @@ -197,7 +221,8 @@ model.clear(); - for(TaskRef task : tasks) + List<TaskRef> trimmed = pagingPanel.trim(cachedTasks); + for(TaskRef task : trimmed) { if(TaskRef.STATE.OPEN ==task.getCurrentState()) model.add(task); @@ -207,7 +232,6 @@ controller.handleEvent( new Event(UpdateDetailsAction.ID, new DetailViewEvent("OpenDetailView", null)) ); - } } Modified: bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-10-22 13:19:01 UTC (rev 849) +++ bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-10-23 09:27:50 UTC (rev 850) @@ -336,4 +336,11 @@ .bpm-window-layout { margin: 1px; +} + +.bpm-paging-panel { + padding:2px; + font-size:8px; + background-color:#dfe8f6; + border-bottom: 1px solid #bbbbbb; } \ No newline at end of file