Author: heiko.braun(a)jboss.com Date: 2009-09-18 06:12:22 -0400 (Fri, 18 Sep 2009) New Revision: 840 Added: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/events/PageSizeEvent.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/DefinitionsPageSizeEvent.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefPageSizeEvent.java Modified: bpm-console/branches/hbraun/BPMC.iws bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentsAction.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java bpm-console/branches/hbraun/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java bpm-console/branches/hbraun/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java bpm-console/branches/hbraun/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java bpm-console/branches/hbraun/server/war/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java Log: Test paging options Modified: bpm-console/branches/hbraun/BPMC.iws =================================================================== --- bpm-console/branches/hbraun/BPMC.iws 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/BPMC.iws 2009-09-18 10:12:22 UTC (rev 840) @@ -114,6 +114,19 @@ <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="247" class="Class at DefinitionListView.java:247" package="org.jboss.bpm.console.client.process"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -186,21 +199,19 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="InstanceListView.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java"> + <file leaf-file-name="DefinitionListView.java" pinned="false" current="true" current-in-tab="true"> + <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="197" column="25" selection-start="6954" selection-end="6954" vertical-scroll-proportion="0.6626066"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="284" column="17" selection-start="8431" selection-end="8431" vertical-scroll-proportion="0.5217391"> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="IFrameWindowPanel.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java"> + <file leaf-file-name="PageFilter.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/PageFilter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="59" column="67" selection-start="2305" selection-end="2305" vertical-scroll-proportion="0.76004875"> + <state line="76" column="0" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.48868176"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -208,42 +219,6 @@ </provider> </entry> </file> - <file leaf-file-name="TaskDetailView.java" pinned="false" current="false" current-in-tab="false"> - <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="39" column="13" selection-start="1721" selection-end="1721" vertical-scroll-proportion="0.15590744"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="AssignedTasksView.java" pinned="false" current="false" current-in-tab="false"> - <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="72" column="33" selection-start="2854" selection-end="2854" vertical-scroll-proportion="0.6041413"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="xhp.json" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/jmaki/xhp/xhp.json"> - <provider selected="true" editor-type-id="text-editor"> - <state line="8" column="31" selection-start="228" selection-end="228" vertical-scroll-proportion="0.15311004"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="IFrameWindowCallback.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="2" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.17224881"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -831,7 +806,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/search" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -881,6 +856,210 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/events" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/events" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -924,7 +1103,7 @@ <showLibraryContents /> <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" /> + <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -988,6 +1167,13 @@ <option name="Make" value="true" /> </method> </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -1001,13 +1187,6 @@ <option name="Make" value="true" /> </method> </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -1132,16 +1311,16 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="383" y="39" width="1275" height="983" extended-state="0" /> + <frame x="522" y="24" width="1148" height="898" extended-state="0" /> <editor active="true" /> <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.33768353" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39812645" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24857838" order="1" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3366697" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39700374" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27752504" 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" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> @@ -1153,7 +1332,7 @@ <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.24937028" 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.39503387" order="4" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39450687" 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" /> @@ -1244,111 +1423,113 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="236" column="0" selection-start="6904" selection-end="6904" vertical-scroll-proportion="0.020671835"> + <state line="115" column="68" selection-start="3700" selection-end="3700" vertical-scroll-proportion="1.0690423"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> + <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="91" column="0" selection-start="3150" selection-end="3150" vertical-scroll-proportion="0.020671835"> + <state line="38" column="33" selection-start="1352" selection-end="1352" vertical-scroll-proportion="0.532294"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="151" column="55" selection-start="4753" selection-end="4753" vertical-scroll-proportion="0.98813057"> + <state line="65" column="63" selection-start="2427" selection-end="2427" vertical-scroll-proportion="0.6057907"> <folding /> </state> </provider> </entry> - <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/MessageBox.class"> + <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="43" column="68" selection-start="1764" selection-end="1764" vertical-scroll-proportion="0.6057907"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="31" selection-start="1397" selection-end="1397" vertical-scroll-proportion="-0.32695374"> + <state line="56" column="53" selection-start="2263" selection-end="2263" vertical-scroll-proportion="0.47826087"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.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="39" column="0" selection-start="1613" selection-end="1626" vertical-scroll-proportion="0.13071896"> + <state line="113" column="22" selection-start="4337" selection-end="4337" vertical-scroll-proportion="0.7826087"> <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/engine/UpdateDeploymentsAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="6" column="11" selection-start="62" selection-end="72" vertical-scroll-proportion="0.15311004"> + <state line="88" column="25" selection-start="3132" selection-end="3132" vertical-scroll-proportion="0.7826087"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/events/PageSizeEvent.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="13" selection-start="2127" selection-end="2127" vertical-scroll-proportion="-1.6993464"> + <state line="28" column="13" selection-start="1202" selection-end="1202" vertical-scroll-proportion="0.1704394"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/DefinitionsPageSizeEvent.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="2" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.17224881"> - <folding /> + <state line="31" column="0" selection-start="1317" selection-end="1317" vertical-scroll-proportion="0.2343542"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="jar:///Users/hbraun/.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/com/google/gwt/user/client/DOM.class"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="267" column="0" selection-start="14409" selection-end="14409" vertical-scroll-proportion="0.7586207"> + <state line="60" column="76" selection-start="2302" selection-end="2302" vertical-scroll-proportion="0.6956522"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="197" column="25" selection-start="6954" selection-end="6954" vertical-scroll-proportion="0.6626066"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="214" column="19" selection-start="6533" selection-end="6533" vertical-scroll-proportion="0.7513587"> + <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/search/SearchDefPageSizeEvent.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="59" column="67" selection-start="2305" selection-end="2305" vertical-scroll-proportion="0.76004875"> + <state line="29" column="18" selection-start="1265" selection-end="1265" vertical-scroll-proportion="0.19174434"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="13" selection-start="1721" selection-end="1721" vertical-scroll-proportion="0.15590744"> + <state line="62" column="30" selection-start="2167" selection-end="2167" vertical-scroll-proportion="0.7826087"> <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/common/PageFilter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="72" column="33" selection-start="2854" selection-end="2854" vertical-scroll-proportion="0.6041413"> - <folding /> + <state line="76" column="0" selection-start="2050" selection-end="2050" vertical-scroll-proportion="0.48868176"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/jmaki/xhp/xhp.json"> + <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="8" column="31" selection-start="228" selection-end="228" vertical-scroll-proportion="0.15311004"> + <state line="284" column="17" selection-start="8431" selection-end="8431" vertical-scroll-proportion="0.5217391"> <folding /> </state> </provider> Modified: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-09-18 10:12:22 UTC (rev 840) @@ -25,6 +25,8 @@ import com.google.gwt.http.client.URL; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.client.model.TokenReference; +import org.jboss.bpm.console.client.events.PageSizeEvent; +import org.jboss.bpm.console.client.common.PageFilter; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; @@ -53,9 +55,11 @@ this.config = config; } - public String getProcessDefinitionsURL() + public String getProcessDefinitionsURL(PageSizeEvent pse) { - return config.getConsoleServerUrl() + "/rs/process/definitions"; + PageFilter pageFiter = pse.getPageFiter(); + return config.getConsoleServerUrl() + "/rs/process/definitions?from=" + + pageFiter.getFromIndex() +"&size="+pageFiter.getPageSize(); } public String getProcessInstancesURL(String processId) Modified: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentsAction.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentsAction.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentsAction.java 2009-09-18 10:12:22 UTC (rev 840) @@ -33,6 +33,7 @@ import org.jboss.bpm.console.client.model.DTOParser; import org.jboss.bpm.console.client.model.DeploymentRef; import org.jboss.bpm.console.client.process.UpdateDefinitionsAction; +import org.jboss.bpm.console.client.process.events.DefinitionsPageSizeEvent; import java.util.List; @@ -84,7 +85,9 @@ // refresh process definitions controller.handleEvent( - new Event(UpdateDefinitionsAction.ID, null) + new Event(UpdateDefinitionsAction.ID, + new DefinitionsPageSizeEvent() + ) ); } } Added: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/events/PageSizeEvent.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/events/PageSizeEvent.java (rev 0) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/events/PageSizeEvent.java 2009-09-18 10:12:22 UTC (rev 840) @@ -0,0 +1,42 @@ +/* + * 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.events; + +import org.jboss.bpm.console.client.common.PageFilter; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class PageSizeEvent +{ + private PageFilter pageFiter; + + public PageSizeEvent(PageFilter pageFilter) + { + this.pageFiter = pageFilter; + } + + public PageFilter getPageFiter() + { + return pageFiter; + } +} Modified: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-09-18 10:12:22 UTC (rev 840) @@ -22,6 +22,7 @@ package org.jboss.bpm.console.client.process; import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Widget; @@ -32,10 +33,11 @@ import org.gwt.mosaic.ui.client.ToolButton; 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.PageFilter; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.process.events.DefinitionsPageSizeEvent; import java.util.List; @@ -54,13 +56,10 @@ private boolean isInitialized; - private int FILTER_NONE = 10; - private int FILTER_ACTIVE = 20; - private int FILTER_SUSPENDED = 30; - private int currentFilter = FILTER_NONE; - private List<ProcessDefinitionRef> definitions = null; + private PageFilter pageFilter = new PageFilter(); + public DefinitionListView() { super(); @@ -81,17 +80,20 @@ { if(!isInitialized) { - definitionList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); - definitionList.setPadding(0); - definitionList.setWidgetSpacing(0); + definitionList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)) + {{ + setPadding(0); + setWidgetSpacing(0); + }}; // toolbar + final LayoutPanel toolBox = new LayoutPanel() + {{ + setPadding(0); + setWidgetSpacing(0); + setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); + }}; - final LayoutPanel toolBox = new LayoutPanel(); - toolBox.setPadding(0); - toolBox.setWidgetSpacing(0); - toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); - // toolbar final ToolBar toolBar = new ToolBar(); toolBar.add( @@ -99,7 +101,9 @@ public void onClick(Widget sender) { // force loading controller.handleEvent( - new Event(UpdateDefinitionsAction.ID, null) + new Event(UpdateDefinitionsAction.ID, + new DefinitionsPageSizeEvent(pageFilter) + ) ); } } @@ -108,26 +112,32 @@ toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); // filter - LayoutPanel filterPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - filterPanel.setStyleName("bpm-filter-panel"); - final com.google.gwt.user.client.ui.ListBox dropBox = new com.google.gwt.user.client.ui.ListBox(false); - dropBox.setStyleName("bpm-operation-ui"); - dropBox.addItem("All"); - dropBox.addItem("Active"); - dropBox.addItem("Suspended"); + LayoutPanel filterPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)) + {{ + setStyleName("bpm-filter-panel"); + }}; + final com.google.gwt.user.client.ui.ListBox dropBox = + new com.google.gwt.user.client.ui.ListBox(false) + {{ + setStyleName("bpm-operation-ui"); + addItem("All"); + addItem("Active"); + addItem("Suspended"); + }}; + dropBox.addChangeListener(new ChangeListener() { public void onChange(Widget sender) { switch (dropBox.getSelectedIndex()) { case 0: - currentFilter = FILTER_NONE; + pageFilter.clear(); break; case 1: - currentFilter = FILTER_ACTIVE; + pageFilter.remove(PageFilter.SUSPENDED); break; case 2: - currentFilter = FILTER_SUSPENDED; + pageFilter.add(PageFilter.SUSPENDED); break; default: throw new IllegalArgumentException("No such index"); @@ -136,6 +146,7 @@ renderFiltered(); } }); + filterPanel.add(dropBox); toolBox.add(filterPanel, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); @@ -143,6 +154,43 @@ this.definitionList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); this.definitionList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + // paging + LayoutPanel pagingPanel = + new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); + Button rev = new Button("<<", new ClickListener() + { + + public void onClick(Widget widget) + { + pageFilter.rev(); + controller.handleEvent( + new Event(UpdateDefinitionsAction.ID, + new DefinitionsPageSizeEvent(pageFilter) + ) + ); + } + }); + + Button ffw = new Button(">", new ClickListener() + { + + public void onClick(Widget widget) + { + pageFilter.ffw(); + controller.handleEvent( + new Event(UpdateDefinitionsAction.ID, + new DefinitionsPageSizeEvent(pageFilter) + ) + ); + + } + }); + + pagingPanel.add(rev); + pagingPanel.add(ffw); + + this.definitionList.add(pagingPanel); + // layout LayoutPanel layout = new LayoutPanel(new BorderLayout()); layout.add(definitionList, new BorderLayoutData(BorderLayout.Region.CENTER)); @@ -215,8 +263,6 @@ } }); - ListModel<ProcessDefinitionRef> origModel = listBox.getModel(); - return listBox; } @@ -230,6 +276,12 @@ { this.definitions = definitions; + // paging + if(definitions.isEmpty()) + pageFilter.rev(); + else + pageFilter.records(definitions.size()); + renderFiltered(); } @@ -244,13 +296,13 @@ for(ProcessDefinitionRef def : definitions) { - if(FILTER_NONE==currentFilter) + if(pageFilter.isEmpty()) { model.add(def); } else { - boolean showSuspended = (FILTER_SUSPENDED==currentFilter); + boolean showSuspended = pageFilter.applies(PageFilter.SUSPENDED); if(def.isSuspended()==showSuspended) model.add(def); } Modified: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java 2009-09-18 10:12:22 UTC (rev 840) @@ -27,6 +27,7 @@ import com.mvc4g.client.Event; import org.jboss.bpm.console.client.ApplicationContext; import org.jboss.bpm.console.client.URLBuilder; +import org.jboss.bpm.console.client.process.events.DefinitionsPageSizeEvent; import org.jboss.bpm.console.client.common.AbstractRESTAction; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; @@ -57,7 +58,7 @@ { // refresh controller.handleEvent( - new Event(UpdateDefinitionsAction.ID, null) + new Event(UpdateDefinitionsAction.ID, new DefinitionsPageSizeEvent()) ); } } Modified: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-09-18 10:12:22 UTC (rev 840) @@ -35,7 +35,9 @@ import org.jboss.bpm.console.client.Editor; import org.jboss.bpm.console.client.LazyPanel; import org.jboss.bpm.console.client.MenuSection; +import org.jboss.bpm.console.client.process.events.DefinitionsPageSizeEvent; import org.jboss.bpm.console.client.common.AbstractView; +import org.jboss.bpm.console.client.common.PageFilter; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; /** @@ -111,7 +113,9 @@ // force loading super.controller.handleEvent( - new Event(UpdateDefinitionsAction.ID, null) + new Event(UpdateDefinitionsAction.ID, + new DefinitionsPageSizeEvent(new PageFilter()) + ) ); appContext.refreshView(); Modified: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java 2009-09-18 10:12:22 UTC (rev 840) @@ -28,6 +28,7 @@ import com.mvc4g.client.Controller; import org.jboss.bpm.console.client.ApplicationContext; import org.jboss.bpm.console.client.URLBuilder; +import org.jboss.bpm.console.client.process.events.DefinitionsPageSizeEvent; import org.jboss.bpm.console.client.common.AbstractRESTAction; import org.jboss.bpm.console.client.model.DTOParser; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; @@ -52,7 +53,8 @@ public String getUrl(Object event) { - return URLBuilder.getInstance().getProcessDefinitionsURL(); + DefinitionsPageSizeEvent pse = (DefinitionsPageSizeEvent)event; + return URLBuilder.getInstance().getProcessDefinitionsURL(pse); } public RequestBuilder.Method getRequestMethod() @@ -62,6 +64,8 @@ public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) { + DefinitionsPageSizeEvent pse = (DefinitionsPageSizeEvent)event; + DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID); if(view!=null) // may not be initialized (lazy) { Added: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/DefinitionsPageSizeEvent.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/DefinitionsPageSizeEvent.java (rev 0) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/DefinitionsPageSizeEvent.java 2009-09-18 10:12:22 UTC (rev 840) @@ -0,0 +1,42 @@ +/* + * 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.process.events; + +import org.jboss.bpm.console.client.events.PageSizeEvent; +import org.jboss.bpm.console.client.common.PageFilter; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class DefinitionsPageSizeEvent extends PageSizeEvent +{ + + public DefinitionsPageSizeEvent() + { + super(new PageFilter()); + } + + public DefinitionsPageSizeEvent(PageFilter pageFilter) + { + super(pageFilter); + } +} Modified: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-09-18 10:12:22 UTC (rev 840) @@ -39,11 +39,9 @@ import org.jboss.bpm.console.client.ApplicationContext; import org.jboss.bpm.console.client.URLBuilder; import org.jboss.bpm.console.client.common.AbstractView; +import org.jboss.bpm.console.client.common.PageFilter; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; -import org.jboss.bpm.console.client.search.SearchDefinitionView; -import org.jboss.bpm.console.client.search.SearchDelegate; -import org.jboss.bpm.console.client.search.SearchWindow; -import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction; +import org.jboss.bpm.console.client.search.*; import java.util.Date; @@ -188,10 +186,15 @@ SearchWindow sw = new SearchWindow("Open process summary report", search); sw.center(); + SearchDefPageSizeEvent pse = + new SearchDefPageSizeEvent( + new PageFilter(), "report.definition.search" + ); + controller.handleEvent( new Event( UpdateSearchDefinitionsAction.ID, - "report.definition.search" + pse ) ); Added: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefPageSizeEvent.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefPageSizeEvent.java (rev 0) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefPageSizeEvent.java 2009-09-18 10:12:22 UTC (rev 840) @@ -0,0 +1,49 @@ +/* + * 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.search; + +import org.jboss.bpm.console.client.events.PageSizeEvent; +import org.jboss.bpm.console.client.common.PageFilter; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class SearchDefPageSizeEvent extends PageSizeEvent +{ + String target; + + public SearchDefPageSizeEvent(PageFilter pageFilter, String target) + { + super(pageFilter); + this.target = target; + } + + public String getTarget() + { + return target; + } + + public void setTarget(String target) + { + this.target = target; + } +} Modified: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java 2009-09-18 10:12:22 UTC (rev 840) @@ -52,7 +52,8 @@ public String getUrl(Object event) { - return URLBuilder.getInstance().getProcessDefinitionsURL(); + SearchDefPageSizeEvent pse = (SearchDefPageSizeEvent)event; + return URLBuilder.getInstance().getProcessDefinitionsURL(pse); } public RequestBuilder.Method getRequestMethod() @@ -62,7 +63,8 @@ public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) { - String target = (String)event; + SearchDefPageSizeEvent pse = (SearchDefPageSizeEvent)event; + String target = pse.getTarget(); JSONValue json = JSONParser.parse(response.getText()); List<ProcessDefinitionRef> definitions = DTOParser.parseProcessDefinitions(json); Modified: bpm-console/branches/hbraun/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java =================================================================== --- bpm-console/branches/hbraun/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-09-18 10:12:22 UTC (rev 840) @@ -35,13 +35,13 @@ */ public interface ProcessManagement { - List<ProcessDefinitionRef> getProcessDefinitions(); + List<ProcessDefinitionRef> getProcessDefinitions(int from, int size); ProcessDefinitionRef getProcessDefinition(String definitionId); List<ProcessDefinitionRef> removeProcessDefinition(String definitionId); - List<ProcessInstanceRef> getProcessInstances(String definitionId); + List<ProcessInstanceRef> getProcessInstances(String definitionId, int from, int size); ProcessInstanceRef getProcessInstance(String instanceId); Modified: bpm-console/branches/hbraun/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java =================================================================== --- bpm-console/branches/hbraun/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java 2009-09-18 10:12:22 UTC (rev 840) @@ -59,10 +59,10 @@ /** * get tasks assingned to a user */ - List<TaskRef> getAssignedTasks(String idRef); + List<TaskRef> getAssignedTasks(String idRef, int from, int size); /** * get unassigned tasks where a user participates */ - List<TaskRef> getUnassignedTasks(String idRef, String participationType); + List<TaskRef> getUnassignedTasks(String idRef, String participationType, int from, int size); } Modified: bpm-console/branches/hbraun/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- bpm-console/branches/hbraun/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-09-18 10:12:22 UTC (rev 840) @@ -102,9 +102,15 @@ @GET @Path("definitions") @Produces("application/json") - public Response getDefinitionsJSON() + public Response getDefinitionsJSON( + @QueryParam("from") + int from, + @QueryParam("size") + int size + ) { - List<ProcessDefinitionRef> processDefinitions = getProcessManagement().getProcessDefinitions(); + List<ProcessDefinitionRef> processDefinitions = + getProcessManagement().getProcessDefinitions(from,size); return decorateProcessDefintions(processDefinitions); } @@ -167,11 +173,17 @@ @Produces("application/json") public Response getInstancesJSON( @PathParam("id") - String definitionId + String definitionId, + @QueryParam("from") + int from, + @QueryParam("size") + int size ) { ProcessInstanceRefWrapper wrapper = - new ProcessInstanceRefWrapper(getProcessManagement().getProcessInstances(definitionId)); + new ProcessInstanceRefWrapper( + getProcessManagement().getProcessInstances(definitionId, from, size) + ); return createJsonResponse(wrapper); } Modified: bpm-console/branches/hbraun/server/war/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java =================================================================== --- bpm-console/branches/hbraun/server/war/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java 2009-09-18 07:22:25 UTC (rev 839) +++ bpm-console/branches/hbraun/server/war/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java 2009-09-18 10:12:22 UTC (rev 840) @@ -34,10 +34,7 @@ import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin; import org.jboss.bpm.console.server.util.RsComment; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.Response; import java.net.URL; import java.util.List; @@ -93,10 +90,14 @@ @Produces("application/json") public Response getTasksForIdRef( @PathParam("idRef") - String idRef + String idRef, + @QueryParam("from") + int from, + @QueryParam("size") + int size ) { - List<TaskRef> assignedTasks = getTaskManagement().getAssignedTasks(idRef); + List<TaskRef> assignedTasks = getTaskManagement().getAssignedTasks(idRef, from, size); return processTaskListResponse(assignedTasks); } @@ -105,10 +106,14 @@ @Produces("application/json") public Response getTasksForIdRefParticipation( @PathParam("idRef") - String idRef + String idRef, + @QueryParam("from") + int from, + @QueryParam("size") + int size ) { - List<TaskRef> taskParticipation = getTaskManagement().getUnassignedTasks(idRef, null); + List<TaskRef> taskParticipation = getTaskManagement().getUnassignedTasks(idRef, null, from, size); return processTaskListResponse(taskParticipation); }