Skip to content

Commit

Permalink
Add the id() method on Statement to make it easier to retrieve the id…
Browse files Browse the repository at this point in the history
… of a Statement. Use tryForNode in the heatmap generator. We need the templates of all the statements with the WrapInTryCatch intention on Lines.
  • Loading branch information
fac2003 committed Jan 28, 2015
1 parent 108ad9e commit 07b736d
Show file tree
Hide file tree
Showing 17 changed files with 2,359 additions and 2,027 deletions.
3 changes: 3 additions & 0 deletions build.properties
@@ -0,0 +1,3 @@
build_number=
reference_commit=
reference_branch=
18 changes: 13 additions & 5 deletions build.xml
Expand Up @@ -32,8 +32,6 @@
<property name="org.campagnelab.mps.UI.ui_version" value="${import.org.campagnelab.mps.UI.org.campagnelab.mps.UI.ui_version}" />
<property name="org.campagnelab.mps.UI.build_number" value="${import.org.campagnelab.mps.UI.org.campagnelab.mps.UI.build_number}" />
<property name="XChart.build_number" value="${import.XChart.XChart.build_number}" />
<property name="XChart.reference_commit" value="${import.XChart.XChart.reference_commit}" />
<property name="XChart.reference_branch" value="${import.XChart.XChart.reference_branch}" />
<property name="XChart.XChart_version" value="${import.XChart.XChart.XChart_version}" />

<path id="path.mps.ant.path">
Expand Down Expand Up @@ -457,18 +455,18 @@
<zipfileset file="${basedir}/devkits/org.campagnelab.HTAnalysis.devkit" prefix="metaR/languages/metaR" />
<fileset dir="${build.tmp}/default/metaR__dl__lbrace_metaR_version_rbrace_.zip" />
</zip>
<echo file="${build.layout}/build.properties">MetaR.org.campagnelab.metaR=${org.campagnelab.metaR}${line.separator}MetaR.metaR_version=${metaR_version}${line.separator}MetaR.textoutput_version=${textoutput_version}${line.separator}MetaR.build_number=${build_number}${line.separator}MetaR.reference_commit=${reference_commit}${line.separator}MetaR.reference_branch=${reference_branch}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}org.campagnelab.TextOutput.build_number=${org.campagnelab.TextOutput.build_number}${line.separator}org.campagnelab.TextOutput.textoutput_version=${org.campagnelab.TextOutput.textoutput_version}${line.separator}org.campagnelab.mps.UI.ui_version=${org.campagnelab.mps.UI.ui_version}${line.separator}org.campagnelab.mps.UI.build_number=${org.campagnelab.mps.UI.build_number}${line.separator}XChart.build_number=${XChart.build_number}${line.separator}XChart.reference_commit=${XChart.reference_commit}${line.separator}XChart.reference_branch=${XChart.reference_branch}${line.separator}XChart.XChart_version=${XChart.XChart_version}</echo>
<echo file="${build.layout}/build.properties">MetaR.org.campagnelab.metaR=${org.campagnelab.metaR}${line.separator}MetaR.metaR_version=${metaR_version}${line.separator}MetaR.textoutput_version=${textoutput_version}${line.separator}MetaR.build_number=${build_number}${line.separator}MetaR.reference_commit=${reference_commit}${line.separator}MetaR.reference_branch=${reference_branch}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}org.campagnelab.TextOutput.build_number=${org.campagnelab.TextOutput.build_number}${line.separator}org.campagnelab.TextOutput.textoutput_version=${org.campagnelab.TextOutput.textoutput_version}${line.separator}org.campagnelab.mps.UI.ui_version=${org.campagnelab.mps.UI.ui_version}${line.separator}org.campagnelab.mps.UI.build_number=${org.campagnelab.mps.UI.build_number}${line.separator}XChart.build_number=${XChart.build_number}${line.separator}XChart.XChart_version=${XChart.XChart_version}</echo>
</target>

<target name="buildDependents" />

<target name="fetchDependencies">
<mkdir dir="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip" />
<unzip src="${artifacts.org.campagnelab.mps.UI}/org.campagnelab.UI-${org.campagnelab.mps.UI.ui_version}.zip" dest="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip" />
<mkdir dir="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip" />
<unzip src="${artifacts.XChart}/XChart_${XChart.XChart_version}.zip" dest="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip" />
<mkdir dir="${build.tmp}/deps/org.campagnelab.TextOutput/org.campagnelab.TextOutput-_dl__lbrace_textoutput_version_rbrace_.zip" />
<unzip src="${artifacts.org.campagnelab.TextOutput}/org.campagnelab.TextOutput-${org.campagnelab.TextOutput.textoutput_version}.zip" dest="${build.tmp}/deps/org.campagnelab.TextOutput/org.campagnelab.TextOutput-_dl__lbrace_textoutput_version_rbrace_.zip" />
<mkdir dir="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip" />
<unzip src="${artifacts.org.campagnelab.mps.UI}/org.campagnelab.UI-${org.campagnelab.mps.UI.ui_version}.zip" dest="${build.tmp}/deps/org.campagnelab.mps.UI/org.campagnelab.UI-_dl__lbrace_ui_version_rbrace_.zip" />
</target>

<target name="build" depends="assemble" />
Expand Down Expand Up @@ -532,6 +530,7 @@
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationParameters.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
Expand Down Expand Up @@ -747,6 +746,7 @@
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
<fileset file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
Expand Down Expand Up @@ -902,6 +902,7 @@
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
<fileset file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
Expand Down Expand Up @@ -1323,6 +1324,7 @@
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<pathelement path="${build.tmp}/java/out/org.campagnelab.metar.code" />
<fileset file="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip/XChart/lib/xchart-2.4.1-SNAPSHOT.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
Expand All @@ -1339,9 +1341,15 @@
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
<fileset file="${artifacts.mps}/languages/util/jetbrains.mps.execution.util.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
<fileset file="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip/XChart/languages/XChart/org.campagnelab.mps.XChart.jar" />
<fileset file="${build.tmp}/deps/XChart/XChart__dl__lbrace_XChart_version_rbrace_.zip/XChart/languages/XChart/org.campagnelab.mps.XChart.types.jar" />
<fileset file="${build.tmp}/deps/org.campagnelab.TextOutput/org.campagnelab.TextOutput-_dl__lbrace_textoutput_version_rbrace_.zip/TextOutput/languages/TextOutput/org.campagnelab.textoutput.jar" />
</classpath>
</javac>
Expand Down
Expand Up @@ -12,6 +12,7 @@
<import index="8vtd" modelUID="r:cbd13695-fd32-4d39-aded-ba7e630ac2c3(org.campagnelab.metar.inspect.structure)" version="1" />
<import index="fxg7" modelUID="f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.io(JDK/java.io@java_stub)" version="-1" />
<import index="ec5l" modelUID="f:java_stub#8865b7a8-5271-43d3-884c-6fd1d9cfdd34#org.jetbrains.mps.openapi.model(MPS.OpenAPI/org.jetbrains.mps.openapi.model@java_stub)" version="-1" />
<import index="2k4h" modelUID="r:930671f0-37d5-4b40-acdb-7bfbc083292a(org.campagnelab.metar.inspect.behavior)" version="0" />
<import index="tpck" modelUID="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" version="0" implicit="yes" />
<import index="tpf8" modelUID="r:00000000-0000-4000-0000-011c895902e8(jetbrains.mps.lang.generator.structure)" version="2" implicit="yes" />
<import index="p6sl" modelUID="r:175e6779-7e81-49b1-b295-33bbabafa8d6(org.campagnelab.textoutput.structure)" version="1" implicit="yes" />
Expand Down
Expand Up @@ -2,8 +2,10 @@
<model modelUID="r:930671f0-37d5-4b40-acdb-7bfbc083292a(org.campagnelab.metar.inspect.behavior)" version="0">
<persistence version="8" />
<language namespace="af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)" />
<language namespace="b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)" />
<devkit namespace="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
<import index="8vtd" modelUID="r:cbd13695-fd32-4d39-aded-ba7e630ac2c3(org.campagnelab.metar.inspect.structure)" version="1" />
<import index="ec5l" modelUID="f:java_stub#8865b7a8-5271-43d3-884c-6fd1d9cfdd34#org.jetbrains.mps.openapi.model(MPS.OpenAPI/org.jetbrains.mps.openapi.model@java_stub)" version="-1" />
<import index="tpee" modelUID="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" version="5" implicit="yes" />
<import index="1i04" modelUID="r:3270011d-8b2d-4938-8dff-d256a759e017(jetbrains.mps.lang.behavior.structure)" version="-1" implicit="yes" />
<root type="1i04.ConceptBehavior" typeId="1i04.1225194240794" id="4166618652720345532" nodeInfo="ng">
Expand All @@ -12,5 +14,11 @@
<node role="body" roleId="tpee.1137022507850" type="tpee.StatementList" typeId="tpee.1068580123136" id="4166618652720345534" nodeInfo="sn" />
</node>
</root>
<root type="1i04.ConceptBehavior" typeId="1i04.1225194240794" id="3007013211739060828" nodeInfo="ng">
<link role="concept" roleId="1i04.1225194240799" targetNodeId="8vtd.8969925079115431553" resolveInfo="TryAndReport" />
<node role="constructor" roleId="1i04.1225194240801" type="1i04.ConceptConstructorDeclaration" typeId="1i04.1225194413805" id="3007013211739060829" nodeInfo="nn">
<node role="body" roleId="tpee.1137022507850" type="tpee.StatementList" typeId="tpee.1068580123136" id="3007013211739060830" nodeInfo="sn" />
</node>
</root>
</model>

@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<history>
<StructureModification>
<dependencies>
<model index="195s" modelUID="r:597299e2-456c-40ec-87e4-c5fdcfc8d153(org.campagnelab.metar.tables.intentions)" version="2" />
<model index="8n21" modelUID="r:630f3c9b-0e3f-4dda-9e8f-2737c8280fcf(org.campagnelab.metar.inspect.intentions)" version="-1" />
</dependencies>
<move id="8n21.8969925079117982828" to="195s.3007013211738540670" />
<move id="8n21.6703943070278525810" to="195s.3007013211738540691" />
<move id="8n21.8969925079117981054" to="195s.3007013211738540672" />
<move id="8n21.8969925079117982827" to="195s.3007013211738540671" />
<move id="8n21.3007013211738099416" to="195s.3007013211738540708" />
<move id="8n21.3007013211737705142" to="195s.3007013211738540710" />
<move id="8n21.6703943070278487830" to="195s.3007013211738540701" />
<move id="8n21.8969925079118025513" to="195s.3007013211738540725" />
<move id="8n21.8969925079118030258" to="195s.3007013211738540726" />
<move id="8n21.6703943070278525882" to="195s.3007013211738540692" />
<move id="8n21.6703943070278487828" to="195s.3007013211738540699" />
<move id="8n21.8969925079118036681" to="195s.3007013211738540681" />
<move id="8n21.8969925079117981055" to="195s.3007013211738540673" />
<move id="8n21.3007013211738099417" to="195s.3007013211738540709" />
<move id="8n21.6703943070278449402" to="195s.3007013211738540696" />
<move id="8n21.8969925079118022997" to="195s.3007013211738540721" />
<move id="8n21.6703943070278449404" to="195s.3007013211738540693" />
<move id="8n21.6703943070278487826" to="195s.3007013211738540698" />
<move id="8n21.8969925079118031112" to="195s.3007013211738540679" />
<move id="8n21.8969925079118026414" to="195s.3007013211738540720" />
<move id="8n21.8969925079118036562" to="195s.3007013211738540680" />
<move id="8n21.8969925079117981053" to="195s.3007013211738540669" />
<move id="8n21.6703943070278451460" to="195s.3007013211738540697" />
<move id="8n21.8969925079117981052" to="195s.3007013211738540668" />
<move id="8n21.8969925079118031034" to="195s.3007013211738540676" />
<move id="8n21.8969925079118033591" to="195s.3007013211738540688" />
<move id="8n21.3007013211737707893" to="195s.3007013211738540711" />
<move id="8n21.8969925079117981051" to="195s.3007013211738540667" />
<move id="8n21.6703943070278460450" to="195s.3007013211738540694" />
<move id="8n21.6703943070278449689" to="195s.3007013211738540695" />
<move id="8n21.6703943070278496260" to="195s.3007013211738540704" />
<move id="8n21.8969925079118036560" to="195s.3007013211738540682" />
<move id="8n21.8969925079118039002" to="195s.3007013211738540683" />
<move id="8n21.8969925079118033593" to="195s.3007013211738540685" />
<move id="8n21.8969925079118024808" to="195s.3007013211738540724" />
<move id="8n21.8969925079118022053" to="195s.3007013211738540717" />
<move id="8n21.6703943070278499817" to="195s.3007013211738540703" />
<move id="8n21.6703943070278494882" to="195s.3007013211738540705" />
<move id="8n21.8969925079118031035" to="195s.3007013211738540674" />
<move id="8n21.8969925079118031121" to="195s.3007013211738540677" />
<move id="8n21.8969925079118022054" to="195s.3007013211738540718" />
<move id="8n21.8969925079118031038" to="195s.3007013211738540675" />
<move id="8n21.6703943070278435219" to="195s.3007013211738540689" />
<move id="8n21.3007013211737705140" to="195s.3007013211738540713" />
<move id="8n21.8969925079118031111" to="195s.3007013211738540678" />
<move id="8n21.3007013211737708097" to="195s.3007013211738540715" />
<move id="8n21.8969925079118022705" to="195s.3007013211738540722" />
<move id="8n21.8969925079118024806" to="195s.3007013211738540723" />
<move id="8n21.6703943070278398467" to="195s.3007013211738540690" />
<move id="8n21.8969925079118033786" to="195s.3007013211738540687" />
<move id="8n21.6703943070278510872" to="195s.3007013211738540707" />
<move id="8n21.3007013211737706870" to="195s.3007013211738540714" />
<move id="8n21.8969925079118035918" to="195s.3007013211738540686" />
<move id="8n21.6703943070278494884" to="195s.3007013211738540702" />
<move id="8n21.6703943070278497382" to="195s.3007013211738540706" />
<move id="8n21.3007013211738095401" to="195s.3007013211738540716" />
<move id="8n21.8969925079118039075" to="195s.3007013211738540684" />
<move id="8n21.8969925079118022706" to="195s.3007013211738540719" />
<move id="8n21.6703943070278487829" to="195s.3007013211738540700" />
<move id="8n21.3007013211737706217" to="195s.3007013211738540712" />
</StructureModification>
</history>

Expand Up @@ -56,16 +56,16 @@
<root type="tpce.ConceptDeclaration" typeId="tpce.1071489090640" id="8969925079115431553" nodeInfo="ig">
<property name="name" nameId="tpck.1169194664001" value="TryAndReport" />
<link role="extends" roleId="tpce.1071489389519" targetNodeId="p6sl.5039633819242576787" resolveInfo="Lines" />
<node role="propertyDeclaration" roleId="tpce.1071489727084" type="tpce.PropertyDeclaration" typeId="tpce.1071489288299" id="8969925079115431616" nodeInfo="ig">
<property name="name" nameId="tpck.1169194664001" value="nodeId" />
<link role="dataType" roleId="tpce.1082985295845" targetNodeId="tpck.1082983041843" resolveInfo="string" />
</node>
<node role="linkDeclaration" roleId="tpce.1071489727083" type="tpce.LinkDeclaration" typeId="tpce.1071489288298" id="8969925079115431619" nodeInfo="ig">
<property name="metaClass" nameId="tpce.1071599937831" value="aggregation" />
<property name="role" nameId="tpce.1071599776563" value="try" />
<property name="sourceCardinality" nameId="tpce.1071599893252" value="1" />
<link role="target" roleId="tpce.1071599976176" targetNodeId="p6sl.5039633819242576787" resolveInfo="Lines" />
</node>
<node role="propertyDeclaration" roleId="tpce.1071489727084" type="tpce.PropertyDeclaration" typeId="tpce.1071489288299" id="8969925079115431616" nodeInfo="ig">
<property name="name" nameId="tpck.1169194664001" value="nodeId" />
<link role="dataType" roleId="tpce.1082985295845" targetNodeId="tpck.1082983041843" resolveInfo="string" />
</node>
</root>
</model>

Expand Up @@ -38,9 +38,14 @@
<sourcePath />
<dependencies>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</dependency>
<dependency reexport="false">c901f7a1-ed4f-4b52-8d35-10d1a33974f0(org.campagnelab.metar.code)</dependency>
<dependency reexport="false">5ec1cd3d-0a50-4049-a8fa-ae768d7baa25(org.campagnelab.mps.XChart)</dependency>
</dependencies>
<usedLanguages>
<usedLanguage>ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)</usedLanguage>
<usedLanguage>b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</usedLanguage>
<usedLanguage>289fcc83-6543-41e8-a5ca-768235715ce4(jetbrains.mps.lang.generator.generationParameters)</usedLanguage>
<usedLanguage>9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)</usedLanguage>
<usedLanguage>c901f7a1-ed4f-4b52-8d35-10d1a33974f0(org.campagnelab.metar.code)</usedLanguage>
Expand Down

0 comments on commit 07b736d

Please sign in to comment.