[overlord-commits] Overlord SVN: r869 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/model and 3 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-10-30 10:43:24 -0400 (Fri, 30 Oct 2009) New Revision: 869 Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java 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/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java Log: Replace JSOParser with overlay times to improve performance Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-10-30 12:57:18 UTC (rev 868) +++ bpm-console/trunk/BPMC.iws 2009-10-30 14:43:24 UTC (rev 869) @@ -131,6 +131,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/model/JSOParser.java" line="82" class="org.jboss.bpm.console.client.model.JSOParser" package="org.jboss.bpm.console.client.model"> + <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> @@ -204,38 +217,104 @@ <component name="FileColors" enabled="false" enabledForTabs="false" /> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="RenderReportAction.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> + <file leaf-file-name="ReportView.java" pinned="false" current="false" current-in-tab="false"> + <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="113" column="48" selection-start="4124" selection-end="4124" vertical-scroll-proportion="0.6233933"> + <state line="100" column="21" selection-start="3132" selection-end="3132" vertical-scroll-proportion="0.8136247"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="BirtService.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java"> + <file leaf-file-name="ReportLaunchPadView.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="74" selection-start="3792" selection-end="3792" vertical-scroll-proportion="0.79948586"> + <state line="95" column="71" selection-start="3790" selection-end="3790" vertical-scroll-proportion="0.5385604"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="DTOParser.java" pinned="false" current="false" current-in-tab="false"> + <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="195" column="20" selection-start="4849" selection-end="6223" vertical-scroll-proportion="0.93830335"> <folding> + <element signature="method#parseTaskReferenceList#0;class#DTOParser#0" expanded="false" /> + <element signature="method#parseTaskReference#0;class#DTOParser#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="UpdateSearchDefinitionsAction.java" pinned="false" current="false" current-in-tab="false"> + <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="67" column="4" selection-start="2390" selection-end="2390" vertical-scroll-proportion="0.69922876"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="JSOParser.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="82" column="0" selection-start="2829" selection-end="2829" vertical-scroll-proportion="0.4552333"> + <folding> <element signature="imports" expanded="true" /> - <element signature="method#create#0;class#BirtService#0" expanded="false" /> - <element signature="method#loadReports#0;class#BirtService#0" expanded="false" /> - <element signature="method#extractParameterMetaData#0;class#BirtService#0" expanded="false" /> + <element signature="method#parseProcessDefinition#0;class#JSOParser#0" expanded="false" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ReportReference.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java"> + <file leaf-file-name="UpdateInstanceDataAction.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/UpdateInstanceDataAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="82" column="66" selection-start="2160" selection-end="2160" vertical-scroll-proportion="0.69922876"> + <state line="35" column="13" selection-start="1532" selection-end="1532" vertical-scroll-proportion="0.16452442"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="UpdateInstancesAction.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/UpdateInstancesAction.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="57" column="46" selection-start="2304" selection-end="2304" vertical-scroll-proportion="0.38303342"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="JSOModel.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/JSOModel.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="131" column="8" selection-start="3898" selection-end="3898" vertical-scroll-proportion="0.6368222"> + <folding> + <element signature="imports" expanded="true" /> + </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="94" column="0" selection-start="3609" selection-end="3609" vertical-scroll-proportion="1.0758355"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Request.class" pinned="false" current="false" current-in-tab="false"> + <entry file="jar:///Users/hbraun/.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/com/google/gwt/http/client/Request.class"> + <provider selected="true" editor-type-id="text-editor"> + <state line="26" column="0" selection-start="1293" selection-end="1293" vertical-scroll-proportion="0.5141388"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -1094,7 +1173,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/report" /> + <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> @@ -1124,6 +1203,106 @@ <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/model" /> + <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_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/jmaki" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1194,7 +1373,7 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.server"> + <component name="RunManager" selected="Remote.GWT"> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -1424,16 +1603,16 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="342" y="38" width="1273" height="940" extended-state="0" /> + <frame x="311" y="54" width="1273" height="940" 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="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="false" weight="0.3398693" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3398693" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38434163" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22303921" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22303921" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" 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="7" /> @@ -1540,118 +1719,120 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/jmaki/xhp/xhp.json"> + <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="24" selection-start="350" selection-end="350" vertical-scroll-proportion="0.4869565"> - <folding /> + <state line="53" column="69" selection-start="2025" selection-end="2025" vertical-scroll-proportion="0.32647815"> + <folding> + <element signature="imports" expanded="true" /> + <element signature="method#create#0;class#BirtService#0" expanded="false" /> + <element signature="method#loadReports#0;class#BirtService#0" expanded="false" /> + <element signature="method#extractParameterMetaData#0;class#BirtService#0" expanded="false" /> + </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/report/UpdateReportConfigAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="279" column="25" selection-start="8210" selection-end="8210" vertical-scroll-proportion="0.44044945"> + <state line="75" column="12" selection-start="2729" selection-end="2729" vertical-scroll-proportion="0.8184111"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParamCallback.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="30" column="7" selection-start="1202" selection-end="1202" vertical-scroll-proportion="0.3478261"> + <state line="43" column="42" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.28791773"> <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/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="36" selection-start="1855" selection-end="1875" vertical-scroll-proportion="0.020565553"> + <state line="67" column="4" selection-start="2390" selection-end="2390" vertical-scroll-proportion="0.69922876"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.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="84" column="46" selection-start="2829" selection-end="2829" vertical-scroll-proportion="0.41488022"> - <folding /> + <state line="195" column="20" selection-start="4849" selection-end="6223" vertical-scroll-proportion="0.93830335"> + <folding> + <element signature="method#parseTaskReferenceList#0;class#DTOParser#0" expanded="false" /> + <element signature="method#parseTaskReference#0;class#DTOParser#0" expanded="false" /> + </folding> </state> </provider> </entry> - <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="99" column="26" selection-start="2551" selection-end="2551" vertical-scroll-proportion="1.3803132"> + <state line="95" column="71" selection-start="3790" selection-end="3790" vertical-scroll-proportion="0.5385604"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.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="154" column="18" selection-start="5870" selection-end="5870" vertical-scroll-proportion="1.0961969"> + <state line="100" column="21" selection-start="3132" selection-end="3132" vertical-scroll-proportion="0.8136247"> <folding /> </state> </provider> </entry> - <entry file="jar:///Users/hbraun/.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/javax/ws/rs/core/Response.class"> + <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="95" column="27" selection-start="4790" selection-end="4790" vertical-scroll-proportion="0.33290488"> + <state line="152" column="16" selection-start="3681" selection-end="3681" vertical-scroll-proportion="0.6771753"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/util/SimpleDateFormat.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="21" selection-start="5799" selection-end="5799" vertical-scroll-proportion="0.57941836"> + <state line="23" column="13" selection-start="854" selection-end="854" vertical-scroll-proportion="0.12105927"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDataAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="42" selection-start="1506" selection-end="1506" vertical-scroll-proportion="0.9350649"> + <state line="35" column="13" selection-start="1532" selection-end="1532" vertical-scroll-proportion="0.16452442"> <folding /> </state> </provider> </entry> - <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="173" column="0" selection-start="5270" selection-end="5270" vertical-scroll-proportion="0.33333334"> - <folding> - <element signature="method#initBirtService#0;class#ReportFacade#0" expanded="false" /> - <element signature="method#getImage#0;class#ReportFacade#0" expanded="false" /> - <element signature="method#defaultRenderMetaData#0;class#ReportFacade#0" expanded="false" /> - <element signature="method#buildImageUrl#0;class#ReportFacade#0" expanded="false" /> - <element signature="class#BirtInitException#0;class#ReportFacade#0" expanded="false" /> - </folding> + <state line="57" column="46" selection-start="2304" selection-end="2304" vertical-scroll-proportion="0.38303342"> + <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="jar:///Users/hbraun/.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/com/google/gwt/http/client/Request.class"> <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="26" column="0" selection-start="1293" selection-end="1293" vertical-scroll-proportion="0.5141388"> <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/common/AbstractRESTAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="113" column="48" selection-start="4124" selection-end="4124" vertical-scroll-proportion="0.6233933"> + <state line="94" column="0" selection-start="3609" selection-end="3609" vertical-scroll-proportion="1.0758355"> <folding /> </state> </provider> </entry> - <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="82" column="66" selection-start="2160" selection-end="2160" vertical-scroll-proportion="0.69922876"> - <folding /> + <state line="82" column="0" selection-start="2829" selection-end="2829" vertical-scroll-proportion="0.4552333"> + <folding> + <element signature="imports" expanded="true" /> + <element signature="method#parseProcessDefinition#0;class#JSOParser#0" expanded="false" /> + </folding> </state> </provider> </entry> - <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="74" selection-start="3792" selection-end="3792" vertical-scroll-proportion="0.79948586"> + <state line="131" column="8" selection-start="3898" selection-end="3898" vertical-scroll-proportion="0.6368222"> <folding> <element signature="imports" expanded="true" /> - <element signature="method#create#0;class#BirtService#0" expanded="false" /> - <element signature="method#loadReports#0;class#BirtService#0" expanded="false" /> - <element signature="method#extractParameterMetaData#0;class#BirtService#0" expanded="false" /> </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-10-30 12:57:18 UTC (rev 868) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-30 14:43:24 UTC (rev 869) @@ -35,58 +35,7 @@ * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ public class DTOParser -{ - public static List<ProcessDefinitionRef> parseProcessDefinitions(JSONValue jso) - { - List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>(); - - JSONArray arr = JSONWalk.on(jso).next("definitions").asArray(); - for(int i=0; i<arr.size(); i++) - { - results.add(parseProcessDefinition(arr.get(i))); - } - return results; - } - - public static ProcessDefinitionRef parseProcessDefinition(JSONValue root) - { - ConsoleLog.debug("parse " + root); - - String id = JSONWalk.on(root).next("id").asString(); - Long version = JSONWalk.on(root).next("version").asLong(); - String name = JSONWalk.on(root).next("name").asString(); - boolean isSuspended = JSONWalk.on(root).next("suspended").asBool(); - - JSONWalk.JSONWrapper dplIdJson = JSONWalk.on(root).next("deploymentId"); - String dplId = dplIdJson!=null ? dplIdJson.asString() : null; - - ProcessDefinitionRef ref = new ProcessDefinitionRef(id, name, version); - ref.setDeploymentId(dplId); - ref.setSuspended(isSuspended); - - JSONWalk.JSONWrapper pkg = JSONWalk.on(root).next("packageName"); - if(pkg !=null) - ref.setPackageName(pkg.asString()); - - // optional start form url - JSONWalk.JSONWrapper formUrl = JSONWalk.on(root).next("formUrl"); - if(formUrl !=null) - ref.setFormUrl(formUrl.asString()); - - // optional diagram url - JSONWalk.JSONWrapper diagramUrl = JSONWalk.on(root).next("diagramUrl"); - if(diagramUrl !=null) - ref.setDiagramUrl(diagramUrl.asString()); - - return ref; - } - - public static ProcessDefinitionRef parseProcessDefinition(String json) - { - JSONValue root = JSONParser.parse(json); - return parseProcessDefinition(root); - } - +{ public static List<TaskRef> parseTaskReferenceList(String json) { List<TaskRef> results = new ArrayList<TaskRef>(); Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java 2009-10-30 14:43:24 UTC (rev 869) @@ -0,0 +1,151 @@ +/* + * 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.model; + +import java.util.HashSet; +import java.util.Set; +import java.util.Date; + +import com.google.gwt.core.client.JavaScriptObject; +import com.google.gwt.core.client.JsArray; +import com.google.gwt.core.client.JsArrayString; +import org.jboss.bpm.console.client.util.SimpleDateFormat; + +/** + * Java overlay of a JavaScriptObject. + * Borrowed from Matt Raible: + * http://raibledesigns.com/rd/entry/json_parsing_with_javascript_overlay + */ +public abstract class JSOModel extends JavaScriptObject { + + // Overlay types always have protected, zero-arg constructors + protected JSOModel() { + } + + /** + * Create an empty instance. + * + * @return new Object + */ + public static native JSOModel create() /*-{ + return new Object(); + }-*/; + + /** + * Convert a JSON encoded string into a JSOModel instance. + * <p/> + * Expects a JSON string structured like '{"foo":"bar","number":123}' + * + * @return a populated JSOModel object + */ + public static native JSOModel fromJson(String jsonString) /*-{ + return eval('(' + jsonString + ')'); + }-*/; + + /** + * Convert a JSON encoded string into an array of JSOModel instance. + * <p/> + * Expects a JSON string structured like '[{"foo":"bar","number":123}, {...}]' + * + * @return a populated JsArray + */ + public static native JsArray<JSOModel> arrayFromJson(String jsonString) /*-{ + return eval('(' + jsonString + ')'); + }-*/; + + public final native boolean hasKey(String key) /*-{ + return this[key] != undefined; + }-*/; + + public final native JsArrayString keys() /*-{ + var a = new Array(); + for (var p in this) { a.push(p); } + return a; + }-*/; + + @Deprecated + public final Set<String> keySet() { + JsArrayString array = keys(); + Set<String> set = new HashSet<String>(); + for (int i = 0; i < array.length(); i++) { + set.add(array.get(i)); + } + return set; + } + + public final native String get(String key) /*-{ + return "" + this[key]; + }-*/; + + public final native String get(String key, String defaultValue) /*-{ + return this[key] ? ("" + this[key]) : defaultValue; + }-*/; + + public final native void set(String key, String value) /*-{ + this[key] = value; + }-*/; + + public final int getInt(String key) { + return Integer.parseInt(get(key)); + } + + public final boolean getBoolean(String key) { + return Boolean.parseBoolean(get(key)); + } + + public final native JSOModel getObject(String key) /*-{ + return this[key]; + }-*/; + + public final native JsArray<JSOModel> getArray(String key) /*-{ + return this[key] ? this[key] : new Array(); + }-*/; + + public final long getLong(String key) + { + return Long.valueOf(get(key)); + } + + public final Date getDate(String key) + { + Date result = null; + String value = get(key); + if(!isNull(value)) + { + SimpleDateFormat df = new SimpleDateFormat(); + result = df.parse(value); + } + + return result; + } + + public final Date getDate(String key, Date fallback) + { + Date date = getDate(key); + return date != null ? date : fallback; + } + + private final boolean isNull(String val) + { + return (val != null && "null".equals(val) || "undefined".equals(val)); + } +} Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java 2009-10-30 14:43:24 UTC (rev 869) @@ -0,0 +1,103 @@ +/* + * 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.model; + +import com.google.gwt.core.client.JsArray; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class JSOParser +{ + public static List<ProcessDefinitionRef> parseProcessDefinitions(String json) + { + List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>(); + JSOModel rootModel = JSOModel.fromJson(json); + + JsArray<JSOModel> definitions = rootModel.getArray("definitions"); + for(int i=0; i<definitions.length(); i++) + { + JSOModel def = definitions.get(i); + results.add(parseProcessDefinition(def)); + } + + return results; + } + + public static ProcessDefinitionRef parseProcessDefinition(JSOModel rootModel) + { + ProcessDefinitionRef def = new ProcessDefinitionRef(); + + def.setId(rootModel.get("id")); + def.setName(rootModel.get("name")); + def.setVersion(rootModel.getLong("version")); + def.setKey(rootModel.get("key")); + def.setDeploymentId(rootModel.get("deploymentId")); + def.setSuspended(rootModel.getBoolean("suspended")); + + return def; + } + + public static List<ProcessInstanceRef> parseProcessInstances(String json) + { + System.out.println(json); + List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>(); + JSOModel rootModel = JSOModel.fromJson(json); + + JsArray<JSOModel> instances = rootModel.getArray("instances"); + for(int i=0; i<instances.length(); i++) + { + results.add(parseProcessInstance(instances.get(i))); + } + return results; + } + + public static ProcessInstanceRef parseProcessInstance(JSOModel root) + { + String id = root.get("id"); + String definitionId = root.get("definitionId"); + Date start = root.getDate("startDate"); + Date end = root.getDate("endDate", null); + boolean suspended = root.getBoolean("suspended"); + + ProcessInstanceRef processInstance = new ProcessInstanceRef( + id, definitionId, + start, end, + suspended + ); + + // tokens + /*JSONWalk.JSONWrapper rootTokenJSON = JSONWalk.on(root).next("rootToken"); + if (rootTokenJSON != null) { + JSONObject tokJso = rootTokenJSON.asObject(); + + TokenReference rootToken = parseTokenReference(tokJso); + processInstance.setRootToken(rootToken); + } */ + + return processInstance; + } +} Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java 2009-10-30 12:57:18 UTC (rev 868) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java 2009-10-30 14:43:24 UTC (rev 869) @@ -23,13 +23,10 @@ import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.Response; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONValue; 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.common.AbstractRESTAction; -import org.jboss.bpm.console.client.model.DTOParser; +import org.jboss.bpm.console.client.model.JSOParser; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.util.ConsoleLog; @@ -67,11 +64,10 @@ DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID); if(view!=null) // may not be initialized (lazy) { - JSONValue json = JSONParser.parse(response.getText()); - List<ProcessDefinitionRef> definitions = DTOParser.parseProcessDefinitions(json); - + //JSONValue json = JSONParser.parse(response.getText()); + List<ProcessDefinitionRef> definitions = + JSOParser.parseProcessDefinitions(response.getText()); view.update(definitions); - ConsoleLog.info("Loaded " + definitions.size() + " process definitions in " +(System.currentTimeMillis()-start)+" ms"); } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java 2009-10-30 12:57:18 UTC (rev 868) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java 2009-10-30 14:43:24 UTC (rev 869) @@ -32,6 +32,7 @@ import org.jboss.bpm.console.client.model.DTOParser; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; +import org.jboss.bpm.console.client.model.JSOParser; import org.jboss.bpm.console.client.util.ConsoleLog; import java.util.List; @@ -68,9 +69,7 @@ final long start = System.currentTimeMillis(); final ProcessDefinitionRef def = (ProcessDefinitionRef)event; - JSONValue json = JSONParser.parse(response.getText()); - - List<ProcessInstanceRef> instances = DTOParser.parseProcessInstances(json); + List<ProcessInstanceRef> instances = JSOParser.parseProcessInstances(response.getText()); InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID); view.update(def, instances); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-30 12:57:18 UTC (rev 868) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-30 14:43:24 UTC (rev 869) @@ -97,11 +97,8 @@ public void configure(List<ReportReference> reports) { - ConsoleLog.debug("Report Config: "+reports); - // update coverview - coverpanel.update(reports); - + coverpanel.update(reports); deck.showWidget(1); } } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-30 12:57:18 UTC (rev 868) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-30 14:43:24 UTC (rev 869) @@ -70,8 +70,7 @@ public void handleSuccessfulResponse( final Controller controller, final Object event, Response response) { - String json = response.getText(); - System.out.println(json); + String json = response.getText(); List<ReportReference> reports = DTOParser.parseReportConfig(json); ReportView view = (ReportView)controller.getView(ReportView.ID); view.configure(reports); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java 2009-10-30 12:57:18 UTC (rev 868) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java 2009-10-30 14:43:24 UTC (rev 869) @@ -31,6 +31,7 @@ import org.jboss.bpm.console.client.common.AbstractRESTAction; import org.jboss.bpm.console.client.model.DTOParser; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.model.JSOParser; import org.jboss.bpm.console.client.util.ConsoleLog; import java.util.List; @@ -63,10 +64,8 @@ public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) { String target = (String)event; - - JSONValue json = JSONParser.parse(response.getText()); - List<ProcessDefinitionRef> definitions = DTOParser.parseProcessDefinitions(json); + List<ProcessDefinitionRef> definitions = JSOParser.parseProcessDefinitions(response.getText()); SearchDefinitionView view = (SearchDefinitionView)controller.getView(target); view.update(definitions);