Author: heiko.braun(a)jboss.com Date: 2008-06-30 06:55:52 -0400 (Mon, 30 Jun 2008) New Revision: 84 Modified: sam/trunk/SAM.iws sam/trunk/src/main/java/org/jboss/sam/chart/ChartServer.java Log: ChartServer API update Modified: sam/trunk/SAM.iws =================================================================== --- sam/trunk/SAM.iws 2008-06-30 09:52:26 UTC (rev 83) +++ sam/trunk/SAM.iws 2008-06-30 10:55:52 UTC (rev 84) @@ -148,8 +148,8 @@ <property name="field_breakpoints_groupByClasses" value="true" /> <property name="method_breakpoints_groupByClasses" value="true" /> <property name="exception_breakpoints_viewId" value="TABLE" /> + <property name="field_breakpoints_viewId" value="TABLE" /> <property name="exception_breakpoints_groupByClasses" value="true" /> - <property name="field_breakpoints_viewId" value="TABLE" /> <property name="method_breakpoints_groupByMethods" value="false" /> </ui_properties> </component> @@ -172,33 +172,15 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="SimulationMain.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/sim/SimulationMain.java"> + <file leaf-file-name="ChartServer.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartServer.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="13" selection-start="1274" selection-end="1274" vertical-scroll-proportion="0.1794569"> + <state line="47" column="64" selection-start="1705" selection-end="1705" vertical-scroll-proportion="0.60566705"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="EventProcessorEntity.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/sim/EventProcessorEntity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="13" selection-start="1593" selection-end="1593" vertical-scroll-proportion="-0.022432113"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="EventSink.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/sim/EventSink.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1528" selection-end="1528" vertical-scroll-proportion="-0.5608028"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -449,7 +431,41 @@ <option name="myItemId" value="SAM.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-trunk" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/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$/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$/src/main/java/org/jboss/sam/chart" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="SAM.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -463,7 +479,7 @@ <showLibraryContents /> <hideEmptyPackages /> <abbreviatePackageNames /> - <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> + <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -473,13 +489,13 @@ <property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" /> <property name="GoToFile.includeJavaFiles" value="false" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> <property name="RunManagerConfig.compileBeforeRunning" value="false" /> - <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> <property name="GenerateAntBuildDialog.generateSingleFile" value="false" /> <property name="MemberChooser.sorted" value="false" /> <property name="MemberChooser.showClasses" value="true" /> + <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" /> <property name="GenerateAntBuildDialog.backupFiles" value="true" /> - <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" /> <property name="GoToClass.includeLibraries" value="false" /> <property name="MemberChooser.copyJavadoc" value="false" /> </component> @@ -778,13 +794,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMapping.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="97" column="4" selection-start="3212" selection-end="3212" vertical-scroll-proportion="1.4571773"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMappingRegistry.java"> <provider selected="true" editor-type-id="text-editor"> <state line="36" column="0" selection-start="1357" selection-end="1357" vertical-scroll-proportion="0.36670688"> @@ -806,13 +815,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartServer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="17" selection-start="1260" selection-end="1260" vertical-scroll-proportion="0.2291918"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartServerFactory.java"> <provider selected="true" editor-type-id="text-editor"> <state line="26" column="22" selection-start="1139" selection-end="1139" vertical-scroll-proportion="0.13751508"> @@ -864,25 +866,39 @@ </entry> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/sim/SimulationMain.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="13" selection-start="1274" selection-end="1274" vertical-scroll-proportion="0.1794569"> + <state line="30" column="13" selection-start="1274" selection-end="1274" vertical-scroll-proportion="0.022432113"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/sim/EventProcessorEntity.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="13" selection-start="1593" selection-end="1593" vertical-scroll-proportion="-0.022432113"> + <state line="37" column="13" selection-start="1593" selection-end="1593" vertical-scroll-proportion="0.022432113"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/sam/sim/EventSink.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1528" selection-end="1528" vertical-scroll-proportion="-0.5608028"> + <state line="38" column="13" selection-start="1528" selection-end="1528" vertical-scroll-proportion="0.022432113"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartMapping.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="37" column="19" selection-start="1563" selection-end="1563" vertical-scroll-proportion="0.33293977"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/sam/chart/ChartServer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="47" column="64" selection-start="1705" selection-end="1705" vertical-scroll-proportion="0.60566705"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: sam/trunk/src/main/java/org/jboss/sam/chart/ChartServer.java =================================================================== --- sam/trunk/src/main/java/org/jboss/sam/chart/ChartServer.java 2008-06-30 09:52:26 UTC (rev 83) +++ sam/trunk/src/main/java/org/jboss/sam/chart/ChartServer.java 2008-06-30 10:55:52 UTC (rev 84) @@ -24,7 +24,9 @@ import org.jboss.sam.EventMessage; /** - * Allows creation and retrieval of {@link org.jboss.sam.chart.Chart} repesenations. + * Allows creation and retrieval of {@link org.jboss.sam.chart.Chart} repesentations. + * A chart server will be associated with a {@link org.jboss.sam.chart.ChartMappingRegistry} that stores + * the preconfigured mappings. * * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ @@ -43,5 +45,5 @@ * @param payloads * @return */ - Chart createChart(String chartName, EventMessage[] payloads); + Chart createChart(String chartName, String chartMappingAlias, EventMessage[] payloads); }