[overlord-commits] Overlord SVN: r872 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 2 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Mon Nov 2 06:42:29 EST 2009
Author: heiko.braun at jboss.com
Date: 2009-11-02 06:42:28 -0500 (Mon, 02 Nov 2009)
New Revision: 872
Modified:
bpm-console/trunk/BPMC.iws
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java
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/JSOParser.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
Log:
Fix default editor initialization. Switch server status and report config parsing to overlay types
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-11-02 11:21:59 UTC (rev 871)
+++ bpm-console/trunk/BPMC.iws 2009-11-02 11:42:28 UTC (rev 872)
@@ -131,7 +131,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java" line="82" class="org.jboss.bpm.console.client.model.JSOParser" package="org.jboss.bpm.console.client.model">
+ <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java" line="87" 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" />
@@ -170,6 +170,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/ProcessDetailView.java" line="118" class="org.jboss.bpm.console.client.process.ProcessDetailView" 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>
@@ -243,42 +256,33 @@
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="ReportParameterForm.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/ReportParameterForm.java">
+ <file leaf-file-name="ProcessDetailView.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/ProcessDetailView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="89" column="53" selection-start="3322" selection-end="3322" vertical-scroll-proportion="0.92544985">
+ <state line="72" column="4" selection-start="2593" selection-end="2593" vertical-scroll-proportion="0.50642675">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ConsoleIconBundle.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java">
+ <file leaf-file-name="MainLayout.java" pinned="false" current="false" current-in-tab="false">
+ <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="147" column="33" selection-start="3492" selection-end="3492" vertical-scroll-proportion="2.4930644">
+ <state line="83" column="44" selection-start="2954" selection-end="2954" vertical-scroll-proportion="0.24678664">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="BootstrapAction.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="120" column="46" selection-start="4817" selection-end="4817" vertical-scroll-proportion="0.46529564">
+ <state line="68" column="0" selection-start="2327" selection-end="2327" vertical-scroll-proportion="0.48586118">
<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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="176" column="0" selection-start="0" selection-end="14554" vertical-scroll-proportion="0.42416453">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -555,7 +559,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="report-server" />
+ <option name="myItemId" value="gui-war" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
</PATH>
@@ -565,11 +569,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="report-server" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -579,15 +583,15 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="report-server" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -597,25 +601,51 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="report-server" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src" />
+ <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>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main" />
+ <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>
@@ -623,45 +653,87 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="report-server" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm" />
+ <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="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report" />
+ <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>
@@ -669,50 +741,176 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="report-server" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report" />
+ <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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report" />
<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>
+ <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/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>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -1121,107 +1319,107 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="82" column="0" selection-start="2829" selection-end="2829" vertical-scroll-proportion="0.48802018">
+ <state line="190" column="53" selection-start="6235" selection-end="6235" vertical-scroll-proportion="0.6169666">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDataAction.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1532" selection-end="1532" vertical-scroll-proportion="0.16452442">
+ <state line="89" column="53" selection-start="3322" selection-end="3322" vertical-scroll-proportion="0.92544985">
<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/http/client/Request.class">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="0" selection-start="1293" selection-end="1293" vertical-scroll-proportion="0.5141388">
+ <state line="147" column="33" selection-start="3492" selection-end="3492" vertical-scroll-proportion="2.4930644">
<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/process/InstanceDetailView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="94" column="0" selection-start="3609" selection-end="3609" vertical-scroll-proportion="0.020565553">
+ <state line="48" column="13" selection-start="2187" selection-end="2187" vertical-scroll-proportion="0.16452442">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.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="57" column="46" selection-start="2304" selection-end="2304" vertical-scroll-proportion="0.41645244">
+ <state line="30" column="35" selection-start="450" selection-end="450" vertical-scroll-proportion="0.6052963">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.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="37" column="22" selection-start="1526" selection-end="1526" vertical-scroll-proportion="0.20176545">
+ <state line="388" column="30" selection-start="12210" selection-end="12210" vertical-scroll-proportion="0.45244217">
<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/ui/HasVerticalAlignment.class">
+ <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="13" column="15" selection-start="728" selection-end="728" vertical-scroll-proportion="0.24678664">
+ <state line="120" column="46" selection-start="4817" selection-end="4817" vertical-scroll-proportion="0.46529564">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java">
+ <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="190" column="53" selection-start="6235" selection-end="6235" vertical-scroll-proportion="0.6169666">
+ <state line="176" column="0" selection-start="0" selection-end="14554" vertical-scroll-proportion="0.42416453">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.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="89" column="53" selection-start="3322" selection-end="3322" vertical-scroll-proportion="0.92544985">
+ <state line="73" column="18" selection-start="2595" selection-end="2595" vertical-scroll-proportion="0.778058">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.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="147" column="33" selection-start="3492" selection-end="3492" vertical-scroll-proportion="2.4930644">
+ <state line="331" column="0" selection-start="10432" selection-end="10432" vertical-scroll-proportion="5.401028">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.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="48" column="13" selection-start="2187" selection-end="2187" vertical-scroll-proportion="0.16452442">
+ <state line="118" column="40" selection-start="3620" selection-end="3620" vertical-scroll-proportion="1.2812105">
<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/model/JSOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="35" selection-start="450" selection-end="450" vertical-scroll-proportion="0.6052963">
+ <state line="150" column="16" selection-start="4992" selection-end="4992" vertical-scroll-proportion="0.55611604">
<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/process/ProcessDetailView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="388" column="30" selection-start="12210" selection-end="12210" vertical-scroll-proportion="0.45244217">
+ <state line="72" column="4" selection-start="2593" selection-end="2593" vertical-scroll-proportion="0.50642675">
<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/MainLayout.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="120" column="46" selection-start="4817" selection-end="4817" vertical-scroll-proportion="0.46529564">
+ <state line="83" column="44" selection-start="2954" selection-end="2954" vertical-scroll-proportion="0.24678664">
<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/BootstrapAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="176" column="0" selection-start="0" selection-end="14554" vertical-scroll-proportion="0.42416453">
+ <state line="68" column="0" selection-start="2327" selection-end="2327" vertical-scroll-proportion="0.48586118">
<folding />
</state>
</provider>
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java 2009-11-02 11:21:59 UTC (rev 871)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java 2009-11-02 11:42:28 UTC (rev 872)
@@ -23,15 +23,12 @@
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.Response;
-import com.google.gwt.json.client.JSONArray;
-import com.google.gwt.json.client.JSONParser;
-import com.google.gwt.json.client.JSONValue;
+import com.google.gwt.user.client.DeferredCommand;
+import com.google.gwt.user.client.Command;
import com.mvc4g.client.Controller;
import org.jboss.bpm.console.client.common.AbstractRESTAction;
-import org.jboss.bpm.console.client.model.PluginInfo;
+import org.jboss.bpm.console.client.model.JSOParser;
import org.jboss.bpm.console.client.model.ServerStatus;
-import org.jboss.bpm.console.client.util.ConsoleLog;
-import org.jboss.bpm.console.client.util.JSONWalk;
/**
* Bootstrap the console form server settings.
@@ -43,6 +40,13 @@
{
public final static String ID = BootstrapAction.class.getName();
+ private ApplicationContext appContext;
+
+ public BootstrapAction()
+ {
+ this.appContext = Registry.get(ApplicationContext.class);
+ }
+
public String getId()
{
return ID;
@@ -60,28 +64,25 @@
public void handleSuccessfulResponse(final Controller controller, final Object event, Response response)
{
- JSONValue json = JSONParser.parse(response.getText());
- ServerStatus status = BootstrapAction.parseStatus(json);
-
- // global var
+ ServerStatus status = JSOParser.parseStatus(response.getText());
ServerPlugins.setStatus(status);
- }
+
+ // show default editor
+ DeferredCommand.addCommand(
+ new Command()
+ {
+ public void execute()
+ {
+ String defaultEditorID = Preferences.has(Preferences.BPM_DEFAULT_TOOL) ?
+ Preferences.get(Preferences.BPM_DEFAULT_TOOL) :
+ appContext.getConfig().getDefaultEditor();
+
+ Workspace workspace = appContext.getWorkpace();
+ if(workspace.hasEditor(defaultEditorID))
+ workspace.showEditor(defaultEditorID);
+ }
+ }
+ );
- public static ServerStatus parseStatus(JSONValue json)
- {
- ConsoleLog.debug("parse " + json);
-
- ServerStatus status = new ServerStatus();
-
- JSONArray jsonArray = JSONWalk.on(json).next("plugins").asArray();
- for (int i = 0; i < jsonArray.size(); i++)
- {
- JSONValue item = jsonArray.get(i);
- String type = JSONWalk.on(item).next("type").asString();
- boolean avail = JSONWalk.on(item).next("available").asBool();
- status.getPlugins().add( new PluginInfo(type, avail) );
- }
-
- return status;
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2009-11-02 11:21:59 UTC (rev 871)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2009-11-02 11:42:28 UTC (rev 872)
@@ -83,21 +83,7 @@
controller.handleEvent(
new com.mvc4g.client.Event(BootstrapAction.ID, null)
);
-
- // show default editor
- DeferredCommand.addCommand(
- new Command()
- {
- public void execute()
- {
- String defaultEditorID = Preferences.has(Preferences.BPM_DEFAULT_TOOL) ?
- Preferences.get(Preferences.BPM_DEFAULT_TOOL) : config.getDefaultEditor();
- if(workspace.hasEditor(defaultEditorID))
- workspace.showEditor(defaultEditorID);
- }
- }
- );
-
+
Timer t = new Timer() {
public void run()
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-11-02 11:21:59 UTC (rev 871)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-11-02 11:42:28 UTC (rev 872)
@@ -330,49 +330,4 @@
return result;
}
- public static List<ReportReference> parseReportConfig(String json)
- {
- JSONValue root = JSONParser.parse(json);
- List<ReportReference> results = new ArrayList<ReportReference>();
-
- JSONArray jsonArray = root.isArray();
- for (int i = 0; i < jsonArray.size(); i++)
- {
- JSONValue item = jsonArray.get(i);
- String title = JSONWalk.on(item).next("title").asString();
- String description = JSONWalk.on(item).next("description").asString();
- String reportFile = JSONWalk.on(item).next("reportFileName").asString();
-
- ReportReference reportRef = new ReportReference(reportFile);
- reportRef.setTitle(title);
- reportRef.setDescription(description);
-
- // parameter
- JSONArray params = JSONWalk.on(item).next("parameterMetaData").asArray();
- for (int x=0; x < params.size(); x++)
- {
- JSONValue p = params.get(x);
- String name = JSONWalk.on(p).next("name").asString();
- String type = JSONWalk.on(p).next("type").asString();
- String dataType = JSONWalk.on(p).next("dataType").asString();
-
- ReportParameter pmd = new ReportParameter(name, ReportParameter.Type.valueOf(type));
- pmd.setDataType(ReportParameter.DataType.valueOf(dataType));
-
- // optional values
- JSONWalk.JSONWrapper help = JSONWalk.on(p).next("helptext");
- if(help!=null)
- pmd.setHelptext(help.asString());
-
- JSONWalk.JSONWrapper prompt = JSONWalk.on(p).next("promptText");
- if(prompt!=null)
- pmd.setPromptText(prompt.asString());
-
- reportRef.getParameterMetaData().add(pmd);
- }
-
- results.add(reportRef);
- }
- return results;
- }
}
Modified: 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 2009-11-02 11:21:59 UTC (rev 871)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java 2009-11-02 11:42:28 UTC (rev 872)
@@ -22,6 +22,11 @@
package org.jboss.bpm.console.client.model;
import com.google.gwt.core.client.JsArray;
+import com.google.gwt.json.client.JSONArray;
+import com.google.gwt.json.client.JSONValue;
+import org.jboss.bpm.report.model.ReportParameter;
+import org.jboss.bpm.report.model.ReportReference;
+import org.jboss.bpm.console.client.util.JSONWalk;
import java.util.ArrayList;
import java.util.Date;
@@ -57,7 +62,7 @@
def.setKey(rootModel.get("key"));
def.setDeploymentId(rootModel.get("deploymentId"));
def.setSuspended(rootModel.getBoolean("suspended"));
-
+
return def;
}
@@ -100,4 +105,65 @@
return processInstance;
}
+
+
+ public static List<ReportReference> parseReportConfig(String json)
+ {
+ List<ReportReference> results = new ArrayList<ReportReference>();
+ JsArray<JSOModel> rootModel = JSOModel.arrayFromJson(json);
+
+ for(int i=0; i<rootModel.length(); i++)
+ {
+
+ JSOModel reportCfg = rootModel.get(i);
+ String title = reportCfg.get("title");
+ String description = reportCfg.get("description", "");
+ String reportFile = reportCfg.get("reportFileName");
+
+ ReportReference reportRef = new ReportReference(reportFile);
+ reportRef.setTitle(title);
+ reportRef.setDescription(description);
+
+ // parameter
+ JsArray<JSOModel> params = reportCfg.getArray("parameterMetaData");
+ for (int x=0; x < params.length(); x++)
+ {
+ JSOModel p = params.get(x);
+ String name = p.get("name");
+ String type = p.get("type");
+ String dataType = p.get("dataType");
+
+ ReportParameter pmd = new ReportParameter(name, ReportParameter.Type.valueOf(type));
+ pmd.setDataType(ReportParameter.DataType.valueOf(dataType));
+
+ // optional values
+ pmd.setHelptext(p.get("helptext", ""));
+ pmd.setPromptText(p.get("promptText", ""));
+
+ reportRef.getParameterMetaData().add(pmd);
+ }
+
+ results.add(reportRef);
+ }
+ return results;
+ }
+
+ public static ServerStatus parseStatus(String json)
+ {
+ ServerStatus status = new ServerStatus();
+ JSOModel rootModel = JSOModel.fromJson(json);
+
+ JsArray<JSOModel> plugins = rootModel.getArray("plugins");
+ for(int i=0; i<plugins.length(); i++)
+ {
+ JSOModel item = plugins.get(i);
+ String type = item.get("type");
+ boolean avail = item.getBoolean("available");
+ status.getPlugins().add( new PluginInfo(type, avail) );
+ }
+
+ return status;
+ }
}
+
+
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-11-02 11:21:59 UTC (rev 871)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-11-02 11:42:28 UTC (rev 872)
@@ -26,8 +26,8 @@
import com.mvc4g.client.Controller;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.Registry;
-import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.common.AbstractRESTAction;
+import org.jboss.bpm.console.client.model.JSOParser;
import org.jboss.bpm.report.model.ReportReference;
import java.util.List;
@@ -71,7 +71,7 @@
final Controller controller, final Object event, Response response)
{
String json = response.getText();
- List<ReportReference> reports = DTOParser.parseReportConfig(json);
+ List<ReportReference> reports = JSOParser.parseReportConfig(json);
ReportView view = (ReportView)controller.getView(ReportView.ID);
view.configure(reports);
}
More information about the overlord-commits
mailing list