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

Author: heiko.braun(a)jboss.com Date: 2009-09-08 11:49:14 -0400 (Tue, 08 Sep 2009) New Revision: 831 Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTParser.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CurrentSnapshotAction.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadSnapshotAction.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java Removed: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/PollingRESTAction.java Modified: sam/trunk/SAMM.iws sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTChart.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java sam/trunk/pom.xml sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/CVT.java sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterExample.java Log: Begin work on drill down Modified: sam/trunk/SAMM.iws =================================================================== --- sam/trunk/SAMM.iws 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/SAMM.iws 2009-09-08 15:49:14 UTC (rev 831) @@ -86,6 +86,47 @@ <disable_hints /> </component> <component name="DebuggerManager"> + <line_breakpoints> + <breakpoint url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java" line="78" class="org.jboss.sam.examples.twitter.InMemorySwapHandler" package="org.jboss.sam.examples.twitter"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java" line="87" class="org.jboss.sam.cvt.internal.DefaultCVT" package="org.jboss.sam.cvt.internal"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java" line="41" class="org.jboss.sam.examples.twitter.InMemorySwapHandler" package="org.jboss.sam.examples.twitter"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + </line_breakpoints> <breakpoint_any> <breakpoint> <option name="NOTIFY_CAUGHT" value="true" /> @@ -157,103 +198,33 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="CVTRegistry.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTRegistry.java"> + <file leaf-file-name="DefaultCVT.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="1335" selection-end="1335" vertical-scroll-proportion="0.1980198"> + <state line="63" column="0" selection-start="2100" selection-end="2100" vertical-scroll-proportion="0.18789408"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/console/server/war/pom.xml"> + <file leaf-file-name="CVTOutput.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="28" selection-start="1224" selection-end="1224" vertical-scroll-proportion="0.7061791"> + <state line="68" column="0" selection-start="1962" selection-end="1962" vertical-scroll-proportion="0.5049505"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="CVTFacade.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java"> + <file leaf-file-name="InMemorySwapHandler.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="82" column="21" selection-start="2454" selection-end="2454" vertical-scroll-proportion="0.27722773"> + <state line="49" column="8" selection-start="1634" selection-end="1634" vertical-scroll-proportion="0.19059406"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="DefaultActivityMonitorImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="71" selection-start="1974" selection-end="1974" vertical-scroll-proportion="0.57425743"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/core/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="114" column="28" selection-start="2959" selection-end="3123" vertical-scroll-proportion="0.7263556"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/sam/sim/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="21" selection-start="1050" selection-end="1050" vertical-scroll-proportion="0.6052963"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="DefaultCVT.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/DefaultCVT.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="70" selection-start="2872" selection-end="2872" vertical-scroll-proportion="0.46406052"> - <folding> - <element signature="imports" expanded="true" /> - <element signature="method#dump#0;class#DefaultCVT#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TwitterExample.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterExample.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1525" selection-end="1525" vertical-scroll-proportion="-0.5334174"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SearchInput.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="13" selection-start="1290" selection-end="1290" vertical-scroll-proportion="0.16141236"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="CVTOutput.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="13" selection-start="1199" selection-end="1199" vertical-scroll-proportion="0.16831683"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -771,6 +742,52 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/datasource" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/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$/sam/core/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$/sam/core/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$/sam/core/src/main/java/org/jboss/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -817,6 +834,56 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/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$/sam/core/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$/sam/core/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$/sam/core/src/main/java/org/jboss/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/common" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -960,7 +1027,291 @@ <option name="myItemId" value="console" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/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$/console/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="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/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$/console/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$/console/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="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/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$/console/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$/console/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$/console/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$/console/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$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAMM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -994,12 +1345,15 @@ <option name="SHOW_DIALOG" value="true" /> </component> <component name="RecentsManager"> + <key name="IntroduceConstantDialog.RECENTS_KEY"> + <recent name="" /> + </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.sam.cvt.internal" /> <recent name="org.jboss.sam.util" /> <recent name="org.jboss.sam.examples.twitter" /> <recent name="twitter4j.http" /> <recent name="twitter" /> - <recent name="org.jboss.sam.config.internal" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -1203,14 +1557,14 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="411" y="45" width="1183" height="955" extended-state="0" /> + <frame x="328" y="41" width="1313" height="955" extended-state="0" /> <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922825" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="14" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31040564" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.36787975" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31934732" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24451666" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908458" order="9" /> @@ -1222,9 +1576,9 @@ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32791728" order="11" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57937425" order="2" /> <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24759616" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24691358" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39513326" order="4" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3951049" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -1314,118 +1668,117 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/ActivityMonitor.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="0" selection-start="1458" selection-end="1458" vertical-scroll-proportion="0.41584158"> - <folding /> + <state line="52" column="67" selection-start="1685" selection-end="1750" vertical-scroll-proportion="0.57054454"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVT.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="13" selection-start="1945" selection-end="1945" vertical-scroll-proportion="0.5841584"> + <state line="190" column="15" selection-start="4982" selection-end="5518" vertical-scroll-proportion="0.7667087"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTSnapshot.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterNavigation.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="35" selection-start="1396" selection-end="1396" vertical-scroll-proportion="0.45544556"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="32" column="6" selection-start="1381" selection-end="1381" vertical-scroll-proportion="0.15841584"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/DefaultCVTSnapshot.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTParser.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="0" selection-start="1290" selection-end="1290" vertical-scroll-proportion="0.25742576"> + <state line="65" column="17" selection-start="2536" selection-end="2536" vertical-scroll-proportion="0.9079445"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/SwapHandler.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="17" selection-start="1346" selection-end="1346" vertical-scroll-proportion="0.23762377"> + <state line="37" column="0" selection-start="1313" selection-end="1313" vertical-scroll-proportion="0.33663365"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/DefaultCVT.java"> + <entry file="jar:///Users/hbraun/.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/org/jboss/resteasy/core/MethodInjectorImpl.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="70" selection-start="2872" selection-end="2872" vertical-scroll-proportion="0.46406052"> - <folding> - <element signature="imports" expanded="true" /> - <element signature="method#dump#0;class#DefaultCVT#0" expanded="false" /> - </folding> + <state line="18" column="0" selection-start="1001" selection-end="1001" vertical-scroll-proportion="0.60850114"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterExample.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1525" selection-end="1525" vertical-scroll-proportion="-0.5334174"> + <state line="32" column="13" selection-start="1295" selection-end="1295" vertical-scroll-proportion="0.23762377"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/SearchInput.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CurrentSnapshotAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="13" selection-start="1290" selection-end="1290" vertical-scroll-proportion="0.16141236"> + <state line="35" column="13" selection-start="1453" selection-end="1453" vertical-scroll-proportion="0.15841584"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadSnapshotAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="13" selection-start="1199" selection-end="1199" vertical-scroll-proportion="0.16831683"> + <state line="47" column="37" selection-start="1731" selection-end="1731" vertical-scroll-proportion="0.2522068"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTRegistry.java"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="1335" selection-end="1335" vertical-scroll-proportion="0.1980198"> + <state line="44" column="13" selection-start="1819" selection-end="1819" vertical-scroll-proportion="-0.37623763"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/server/war/pom.xml"> + <entry file="file://$PROJECT_DIR$/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="28" selection-start="1224" selection-end="1224" vertical-scroll-proportion="0.7061791"> - <folding /> + <state line="108" column="42" selection-start="3534" selection-end="3534" vertical-scroll-proportion="0.9079445"> + <folding> + <element signature="class#2936:3425" expanded="false" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="82" column="21" selection-start="2454" selection-end="2454" vertical-scroll-proportion="0.27722773"> + <state line="113" column="15" selection-start="3390" selection-end="3390" vertical-scroll-proportion="0.5940594"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/internal/DefaultActivityMonitorImpl.java"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="71" selection-start="1974" selection-end="1974" vertical-scroll-proportion="0.57425743"> + <state line="68" column="0" selection-start="1962" selection-end="1962" vertical-scroll-proportion="0.5049505"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/core/pom.xml"> + <entry file="file://$PROJECT_DIR$/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="114" column="28" selection-start="2959" selection-end="3123" vertical-scroll-proportion="0.7263556"> + <state line="63" column="0" selection-start="2100" selection-end="2100" vertical-scroll-proportion="0.18789408"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/sim/pom.xml"> + <entry file="file://$PROJECT_DIR$/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="21" selection-start="1050" selection-end="1050" vertical-scroll-proportion="0.6052963"> + <state line="49" column="8" selection-start="1634" selection-end="1634" vertical-scroll-proportion="0.19059406"> <folding /> </state> </provider> Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTChart.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTChart.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTChart.java 2009-09-08 15:49:14 UTC (rev 831) @@ -61,6 +61,7 @@ getCurve().setLegendLabel("iran tweets"); //getXAxis().setAxisLabel("Samples"); //getYAxis().setAxisLabel("Num"); + } public int getXMax() Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTParser.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTParser.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTParser.java 2009-09-08 15:49:14 UTC (rev 831) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.sam; + +import com.google.gwt.json.client.JSONValue; +import com.google.gwt.json.client.JSONParser; +import com.google.gwt.json.client.JSONObject; +import com.google.gwt.json.client.JSONArray; +import org.jboss.bpm.console.client.util.JSONWalk; +import org.jboss.bpm.console.client.util.ConsoleLog; + +import java.util.List; +import java.util.ArrayList; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class CVTParser +{ + public static Object[] parseSnapshot(String text) + { + Object[] model = new Object[2]; + + // {"snapshotId":"f4bb3900-9f26-4983-b9bb-2ea99ba94e70", + // "table":[{"fromUser":"svlng","createdAt":"Tue Sep 08 16:07:13 CEST 2009","id":"3840598195"}]} + + JSONValue root = JSONParser.parse(text); + JSONObject top = root.isObject(); + String snapshotId = JSONWalk.on(top).next("snapshotId").asString(); + JSONArray arr = JSONWalk.on(top).next("table").asArray(); + ConsoleLog.debug("ID "+snapshotId+": Contains "+arr.size()+ " events"); + + List<List<String>> results = new ArrayList<List<String>>(); + for (int i = 0; i < arr.size(); ++i) + { + JSONObject item = arr.get(i).isObject(); + List<String> row = new ArrayList<String>(); + row.add( JSONWalk.on(item).next("fromUser").asString()); + row.add( JSONWalk.on(item).next("createdAt").asString()); + row.add( JSONWalk.on(item).next("id").asString()); + results.add(row); + } + + model[0] = snapshotId; + model[1] = results; + + return model; + } +} Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CVTView.java 2009-09-08 15:49:14 UTC (rev 831) @@ -21,85 +21,156 @@ */ package org.jboss.bpm.console.client.sam; -import com.google.gwt.json.client.JSONArray; -import com.google.gwt.json.client.JSONObject; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONValue; -import com.google.gwt.user.client.ui.ChangeListener; +import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.WindowCloseListener; +import com.googlecode.gchart.client.GChart; import com.mvc4g.client.Controller; import com.mvc4g.client.ViewInterface; -import org.gwt.mosaic.ui.client.ListBox; +import com.mvc4g.client.Event; import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; import org.gwt.mosaic.ui.client.layout.LayoutPanel; -import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.gwt.mosaic.ui.client.WindowPanel; import org.jboss.bpm.console.client.util.ConsoleLog; -import org.jboss.bpm.console.client.util.JSONWalk; +import org.jboss.bpm.console.client.LazyPanel; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ -public class CVTView extends LayoutPanel implements ViewInterface +public class CVTView extends LayoutPanel implements ViewInterface, LazyPanel { public final static String ID = CVTView.class.getName(); private Controller controller = null; - private ListBox listBox = null; + private ValueTable valueTable= null; private CVTChart chart; private int numSamples = 0; - - public CVTView() + + private Map<Double, String> point2snapshot = new HashMap<Double,String>(); + private String tableName; + + private WindowPanel window; + + private HistoryView history; + private boolean initialzed; + + public CVTView(String tableName) { super(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - chart = new CVTChart(); - this.add(chart, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); - chart.update(); - - this.listBox = createListBox(); - this.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + this.tableName = tableName; + } + + public boolean isInitialized() + { + return this.initialzed; } - public void setController(Controller controller) + public void initialize() { - this.controller = controller; + if(!initialzed) + { + chart = new CVTChart(); + chart.addClickListener( + new ClickListener() + { + public void onClick(Widget widget) + { + GChart theGChart = (GChart) widget; + GChart.Curve.Point p = theGChart.getTouchedPoint(); + if (null != p) + { + String sid = point2snapshot.get(p.getX()); + if(sid!=null) + displaySnapshot(sid); + else + ConsoleLog.error("No snapshot for point " +p.getX()); + } + } + } + ); + this.add(chart, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); + chart.update(); + + this.valueTable = new ValueTable(); + this.add(valueTable, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + this.history = new HistoryView(); + controller.addView(HistoryView.ID, this.history); + createSnapshotWindow(this.history); + + this.initialzed = true; + } } - public void update(String text) + private void displaySnapshot(String sid) { - JSONValue root = JSONParser.parse(text); - JSONArray arr = root.isArray(); - ConsoleLog.debug("Recv "+arr.size()+ " events"); + if(sid!=valueTable.getSnapshotId()) // not recent one + { + controller.handleEvent( + new Event(LoadSnapshotAction.ID, new LoadEvent(tableName, sid)) + ); - List<List<String>> results = new ArrayList<List<String>>(); - // {"fromUser":"DominiqueRdr","createdAt":"Mon Sep 07 17:51:12 CEST 2009","id":"3820456306"} - for (int i = 0; i < arr.size(); ++i) + window.center(); + } + else { - JSONObject item = arr.get(i).isObject(); - List<String> row = new ArrayList<String>(); - row.add( JSONWalk.on(item).next("fromUser").asString()); - row.add( JSONWalk.on(item).next("createdAt").asString()); - row.add( JSONWalk.on(item).next("id").asString()); - results.add(row); + ConsoleLog.debug("Skip current snapshot"); } + } - updateListBox(results); - updateChart(results); + /** + * The 'layout' window panel. + */ + private void createSnapshotWindow(HistoryView history) { + window = new WindowPanel("Past events"); + window.setAnimationEnabled(true); + window.setSize("320px", "180px"); + + LayoutPanel panel = new LayoutPanel(); + + panel.add(history); + + window.setWidget(panel); + + window.addWindowCloseListener(new WindowCloseListener() { + public void onWindowClosed() { + //window = null; + } + + public String onWindowClosing() { + return null; + } + }); } - private void updateChart(List<List<String>> results) + + public void setController(Controller controller) { + this.controller = controller; + } + + public void update(String snapshotId, List<List<String>> table) + { + updateListBox(snapshotId, table); + updateChart(snapshotId, table); + } + + private void updateChart(String snapshotId, List<List<String>> results) + { verifyReset(); chart.getCurve().addPoint(numSamples, results.size()); + point2snapshot.put(chart.getCurve().getPoint().getX(), snapshotId); numSamples++; chart.update(); } @@ -110,64 +181,13 @@ { chart.getCurve().clearPoints(); numSamples=0; + point2snapshot.clear(); } } - private void updateListBox(List<List<String>> results) + private void updateListBox(String snapshotId, List<List<String>> results) { - // update listbox model - final DefaultListModel<List<String>> model = - (DefaultListModel<List<String>>) listBox.getModel(); - - model.clear(); - - for(List<String> row : results) - { - model.add(row); - } + valueTable.update(snapshotId, results); } - private ListBox createListBox() - { - final ListBox<List<String>> listBox = - new ListBox<List<String>>( - new String[] {"ID", "From"} - ); - - - listBox.setCellRenderer(new ListBox.CellRenderer<List<String>>() { - public void renderCell(ListBox<List<String>> listBox, int row, int column, - List<String> item) { - switch (column) { - case 0: - listBox.setText(row, column, item.get(2)); - break; - case 1: - listBox.setText(row, column, item.get(0)); - break; - /* case 2: - listBox.setText(row, column, item.get(1)); - break;*/ - default: - throw new RuntimeException("Unexpected column size"); - } - } - }); - - listBox.addChangeListener(new ChangeListener() - { - public void onChange(Widget widget) - { - int index = listBox.getSelectedIndex(); - if(index!=-1) - { - List<String> item = listBox.getItem(index); - - // do something - } - } - }); - - return listBox; - } } Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CurrentSnapshotAction.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CurrentSnapshotAction.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/CurrentSnapshotAction.java 2009-09-08 15:49:14 UTC (rev 831) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.sam; + +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.util.ConsoleLog; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; +import com.mvc4g.client.Controller; + +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class CurrentSnapshotAction extends AbstractRESTAction +{ + public final static String ID = CurrentSnapshotAction.class.getName(); + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + String tableName = (String)event; + String baseURL = appContext.getConfig().getConsoleServerUrl(); + String url = baseURL + "/rs/cvt/table/current?table=" + URL.encode(tableName); + + ConsoleLog.debug(getRequestMethod() + " " + url); + + return url; + + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.GET; + } + + public void handleSuccessfulResponse( + final Controller controller, + final Object event, + Response response) + { + CVTView view = (CVTView)controller.getView(CVTView.ID); + Object[] model = CVTParser.parseSnapshot(response.getText()); + + String snapshotId = (String)model[0]; + List<List<String>> table = (List<List<String>>)model[1]; + view.update(snapshotId, table); + } +} Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/HistoryView.java 2009-09-08 15:49:14 UTC (rev 831) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.sam; + +import com.mvc4g.client.ViewInterface; +import com.mvc4g.client.Controller; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; + +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class HistoryView extends LayoutPanel implements ViewInterface +{ + public final static String ID = HistoryView.class.getName(); + + private ValueTable valueTable; + private Controller controller; + + public HistoryView() + { + super(); + + this.valueTable = new ValueTable(); + this.add(valueTable); + } + + public void setController(Controller controller) + { + this.controller = controller; + } + + public void update(String snapshotId, List<List<String>> results) + { + this.valueTable.update(snapshotId, results); + } +} Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadEvent.java 2009-09-08 15:49:14 UTC (rev 831) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.sam; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public final class LoadEvent +{ + String table; + String snapshot; + + public LoadEvent(String table, String snapshot) + { + this.table = table; + this.snapshot = snapshot; + } +} Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadSnapshotAction.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadSnapshotAction.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/LoadSnapshotAction.java 2009-09-08 15:49:14 UTC (rev 831) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.sam; + +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.util.ConsoleLog; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; +import com.mvc4g.client.Controller; + +import java.util.List; + +/** + * Consumes {@link org.jboss.bpm.console.client.sam.LoadEvent}'s + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class LoadSnapshotAction extends AbstractRESTAction +{ + public final static String ID = LoadSnapshotAction.class.getName(); + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + LoadEvent le = (LoadEvent)event; + String baseURL = appContext.getConfig().getConsoleServerUrl(); + String url = baseURL + "/rs/cvt/table/load?table=" + URL.encode(le.table); + url += "&snapshot="+le.snapshot; + + return url; + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.GET; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + LoadEvent le = (LoadEvent)event; + + if(response.getStatusCode()==404) + ConsoleLog.error("Snapshot "+le.snapshot + " doesn't exist for "+ le.table); + else + { + ConsoleLog.debug(response.getText()); + HistoryView view = (HistoryView)controller.getView(HistoryView.ID); + Object[] model = CVTParser.parseSnapshot(response.getText()); + + String snapshotId = (String)model[0]; + List<List<String>> table = (List<List<String>>)model[1]; + view.update(snapshotId, table); + } + } +} Deleted: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/PollingRESTAction.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/PollingRESTAction.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/PollingRESTAction.java 2009-09-08 15:49:14 UTC (rev 831) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.sam; - -import org.jboss.bpm.console.client.common.AbstractRESTAction; -import org.jboss.bpm.console.client.util.ConsoleLog; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.Response; -import com.google.gwt.http.client.URL; -import com.mvc4g.client.Controller; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class PollingRESTAction extends AbstractRESTAction -{ - public final static String ID = PollingRESTAction.class.getName(); - - public String getId() - { - return ID; - } - - public String getUrl(Object event) - { - String tableName = (String)event; - String baseURL = appContext.getConfig().getConsoleServerUrl(); - String url = baseURL + "/rs/cvt/table?name=" + URL.encode(tableName); - - ConsoleLog.debug(getRequestMethod() + " " + url); - - return url; - - } - - public RequestBuilder.Method getRequestMethod() - { - return RequestBuilder.GET; - } - - public void handleSuccessfulResponse( - final Controller controller, - final Object event, - Response response) - { - CVTView view = (CVTView)controller.getView(CVTView.ID); - view.update(response.getText()); - } -} Modified: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/TwitterEditor.java 2009-09-08 15:49:14 UTC (rev 831) @@ -48,7 +48,8 @@ private ToggleButton toggle; private DecoratedTabLayoutPanel tabPanel; - + private static final String TABLE_NAME = "iran results"; + public TwitterEditor(ApplicationContext appContext) { super(appContext); @@ -65,13 +66,15 @@ LayoutPanel layout = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); // action and view - controller.addAction(PollingRESTAction.ID, new PollingRESTAction()); + controller.addAction(CurrentSnapshotAction.ID, new CurrentSnapshotAction()); + controller.addAction(LoadSnapshotAction.ID, new LoadSnapshotAction()); // -------------- - this.cvtView = new CVTView(); + this.cvtView = new CVTView(TABLE_NAME); controller.addView(CVTView.ID, cvtView); - + cvtView.initialize(); + layout.add(cvtView, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); // -------------- @@ -87,7 +90,7 @@ { // instant response getController().handleEvent( - new Event(PollingRESTAction.ID, "iran results") + new Event(CurrentSnapshotAction.ID, TABLE_NAME) ); polling.scheduleRepeating(10000); @@ -104,7 +107,7 @@ public void run() { getController().handleEvent( - new Event(PollingRESTAction.ID, "iran results") + new Event(CurrentSnapshotAction.ID, TABLE_NAME) ); } }; Added: sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java =================================================================== --- sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java (rev 0) +++ sam/trunk/console/gui/war/src/main/java/org/jboss/bpm/console/client/sam/ValueTable.java 2009-09-08 15:49:14 UTC (rev 831) @@ -0,0 +1,112 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.sam; + +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.list.DefaultListModel; + +import java.util.List; + +import com.google.gwt.user.client.ui.ChangeListener; +import com.google.gwt.user.client.ui.Widget; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class ValueTable extends LayoutPanel +{ + private ListBox listBox = null; + private String snapshotId; + + public ValueTable() + { + super(); + this.listBox = createListBox(); + this.add(listBox); + } + + public String getSnapshotId() + { + return snapshotId; + } + + public void update(String snapshotId, List<List<String>> results) + { + this.snapshotId = snapshotId; + + // update listbox model + final DefaultListModel<List<String>> model = + (DefaultListModel<List<String>>) listBox.getModel(); + + model.clear(); + + for(List<String> row : results) + { + model.add(row); + } + } + + private ListBox createListBox() + { + final ListBox<List<String>> listBox = + new ListBox<List<String>>( + new String[] {"ID", "From"} + ); + + + listBox.setCellRenderer(new ListBox.CellRenderer<List<String>>() { + public void renderCell(ListBox<List<String>> listBox, int row, int column, + List<String> item) { + switch (column) { + case 0: + listBox.setText(row, column, item.get(2)); + break; + case 1: + listBox.setText(row, column, item.get(0)); + break; + /* case 2: + listBox.setText(row, column, item.get(1)); + break;*/ + default: + throw new RuntimeException("Unexpected column size"); + } + } + }); + + listBox.addChangeListener(new ChangeListener() + { + public void onChange(Widget widget) + { + int index = listBox.getSelectedIndex(); + if(index!=-1) + { + List<String> item = listBox.getItem(index); + + // do something + } + } + }); + + return listBox; + } +} Modified: sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java =================================================================== --- sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/CVTFacade.java 2009-09-08 15:49:14 UTC (rev 831) @@ -71,37 +71,54 @@ } @GET - @Path("table") + @Path("table/current") @Produces("application/json") @RsComment( title = "CVT values by table name", - description = "Access current table values") - public Response getCVT( - @QueryParam("name") - String name + description = "Access current table values") + public Response getCurrentCVT( + @QueryParam("table") + String tableId ) { - String decodedKey = URLDecoder.decode(name); + String decodedKey = URLDecoder.decode(tableId); CVT cvt = getMonitor().getCVTRegistry().lookupCVT(decodedKey); if(null==cvt) - throw new IllegalArgumentException("No CVT for key "+name); + throw new IllegalArgumentException("No CVT for key "+decodedKey); - CVTSnapshot snapshot = cvt.snapshot(); - List<Map> converted = new ArrayList<Map>(); - for(Map<String,Object> m : snapshot.getTable()) + CVTSnapshot snapshot = cvt.snapshot(); + return parseCVTTable(snapshot); + } + + @GET + @Path("table/load") + @Produces("application/json") + @RsComment( + title = "Access CVT history", + description = "Access stored table values") + public Response loadCVT( + @QueryParam("table") + String tableId, + @QueryParam("snapshot") + String snapshotId + ) + { + String decodedKey = URLDecoder.decode(tableId); + CVT cvt = getMonitor().getCVTRegistry().lookupCVT(decodedKey); + if(null==cvt) + throw new IllegalArgumentException("No CVT for key "+decodedKey); + + if(cvt.getSwapHandler().maintains(snapshotId)==false) { - Map<String,String> row = new HashMap<String, String>(); - for(String k : m.keySet()) - { - row.put(k, String.valueOf(m.get(k))); - } - - converted.add(row); + return Response.status(404).build(); } - return parseCVTTable(converted); + else + { + CVTSnapshot snapshot = cvt.getSwapHandler().load(snapshotId); + return parseCVTTable(snapshot); + } } - @GET @Path("registry/keys") @Produces("application/json") @@ -118,16 +135,56 @@ private Response createJsonResponse(Object wrapper) { - Gson gson = GsonFactory.createInstance(); + Gson gson = GsonFactory.createInstance(); String json = gson.toJson(wrapper); return Response.ok(json).type("application/json").build(); } - private Response parseCVTTable(Object wrapper) + private Response parseCVTTable(CVTSnapshot snapshot) { - Gson gson = GsonFactory.createInstance(); - Type mapType = new TypeToken<List<Map<String, String>>>() {}.getType(); - String json = gson.toJson(wrapper, mapType); + List<Map> converted = new ArrayList<Map>(); + for(Map<String,Object> m : snapshot.getTable()) + { + Map<String,String> row = new HashMap<String, String>(); + for(String k : m.keySet()) + { + row.put(k, String.valueOf(m.get(k))); + } + + converted.add(row); + } + + CVTSnapshotRef jsonModel = new CVTSnapshotRef( + snapshot.getSnapshotId(), + converted + ); + + Gson gson = GsonFactory.createInstance(); + //Type mapType = new TypeToken<List<Map<String, String>>>() {}.getType(); + String json = gson.toJson(jsonModel); return Response.ok(json).type("application/json").build(); } + + final class CVTSnapshotRef + { + private String snapshotId; + private List<Map> table; + + + public CVTSnapshotRef(String snapshotId, List<Map> table) + { + this.snapshotId = snapshotId; + this.table = table; + } + + public String getSnapshotId() + { + return snapshotId; + } + + public List<Map> getTable() + { + return table; + } + } } Modified: sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java =================================================================== --- sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/console/server/war/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java 2009-09-08 15:49:14 UTC (rev 831) @@ -21,20 +21,64 @@ */ package org.jboss.bpm.console.server.gson; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; +import com.google.gson.*; +import java.lang.reflect.Type; +import java.lang.reflect.ParameterizedType; +import java.util.Map; +import java.util.Iterator; +import java.util.LinkedHashMap; + /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ public class GsonFactory { - public static Gson createInstance() - { - Gson gson = new GsonBuilder() + public static Gson createInstance() + { + GsonBuilder gsonBuilder = new GsonBuilder() .setDateFormat("yyyy-MM-dd HH:mm:ss") - .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) - .create(); - return gson; - } + .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()); + + + return gsonBuilder.create(); + } + + /* static class MyMapTypeAdapter implements JsonSerializer<Map>, JsonDeserializer<Map>, InstanceCreator<Map> { + public JsonElement serialize(Map src, Type typeOfSrc, JsonSerializationContext context) { + JsonObject map = new JsonObject(); + Type childGenericType = null; + if (typeOfSrc instanceof ParameterizedType) { + childGenericType = new TypeInfoMap(typeOfSrc).getValueType(); + } + for (Iterator iterator = src.entrySet().iterator(); iterator.hasNext(); ) { + Map.Entry entry = (Map.Entry) iterator.next(); + Object value = entry.getValue(); + Type childType = (childGenericType == null) ? + childType = value.getClass() : childGenericType; + JsonElement valueElement = context.serialize(value, childType); + map.add(entry.getKey().toString(), valueElement); + } + return map; + } + + public Map deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException { + // Using linked hash map to preserve order in which elements are entered + Map<String, Object> map = new LinkedHashMap<String, Object>(); + Type childType = new TypeInfoMap(typeOfT).getValueType(); + for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) { + Object value = context.deserialize(entry.getValue(), childType); + map.put(entry.getKey(), value); + } + return map; + } + public Map createInstance(Type type) { + return new LinkedHashMap(); + } + @Override + public String toString() { + return MyMapTypeAdapter.class.getSimpleName(); + } + } */ } Modified: sam/trunk/pom.xml =================================================================== --- sam/trunk/pom.xml 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/pom.xml 2009-09-08 15:49:14 UTC (rev 831) @@ -39,7 +39,7 @@ <commons.logging.version >1.1.1</commons.logging.version> <commons-lang.version>2.4</commons-lang.version> <commons-config.version>1.6</commons-config.version> - <gson.version>1.2.2</gson.version> + <gson.version>1.3</gson.version> <gwt.version>1.5.3</gwt.version> <gwt-mosaic.version>0.1.10</gwt-mosaic.version> Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/CVT.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/CVT.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/CVT.java 2009-09-08 15:49:14 UTC (rev 831) @@ -81,6 +81,11 @@ void setSwapHandler(SwapHandler swapHandler); /** + * access {@link org.jboss.sam.cvt.SwapHandler} + */ + SwapHandler getSwapHandler(); + + /** * Dumps the table contents to a printstream. * This implies a {@link #snapshot()} * @param out Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/CVTOutput.java 2009-09-08 15:49:14 UTC (rev 831) @@ -33,7 +33,7 @@ * * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ -public class CVTOutput implements StreamOutput +public final class CVTOutput implements StreamOutput { private boolean started; private String name; Modified: sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java =================================================================== --- sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/sam/core/src/main/java/org/jboss/sam/cvt/internal/DefaultCVT.java 2009-09-08 15:49:14 UTC (rev 831) @@ -120,6 +120,12 @@ this.swapHandler = swapHandler; } + + public SwapHandler getSwapHandler() + { + return this.swapHandler; + } + public void dump(PrintStream out) { synchronized(table) Added: sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java =================================================================== --- sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java (rev 0) +++ sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/InMemorySwapHandler.java 2009-09-08 15:49:14 UTC (rev 831) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.sam.examples.twitter; + +import org.jboss.sam.cvt.CVTSnapshot; +import org.jboss.sam.cvt.SwapHandler; + +import java.util.LinkedList; +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class InMemorySwapHandler implements SwapHandler +{ + + private List<CVTSnapshot> snapshots = new LinkedList<CVTSnapshot>(); + + private final static int MAX_SNAPSHOTS = 50; + + public void store(CVTSnapshot snapshot) + { + synchronized(snapshots) + { + if(snapshots.size()<MAX_SNAPSHOTS) + { + snapshots.add(snapshot); + } + else + { + snapshots.remove(0); // first is the oldest + snapshots.add(snapshot); + } + } + } + + public CVTSnapshot load(String snapshotId) + { + return internalLoad(snapshotId, true); + } + + public CVTSnapshot internalLoad(String snapshotId, boolean failfast) + { + CVTSnapshot match = null; + synchronized(snapshots) + { + for(CVTSnapshot snapshot : snapshots) + { + if(snapshotId.equals(snapshot.getSnapshotId())) + { + match = snapshot; + break; + } + } + } + + if(null==match && failfast) + throw new RuntimeException("No snapshot with id "+snapshotId); + + return match; + } + + public boolean maintains(String snapshotId) + { + return internalLoad(snapshotId, false)!=null; + } +} Modified: sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterExample.java =================================================================== --- sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterExample.java 2009-09-08 12:17:05 UTC (rev 830) +++ sam/trunk/sam/examples/twitter/src/main/java/org/jboss/sam/examples/twitter/TwitterExample.java 2009-09-08 15:49:14 UTC (rev 831) @@ -28,6 +28,7 @@ import org.jboss.sam.config.Configuration; import org.jboss.sam.cvt.CVTRegistry; import org.jboss.sam.cvt.CVTOutput; +import org.jboss.sam.cvt.SwapHandler; import org.jboss.sam.datasource.DataSourceManager; import java.io.InputStream; @@ -40,6 +41,7 @@ { private ActivityMonitor delegate; + private SwapHandler inMemorySwapHandler = new InMemorySwapHandler(); public TwitterExample() { @@ -90,6 +92,8 @@ private CVTOutput createAndRegisterCVT(String name) { CVTOutput output = new CVTOutput(name, new String[] {"id", "fromUser", "createdAt"}); + output.getTable().setSwapHandler(inMemorySwapHandler); + delegate.getEventProcessor().addOutput(output); delegate.getCVTRegistry().addTable(output.getTable());