September 2009 - overlord-commits

Overlord SVN: r841 - bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/common.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-18 06:14:03 -0400 (Fri, 18 Sep 2009) New Revision: 841 Added: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/common/PageFilter.java Log: Missing class Added: bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/common/PageFilter.java =================================================================== --- bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/common/PageFilter.java (rev 0) +++ bpm-console/branches/hbraun/gui/war/src/main/java/org/jboss/bpm/console/client/common/PageFilter.java 2009-09-18 10:14:03 UTC (rev 841) @@ -0,0 +1,96 @@ +/* + * 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 java.util.ArrayList; +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public final class PageFilter +{ + public final static int DEFAULT_PAGE_SIZE = 20; + + public final static String SUSPENDED = "suspended"; + + private int fromIndex = 0; + private int pageSize = DEFAULT_PAGE_SIZE; + + private boolean outOfBounds; + + private List<String> appliedFilter = new ArrayList<String>(); + + public boolean applies(String filter) + { + return appliedFilter.contains(filter); + } + + public void remove(String filter) + { + appliedFilter.remove(filter); + } + + public void add(String filter) + { + appliedFilter.add(filter); + } + + public void clear() + { + appliedFilter.clear(); + } + + public boolean isEmpty() + { + return appliedFilter.isEmpty(); + } + + public void rev() + { + int nextIndex = (fromIndex-pageSize)>0 ? fromIndex-pageSize : 0; + fromIndex = nextIndex; + outOfBounds = false; + } + + public void ffw() + { + int nextIndex = outOfBounds ? fromIndex : fromIndex+pageSize; + fromIndex = nextIndex; + } + + public void records(int currentNumRecords) + { + if(currentNumRecords<pageSize) + outOfBounds = true; + } + + public int getFromIndex() + { + return fromIndex; + } + + public int getPageSize() + { + return pageSize; + } +}

14 years, 7 months

1
0
0 / 0

Overlord SVN: r840 - in bpm-console/branches/hbraun: gui/war/src/main/java/org/jboss/bpm/console/client and 8 other directories.

by overlord-commits＠lists.jboss.org

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> @@ -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> + */ +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> + */ +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> + */ +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); }

14 years, 7 months

1
0
0 / 0

Overlord SVN: r839 - bpm-console/branches.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-18 03:22:25 -0400 (Fri, 18 Sep 2009) New Revision: 839 Added: bpm-console/branches/hbraun/ Log: Create user branch Copied: bpm-console/branches/hbraun (from rev 838, bpm-console/trunk)

14 years, 7 months

1
0
0 / 0

Overlord SVN: r838 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 3 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-17 04:31:52 -0400 (Thu, 17 Sep 2009) New Revision: 838 Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java Modified: bpm-console/trunk/BPMC.iws 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/task/AssignedTasksView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java Log: Fix BPMC-22: Auto-resize task form windows Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-09-17 08:29:38 UTC (rev 837) +++ bpm-console/trunk/BPMC.iws 2009-09-17 08:31:52 UTC (rev 838) @@ -16,12 +16,7 @@ <option name="USER" value="" /> </component> <component name="ChangeListManager"> - <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/gui/war/src/test/java/org/jboss/bpm/console/client/BPMC20TestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/server-war.iml" afterPath="$PROJECT_DIR$/server/war/server-war.iml" /> - </list> + <list default="true" name="Default" comment="" /> <list name="Failed commit: Default" comment="remove dependency on DTOParser" /> </component> <component name="ChangeListSynchronizer" /> @@ -106,6 +101,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/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" /> + <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> @@ -178,46 +186,59 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="DTOParser.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state line="252" column="52" selection-start="8191" selection-end="8191" vertical-scroll-proportion="0.45788667"> - <folding /> + <state line="197" column="25" selection-start="6954" selection-end="6954" vertical-scroll-proportion="0.6626066"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ProcessInstanceRef.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1363" selection-end="1363" vertical-scroll-proportion="-0.29153606"> + <state line="59" column="67" selection-start="2305" selection-end="2305" vertical-scroll-proportion="0.76004875"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </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="AbstractRESTAction.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/AbstractRESTAction.java"> + <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="99" column="36" selection-start="3727" selection-end="3727" vertical-scroll-proportion="0.38557994"> + <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="HttpClient.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java"> + <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="236" column="0" selection-start="6904" selection-end="6904" vertical-scroll-proportion="0.23510972"> + <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="Authentication.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> + <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="91" column="0" selection-start="3150" selection-end="3150" vertical-scroll-proportion="0.23510972"> + <state line="29" column="2" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.17224881"> <folding /> </state> </provider> @@ -425,10 +446,28 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test/java/org/jboss/bpm/console" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test/java/org/jboss/bpm/console/client" /> + <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> <PATH> <PATH_ELEMENT> @@ -451,7 +490,427 @@ <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/resources" /> + <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/resources" /> + <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/resources/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/resources/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/resources/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/resources/org/jboss/bpm/console" /> + <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/resources" /> + <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/resources/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/resources/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/resources/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/resources/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/resources/org/jboss/bpm/console/public" /> + <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/resources" /> + <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/resources/jmaki" /> + <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/resources/jmaki/xhp" /> + <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> + <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> + <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> + <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/util" /> + <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/task" /> + <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> + </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> </subPane> </component> <component name="ProjectReloadState"> @@ -465,7 +924,7 @@ <showLibraryContents /> <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" /> + <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -510,25 +969,25 @@ </component> <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Remote.GWT"> - <configuration default="true" type="Applet" factoryName="Applet"> + <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + <method> + <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" /> @@ -542,24 +1001,24 @@ <option name="Make" value="true" /> </method> </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <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" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ADDITIONAL_CLASS_PATH" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> - <method> - <option name="Make" value="true" /> - </method> </configuration> <configuration default="false" name="GWT" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -673,16 +1132,16 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="1663" y="0" width="1265" height="800" extended-state="0" /> + <frame x="383" y="39" width="1275" height="983" 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="false" weight="0.22697368" order="0" /> + <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="true" weight="0.24671052" 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="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" /> @@ -694,7 +1153,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.39722863" order="4" /> + <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="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" /> @@ -785,111 +1244,111 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <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/java/jmaki/xhp/HttpClient.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="68" column="49" selection-start="2400" selection-end="2415" vertical-scroll-proportion="0.93658537"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="236" column="0" selection-start="6904" selection-end="6904" vertical-scroll-proportion="0.020671835"> + <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$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="112" column="79" selection-start="4142" selection-end="4142" vertical-scroll-proportion="0.7354037"> + <state line="91" column="0" selection-start="3150" selection-end="3150" vertical-scroll-proportion="0.020671835"> <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/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> + <state line="151" column="55" selection-start="4753" selection-end="4753" vertical-scroll-proportion="0.98813057"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.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/MessageBox.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="234" column="39" selection-start="6700" selection-end="6700" vertical-scroll-proportion="0.47153464"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/sam/SAMEditor.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="75" selection-start="1762" selection-end="1762" vertical-scroll-proportion="0.5054678"> + <state line="36" column="31" selection-start="1397" selection-end="1397" vertical-scroll-proportion="-0.32695374"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/pom.xml"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="13" selection-start="533" selection-end="533" vertical-scroll-proportion="0.27722773"> + <state line="39" column="0" selection-start="1613" selection-end="1626" vertical-scroll-proportion="0.13071896"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/util/InvocationProxy.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="37" column="26" selection-start="1513" selection-end="1513" vertical-scroll-proportion="0.2839037"> + <state line="6" column="11" selection-start="62" selection-end="72" vertical-scroll-proportion="0.15311004"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="52" selection-start="1841" selection-end="1841" vertical-scroll-proportion="0.44613436"> + <state line="47" column="13" selection-start="2127" selection-end="2127" vertical-scroll-proportion="-1.6993464"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java"> + <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="77" column="23" selection-start="2227" selection-end="2227" vertical-scroll-proportion="0.9607843"> + <state line="29" column="2" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.17224881"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/test/java/org/jboss/bpm/console/client/BPMC20TestCase.java"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="0" selection-start="2004" selection-end="2004" vertical-scroll-proportion="0.47940075"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="267" column="0" selection-start="14409" selection-end="14409" vertical-scroll-proportion="0.7586207"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java"> + <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="236" column="0" selection-start="6904" selection-end="6904" vertical-scroll-proportion="0.23510972"> - <folding /> + <state line="197" column="25" selection-start="6954" selection-end="6954" vertical-scroll-proportion="0.6626066"> + <folding> + <element signature="imports" expanded="true" /> + </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$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="91" column="0" selection-start="3150" selection-end="3150" vertical-scroll-proportion="0.23510972"> - <folding /> + <state line="59" column="67" selection-start="2305" selection-end="2305" vertical-scroll-proportion="0.76004875"> + <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/common/AbstractRESTAction.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="99" column="36" selection-start="3727" selection-end="3727" vertical-scroll-proportion="0.38557994"> + <state line="39" column="13" selection-start="1721" selection-end="1721" vertical-scroll-proportion="0.15590744"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.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="34" column="13" selection-start="1363" selection-end="1363" vertical-scroll-proportion="-0.29153606"> + <state line="72" column="33" selection-start="2854" selection-end="2854" vertical-scroll-proportion="0.6041413"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/jmaki/xhp/xhp.json"> <provider selected="true" editor-type-id="text-editor"> - <state line="252" column="52" selection-start="8191" selection-end="8191" vertical-scroll-proportion="0.45788667"> + <state line="8" column="31" selection-start="228" selection-end="228" vertical-scroll-proportion="0.15311004"> <folding /> </state> </provider> Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java 2009-09-17 08:31:52 UTC (rev 838) @@ -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> + */ +public interface IFrameWindowCallback +{ + void onWindowClosed(); + +} Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java 2009-09-17 08:31:52 UTC (rev 838) @@ -0,0 +1,206 @@ +/* + * 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.dom.client.Element; +import com.google.gwt.dom.client.IFrameElement; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.WindowCloseListener; +import com.google.gwt.user.client.ui.Frame; +import org.gwt.mosaic.core.client.Dimension; +import org.gwt.mosaic.ui.client.Caption; +import org.gwt.mosaic.ui.client.Label; +import org.gwt.mosaic.ui.client.ScrollLayoutPanel; +import org.gwt.mosaic.ui.client.WindowPanel; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.jboss.bpm.console.client.util.ConsoleLog; +import org.jboss.bpm.console.client.util.WindowUtil; + +import java.util.Date; + +/** + * A window panel that embeds an iframe.<br> + * It resizes autmatically, if the iframe.window.name property + * is set to the contents size.<p> + * I.e. + * <code> + * window.name="320,240"; + * </code> + * <p/> + * In case the property is not set, is resizes according to the current + * window dimension. + * + * @see org.jboss.bpm.console.client.common.IFrameWindowCallback + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class IFrameWindowPanel +{ + private WindowPanel windowPanel = null; + private Frame frame = null; + + private String url; + private String title; + + private IFrameWindowCallback callback = null; + + public IFrameWindowPanel(String url, String title) + { + this.url = url; + this.title = title; + } + + private void createWindow() + { + windowPanel = new WindowPanel(); + windowPanel.setAnimationEnabled(true); + + ScrollLayoutPanel layout = new ScrollLayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + layout.setStyleName("bpm-window-layout"); + layout.setPadding(5); + // info + Label header = new Label(title); + header.setStyleName("bpm-label-header"); + layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + windowPanel.addWindowCloseListener(new WindowCloseListener() { + public void onWindowClosed() { + if(getCallback()!=null) + getCallback().onWindowClosed(); + + windowPanel = null; + frame = null; + } + + public String onWindowClosing() { + return null; + } + }); + + // iframe + frame = new Frame() + { + public void onBrowserEvent(com.google.gwt.user.client.Event event) + { + ConsoleLog.debug("Browser Event: "+ DOM.eventGetTypeString(event)); + + final Element iframe = getFrame().getElement(); + String size = getContents(IFrameElement.as(iframe)); + if(size!=null && size.indexOf(",")!=-1) + { + ConsoleLog.debug("Frame content size: "+ size); + String[] wh = size.split(","); + getWindowPanel().setContentSize( + new Dimension( + Integer.valueOf(wh[0]), + Integer.valueOf(wh[1])+100 + ) + ); + + } + else + { + ConsoleLog.debug("Unable to retrieve frame content size: "+size); + + final int width = Window.getClientWidth()-200; + final int height = Window.getClientHeight()-100; + + getWindowPanel().setContentSize( + new Dimension(width,height) + ); + + } + + windowPanel.layout(); + windowPanel.center(); + windowPanel.setVisible(true); + } + }; + + frame.sinkEvents(com.google.gwt.user.client.Event.ONLOAD); + + DOM.setStyleAttribute(frame.getElement(), "border", "none"); + + // https://jira.jboss.org/jira/browse/JBPM-2244 + frame.getElement().setId( + String.valueOf( new Date().getTime()) + ); + + frame.setUrl(this.url); + + layout.add(frame, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + windowPanel.setWidget(layout); + + WindowUtil.addMaximizeButton(windowPanel, Caption.CaptionRegion.RIGHT); + WindowUtil.addMinimizeButton(windowPanel, Caption.CaptionRegion.RIGHT); + + // + windowPanel.setVisible(false); + windowPanel.show(); + } + + private void destroyWindow() + { + this.windowPanel.close(); + } + + public Frame getFrame() + { + return frame; + } + + public WindowPanel getWindowPanel() + { + return windowPanel; + } + + public void setCallback(IFrameWindowCallback callback) + { + this.callback = callback; + } + + private IFrameWindowCallback getCallback() + { + return callback; + } + + public native String getContents(Element iframe) /*-{ + try { + // Make sure the iframe's window & document are loaded. + if (!iframe.contentWindow || !iframe.contentWindow.document) + return "no set"; + + // Get the contents from the window.name property. + return iframe.contentWindow.name; + } catch (e) { + return "Error: "+e; + } + }-*/; + + + public void show() + { + createWindow(); + } +} 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-09-17 08:29:38 UTC (rev 837) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-09-17 08:31:52 UTC (rev 838) @@ -22,28 +22,27 @@ package org.jboss.bpm.console.client.process; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.WindowCloseListener; import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.Widget; import com.mvc4g.client.Controller; import com.mvc4g.client.Event; -import org.gwt.mosaic.ui.client.*; +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.AbstractView; +import org.jboss.bpm.console.client.common.IFrameWindowPanel; +import org.jboss.bpm.console.client.common.IFrameWindowCallback; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.client.process.events.InstanceEvent; -import org.jboss.bpm.console.client.util.ConsoleLog; import org.jboss.bpm.console.client.util.SimpleDateFormat; -import org.jboss.bpm.console.client.util.WindowUtil; -import java.util.Date; import java.util.List; /** @@ -69,9 +68,8 @@ private ApplicationContext appContext; - private WindowPanel windowPanel = null; - private Frame frame = null; - + private IFrameWindowPanel iframeWindow = null; + public InstanceListView(ApplicationContext appContext) { super(); @@ -134,7 +132,7 @@ controller.handleEvent( new Event(UpdateInstanceDetailAction.ID, new InstanceEvent(currentDefinition, item) - ) + ) ); } } @@ -178,7 +176,24 @@ boolean hasForm = (url !=null && !url.equals("")); if(hasForm) { - createProcessFormWindow(getCurrentDefinition()); + ProcessDefinitionRef definition = getCurrentDefinition(); + iframeWindow = new IFrameWindowPanel( + definition.getFormUrl(), "New Process Instance: "+ definition.getId() + ); + + iframeWindow.setCallback( + new IFrameWindowCallback() + { + public void onWindowClosed() + { + controller.handleEvent( + new Event(UpdateInstancesAction.ID, getCurrentDefinition()) + ); + } + } + ); + + iframeWindow.show(); } else { @@ -307,63 +322,7 @@ } } - - private void createProcessFormWindow(ProcessDefinitionRef process) - { - windowPanel = new WindowPanel("Process Interface"); - windowPanel.setAnimationEnabled(true); - windowPanel.setSize("320px", "240px"); - - LayoutPanel layout = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - layout.setStyleName("bpm-window-layout"); - layout.setPadding(5); - // info - Label header = new Label("Process: "+process.getId()); - header.setStyleName("bpm-label-header"); - layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - - // task form iframe - - windowPanel.addWindowCloseListener(new WindowCloseListener() { - public void onWindowClosed() { - controller.handleEvent( - new Event(UpdateInstancesAction.ID, getCurrentDefinition()) - ); - - windowPanel = null; - frame = null; - - } - - public String onWindowClosing() { - return null; - } - }); - - // iframe - frame = new Frame(); - DOM.setStyleAttribute(frame.getElement(), "border", "none"); - - // https://jira.jboss.org/jira/browse/JBPM-2244 - frame.getElement().setId( - String.valueOf( new Date().getTime()) - ); - - ConsoleLog.debug(frame.getElement().toString()); - frame.setUrl(process.getFormUrl()); - - layout.add(frame, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - windowPanel.setWidget(layout); - - WindowUtil.addMaximizeButton(windowPanel, Caption.CaptionRegion.RIGHT); - WindowUtil.addMinimizeButton(windowPanel, Caption.CaptionRegion.RIGHT); - - // display - windowPanel.center(); - - } - - + public ProcessInstanceRef getSelection() { ProcessInstanceRef selection = null; @@ -416,4 +375,5 @@ // layout again this.invalidate(); } + } 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-09-17 08:29:38 UTC (rev 837) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-09-17 08:31:52 UTC (rev 838) @@ -22,27 +22,26 @@ package org.jboss.bpm.console.client.task; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.WindowCloseListener; import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.Widget; import com.mvc4g.client.Event; -import org.gwt.mosaic.ui.client.*; +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.icons.ConsoleIconBundle; import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.client.task.events.DetailViewEvent; import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; -import org.jboss.bpm.console.client.util.ConsoleLog; import org.jboss.bpm.console.client.util.SimpleDateFormat; -import org.jboss.bpm.console.client.util.WindowUtil; -import java.util.Date; import java.util.List; /** @@ -55,9 +54,8 @@ private final ApplicationContext appContext; - private WindowPanel windowPanel; - private Frame frame; - + private IFrameWindowPanel iframeWindow = null; + private TaskDetailView detailsView; private SimpleDateFormat dateFormat = new SimpleDateFormat(); @@ -161,9 +159,29 @@ if (selection != null) { if (selection.getUrl() != null && !selection.getUrl().equals("")) - createTaskFormWindow(selection); + { + iframeWindow = new IFrameWindowPanel( + selection.getUrl(), "Task Form: "+selection.getName() + ); + + iframeWindow.setCallback( + new IFrameWindowCallback() + { + public void onWindowClosed() + { + controller.handleEvent( + new Event(LoadTasksAction.ID, appContext.getAuthentication().getUsername()) + ); + } + } + ); + + iframeWindow.show(); + } else + { MessageBox.alert("Invalid operation", "The task doesn't provide a UI"); + } } else { @@ -221,62 +239,7 @@ isInitialized = true; } } - - private void createTaskFormWindow(TaskRef task) - { - windowPanel = new WindowPanel("Task Interface"); - windowPanel.setAnimationEnabled(true); - windowPanel.setSize("320px", "240px"); - - LayoutPanel layout = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - layout.setStyleName("bpm-window-layout"); - layout.setPadding(5); - // info - Label header = new Label("Process: "+task.getProcessId()+", Task: "+task.getName()); - header.setStyleName("bpm-label-header"); - layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - - // task form iframe - - windowPanel.addWindowCloseListener(new WindowCloseListener() { - public void onWindowClosed() { - controller.handleEvent( - new Event(LoadTasksAction.ID, appContext.getAuthentication().getUsername()) - ); - - windowPanel = null; - frame = null; - - } - - public String onWindowClosing() { - return null; - } - }); - - // iframe - frame = new Frame(); - DOM.setStyleAttribute(frame.getElement(), "border", "none"); - - // https://jira.jboss.org/jira/browse/JBPM-2244 - frame.getElement().setId( - String.valueOf( new Date().getTime()) - ); - - ConsoleLog.debug(frame.getElement().toString()); - frame.setUrl(task.getUrl()); - - layout.add(frame, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - windowPanel.setWidget(layout); - - WindowUtil.addMaximizeButton(windowPanel, Caption.CaptionRegion.RIGHT); - WindowUtil.addMinimizeButton(windowPanel, Caption.CaptionRegion.RIGHT); - - // display - windowPanel.center(); - - } - + public void update(String identity, List<TaskRef> tasks) { Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java 2009-09-17 08:29:38 UTC (rev 837) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java 2009-09-17 08:31:52 UTC (rev 838) @@ -34,49 +34,49 @@ public class WindowUtil { /** - * - * @param windowPanel - */ - public static void addMaximizeButton(final WindowPanel windowPanel, - Caption.CaptionRegion captionRegion) { - final ImageButton maximizeBtn = new ImageButton( - Caption.IMAGES.windowMaximize()); - maximizeBtn.addClickListener(new ClickListener() { - public void onClick(Widget sender) { - if (windowPanel.getWindowState() == WindowPanel.WindowState.MAXIMIZED) { - windowPanel.setWindowState(WindowPanel.WindowState.NORMAL); - } else { - windowPanel.setWindowState(WindowPanel.WindowState.MAXIMIZED); - } - } - }); - windowPanel.addWindowStateListener(new WindowPanel.WindowStateListener() { - public void onWindowStateChange(WindowPanel sender) { - if (sender.getWindowState() == WindowPanel.WindowState.MAXIMIZED) { - maximizeBtn.setImage(Caption.IMAGES.windowRestore().createImage()); - } else { - maximizeBtn.setImage(Caption.IMAGES.windowMaximize().createImage()); - } + * + * @param windowPanel + */ + public static void addMaximizeButton(final WindowPanel windowPanel, + Caption.CaptionRegion captionRegion) { + final ImageButton maximizeBtn = new ImageButton( + Caption.IMAGES.windowMaximize()); + maximizeBtn.addClickListener(new ClickListener() { + public void onClick(Widget sender) { + if (windowPanel.getWindowState() == WindowPanel.WindowState.MAXIMIZED) { + windowPanel.setWindowState(WindowPanel.WindowState.NORMAL); + } else { + windowPanel.setWindowState(WindowPanel.WindowState.MAXIMIZED); + } + } + }); + windowPanel.addWindowStateListener(new WindowPanel.WindowStateListener() { + public void onWindowStateChange(WindowPanel sender) { + if (sender.getWindowState() == WindowPanel.WindowState.MAXIMIZED) { + maximizeBtn.setImage(Caption.IMAGES.windowRestore().createImage()); + } else { + maximizeBtn.setImage(Caption.IMAGES.windowMaximize().createImage()); + } - } - }); - windowPanel.getHeader().add(maximizeBtn, captionRegion); - } + } + }); + windowPanel.getHeader().add(maximizeBtn, captionRegion); + } - /** - * - * @param windowPanel - */ - public static void addMinimizeButton(final WindowPanel windowPanel, - Caption.CaptionRegion captionRegion) { - final ImageButton minimizeBtn = new ImageButton( - Caption.IMAGES.windowMinimize()); - minimizeBtn.addClickListener(new ClickListener() { - public void onClick(Widget sender) { - windowPanel.setWindowState(WindowPanel.WindowState.NORMAL); - } - }); - windowPanel.getHeader().add(minimizeBtn, captionRegion); - } + /** + * + * @param windowPanel + */ + public static void addMinimizeButton(final WindowPanel windowPanel, + Caption.CaptionRegion captionRegion) { + final ImageButton minimizeBtn = new ImageButton( + Caption.IMAGES.windowMinimize()); + minimizeBtn.addClickListener(new ClickListener() { + public void onClick(Widget sender) { + windowPanel.setWindowState(WindowPanel.WindowState.NORMAL); + } + }); + windowPanel.getHeader().add(minimizeBtn, captionRegion); + } }

14 years, 7 months

1
0
0 / 0

Overlord SVN: r837 - bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-17 04:29:38 -0400 (Thu, 17 Sep 2009) New Revision: 837 Modified: bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/xhp.json Log: point to 127.0.0.1 Modified: bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/xhp.json =================================================================== --- bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/xhp.json 2009-09-15 11:04:23 UTC (rev 836) +++ bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/xhp.json 2009-09-17 08:29:38 UTC (rev 837) @@ -2,11 +2,11 @@ "version": "1.1", "services": [ {"id": "default", - "url":"http://localhost:8080/gwt-console-server", + "url":"http://127.0.0.1:8080/gwt-console-server", "passthrough":true }, {"id": "birt", - "url":"http://localhost:8080/gwt-console-server", + "url":"http://127.0.0.1:8080/gwt-console-server", "passthrough":true, "contentType":"text/html" }

14 years, 7 months

1
0
0 / 0

Overlord SVN: r836 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/model and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-15 07:04:23 -0400 (Tue, 15 Sep 2009) New Revision: 836 Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java bpm-console/trunk/server/war/server-war.iml Log: Fix BPMC-20: Parse error on process instance with two active nodes Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-09-10 08:18:00 UTC (rev 835) +++ bpm-console/trunk/BPMC.iws 2009-09-15 11:04:23 UTC (rev 836) @@ -17,8 +17,10 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java" afterPath="$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/gui/war/src/test/java/org/jboss/bpm/console/client/BPMC20TestCase.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/server-war.iml" afterPath="$PROJECT_DIR$/server/war/server-war.iml" /> </list> <list name="Failed commit: Default" comment="remove dependency on DTOParser" /> </component> @@ -91,7 +93,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java" line="236" class="jmaki.xhp.HttpClient" package="jmaki.xhp"> + <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java" line="243" class="org.jboss.bpm.console.client.model.DTOParser" package="org.jboss.bpm.console.client.model"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -104,32 +106,6 @@ <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/Authentication.java" line="91" class="Class at Authentication.java:91" package="org.jboss.bpm.console.client"> - <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> - <breakpoint url="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java" line="145" class="org.jboss.bpm.console.server.FormProcessingFacade" package="org.jboss.bpm.console.server"> - <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> @@ -202,24 +178,51 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="InvocationProxy.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/util/InvocationProxy.java"> + <file leaf-file-name="DTOParser.java" pinned="false" current="true" current-in-tab="true"> + <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="37" column="26" selection-start="1513" selection-end="1513" vertical-scroll-proportion="0.2839037"> + <state line="252" column="52" selection-start="8191" selection-end="8191" vertical-scroll-proportion="0.45788667"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="PluginMgr.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java"> + <file leaf-file-name="ProcessInstanceRef.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="24" selection-start="2140" selection-end="2140" vertical-scroll-proportion="0.6489227"> + <state line="34" column="13" selection-start="1363" selection-end="1363" vertical-scroll-proportion="-0.29153606"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="AbstractRESTAction.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/AbstractRESTAction.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="99" column="36" selection-start="3727" selection-end="3727" vertical-scroll-proportion="0.38557994"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="HttpClient.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="236" column="0" selection-start="6904" selection-end="6904" vertical-scroll-proportion="0.23510972"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="91" column="0" selection-start="3150" selection-end="3150" vertical-scroll-proportion="0.23510972"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -315,7 +318,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server-war" /> + <option name="myItemId" value="gui-war" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -325,11 +328,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server-war" /> + <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$/server/war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -339,17 +342,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server-war" /> + <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$/server/war" /> + <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$/server/war/src" /> + <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/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -357,21 +364,25 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server-war" /> + <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$/server/war" /> + <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$/server/war/src" /> + <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$/server/war/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test" /> <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/test/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -379,43 +390,43 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server-war" /> + <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$/server/war" /> + <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$/server/war/src" /> + <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$/server/war/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main/java" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main/java/org" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test/java/org" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main/java/org/jboss" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test/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$/server/war/src/main/java/org/jboss/bpm" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test/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$/server/war/src/main/java/org/jboss/bpm/console" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test/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$/server/war/src/main/java/org/jboss/bpm/console/server" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/test/java/org/jboss/bpm/console/client" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -425,49 +436,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server-war" /> + <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$/server/war" /> + <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$/server/war/src" /> + <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$/server/war/src/main" /> + <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$/server/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$/server/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$/server/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$/server/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$/server/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$/server/war/src/main/java/org/jboss/bpm/console/server" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/util" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> </subPane> </component> @@ -482,7 +465,7 @@ <showLibraryContents /> <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" /> + <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -501,8 +484,8 @@ <property name="cvs_file_history_flatOrder1" value="1" /> <property name="cvs_file_history_flatWidth1" value="291" /> <property name="cvs_file_history_treeWidth1" value="287" /> - <property name="cvs_file_history_treeWidth3" value="287" /> <property name="cvs_file_history_treeOrder2" value="2" /> + <property name="cvs_file_history_treeWidth3" value="287" /> <property name="GoToClass.includeLibraries" value="false" /> <property name="cvs_file_history_flatOrder2" value="2" /> <property name="MemberChooser.showClasses" value="true" /> @@ -511,8 +494,8 @@ <property name="cvs_file_history_treeWidth2" value="287" /> <property name="cvs_file_history_flatOrder3" value="3" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> - <property name="cvs_file_history_treeOrder0" value="0" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> + <property name="cvs_file_history_treeOrder0" value="0" /> </component> <component name="ReadonlyStatusHandler"> <option name="SHOW_DIALOG" value="true" /> @@ -526,19 +509,18 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.server"> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> + <component name="RunManager" selected="Remote.GWT"> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="" /> - <method> - <option name="Make" value="true" /> - </method> </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -547,17 +529,18 @@ <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> @@ -690,16 +673,16 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="451" y="33" width="1211" height="951" extended-state="0" /> + <frame x="1663" y="0" width="1265" height="800" 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.2857143" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22697368" 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.24697755" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24671052" 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" /> @@ -711,7 +694,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.3977143" order="4" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39722863" 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" /> @@ -802,112 +785,111 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html"> - <provider editor-type-id="HtmlPreview"> - <state /> - </provider> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="0" selection-start="614" selection-end="614" vertical-scroll-proportion="0.62015504"> - <folding /> + <state line="68" column="49" selection-start="2400" selection-end="2415" vertical-scroll-proportion="0.93658537"> + <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/report/RenderReportAction.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> + <state line="112" column="79" selection-start="4142" selection-end="4142" vertical-scroll-proportion="0.7354037"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.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="66" column="69" selection-start="2329" selection-end="2329" vertical-scroll-proportion="0.19875777"> + <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.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="37" column="11" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.31219512"> + <state line="234" column="39" selection-start="6700" selection-end="6700" vertical-scroll-proportion="0.47153464"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/sam/SAMEditor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> + <state line="50" column="75" selection-start="1762" selection-end="1762" vertical-scroll-proportion="0.5054678"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java"> + <entry file="file://$PROJECT_DIR$/gui/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.15609756"> + <state line="14" column="13" selection-start="533" selection-end="533" vertical-scroll-proportion="0.27722773"> <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$/server/integration/src/main/java/org/jboss/bpm/console/server/util/InvocationProxy.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="68" column="49" selection-start="2400" selection-end="2415" vertical-scroll-proportion="0.93658537"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="37" column="26" selection-start="1513" selection-end="1513" vertical-scroll-proportion="0.2839037"> + <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$/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="112" column="79" selection-start="4142" selection-end="4142" vertical-scroll-proportion="0.7354037"> + <state line="45" column="52" selection-start="1841" selection-end="1841" vertical-scroll-proportion="0.44613436"> <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$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> + <state line="77" column="23" selection-start="2227" selection-end="2227" vertical-scroll-proportion="0.9607843"> <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$/gui/war/src/test/java/org/jboss/bpm/console/client/BPMC20TestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="270" column="4" selection-start="7894" selection-end="7894" vertical-scroll-proportion="0.45217392"> - <folding /> + <state line="44" column="0" selection-start="2004" selection-end="2004" vertical-scroll-proportion="0.47940075"> + <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/LoginView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="234" column="39" selection-start="6700" selection-end="6700" vertical-scroll-proportion="0.47153464"> + <state line="236" column="0" selection-start="6904" selection-end="6904" vertical-scroll-proportion="0.23510972"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/sam/SAMEditor.java"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="75" selection-start="1762" selection-end="1762" vertical-scroll-proportion="0.5054678"> + <state line="91" column="0" selection-start="3150" selection-end="3150" vertical-scroll-proportion="0.23510972"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/pom.xml"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="13" selection-start="533" selection-end="533" vertical-scroll-proportion="0.27722773"> + <state line="99" column="36" selection-start="3727" selection-end="3727" vertical-scroll-proportion="0.38557994"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/util/InvocationProxy.java"> + <entry file="file://$PROJECT_DIR$/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="26" selection-start="1513" selection-end="1513" vertical-scroll-proportion="0.2839037"> + <state line="34" column="13" selection-start="1363" selection-end="1363" vertical-scroll-proportion="-0.29153606"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/PluginMgr.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="55" column="24" selection-start="2140" selection-end="2140" vertical-scroll-proportion="0.6489227"> + <state line="252" column="52" selection-start="8191" selection-end="8191" vertical-scroll-proportion="0.45788667"> <folding /> </state> </provider> Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-09-10 08:18:00 UTC (rev 835) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-09-15 11:04:23 UTC (rev 836) @@ -245,7 +245,8 @@ String rootTokenId = JSONWalk.on(jso).next("id").asString(); //String name = JSONWalk.on(jso).next("name").asString(); - String nodeName = JSONWalk.on(jso).next("currentNodeName").asString(); + JSONWalk.JSONWrapper nodeNameWrapper = JSONWalk.on(jso).next("currentNodeName"); + String nodeName = nodeNameWrapper!=null? nodeNameWrapper.asString() : ""; // TDOD: Fix token name TokenReference rt = new TokenReference(rootTokenId, "", nodeName); Modified: bpm-console/trunk/server/war/server-war.iml =================================================================== --- bpm-console/trunk/server/war/server-war.iml 2009-09-10 08:18:00 UTC (rev 835) +++ bpm-console/trunk/server/war/server-war.iml 2009-09-15 11:04:23 UTC (rev 836) @@ -60,24 +60,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> @@ -105,15 +87,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> @@ -161,276 +134,292 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> + <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided"> + <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> + <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> + <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> + <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> + <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile"> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> + <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> + <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> + <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> + <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />

14 years, 7 months

1
0
0 / 0

Overlord SVN: r835 - sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-10 04:18:00 -0400 (Thu, 10 Sep 2009) New Revision: 835 Modified: sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java Log: Switch to Queue interfaces Modified: sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java =================================================================== --- sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-09 13:54:53 UTC (rev 834) +++ sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-10 08:18:00 UTC (rev 835) @@ -25,6 +25,7 @@ import org.jboss.sam.cvt.SwapHandler; import java.util.LinkedList; +import java.util.Queue; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -32,7 +33,7 @@ public class InMemorySwapHandler implements SwapHandler { - private LinkedList<CVTSnapshot> buffer = new LinkedList<CVTSnapshot>(); + private Queue<CVTSnapshot> buffer = new LinkedList<CVTSnapshot>(); private final static int MAX_SNAPSHOTS = 50; @@ -48,15 +49,10 @@ { synchronized(buffer) { - if(buffer.size()<MAX_SNAPSHOTS) - { - buffer.addLast(snapshot); - } - else - { - buffer.removeFirst(); // first is the oldest - buffer.addLast(snapshot); - } + if(buffer.size()>=MAX_SNAPSHOTS) // retain max capacity + buffer.poll(); + + buffer.add(snapshot); } }

14 years, 7 months

1
0
0 / 0

Overlord SVN: r834 - in sam/trunk: console/gui/war/src/main/java/org/jboss/bpm/console/client/sam and 4 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-09 09:54:53 -0400 (Wed, 09 Sep 2009) New Revision: 834 Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/EventDetailView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordAction.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordEvent.java sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterStatus.java Modified: sam/trunk/SAMM.iws sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/SwapHandler.java sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/NoopSwapHandler.java sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java Log: Added record loading capabilities Modified: sam/trunk/SAMM.iws =================================================================== --- sam/trunk/SAMM.iws 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/SAMM.iws 2009-09-09 13:54:53 UTC (rev 834) @@ -87,7 +87,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <breakpoint url="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java" line="105" class="org.jboss.bpm.console.server.CVTFacade" package="org.jboss.bpm.console.server"> + <breakpoint url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java" line="52" class="org.jboss.sam.examples.twitter.InMemorySwapHandler" package="org.jboss.sam.examples.twitter"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -100,7 +100,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java" line="45" class="org.jboss.sam.examples.twitter.InMemorySwapHandler" package="org.jboss.sam.examples.twitter"> + <breakpoint url="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java" line="138" class="org.jboss.bpm.console.server.CVTFacade" package="org.jboss.bpm.console.server"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -184,7 +184,57 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="CVTView.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="113" column="45" selection-start="3798" selection-end="3798" vertical-scroll-proportion="0.64761907"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="EventDetailView.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/EventDetailView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="35" column="13" selection-start="1507" selection-end="1507" vertical-scroll-proportion="0.28070176"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="LoadRecordAction.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordAction.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="53" column="0" selection-start="1878" selection-end="1878" vertical-scroll-proportion="0.62857145"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ValueTable.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="75" column="4" selection-start="2711" selection-end="2711" vertical-scroll-proportion="-1.4380952"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="HistoryView.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="56" column="38" selection-start="1847" selection-end="1847" vertical-scroll-proportion="0.54269004"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -1321,26 +1371,23 @@ </component> <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Remote.server"> - <tempConfiguration default="false" name="Runner" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" value="org.jboss.bpm.console.server.Runner" /> + <tempConfiguration default="false" name="TwitterStatus" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" value="org.jboss.sam.examples.twitter.TwitterStatus" /> <option name="VM_PARAMETERS" /> <option name="PROGRAM_PARAMETERS" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="server-war" /> + <module name="twitter" /> <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="62202" /> + <option name="DEBUG_PORT" value="61799" /> <option name="TRANSPORT" value="0" /> <option name="LOCAL" value="true" /> </RunnerSettings> <RunnerSettings RunnerId="Run" /> <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> - <method> - <option name="Make" value="false" /> - </method> </tempConfiguration> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> @@ -1440,6 +1487,24 @@ <option name="Make" value="true" /> </method> </configuration> + <configuration default="false" name="TwitterStatus" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" value="org.jboss.sam.examples.twitter.TwitterStatus" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="twitter" /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="61799" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + </configuration> <configuration name="<template>" type="WebApp" default="true" selected="false"> <Host>localhost</Host> <Port>5050</Port> @@ -1521,25 +1586,25 @@ </component> <component name="ToolWindowManager"> <frame x="301" y="30" width="1371" height="1002" extended-state="0" /> - <editor active="false" /> + <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.32922825" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="14" /> <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="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3517398" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3517398" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.41878453" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24432677" order="1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908458" order="9" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3281768" order="9" /> <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="6" /> <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.18719211" order="4" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32791728" order="11" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57937425" order="2" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57900554" order="2" /> <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24691358" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24659607" 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="5" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39116022" 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" /> @@ -1631,105 +1696,113 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="271" column="4" selection-start="7922" selection-end="7922" vertical-scroll-proportion="0.2761905"> + <state line="26" column="6" selection-start="1136" selection-end="1136" vertical-scroll-proportion="0.112280704"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/SwapHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="43" selection-start="1717" selection-end="1717" vertical-scroll-proportion="0.17660819"> + <state line="34" column="20" selection-start="1367" selection-end="1367" vertical-scroll-proportion="0.24327485"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/NoopSwapHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="117" column="47" selection-start="3260" selection-end="3260" vertical-scroll-proportion="0.85730994"> + <state line="54" column="28" selection-start="1853" selection-end="1853" vertical-scroll-proportion="0.60952383"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="48" column="69" selection-start="1625" selection-end="1625" vertical-scroll-proportion="0.44912282"> + <state line="93" column="28" selection-start="2479" selection-end="2479" vertical-scroll-proportion="0.7754386"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="100" column="50" selection-start="3005" selection-end="3005" vertical-scroll-proportion="1.0666667"> + <state line="50" column="9" selection-start="2030" selection-end="2030" vertical-scroll-proportion="0.33684212"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java"> + <entry file="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="6" selection-start="1274" selection-end="1274" vertical-scroll-proportion="0.1497076"> + <state line="158" column="43" selection-start="4237" selection-end="4237" vertical-scroll-proportion="0.5660819"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java"> + <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterStatus.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="130" column="75" selection-start="4122" selection-end="4184" vertical-scroll-proportion="0.6952381"> - <folding /> + <state line="44" column="18" selection-start="1522" selection-end="1522" vertical-scroll-proportion="0.44912282"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images/red.png"> - <provider selected="true" editor-type-id="images"> - <state /> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="56" column="38" selection-start="1847" selection-end="1847" vertical-scroll-proportion="0.54269004"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images/loading.gif"> - <provider selected="true" editor-type-id="images"> - <state /> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="113" column="45" selection-start="3798" selection-end="3798" vertical-scroll-proportion="0.64761907"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/EventDetailView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="98" column="0" selection-start="3153" selection-end="3153" vertical-scroll-proportion="0.12631579"> + <state line="35" column="13" selection-start="1507" selection-end="1507" vertical-scroll-proportion="0.28070176"> <folding> - <element signature="class#2531:3045" expanded="false" /> + <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="35" selection-start="1640" selection-end="1640" vertical-scroll-proportion="0.28070176"> + <state line="37" column="13" selection-start="1552" selection-end="1552" vertical-scroll-proportion="-1.5047619"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="134" column="48" selection-start="3283" selection-end="3283" vertical-scroll-proportion="0.7380117"> + <state line="96" column="46" selection-start="3412" selection-end="3768" vertical-scroll-proportion="0.68187135"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="14" selection-start="1879" selection-end="1879" vertical-scroll-proportion="0.2857143"> + <state line="39" column="13" selection-start="1626" selection-end="1626" vertical-scroll-proportion="-0.83809525"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="43" selection-start="502" selection-end="502" vertical-scroll-proportion="0.65497077"> - <folding /> + <state line="53" column="0" selection-start="1878" selection-end="1878" vertical-scroll-proportion="0.62857145"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="117" column="47" selection-start="4269" selection-end="4269" vertical-scroll-proportion="0.53333336"> + <state line="75" column="4" selection-start="2711" selection-end="2711" vertical-scroll-proportion="-1.4380952"> <folding /> </state> </provider> Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-09 13:54:53 UTC (rev 834) @@ -23,6 +23,7 @@ import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.TextBox; import com.googlecode.gchart.client.GChart; import com.mvc4g.client.Controller; import com.mvc4g.client.Event; @@ -58,7 +59,7 @@ private HistoryView history; private boolean initialzed; - + public CVTView(String tableName) { super(new BoxLayout(BoxLayout.Orientation.VERTICAL)); @@ -97,12 +98,25 @@ this.add(chart, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); chart.update(); - this.currentValues = new ValueTable("Current Events"); - this.add(currentValues, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + // ----- + LayoutPanel comparisonPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); + this.currentValues = new ValueTable("Current Events", controller); + comparisonPanel.add(currentValues, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + this.history = new HistoryView(); - controller.addView(HistoryView.ID, this.history); + controller.addView(HistoryView.ID, this.history); + this.history.initialize(); + comparisonPanel.add(history, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + this.add(comparisonPanel, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + // ------ + + EventDetailView detailView = new EventDetailView(); + controller.addView(EventDetailView.ID, detailView); + this.add(detailView); + this.initialzed = true; currentValues.highlight(); } Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/EventDetailView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/EventDetailView.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/EventDetailView.java 2009-09-09 13:54:53 UTC (rev 834) @@ -0,0 +1,63 @@ +/* + * 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.sam; + +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.gwt.mosaic.ui.client.Label; +import com.mvc4g.client.ViewInterface; +import com.mvc4g.client.Controller; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.user.client.ui.TextArea; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class EventDetailView extends LayoutPanel implements ViewInterface +{ + + public final static String ID = EventDetailView.class.getName(); + + private TextArea textBox; + + public EventDetailView() + { + super(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + + this.add(new Label("Event details")); + this.textBox = new TextArea(); + this.textBox.setVisibleLines(5); + this.textBox.setCharacterWidth(60); + this.add(textBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + } + + public void setController(Controller controller) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void update(String text) + { + textBox.setText(text); + } +} Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-09 13:54:53 UTC (rev 834) @@ -26,31 +26,48 @@ import com.google.gwt.user.client.WindowCloseListener; import org.gwt.mosaic.ui.client.layout.LayoutPanel; import org.gwt.mosaic.ui.client.WindowPanel; +import org.jboss.bpm.console.client.LazyPanel; import java.util.List; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ -public class HistoryView extends LayoutPanel implements ViewInterface +public class HistoryView extends LayoutPanel implements ViewInterface, LazyPanel { public final static String ID = HistoryView.class.getName(); private ValueTable valueTable; private Controller controller; - private WindowPanel window; + //private WindowPanel window; + private boolean initialized; public HistoryView() { super(); - this.valueTable = new ValueTable("Past events"); - this.add(valueTable); - this.window = createSnapshotWindow(); + } + public boolean isInitialized() + { + return initialized; } + public void initialize() + { + if(!initialized) + { + this.valueTable = new ValueTable("Past events", controller); + this.add(valueTable); + //this.window = createSnapshotWindow(); + + valueTable.highlight(); + + this.initialized = true; + } + } + /** * The 'layout' window panel. */ @@ -86,6 +103,6 @@ public void update(String snapshotId, List<List<String>> results) { this.valueTable.update(snapshotId, results); - window.show(); + //window.show(); } } Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java 2009-09-09 13:54:53 UTC (rev 834) @@ -24,7 +24,7 @@ /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ -public final class LoadEvent +public class LoadEvent { String table; String snapshot; Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordAction.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordAction.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordAction.java 2009-09-09 13:54:53 UTC (rev 834) @@ -0,0 +1,65 @@ +/* + * 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.sam; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; +import com.mvc4g.client.Controller; +import org.jboss.bpm.console.client.common.AbstractRESTAction; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class LoadRecordAction extends AbstractRESTAction +{ + + public final static String ID = LoadRecordAction.class.getName(); + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + LoadRecordEvent lre = (LoadRecordEvent)event; + + String baseURL = appContext.getConfig().getConsoleServerUrl(); + String url = baseURL + "/rs/cvt/table/details?table=" + URL.encode(lre.table); + url += "&snapshot="+lre.snapshot; + url += "&record="+lre.recordId; + + return url; + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.GET; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + EventDetailView view = (EventDetailView)controller.getView(EventDetailView.ID); + view.update(response.getText()); + } +} Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordEvent.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordEvent.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadRecordEvent.java 2009-09-09 13:54:53 UTC (rev 834) @@ -0,0 +1,36 @@ +/* + * 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.sam; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class LoadRecordEvent extends LoadEvent +{ + + public String recordId; + + public LoadRecordEvent(String table, String snapshot) + { + super(table, snapshot); + } +} Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java 2009-09-09 13:54:53 UTC (rev 834) @@ -48,7 +48,7 @@ private ToggleButton toggle; private DecoratedTabLayoutPanel tabPanel; - private static final String TABLE_NAME = "iran results"; + public static final String TABLE_NAME = "iran results"; public TwitterEditor(ApplicationContext appContext) { @@ -68,6 +68,7 @@ // action and view controller.addAction(CurrentSnapshotAction.ID, new CurrentSnapshotAction()); controller.addAction(LoadSnapshotAction.ID, new LoadSnapshotAction()); + controller.addAction(LoadRecordAction.ID, new LoadRecordAction()); // -------------- Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-09 13:54:53 UTC (rev 834) @@ -21,22 +21,25 @@ */ package org.jboss.bpm.console.client.sam; -import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.ui.ChangeListener; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Widget; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; +import org.gwt.mosaic.ui.client.Label; +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.PopupMenu; import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; -import org.gwt.mosaic.ui.client.ListBox; -import org.gwt.mosaic.ui.client.Label; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import java.util.List; -import com.google.gwt.user.client.ui.ChangeListener; -import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.Timer; -import com.google.gwt.core.client.GWT; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ @@ -46,11 +49,16 @@ private String snapshotId; private Image reload; + private List<List<String>> currentModel; - public ValueTable(String title) + private Controller controller; + + public ValueTable(String title, Controller controller) { super(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + this.controller = controller; + LayoutPanel imgContainer = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); imgContainer.setHeight("16px"); @@ -63,18 +71,19 @@ this.listBox = createListBox(); this.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - + } public String getSnapshotId() { return snapshotId; } - + public void update(String snapshotId, List<List<String>> results) { this.snapshotId = snapshotId; - + this.currentModel = results; + // update listbox model final DefaultListModel<List<String>> model = (DefaultListModel<List<String>>) listBox.getModel(); @@ -146,6 +155,43 @@ } }); + listBox.setContextMenu(createContextMenu()); + return listBox; } + + private PopupMenu createContextMenu() + { + Command cmd = new Command() + { + public void execute() + { + int index = listBox.getSelectedIndex(); + String recordId = currentModel.get(index).get(2); + + LoadRecordEvent meta = new LoadRecordEvent(TwitterEditor.TABLE_NAME, snapshotId); + meta.recordId = recordId; + + controller.handleEvent( + new Event(LoadRecordAction.ID, + meta + ) + ); + + //InfoPanel.show("Selection", recordId); + } + }; + + PopupMenu contextMenu = new PopupMenu(); + + contextMenu.addItem("View Details", cmd); + + /*contextMenu.addSeparator(); + + contextMenu.addItem("MenuItem 3", cmd); + contextMenu.addItem("MenuItem 4", cmd); + */ + return contextMenu; + } + } Modified: sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java =================================================================== --- sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java 2009-09-09 13:54:53 UTC (rev 834) @@ -74,19 +74,15 @@ @Path("table/current") @Produces("application/json") @RsComment( - title = "CVT values by table name", + title = "Current Values", description = "Access current table values") public Response getCurrentCVT( @QueryParam("table") String tableId ) { - String decodedKey = URLDecoder.decode(tableId); - CVT cvt = getMonitor().getCVTRegistry().lookupCVT(decodedKey); - if(null==cvt) - throw new IllegalArgumentException("No CVT for key "+decodedKey); - - CVTSnapshot snapshot = cvt.snapshot(); + CVT cvt = getCVT(tableId); + CVTSnapshot snapshot = cvt.snapshot(); return parseCVTTable(snapshot); } @@ -94,7 +90,7 @@ @Path("table/load") @Produces("application/json") @RsComment( - title = "Access CVT history", + title = "Previous snapshots", description = "Access stored table values") public Response loadCVT( @QueryParam("table") @@ -103,10 +99,7 @@ String snapshotId ) { - String decodedKey = URLDecoder.decode(tableId); - CVT cvt = getMonitor().getCVTRegistry().lookupCVT(decodedKey); - if(null==cvt) - throw new IllegalArgumentException("No CVT for key "+decodedKey); + CVT cvt = getCVT(tableId); if(cvt.getSwapHandler().maintains(snapshotId)==false) { @@ -114,12 +107,42 @@ } else { - CVTSnapshot snapshot = cvt.getSwapHandler().load(snapshotId); + CVTSnapshot snapshot = cvt.getSwapHandler().load(snapshotId); return parseCVTTable(snapshot); } } + private CVT getCVT(String tableId) + { + String decodedKey = URLDecoder.decode(tableId); + CVT cvt = getMonitor().getCVTRegistry().lookupCVT(decodedKey); + if(null==cvt) + throw new IllegalArgumentException("No CVT for key "+decodedKey); + return cvt; + } + @GET + @Path("table/details") + @Produces("text/plain") + @RsComment( + title = "Fetch details", + description = "Access CVT record details") + public Response loadCVT( + @QueryParam("table") + String tableId, + @QueryParam("snapshot") + String snapshotId, + @QueryParam("record") + String record + ) + { + CVT cvt = getCVT(tableId); + Object o = cvt.getSwapHandler().loadContent(record); + return Response.ok(o).build(); + } + + + @GET @Path("registry/keys") @Produces("application/json") @RsComment( @@ -159,7 +182,7 @@ converted ); - Gson gson = GsonFactory.createInstance(); + Gson gson = GsonFactory.createInstance(); //Type mapType = new TypeToken<List<Map<String, String>>>() {}.getType(); String json = gson.toJson(jsonModel); return Response.ok(json).type("application/json").build(); Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/SwapHandler.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/SwapHandler.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/SwapHandler.java 2009-09-09 13:54:53 UTC (rev 834) @@ -60,4 +60,12 @@ * @return true if the snapshot can be loaded */ boolean maintains(String snapshotId); + + /** + * Load record contents + * + * @param recordId + * @return a content represenation + */ + Object loadContent(String recordId); } Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/NoopSwapHandler.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/NoopSwapHandler.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/NoopSwapHandler.java 2009-09-09 13:54:53 UTC (rev 834) @@ -50,4 +50,10 @@ { return false; // stateless } + + + public Object loadContent(String recordId) + { + return null; + } } Modified: sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java =================================================================== --- sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-09 12:25:04 UTC (rev 833) +++ sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-09 13:54:53 UTC (rev 834) @@ -25,7 +25,6 @@ import org.jboss.sam.cvt.SwapHandler; import java.util.LinkedList; -import java.util.List; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -37,6 +36,14 @@ private final static int MAX_SNAPSHOTS = 50; + private TwitterStatus status; + + + public InMemorySwapHandler() + { + this.status = new TwitterStatus(); + } + public void store(CVTSnapshot snapshot) { synchronized(buffer) @@ -83,4 +90,10 @@ { return internalLoad(snapshotId, false)!=null; } + + public Object loadContent(String recordId) + { + // doesn't require the snapshotId + return status.load(recordId); + } } Added: sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterStatus.java =================================================================== --- sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterStatus.java (rev 0) +++ sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterStatus.java 2009-09-09 13:54:53 UTC (rev 834) @@ -0,0 +1,60 @@ +/* + * 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.sam.examples.twitter; + +import twitter4j.Twitter; +import twitter4j.Status; +import twitter4j.TwitterException; +import org.jboss.logging.Logger; + +/** + * Simple helper to fetch tweets. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class TwitterStatus +{ + private final static Logger log = Logger.getLogger(TwitterStatus.class); + + private Twitter twitter; + + public TwitterStatus() + { + this.twitter = new Twitter("hlan", "sam2000"); + } + + public String load(String id) + { + String text = ""; + try + { + Status st = twitter.show(Long.valueOf(id)); + text = st.getText(); + } + catch (TwitterException e) + { + log.error("Failed to retrieve status", e); + } + + return text; + } +}

14 years, 7 months

1
0
0 / 0

Overlord SVN: r833 - in sam/trunk: console/gui/war/src/main/java/org/jboss/bpm/console/client and 4 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-09 08:25:04 -0400 (Wed, 09 Sep 2009) New Revision: 833 Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/blue.png sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/green.png sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/red.png sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/yellow.png sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images/red.png Modified: sam/trunk/SAMM.iws sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css Log: CVT update status image Modified: sam/trunk/SAMM.iws =================================================================== --- sam/trunk/SAMM.iws 2009-09-09 11:02:09 UTC (rev 832) +++ sam/trunk/SAMM.iws 2009-09-09 12:25:04 UTC (rev 833) @@ -184,17 +184,7 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="CVTView.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="117" column="32" selection-start="3673" selection-end="3673" vertical-scroll-proportion="0.71929824"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -1097,186 +1087,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAMM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> - </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$/console/gui/war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/gui/war/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/org/jboss/bpm/console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAMM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> - </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$/console/gui/war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/gui/war/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/org/jboss/bpm/console/public" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAMM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> - </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$/console/gui/war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/gui/war/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/org/jboss/bpm/console/public" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="SAMM.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> - </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$/console/gui/war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/gui/war/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1711,13 +1521,13 @@ </component> <component name="ToolWindowManager"> <frame x="301" y="30" width="1371" height="1002" extended-state="0" /> - <editor active="true" /> + <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.32922825" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="14" /> <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.3517398" order="0" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3517398" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.41878453" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24432677" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908458" order="9" /> @@ -1821,29 +1631,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/sam/examples/twitter/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="71" selection-start="1581" selection-end="1581" vertical-scroll-proportion="0.64761907"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/resources/iran-tweets.drl"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="48" column="16" selection-start="1712" selection-end="1712" vertical-scroll-proportion="0.53333336"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java"> <provider selected="true" editor-type-id="text-editor"> <state line="271" column="4" selection-start="7922" selection-end="7922" vertical-scroll-proportion="0.2761905"> @@ -1879,55 +1666,74 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="32" selection-start="502" selection-end="502" vertical-scroll-proportion="0.6175439"> + <state line="30" column="6" selection-start="1274" selection-end="1274" vertical-scroll-proportion="0.1497076"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="33" selection-start="1692" selection-end="1692" vertical-scroll-proportion="0.39298245"> + <state line="130" column="75" selection-start="4122" selection-end="4184" vertical-scroll-proportion="0.6952381"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images/red.png"> + <provider selected="true" editor-type-id="images"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images/loading.gif"> + <provider selected="true" editor-type-id="images"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="6" selection-start="1274" selection-end="1274" vertical-scroll-proportion="0.1497076"> - <folding /> + <state line="98" column="0" selection-start="3153" selection-end="3153" vertical-scroll-proportion="0.12631579"> + <folding> + <element signature="class#2531:3045" expanded="false" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="130" column="75" selection-start="4122" selection-end="4184" vertical-scroll-proportion="0.6952381"> + <state line="43" column="35" selection-start="1640" selection-end="1640" vertical-scroll-proportion="0.28070176"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="118" column="74" selection-start="2994" selection-end="2994" vertical-scroll-proportion="0.64444447"> + <state line="134" column="48" selection-start="3283" selection-end="3283" vertical-scroll-proportion="0.7380117"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="83" column="52" selection-start="2632" selection-end="2632" vertical-scroll-proportion="0.5239766"> + <state line="49" column="14" selection-start="1879" selection-end="1879" vertical-scroll-proportion="0.2857143"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> <provider selected="true" editor-type-id="text-editor"> - <state line="117" column="32" selection-start="3673" selection-end="3673" vertical-scroll-proportion="0.71929824"> + <state line="35" column="43" selection-start="502" selection-end="502" vertical-scroll-proportion="0.65497077"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="117" column="47" selection-start="4269" selection-end="4269" vertical-scroll-proportion="0.53333336"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-09-09 11:02:09 UTC (rev 832) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-09-09 12:25:04 UTC (rev 833) @@ -82,13 +82,13 @@ LayoutPanel loadingImageContainer = new LayoutPanel(); loadingImageContainer.setStyleName("bpm-loading-image"); - ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class); loadingImage = new Image("images/ajax-loader.gif"); loadingImageContainer.add(loadingImage); - + setLoading(false); // account info + ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class); Image img = icons.userIcon().createImage(); img.addClickListener( new ClickListener() Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java 2009-09-09 11:02:09 UTC (rev 832) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java 2009-09-09 12:25:04 UTC (rev 833) @@ -125,6 +125,23 @@ AbstractImagePrototype deploymentIcon(); /** + * @gwt.resource red.png + */ + AbstractImagePrototype redIcon(); + + /** + * @gwt.resource green.png + */ + AbstractImagePrototype greenIcon(); + /** + * @gwt.resource yellow.png + */ + AbstractImagePrototype yellowIcon(); + /** + * @gwt.resource blue.png + */ + AbstractImagePrototype blueIcon(); + /** * @gwt.resource jobs.png */ AbstractImagePrototype jobsIcon(); Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/blue.png =================================================================== (Binary files differ) Property changes on: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/blue.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/green.png =================================================================== (Binary files differ) Property changes on: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/green.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/red.png =================================================================== (Binary files differ) Property changes on: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/red.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/yellow.png =================================================================== (Binary files differ) Property changes on: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/yellow.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-09 11:02:09 UTC (rev 832) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-09 12:25:04 UTC (rev 833) @@ -66,7 +66,6 @@ this.tableName = tableName; } - public boolean isInitialized() { return this.initialzed; @@ -98,15 +97,14 @@ this.add(chart, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); chart.update(); - this.add(new Label("Current Events")); - - this.currentValues = new ValueTable(); + this.currentValues = new ValueTable("Current Events"); this.add(currentValues, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); this.history = new HistoryView(); controller.addView(HistoryView.ID, this.history); this.initialzed = true; + currentValues.highlight(); } } Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-09 11:02:09 UTC (rev 832) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-09 12:25:04 UTC (rev 833) @@ -45,7 +45,7 @@ { super(); - this.valueTable = new ValueTable(); + this.valueTable = new ValueTable("Past events"); this.add(valueTable); this.window = createSnapshotWindow(); @@ -55,9 +55,9 @@ * The 'layout' window panel. */ private WindowPanel createSnapshotWindow() { - WindowPanel window = new WindowPanel("Past events"); + WindowPanel window = new WindowPanel(); window.setAnimationEnabled(true); - window.setSize("320px", "180px"); + window.setSize("320px", "180px"); LayoutPanel panel = new LayoutPanel(); Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-09 11:02:09 UTC (rev 832) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-09 12:25:04 UTC (rev 833) @@ -25,6 +25,7 @@ import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.Label; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; @@ -46,19 +47,23 @@ private Image reload; - public ValueTable() + public ValueTable(String title) { super(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + LayoutPanel imgContainer = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); + imgContainer.setHeight("16px"); + ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class); - reload = icons.reloadIcon().createImage(); - this.add(reload); + reload = icons.redIcon().createImage(); + imgContainer.add(new Label(title)); + imgContainer.add(reload); + this.add(imgContainer); this.listBox = createListBox(); this.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - - reload.setVisibleRect(-50,-50,32,32); + } public String getSnapshotId() @@ -87,13 +92,14 @@ public void highlight() { - reload.setVisibleRect(0,0,32,32); + + reload.setVisible(true); Timer t = new Timer() { public void run() { - reload.setVisibleRect(-50,-50,32,32); + reload.setVisible(false); } }; t.schedule(500); Modified: sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-09-09 11:02:09 UTC (rev 832) +++ sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-09-09 12:25:04 UTC (rev 833) @@ -3,6 +3,14 @@ background-color:#FFFFCC; } +.cvt-img-container +{ + background-color:#ffffff; + width:16px; + height:16px; + border: green 1px solid; +} + .bpm-layout { border: 1px solid green; margin: 10px; Added: sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images/red.png =================================================================== (Binary files differ) Property changes on: sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images/red.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

14 years, 7 months

1
0
0 / 0

Overlord SVN: r832 - in sam/trunk: console/gui/war/src/main/java/org/jboss/bpm/console/client/sam and 6 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-09-09 07:02:09 -0400 (Wed, 09 Sep 2009) New Revision: 832 Modified: sam/trunk/SAMM.iws sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css sam/trunk/pom.xml sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVTSnapshot.java sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java sam/trunk/sam/examples/twitter/pom.xml sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java Log: Fix cvt references. Identify point2cvt reference visually Modified: sam/trunk/SAMM.iws =================================================================== --- sam/trunk/SAMM.iws 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/SAMM.iws 2009-09-09 11:02:09 UTC (rev 832) @@ -87,7 +87,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <breakpoint url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java" line="78" class="org.jboss.sam.examples.twitter.InMemorySwapHandler" package="org.jboss.sam.examples.twitter"> + <breakpoint url="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java" line="105" class="org.jboss.bpm.console.server.CVTFacade" package="org.jboss.bpm.console.server"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -100,7 +100,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java" line="87" class="org.jboss.sam.cvt.internal.DefaultCVT" package="org.jboss.sam.cvt.internal"> + <breakpoint url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java" line="45" class="org.jboss.sam.examples.twitter.InMemorySwapHandler" package="org.jboss.sam.examples.twitter"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -113,19 +113,6 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java" line="41" class="org.jboss.sam.examples.twitter.InMemorySwapHandler" package="org.jboss.sam.examples.twitter"> - <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> @@ -198,33 +185,15 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="DefaultCVT.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java"> + <file leaf-file-name="CVTView.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="0" selection-start="2100" selection-end="2100" vertical-scroll-proportion="0.18789408"> + <state line="117" column="32" selection-start="3673" selection-end="3673" vertical-scroll-proportion="0.71929824"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="CVTOutput.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="68" column="0" selection-start="1962" selection-end="1962" vertical-scroll-proportion="0.5049505"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InMemorySwapHandler.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="8" selection-start="1634" selection-end="1634" vertical-scroll-proportion="0.19059406"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -455,6 +424,10 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/examples/twitter/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/examples/twitter/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1124,6 +1097,186 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </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$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </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$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/org/jboss/bpm/console/public" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </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$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/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$/console/gui/war/src/main/resources/org/jboss/bpm/console/public" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/images" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </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$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/gui/war/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1557,16 +1710,16 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="328" y="41" width="1313" height="955" extended-state="0" /> + <frame x="301" y="30" width="1371" height="1002" 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.32922825" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="14" /> <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.36787975" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31934732" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24451666" order="1" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3517398" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.41878453" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24432677" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908458" order="9" /> <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="6" /> @@ -1578,7 +1731,7 @@ <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24691358" 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="5" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3951049" order="4" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39116022" 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="13" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -1668,121 +1821,113 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java"> + <entry file="file://$PROJECT_DIR$/sam/examples/twitter/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="52" column="67" selection-start="1685" selection-end="1750" vertical-scroll-proportion="0.57054454"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="190" column="15" selection-start="4982" selection-end="5518" vertical-scroll-proportion="0.7667087"> + <state line="53" column="71" selection-start="1581" selection-end="1581" vertical-scroll-proportion="0.64761907"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterNavigation.java"> + <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/resources/iran-tweets.drl"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="6" selection-start="1381" selection-end="1381" vertical-scroll-proportion="0.15841584"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTParser.java"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="17" selection-start="2536" selection-end="2536" vertical-scroll-proportion="0.9079445"> + <state line="48" column="16" selection-start="1712" selection-end="1712" vertical-scroll-proportion="0.53333336"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="0" selection-start="1313" selection-end="1313" vertical-scroll-proportion="0.33663365"> + <state line="271" column="4" selection-start="7922" selection-end="7922" vertical-scroll-proportion="0.2761905"> <folding /> </state> </provider> </entry> - <entry file="jar:///Users/hbraun/.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/org/jboss/resteasy/core/MethodInjectorImpl.class"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="18" column="0" selection-start="1001" selection-end="1001" vertical-scroll-proportion="0.60850114"> + <state line="49" column="43" selection-start="1717" selection-end="1717" vertical-scroll-proportion="0.17660819"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="13" selection-start="1295" selection-end="1295" vertical-scroll-proportion="0.23762377"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="117" column="47" selection-start="3260" selection-end="3260" vertical-scroll-proportion="0.85730994"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CurrentSnapshotAction.java"> + <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="1453" selection-end="1453" vertical-scroll-proportion="0.15841584"> + <state line="48" column="69" selection-start="1625" selection-end="1625" vertical-scroll-proportion="0.44912282"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadSnapshotAction.java"> + <entry file="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="37" selection-start="1731" selection-end="1731" vertical-scroll-proportion="0.2522068"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="100" column="50" selection-start="3005" selection-end="3005" vertical-scroll-proportion="1.0666667"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="13" selection-start="1819" selection-end="1819" vertical-scroll-proportion="-0.37623763"> + <state line="33" column="32" selection-start="502" selection-end="502" vertical-scroll-proportion="0.6175439"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="108" column="42" selection-start="3534" selection-end="3534" vertical-scroll-proportion="0.9079445"> - <folding> - <element signature="class#2936:3425" expanded="false" /> - </folding> + <state line="47" column="33" selection-start="1692" selection-end="1692" vertical-scroll-proportion="0.39298245"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="113" column="15" selection-start="3390" selection-end="3390" vertical-scroll-proportion="0.5940594"> + <state line="30" column="6" selection-start="1274" selection-end="1274" vertical-scroll-proportion="0.1497076"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="68" column="0" selection-start="1962" selection-end="1962" vertical-scroll-proportion="0.5049505"> + <state line="130" column="75" selection-start="4122" selection-end="4184" vertical-scroll-proportion="0.6952381"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="0" selection-start="2100" selection-end="2100" vertical-scroll-proportion="0.18789408"> + <state line="118" column="74" selection-start="2994" selection-end="2994" vertical-scroll-proportion="0.64444447"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="8" selection-start="1634" selection-end="1634" vertical-scroll-proportion="0.19059406"> + <state line="83" column="52" selection-start="2632" selection-end="2632" vertical-scroll-proportion="0.5239766"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="117" column="32" selection-start="3673" selection-end="3673" vertical-scroll-proportion="0.71929824"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-09 11:02:09 UTC (rev 832) @@ -23,17 +23,16 @@ import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.WindowCloseListener; import com.googlecode.gchart.client.GChart; import com.mvc4g.client.Controller; -import com.mvc4g.client.ViewInterface; import com.mvc4g.client.Event; +import com.mvc4g.client.ViewInterface; import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; import org.gwt.mosaic.ui.client.layout.LayoutPanel; -import org.gwt.mosaic.ui.client.WindowPanel; -import org.jboss.bpm.console.client.util.ConsoleLog; +import org.gwt.mosaic.ui.client.Label; import org.jboss.bpm.console.client.LazyPanel; +import org.jboss.bpm.console.client.util.ConsoleLog; import java.util.HashMap; import java.util.List; @@ -49,7 +48,7 @@ private Controller controller = null; - private ValueTable valueTable= null; + private ValueTable currentValues = null; private CVTChart chart; private int numSamples = 0; @@ -57,8 +56,6 @@ private Map<Double, String> point2snapshot = new HashMap<Double,String>(); private String tableName; - private WindowPanel window; - private HistoryView history; private boolean initialzed; @@ -101,12 +98,13 @@ this.add(chart, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); chart.update(); - this.valueTable = new ValueTable(); - this.add(valueTable, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + this.add(new Label("Current Events")); + this.currentValues = new ValueTable(); + this.add(currentValues, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + this.history = new HistoryView(); - controller.addView(HistoryView.ID, this.history); - createSnapshotWindow(this.history); + controller.addView(HistoryView.ID, this.history); this.initialzed = true; } @@ -114,46 +112,19 @@ private void displaySnapshot(String sid) { - if(sid!=valueTable.getSnapshotId()) // not recent one + if(sid.equals(currentValues.getSnapshotId())) // not recent one { - controller.handleEvent( - new Event(LoadSnapshotAction.ID, new LoadEvent(tableName, sid)) - ); - - window.center(); + ConsoleLog.debug("Skip current snapshot"); + currentValues.highlight(); } else { - ConsoleLog.debug("Skip current snapshot"); + controller.handleEvent( + new Event(LoadSnapshotAction.ID, new LoadEvent(tableName, sid)) + ); } } - /** - * The 'layout' window panel. - */ - private void createSnapshotWindow(HistoryView history) { - window = new WindowPanel("Past events"); - window.setAnimationEnabled(true); - window.setSize("320px", "180px"); - - LayoutPanel panel = new LayoutPanel(); - - panel.add(history); - - window.setWidget(panel); - - window.addWindowCloseListener(new WindowCloseListener() { - public void onWindowClosed() { - //window = null; - } - - public String onWindowClosing() { - return null; - } - }); - } - - public void setController(Controller controller) { this.controller = controller; @@ -187,7 +158,7 @@ private void updateListBox(String snapshotId, List<List<String>> results) { - valueTable.update(snapshotId, results); + currentValues.update(snapshotId, results); } } Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-09 11:02:09 UTC (rev 832) @@ -23,7 +23,9 @@ import com.mvc4g.client.ViewInterface; import com.mvc4g.client.Controller; +import com.google.gwt.user.client.WindowCloseListener; import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.WindowPanel; import java.util.List; @@ -37,14 +39,45 @@ private ValueTable valueTable; private Controller controller; + private WindowPanel window; + public HistoryView() { super(); this.valueTable = new ValueTable(); this.add(valueTable); + this.window = createSnapshotWindow(); + } + /** + * The 'layout' window panel. + */ + private WindowPanel createSnapshotWindow() { + WindowPanel window = new WindowPanel("Past events"); + window.setAnimationEnabled(true); + window.setSize("320px", "180px"); + + LayoutPanel panel = new LayoutPanel(); + + panel.add(this); + + window.setWidget(panel); + + window.addWindowCloseListener(new WindowCloseListener() { + public void onWindowClosed() { + //window = null; + } + + public String onWindowClosing() { + return null; + } + }); + + return window; + } + public void setController(Controller controller) { this.controller = controller; @@ -52,6 +85,7 @@ public void update(String snapshotId, List<List<String>> results) { - this.valueTable.update(snapshotId, results); + this.valueTable.update(snapshotId, results); + window.show(); } } Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-09 11:02:09 UTC (rev 832) @@ -22,13 +22,19 @@ package org.jboss.bpm.console.client.sam; import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import java.util.List; import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.Timer; +import com.google.gwt.core.client.GWT; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -38,18 +44,28 @@ private ListBox listBox = null; private String snapshotId; + private Image reload; + public ValueTable() { - super(); + super(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + + ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class); + reload = icons.reloadIcon().createImage(); + this.add(reload); + + this.listBox = createListBox(); - this.add(listBox); + this.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + reload.setVisibleRect(-50,-50,32,32); } public String getSnapshotId() { return snapshotId; } - + public void update(String snapshotId, List<List<String>> results) { this.snapshotId = snapshotId; @@ -64,8 +80,25 @@ { model.add(row); } + + // highlight + highlight(); } + public void highlight() + { + reload.setVisibleRect(0,0,32,32); + Timer t = new Timer() + { + + public void run() + { + reload.setVisibleRect(-50,-50,32,32); + } + }; + t.schedule(500); + } + private ListBox createListBox() { final ListBox<List<String>> listBox = Modified: sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/console/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-09-09 11:02:09 UTC (rev 832) @@ -1,3 +1,7 @@ +.cvt-highlight +{ + background-color:#FFFFCC; +} .bpm-layout { border: 1px solid green; Modified: sam/trunk/pom.xml =================================================================== --- sam/trunk/pom.xml 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/pom.xml 2009-09-09 11:02:09 UTC (rev 832) @@ -19,7 +19,7 @@  <properties> - + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  <surefire.security.args></surefire.security.args> <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java 2009-09-09 11:02:09 UTC (rev 832) @@ -37,7 +37,7 @@ * when the table is updated. The default SwapHandler implementation purges all records. * * @see org.jboss.sam.cvt.internal.NoopSwapHandler - * + * * @author Heiko.Braun <heiko.braun(a)jboss.com> */ public class DefaultCVT implements CVT @@ -46,6 +46,8 @@ private List<Map<String,Object>> table = new ArrayList<Map<String,Object>>(); + private Object lock = new Object(); + private String[] columns; private String name; @@ -61,23 +63,33 @@ public void swap() { - synchronized(table) + synchronized(lock) { - swapHandler.store(snapshot()); + CVTSnapshot tmp = snapshot(); + if(!swapHandler.maintains(tmp.getSnapshotId())) + { + log.debug("Storing " + tmp.getSnapshotId()); + swapHandler.store(tmp); + } + else + { + log.warn("SwapHandler already maintains " +tmp.getSnapshotId()); + } } } public void clear() { - synchronized(table) + synchronized(lock) { - this.table.clear(); + this.table = new ArrayList<Map<String,Object>>(); // avoid references into SwapHandler + this.currentSnapshot = null; // invalidate snapshot anf roce re-creation } } public int size() { - synchronized(table) + synchronized(lock) { return table.size(); } @@ -85,10 +97,11 @@ public void update(EventMessage[] events) { - synchronized(table) + synchronized(lock) { - clear(); - currentSnapshot = null; // invalidate snapshot + log.debug("Update "+this.name+": " +events.length + " new records"); + + clear(); for(EventMessage event : events) { @@ -104,13 +117,18 @@ public CVTSnapshot snapshot() { - synchronized(table) + synchronized(lock) { if(null==currentSnapshot) // create once and assign reference ID { - List<Map<String, Object>> list = Collections.unmodifiableList(table); - currentSnapshot = new DefaultCVTSnapshot(UUID.randomUUID().toString(), list); + String id = UUID.randomUUID().toString(); + log.debug("Creating new snapshot: " +id); + currentSnapshot = new DefaultCVTSnapshot(id, Collections.unmodifiableList(table)); } + else + { + log.debug("Re-using existing snapshot: "+currentSnapshot.getSnapshotId()); + } return currentSnapshot; } } @@ -128,37 +146,37 @@ public void dump(PrintStream out) { - synchronized(table) + CVTSnapshot tmp = snapshot(); + + int i=1; + Iterator<Map<String,Object>> iterator = tmp.getTable().iterator(); + StringBuffer sb = new StringBuffer(); + sb.append("[").append(name).append("]\n"); + sb.append("-----------\n"); + while(iterator.hasNext()) { - int i=1; - Iterator<Map<String,Object>> iterator = table.iterator(); - StringBuffer sb = new StringBuffer(); - sb.append("[").append(name).append("]\n"); - sb.append("-----------\n"); - while(iterator.hasNext()) + Map row = iterator.next(); + + sb.append(i).append("\t\t"); + for(String s : columns) { - Map row = iterator.next(); + sb.append(row.get(s)).append("\t\t\t"); + } - sb.append(i).append("\t\t"); - for(String s : columns) - { - sb.append(row.get(s)).append("\t\t\t"); - } + sb.append("\n"); + i++; + } + sb.append("-----------\n"); - sb.append("\n"); - i++; - } - sb.append("-----------\n"); + try + { + out.write(sb.toString().getBytes()); + } + catch (IOException e) + { + // + } - try - { - out.write(sb.toString().getBytes()); - } - catch (IOException e) - { - // - } - } } public String getName() Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVTSnapshot.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVTSnapshot.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVTSnapshot.java 2009-09-09 11:02:09 UTC (rev 832) @@ -31,18 +31,18 @@ */ public final class DefaultCVTSnapshot implements CVTSnapshot { - private String refId; + private String snapshotId; private List<Map<String,Object>> table; - public DefaultCVTSnapshot(String refId, List<Map<String, Object>> table) + public DefaultCVTSnapshot(String snapshotId, List<Map<String, Object>> table) { - this.refId = refId; + this.snapshotId = snapshotId; this.table = table; } public String getSnapshotId() { - return refId; + return snapshotId; } public List<Map<String, Object>> getTable() Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/drools/DroolsEventProcessorImpl.java 2009-09-09 11:02:09 UTC (rev 832) @@ -36,6 +36,7 @@ import org.drools.runtime.rule.WorkingMemoryEntryPoint; import org.jboss.sam.*; import org.jboss.sam.datasource.DataSourceManager; +import org.jboss.logging.Logger; import java.io.InputStream; import java.util.Iterator; @@ -49,6 +50,9 @@ public class DroolsEventProcessorImpl implements EventProcessor<KnowledgeBase>, Globals { + + private final static Logger log = Logger.getLogger(DroolsEventProcessorImpl.class); + private String name; private ActivityMonitor runtime; private boolean started; @@ -67,8 +71,6 @@ KnowledgeBaseConfiguration conf = KnowledgeBaseFactory.newKnowledgeBaseConfiguration(); conf.setOption( EventProcessingOption.STREAM ); this.kbase = KnowledgeBaseFactory.newKnowledgeBase(conf); - - //System.out.println("1. Created kbase"); } private StatefulKnowledgeSession getSession() @@ -85,15 +87,12 @@ if(enableRuntimeLogger) KnowledgeRuntimeLoggerFactory.newConsoleLogger(session); - //System.out.println("3. Created session"); - - System.out.println("Known entry-points:"); for(WorkingMemoryEntryPoint entryPoint : session.getWorkingMemoryEntryPoints()) { if(entryPoint instanceof NamedEntryPoint) { NamedEntryPoint nep = (NamedEntryPoint)entryPoint; - System.out.println("-> " + nep.getEntryPoint().getEntryPointId()); + log.debug("Entry-point: " + nep.getEntryPoint().getEntryPointId()); } } @@ -270,8 +269,6 @@ } this.kbase.addKnowledgePackages(builder.getKnowledgePackages()); - //System.out.println("2. Build packages"); - // ----------------------- DroolsProcessingStatement stmt = Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/internal/stream/InVMDispatcher.java 2009-09-09 11:02:09 UTC (rev 832) @@ -22,12 +22,15 @@ package org.jboss.sam.internal.stream; import org.jboss.sam.StreamInputCallback; +import org.jboss.logging.Logger; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ public class InVMDispatcher { + private final static Logger log = Logger.getLogger(InVMDispatcher.class); + public final static String DEFAULT_CHANNEL_NAME = "InVM-Channel"; private InVMStreamRegistry channelRegistry; @@ -43,7 +46,7 @@ public void dispatch(Object event) { if(channelRegistry.getChannelCallbackSize()==0) - System.out.println("WARN: There a no callbacks registered with InVMDispatcher '" +this.streamName+"'"); + log.warn("There are no callbacks registered with InVMDispatcher '" +this.streamName+"'"); for (StreamInputCallback callback : channelRegistry.getChannelCallbacks(streamName)) { Modified: sam/trunk/sam/examples/twitter/pom.xml =================================================================== --- sam/trunk/sam/examples/twitter/pom.xml 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/sam/examples/twitter/pom.xml 2009-09-09 11:02:09 UTC (rev 832) @@ -30,6 +30,12 @@ <version>${version}</version> </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java =================================================================== --- sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-09 11:02:09 UTC (rev 832) @@ -32,23 +32,23 @@ */ public class InMemorySwapHandler implements SwapHandler { + + private LinkedList<CVTSnapshot> buffer = new LinkedList<CVTSnapshot>(); - private List<CVTSnapshot> snapshots = new LinkedList<CVTSnapshot>(); - private final static int MAX_SNAPSHOTS = 50; public void store(CVTSnapshot snapshot) { - synchronized(snapshots) + synchronized(buffer) { - if(snapshots.size()<MAX_SNAPSHOTS) + if(buffer.size()<MAX_SNAPSHOTS) { - snapshots.add(snapshot); + buffer.addLast(snapshot); } else { - snapshots.remove(0); // first is the oldest - snapshots.add(snapshot); + buffer.removeFirst(); // first is the oldest + buffer.addLast(snapshot); } } } @@ -58,14 +58,14 @@ return internalLoad(snapshotId, true); } - public CVTSnapshot internalLoad(String snapshotId, boolean failfast) + private CVTSnapshot internalLoad(String id, boolean failfast) { CVTSnapshot match = null; - synchronized(snapshots) + synchronized(buffer) { - for(CVTSnapshot snapshot : snapshots) + for(CVTSnapshot snapshot : buffer) { - if(snapshotId.equals(snapshot.getSnapshotId())) + if(id.equals(snapshot.getSnapshotId())) { match = snapshot; break; @@ -74,7 +74,7 @@ } if(null==match && failfast) - throw new RuntimeException("No snapshot with id "+snapshotId); + throw new RuntimeException("No snapshot with id "+id); return match; } Modified: sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java =================================================================== --- sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java 2009-09-08 15:49:14 UTC (rev 831) +++ sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java 2009-09-09 11:02:09 UTC (rev 832) @@ -23,6 +23,7 @@ import org.jboss.sam.StreamInput; import org.jboss.sam.StreamInputCallback; +import org.jboss.logging.Logger; import twitter4j.*; import java.util.ArrayList; @@ -34,6 +35,8 @@ public class SearchInput implements StreamInput { + private final static Logger log = Logger.getLogger(SearchInput.class); + // pull interval in seconds // (remeber there is a 150 hits per hour limit on twitter search) private int interval = 30; @@ -68,7 +71,7 @@ public void run() { - System.out.println("Started search watchdog"); + log.info("Started search watchdog"); while(keepRunning) { @@ -87,13 +90,13 @@ } catch (TwitterException e) { - System.out.println("Query failed: " +e.getMessage()); + log.warn("Query failed: " +e.getMessage()); result = null; } if(result!=null) { - System.out.println("Search results: " + result.getTweets().size()); + log.debug("Search results: " + result.getTweets().size()); for(StreamInputCallback callback : callbacks) { @@ -104,7 +107,7 @@ } catch (Throwable e) { - System.out.println("Failed to notify listener: "+e.getMessage()); + log.error("Failed to notify listener: "+e.getMessage(), e); } } @@ -128,7 +131,7 @@ } } - System.out.println("Shutdown search watchdog"); + log.info("Shutdown search watchdog"); } }

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

overlord-commits September 2009