[overlord-commits] Overlord SVN: r875 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 1 other directory.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Mon Nov 2 10:00:21 EST 2009
Author: heiko.braun at jboss.com
Date: 2009-11-02 10:00:21 -0500 (Mon, 02 Nov 2009)
New Revision: 875
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
Log:
Add toggle editor switch to BootstrapAction
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-11-02 14:59:40 UTC (rev 874)
+++ bpm-console/trunk/BPMC.iws 2009-11-02 15:00:21 UTC (rev 875)
@@ -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="87" 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="91" 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" />
@@ -255,35 +255,7 @@
</component>
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
- <leaf>
- <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="72" column="4" selection-start="2593" selection-end="2593" vertical-scroll-proportion="0.50642675">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="83" column="44" selection-start="2954" selection-end="2954" vertical-scroll-proportion="0.24678664">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="68" column="0" selection-start="2327" selection-end="2327" vertical-scroll-proportion="0.48586118">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -781,56 +753,6 @@
<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_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>
@@ -860,57 +782,7 @@
<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">
@@ -1203,7 +1075,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="311" y="54" width="1273" height="940" extended-state="0" />
+ <frame x="285" 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" />
@@ -1319,107 +1191,107 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.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="190" column="53" selection-start="6235" selection-end="6235" vertical-scroll-proportion="0.6169666">
+ <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/report/ReportParameterForm.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="89" column="53" selection-start="3322" selection-end="3322" vertical-scroll-proportion="0.92544985">
+ <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/icons/ConsoleIconBundle.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="147" column="33" selection-start="3492" selection-end="3492" vertical-scroll-proportion="2.4930644">
+ <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/process/InstanceDetailView.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="48" column="13" selection-start="2187" selection-end="2187" vertical-scroll-proportion="0.16452442">
+ <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/resources/org/jboss/bpm/console/public/console.css">
+ <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="30" column="35" selection-start="450" selection-end="450" vertical-scroll-proportion="0.6052963">
+ <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/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/process/UpdateInstancesAction.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="71" column="60" selection-start="2781" selection-end="2781" vertical-scroll-proportion="0.7609255">
<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/JSOParser.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="4" selection-start="2572" selection-end="2572" vertical-scroll-proportion="0.51450187">
<folding />
</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/model/DTOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="73" column="18" selection-start="2595" selection-end="2595" vertical-scroll-proportion="0.778058">
+ <state line="197" column="31" selection-start="6256" selection-end="6256" vertical-scroll-proportion="0.86760926">
<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/process/InstanceListView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="331" column="0" selection-start="10432" selection-end="10432" vertical-scroll-proportion="5.401028">
+ <state line="46" column="6" selection-start="1992" selection-end="1992" vertical-scroll-proportion="-2.3444731">
<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/BootstrapAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="118" column="40" selection-start="3620" selection-end="3620" vertical-scroll-proportion="1.2812105">
+ <state line="40" column="30" selection-start="1690" selection-end="1690" vertical-scroll-proportion="0.2673522">
<folding />
</state>
</provider>
</entry>
- <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/MainLayout.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="150" column="16" selection-start="4992" selection-end="4992" vertical-scroll-proportion="0.55611604">
+ <state line="83" column="67" selection-start="2977" selection-end="2977" vertical-scroll-proportion="0.19151671">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="72" column="4" selection-start="2593" selection-end="2593" vertical-scroll-proportion="0.50642675">
+ <state line="65" column="4" selection-start="2077" selection-end="2077" vertical-scroll-proportion="0.27377892">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java">
+ <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="83" column="44" selection-start="2954" selection-end="2954" vertical-scroll-proportion="0.24678664">
+ <state line="236" column="61" selection-start="7297" selection-end="7297" vertical-scroll-proportion="0.33290488">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.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="68" column="0" selection-start="2327" selection-end="2327" vertical-scroll-proportion="0.48586118">
+ <state line="63" column="73" selection-start="2347" selection-end="2347" vertical-scroll-proportion="0.69922876">
<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 14:59:40 UTC (rev 874)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java 2009-11-02 15:00:21 UTC (rev 875)
@@ -66,23 +66,26 @@
{
ServerStatus status = JSOParser.parseStatus(response.getText());
ServerPlugins.setStatus(status);
-
- // show default editor
- DeferredCommand.addCommand(
- new Command()
- {
- public void execute()
+
+ Boolean toogleEditor = (Boolean)event;
+ if(toogleEditor)
+ {
+ // show default editor
+ DeferredCommand.addCommand(
+ new Command()
{
- 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 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);
+ }
}
- }
- );
-
+ );
+ }
}
}
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 14:59:40 UTC (rev 874)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2009-11-02 15:00:21 UTC (rev 875)
@@ -81,7 +81,7 @@
// bootstrap
controller.handleEvent(
- new com.mvc4g.client.Event(BootstrapAction.ID, null)
+ new com.mvc4g.client.Event(BootstrapAction.ID, Boolean.TRUE)
);
Timer t = new Timer() {
More information about the overlord-commits
mailing list