MPS-27804 - change incorrect dependencies to "Extends" master
authorVaclav <vaclav.pech@gmail.com>
Fri, 20 Apr 2018 08:23:23 +0000 (10:23 +0200)
committerVaclav <vaclav.pech@gmail.com>
Fri, 20 Apr 2018 08:23:23 +0000 (10:23 +0200)
18 files changed:
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/jetbrains.mps.samples.customizedDebugger.Bottomline.mpl
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/source_gen.caches/jetbrains/mps/samples/customizedDebugger/Bottomline/behavior/generated
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/source_gen.caches/jetbrains/mps/samples/customizedDebugger/Bottomline/constraints/generated
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/source_gen.caches/jetbrains/mps/samples/customizedDebugger/Bottomline/dependencies
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/source_gen.caches/jetbrains/mps/samples/customizedDebugger/Bottomline/generated
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/source_gen.caches/jetbrains/mps/samples/customizedDebugger/Bottomline/structure/generated
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/source_gen.caches/jetbrains/mps/samples/customizedDebugger/Bottomline/typesystem/generated
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/source_gen/jetbrains/mps/samples/customizedDebugger/Bottomline/Language.java
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Bottomline/source_gen/jetbrains/mps/samples/customizedDebugger/Bottomline/trace.info
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Highlevel/jetbrains.mps.samples.customizedDebugger.Highlevel.mpl
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Highlevel/source_gen.caches/jetbrains/mps/samples/customizedDebugger/Highlevel/dependencies
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Highlevel/source_gen.caches/jetbrains/mps/samples/customizedDebugger/Highlevel/generated
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Highlevel/source_gen/jetbrains/mps/samples/customizedDebugger/Highlevel/Language.java
samples/customizedDebugger/languages/jetbrains.mps.samples.customizedDebugger.Highlevel/source_gen/jetbrains/mps/samples/customizedDebugger/Highlevel/trace.info
samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/jetbrains.mps.samples.SwingBuilder.mpl
samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/source_gen.caches/jetbrains/mps/samples/SwingBuilder/generated
samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/source_gen/jetbrains/mps/samples/SwingBuilder/Language.java
samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/source_gen/jetbrains/mps/samples/SwingBuilder/trace.info

index e9cb722080e25c71a362cc60809dfee110342bf6..c045eed7710332eacc2b83570962a2942890cba0 100644 (file)
@@ -9,7 +9,6 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
     <dependency reexport="false">f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -18,7 +17,6 @@
     <dependency reexport="false">a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">982eb8df-2c96-4bd7-9963-11712ea622e5(jetbrains.mps.lang.resources)</dependency>
-    <dependency reexport="false">4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -73,6 +71,9 @@
   <runtime>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </runtime>
-  <extendedLanguages />
+  <extendedLanguages>
+    <extendedLanguage>9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)</extendedLanguage>
+    <extendedLanguage>4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)</extendedLanguage>
+  </extendedLanguages>
 </language>
 
index 540aa1155fcdcaa3a1f57dc50c1b6eaa9a599528..d31b519ad5520dda417789dc2845d35000ba416f 100644 (file)
@@ -16,6 +16,7 @@
     <classNode dependClassName="jetbrains.mps.samples.customizedDebugger.Bottomline.textGen.TextGenAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.samples.customizedDebugger.Bottomline.typesystem.TypesystemDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.ids.SLanguageId" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConceptPresentationAspect" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor" />
index 98f9d1083f6828a71fc09d45d7509f12360dc768..8b93b96b92b6604358d365dea538d50f919223df 100644 (file)
@@ -6,6 +6,7 @@ import jetbrains.mps.smodel.language.LanguageRuntime;
 import jetbrains.mps.smodel.adapter.ids.SLanguageId;
 import java.util.Collection;
 import org.jetbrains.mps.openapi.language.SLanguage;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
 import jetbrains.mps.smodel.runtime.ILanguageAspect;
 import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor;
 import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor;
@@ -43,6 +44,8 @@ public class Language extends LanguageRuntime {
 
   @Override
   protected void fillExtendedLanguages(Collection<SLanguage> extendedLanguages) {
+    extendedLanguages.add(MetaAdapterFactory.getLanguage(SLanguageId.deserialize("9ded098b-ad6a-4657-bfd9-48636cfe8bc3"), "jetbrains.mps.lang.traceable"));
+    extendedLanguages.add(MetaAdapterFactory.getLanguage(SLanguageId.deserialize("4caf0310-491e-41f5-8a9b-2006b3a94898"), "jetbrains.mps.execution.util"));
   }
 
   @Override
index 41924217ec17b9b72f76eab72cee2fc0af179d60..db630446b06c43abbfe108a6c243130be83feec9 100644 (file)
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root>
     <file name="Language.java">
-      <unit at="23,0,77,0" name="jetbrains.mps.samples.customizedDebugger.Bottomline.Language" />
+      <unit at="24,0,80,0" name="jetbrains.mps.samples.customizedDebugger.Bottomline.Language" />
     </file>
   </root>
 </debug-info>
index 1f5ec75348c9e7e17554f3e0dc1e99ced09892a3..46d2223913773b99d6e98e52357b6fc68619c1a0 100644 (file)
@@ -42,7 +42,9 @@
         <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="3f028972-a290-4cf2-a87e-9b8f7e56076b(jetbrains.mps.samples.customizedDebugger.Bottomline)" version="0" />
         <module reference="bdab7456-dc1d-4dc5-b5bf-ab059630252d(jetbrains.mps.samples.customizedDebugger.Highlevel)" version="0" />
         <module reference="f652334e-24c4-48f8-8f16-4b69c6aa9b9e(jetbrains.mps.samples.customizedDebugger.Highlevel#8203012558887843487)" version="0" />
@@ -53,7 +55,6 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false" scope="generate-into">3f028972-a290-4cf2-a87e-9b8f7e56076b(jetbrains.mps.samples.customizedDebugger.Bottomline)</dependency>
-    <dependency reexport="false">4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -90,6 +91,8 @@
     <module reference="3f028972-a290-4cf2-a87e-9b8f7e56076b(jetbrains.mps.samples.customizedDebugger.Bottomline)" version="0" />
     <module reference="bdab7456-dc1d-4dc5-b5bf-ab059630252d(jetbrains.mps.samples.customizedDebugger.Highlevel)" version="0" />
   </dependencyVersions>
-  <extendedLanguages />
+  <extendedLanguages>
+    <extendedLanguage>4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)</extendedLanguage>
+  </extendedLanguages>
 </language>
 
index 05548e4098699375d5295d997cecaa65df5841b5..f3a3908c9cdb87521d40fe0c89401494b53e08b4 100644 (file)
@@ -14,6 +14,7 @@
     <classNode dependClassName="jetbrains.mps.samples.customizedDebugger.Highlevel.structure.StructureAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.samples.customizedDebugger.Highlevel.typesystem.TypesystemDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.adapter.ids.SLanguageId" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConceptPresentationAspect" />
     <classNode dependClassName="jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor" />
index 7db43dc7afb6ed2bdab3b3410b44aca7815a8385..6d549b974c26b1fc94a35920c04660819dac427b 100644 (file)
@@ -6,6 +6,7 @@ import jetbrains.mps.smodel.language.LanguageRuntime;
 import jetbrains.mps.smodel.adapter.ids.SLanguageId;
 import java.util.Collection;
 import org.jetbrains.mps.openapi.language.SLanguage;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
 import jetbrains.mps.smodel.runtime.ILanguageAspect;
 import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor;
 import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor;
@@ -40,6 +41,7 @@ public class Language extends LanguageRuntime {
 
   @Override
   protected void fillExtendedLanguages(Collection<SLanguage> extendedLanguages) {
+    extendedLanguages.add(MetaAdapterFactory.getLanguage(SLanguageId.deserialize("4caf0310-491e-41f5-8a9b-2006b3a94898"), "jetbrains.mps.execution.util"));
   }
 
   @Override
index ca33395b6739d8162d1c890d501e8a8ece159233..69b15238a8dd9c5a3d6bf9e7a46d2bc2ecd2e3c3 100644 (file)
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root>
     <file name="Language.java">
-      <unit at="20,0,68,0" name="jetbrains.mps.samples.customizedDebugger.Highlevel.Language" />
+      <unit at="21,0,70,0" name="jetbrains.mps.samples.customizedDebugger.Highlevel.Language" />
     </file>
   </root>
 </debug-info>
index 86d720910f221a840cd3f5e030b0847c27110a8b..28f0af130102eefb7c4f48d0b17061ae32b11759 100644 (file)
@@ -48,6 +48,7 @@
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67(jetbrains.mps.baseLanguage.lightweightdsl)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   <sourcePath />
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">c7d5b9dd-a05f-4be2-bc73-f2e16994cc67(jetbrains.mps.baseLanguage.lightweightdsl)</dependency>
     <dependency reexport="false">14676325-ef8e-4fcf-b902-937f5612d1ba(jetbrains.mps.samples.LightweightDSL.plugin)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
-    <dependency reexport="false">4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
   </dependencies>
   <languageVersions>
     <module reference="b4dbff0c-8c31-4a79-a45a-98e5fd0530e7(jetbrains.mps.samples.SwingBuilder)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
+    <extendedLanguage>c7d5b9dd-a05f-4be2-bc73-f2e16994cc67(jetbrains.mps.baseLanguage.lightweightdsl)</extendedLanguage>
+    <extendedLanguage>4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)</extendedLanguage>
     <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
   </extendedLanguages>
 </language>
index 2c94f32294fd2d1fff23bb5a6c39cba5be280e4e..cd864822b95163de5407ad69fe7a87d68dddf5d6 100644 (file)
@@ -41,6 +41,8 @@ public class Language extends LanguageRuntime {
 
   @Override
   protected void fillExtendedLanguages(Collection<SLanguage> extendedLanguages) {
+    extendedLanguages.add(MetaAdapterFactory.getLanguage(SLanguageId.deserialize("c7d5b9dd-a05f-4be2-bc73-f2e16994cc67"), "jetbrains.mps.baseLanguage.lightweightdsl"));
+    extendedLanguages.add(MetaAdapterFactory.getLanguage(SLanguageId.deserialize("4caf0310-491e-41f5-8a9b-2006b3a94898"), "jetbrains.mps.execution.util"));
     extendedLanguages.add(MetaAdapterFactory.getLanguage(SLanguageId.deserialize("f3061a53-9226-4cc5-a443-f952ceaf5816"), "jetbrains.mps.baseLanguage"));
   }
 
index 9c07d3abd890060055a8d2ce7916cae5503353e2..597f9d27a77344e9e32551a6a102dd61aa5518dc 100644 (file)
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root>
     <file name="Language.java">
-      <unit at="21,0,70,0" name="jetbrains.mps.samples.SwingBuilder.Language" />
+      <unit at="21,0,72,0" name="jetbrains.mps.samples.SwingBuilder.Language" />
     </file>
   </root>
 </debug-info>