[overlord-commits] Overlord SVN: r864 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/model and 2 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Oct 28 16:37:58 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-10-28 16:37:57 -0400 (Wed, 28 Oct 2009)
New Revision: 864
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/report/CoverPanel.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/resources/org/jboss/bpm/console/Application.gwt.xml
Log:
Depend on BPM report model to initialize report editor
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/BPMC.iws 2009-10-28 20:37:57 UTC (rev 864)
@@ -163,10 +163,28 @@
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="UpdateReportConfigAction.java" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="BPMReport.gwt.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1" column="21" selection-start="30" selection-end="30" vertical-scroll-proportion="0.025518341">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Application.gwt.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="24" selection-start="8" selection-end="8" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="UpdateReportConfigAction.java" pinned="false" current="true" current-in-tab="true">
<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="67" column="6" selection-start="2321" selection-end="2321" vertical-scroll-proportion="1.7097288">
+ <state line="69" column="28" selection-start="2435" selection-end="2435" vertical-scroll-proportion="0.7703349">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -174,10 +192,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="DTOParser.java" pinned="false" current="true" current-in-tab="true">
+ <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="407" column="5" selection-start="13551" selection-end="13551" vertical-scroll-proportion="10.117647">
+ <state line="400" column="82" selection-start="13392" selection-end="13392" vertical-scroll-proportion="0.5816994">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -185,6 +203,34 @@
</provider>
</entry>
</file>
+ <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="107" column="19" selection-start="3360" selection-end="3360" vertical-scroll-proportion="0.7124183">
+ <folding>
+ <marker date="1256761451000" expanded="false" signature="0:1031" placeholder="/.../" />
+ <marker date="1256761451000" expanded="true" signature="1821:1875" placeholder="/**...*/" />
+ <marker date="1256761451000" expanded="true" signature="2144:2297" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2334:2365" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2396:3110" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3165:3204" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3265:3405" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="CoverPanel.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/CoverPanel.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="76" column="0" selection-start="2952" selection-end="2952" vertical-scroll-proportion="0.9411765">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -523,6 +569,52 @@
<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/shared/src/main/resources" />
+ <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/shared/src/main/resources/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/shared/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:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/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:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/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="report-server" />
+ <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="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/shared" />
+ <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/shared/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/shared/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/shared/src/main/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -723,6 +815,74 @@
<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/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -756,7 +916,145 @@
<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/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>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -1165,55 +1463,6 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtEngineFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1507" selection-end="1507" vertical-scroll-proportion="0.26143792">
- <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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="219" column="56" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.6862745">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="97" column="37" selection-start="3832" selection-end="3832" vertical-scroll-proportion="0.59477127">
- <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/ReportView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="147" column="46" selection-start="4740" selection-end="4740" vertical-scroll-proportion="0.65849674">
- <folding>
- <marker date="1256756994000" expanded="false" signature="0:1031" placeholder="/.../" />
- <marker date="1256756994000" expanded="true" signature="1770:1824" placeholder="/**...*/" />
- <marker date="1256756994000" expanded="true" signature="2093:2246" placeholder="{...}" />
- <marker date="1256756994000" expanded="true" signature="2283:2314" placeholder="{...}" />
- <marker date="1256756994000" expanded="true" signature="2345:3059" placeholder="{...}" />
- <marker date="1256756994000" expanded="true" signature="3114:3153" placeholder="{...}" />
- <marker date="1256756994000" expanded="true" signature="3203:4830" placeholder="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="25" column="24" selection-start="809" selection-end="809" vertical-scroll-proportion="0.52287585">
- <folding>
- <element signature="tag#parent#0;tag#project#0" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="120" column="2" selection-start="3485" selection-end="3485" vertical-scroll-proportion="0.7385621">
@@ -1251,15 +1500,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="58" column="56" selection-start="1688" selection-end="1688" vertical-scroll-proportion="0.8169935">
- <folding>
- <marker date="1256759001000" expanded="true" signature="1688:1705" placeholder="..." />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="78" selection-start="231" selection-end="231" vertical-scroll-proportion="0.030303031">
@@ -1299,24 +1539,80 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="6" selection-start="2321" selection-end="2321" vertical-scroll-proportion="1.7097288">
+ <state line="40" column="13" selection-start="1675" selection-end="1675" vertical-scroll-proportion="-1.8235294">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="160" column="65" selection-start="4545" selection-end="4545" vertical-scroll-proportion="0.026143791">
<folding>
- <element signature="imports" expanded="true" />
+ <marker date="1256760848000" expanded="true" signature="10145:16658" placeholder="..." />
+ <marker date="1256760848000" expanded="false" signature="10145:11484" placeholder="..." />
+ <marker date="1256760848000" expanded="false" signature="10145:10164" placeholder="..." />
</folding>
</state>
</provider>
</entry>
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1" column="21" selection-start="30" selection-end="30" vertical-scroll-proportion="0.025518341">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="24" selection-start="8" selection-end="8" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<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="407" column="5" selection-start="13551" selection-end="13551" vertical-scroll-proportion="10.117647">
+ <state line="400" column="82" selection-start="13392" selection-end="13392" vertical-scroll-proportion="0.5816994">
<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/ReportView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="107" column="19" selection-start="3360" selection-end="3360" vertical-scroll-proportion="0.7124183">
+ <folding>
+ <marker date="1256761451000" expanded="false" signature="0:1031" placeholder="/.../" />
+ <marker date="1256761451000" expanded="true" signature="1821:1875" placeholder="/**...*/" />
+ <marker date="1256761451000" expanded="true" signature="2144:2297" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2334:2365" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2396:3110" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3165:3204" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3265:3405" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="76" column="0" selection-start="2952" selection-end="2952" vertical-scroll-proportion="0.9411765">
+ <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/UpdateReportConfigAction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="69" column="28" selection-start="2435" selection-end="2435" vertical-scroll-proportion="0.7703349">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
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-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-28 20:37:57 UTC (rev 864)
@@ -24,6 +24,7 @@
import com.google.gwt.json.client.*;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.JSONWalk;
+import org.jboss.bpm.report.model.ReportReference;
import java.util.ArrayList;
import java.util.Date;
@@ -379,7 +380,7 @@
return result;
}
- /* public static List<ReportReference> parseReportConfig(String json)
+ public static List<ReportReference> parseReportConfig(String json)
{
JSONValue root = JSONParser.parse(json);
List<ReportReference> results = new ArrayList<ReportReference>();
@@ -405,5 +406,5 @@
results.add(reportRef);
}
return results;
- }*/
+ }
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-28 20:37:57 UTC (rev 864)
@@ -23,24 +23,24 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.*;
-import com.google.gwt.gen2.event.dom.client.ClickEvent;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import com.mvc4g.client.ViewInterface;
-import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
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.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.Registry;
import org.jboss.bpm.console.client.URLBuilder;
+import org.jboss.bpm.console.client.common.HeaderLabel;
import org.jboss.bpm.console.client.common.IconHeader;
import org.jboss.bpm.console.client.common.WidgetWindowPanel;
-import org.jboss.bpm.console.client.common.HeaderLabel;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
+import org.jboss.bpm.report.model.ReportReference;
+import org.jboss.bpm.report.model.ReportParameter;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
@@ -64,56 +64,52 @@
this.appContext = Registry.get(ApplicationContext.class);
}
- public void update(List<ReportGroup> groups)
+ public void update(List<ReportReference> reports)
{
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- for(final ReportGroup group : groups)
+ for(final ReportReference reportRef : reports)
{
- CaptionLayoutPanel p = new CaptionLayoutPanel(group.name);
- final boolean hasParameters = group.params.size()>0;
+ final boolean hasParameters = reportRef.getParameterMetaData().size()>0;
//p.add(new HeaderLabel(group.name));
LayoutPanel inner = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
- for(final ReportRef reportRef : group.reports)
- {
- LayoutPanel row = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
- IconHeader header = new IconHeader(icons.pieceIcon(), reportRef.name);
- header.setWidth("95%");
- row.add(
- header,
- new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)
- );
+ LayoutPanel row = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+ IconHeader header = new IconHeader(icons.pieceIcon(), reportRef.getTitle());
+ header.setWidth("95%");
+ row.add(
+ header,
+ new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)
+ );
- row.add(new Button("Render",
- new ClickListener()
+ row.add(new Button("Render",
+ new ClickListener()
+ {
+ public void onClick(Widget widget)
{
- public void onClick(Widget widget)
+ if(hasParameters)
{
- if(hasParameters)
- {
- window = new WidgetWindowPanel("Hello World", createForm(reportRef, group));
- }
- else
- {
- String url = URLBuilder.getInstance().getGeneralReportUrl(reportRef.template);
- controller.handleEvent(
- new Event(RenderReportAction.ID,
- new RenderDispatchEvent(reportRef.name, url)
- )
- );
- }
+ window = new WidgetWindowPanel("Hello World", createForm(reportRef));
}
- })
- );
+ else
+ {
+ String url = URLBuilder.getInstance().getGeneralReportUrl(reportRef.getReportFileName());
+ controller.handleEvent(
+ new Event(RenderReportAction.ID,
+ new RenderDispatchEvent(reportRef.getTitle(), url)
+ )
+ );
+ }
+ }
+ })
+ );
- inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- }
+ inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- p.add(inner);
- this.add(p, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+ this.add(inner, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+
}
@@ -126,21 +122,19 @@
this.controller = controller;
}
- private Widget createForm(
- final ReportRef reportRef,
- final ReportGroup reportGroup)
+ private Widget createForm(final ReportReference reportRef)
{
LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
HeaderLabel label = new HeaderLabel("Report Parameters", true);
p.add(label, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- Grid grid = new Grid(reportGroup.params.size(),2);
+ Grid grid = new Grid(reportRef.getParameterMetaData().size(),2);
int row = 0;
final List<TextBox> inputFields = new ArrayList<TextBox>();
- for(ReportParameter reportParam : reportGroup.params)
+ for(ReportParameter reportParam : reportRef.getParameterMetaData())
{
- grid.setWidget(row,0, new Label(reportParam.name));
+ grid.setWidget(row,0, new Label(reportParam.getDisplayName()));
TextBox textBox = new TextBox();
inputFields.add(textBox);
grid.setWidget(row,1, textBox);
@@ -154,11 +148,11 @@
public void onClick(Widget widget)
{
String url = URLBuilder.getInstance().getProcessSummaryReportUrl(
- reportRef.template, inputFields.get(0).getText()); // TODO: match params
+ reportRef.getReportFileName(), inputFields.get(0).getText()); // TODO: match params
controller.handleEvent(
new Event(RenderReportAction.ID,
- new RenderDispatchEvent(reportRef.name, url))
+ new RenderDispatchEvent(reportRef.getTitle(), url))
);
window.close();
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-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-28 20:37:57 UTC (rev 864)
@@ -34,6 +34,7 @@
import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.DOMUtil;
+import org.jboss.bpm.report.model.ReportReference;
import java.util.ArrayList;
import java.util.List;
@@ -99,56 +100,12 @@
this.controller = controller;
}
- public void configure(Document configDOM)
+ public void configure(List<ReportReference> reports)
{
- ConsoleLog.debug("Report Config: "+configDOM);
+ ConsoleLog.debug("Report Config: "+reports);
- Node reportsNode = configDOM.getElementsByTagName("reports").item(0);
- List<Node> groups = DOMUtil.getChildElements(reportsNode.getChildNodes());
- List<ReportGroup> results = new ArrayList<ReportGroup>();
-
- for(Node groupNode : groups)
- {
- ReportGroup reportGroup = new ReportGroup();
- reportGroup.name = groupNode.getAttributes().getNamedItem("name").getNodeValue();
-
- List<Node> groupChildren = DOMUtil.getChildElements(groupNode.getChildNodes());
- for(Node childNode : groupChildren)
- {
- String name = childNode.getNodeName();
- NamedNodeMap atts = childNode.getAttributes();
-
- if(name.equals("report"))
- {
- reportGroup.reports.add(
- new ReportRef(
- atts.getNamedItem("name").getNodeValue(),
- atts.getNamedItem("template").getNodeValue()
- )
- );
- }
- else if(name.equals("init-params"))
- {
- List<Node> params = DOMUtil.getChildElements(childNode.getChildNodes());
- for(Node paramNode: params)
- {
- NamedNodeMap paramAtts = paramNode.getAttributes();
- reportGroup.params.add(
- new ReportParameter(
- paramAtts.getNamedItem("name").getNodeValue(),
- paramAtts.getNamedItem("desc").getNodeValue()
- )
- );
- }
- }
- }
-
- results.add(reportGroup);
- }
-
-
// update coverview
- coverpanel.update(results);
+ 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-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-28 20:37:57 UTC (rev 864)
@@ -26,8 +26,12 @@
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.report.model.ReportReference;
+import java.util.List;
+
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
@@ -61,10 +65,8 @@
final Controller controller, final Object event, Response response)
{
String json = response.getText();
- //List<ReportReference> reports = DTOParser.parseReportConfig(json);
+ List<ReportReference> reports = DTOParser.parseReportConfig(json);
ReportView view = (ReportView)controller.getView(ReportView.ID);
-
- //view.configure(configDOM);
- //System.out.println(reports);
+ view.configure(reports);
}
}
Modified: bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-10-28 20:37:57 UTC (rev 864)
@@ -14,6 +14,8 @@
<inherits name='org.gwt.mosaic.Mosaic' />
<inherits name='org.gwt.mosaic.forms.Forms' />
+ <inherits name='org.jboss.bpm.report.BPMReport' />
+
<!-- Includes the public resources used by the GWT Mosaic -->
<!-- themes. Those files do not inject a style sheet into the -->
<!-- application. -->
More information about the overlord-commits
mailing list