rename package j.m.smodel.apiadapter -> adapter; add SPrimitiveDataTy…

…peAdapter; add dependency kinds; remove SScopePlace; add SEnumeration.getDefault()
JetBrains · Oct 12, 2012 · 4ff6c1f · 4ff6c1f
1 parent 116ba9b
commit 4ff6c1f
Show file tree

Hide file tree

Showing 30 changed files with 496 additions and 133 deletions.
diff --git a/...ution/jetbrains/mps/smodel/apiadapter.mps → ...Solution/jetbrains/mps/smodel/adapter.mps b/...ution/jetbrains/mps/smodel/apiadapter.mps → ...Solution/jetbrains/mps/smodel/adapter.mps
diff --git a/core/kernel/kernelSolution/jetbrains/mps/util.mps b/core/kernel/kernelSolution/jetbrains/mps/util.mps
@@ -16,7 +16,7 @@
   <import index="msyo" modelUID="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#jetbrains.mps.util(MPS.Core/jetbrains.mps.util@java_stub)" version="-1" />
   <import index="hmg3" modelUID="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#org.jetbrains.mps.openapi.model(MPS.Core/org.jetbrains.mps.openapi.model@java_stub)" version="-1" />
   <import index="821q" modelUID="f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#org.jetbrains.mps.openapi.language(MPS.Core/org.jetbrains.mps.openapi.language@java_stub)" version="-1" />
-  <import index="43z9" modelUID="r:74a06cc2-db96-4e19-8301-ff85828f9c7b(jetbrains.mps.smodel.apiadapter)" version="-1" />
+  <import index="43z9" modelUID="r:74a06cc2-db96-4e19-8301-ff85828f9c7b(jetbrains.mps.smodel.adapter)" version="-1" />
   <import index="iwwu" modelUID="r:2c4d9270-b6d6-44af-aecd-e01a223680db(jetbrains.mps.kernel.model)" version="-1" />
   <import index="i8bi" modelUID="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" version="-1" />
   <import index="tpck" modelUID="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" version="0" implicit="yes" />

diff --git a/core/kernel/source/jetbrains/mps/MPSCore.java b/core/kernel/source/jetbrains/mps/MPSCore.java
@@ -35,7 +35,7 @@
 import jetbrains.mps.reloading.ClassLoaderManager;
 import jetbrains.mps.resolve.ResolverComponent;
 import jetbrains.mps.smodel.*;
-import jetbrains.mps.smodel.apiadapter.SConceptNodeAdapter;
+import jetbrains.mps.smodel.adapter.SConceptNodeAdapter;
 import jetbrains.mps.smodel.behaviour.OldBehaviorManager;
 import jetbrains.mps.smodel.language.ConceptRegistry;
 import jetbrains.mps.smodel.language.ExtensionRegistry;

diff --git a/core/kernel/source/jetbrains/mps/smodel/BaseSModelDescriptor.java b/core/kernel/source/jetbrains/mps/smodel/BaseSModelDescriptor.java
@@ -102,6 +102,7 @@ void setRegistered(boolean registered) {
     myRegistered = registered;
   }
 
+  @NotNull
   public SModelReference getModelReference() {
     return myModelReference;
   }

diff --git a/core/kernel/source/jetbrains/mps/smodel/SNode.java b/core/kernel/source/jetbrains/mps/smodel/SNode.java
@@ -21,7 +21,7 @@
 import jetbrains.mps.logging.Logger;
 import jetbrains.mps.project.GlobalScope;
 import jetbrains.mps.project.structure.modules.ModuleReference;
-import jetbrains.mps.smodel.apiadapter.SConceptNodeAdapter;
+import jetbrains.mps.smodel.adapter.SConceptNodeAdapter;
 import jetbrains.mps.smodel.language.ConceptRegistry;
 import jetbrains.mps.smodel.runtime.PropertyConstraintsDescriptor;
 import jetbrains.mps.smodel.runtime.ReferenceConstraintsDescriptor;

diff --git a/core/kernel/source/jetbrains/mps/smodel/behaviour/OldBehaviorManager.java b/core/kernel/source/jetbrains/mps/smodel/behaviour/OldBehaviorManager.java
@@ -22,7 +22,7 @@
 import jetbrains.mps.reloading.ClassLoaderManager;
 import jetbrains.mps.reloading.ReloadAdapter;
 import jetbrains.mps.smodel.*;
-import jetbrains.mps.smodel.apiadapter.SConceptNodeAdapter;
+import jetbrains.mps.smodel.adapter.SConceptNodeAdapter;
 import jetbrains.mps.util.Computable;
 import jetbrains.mps.util.InternUtil;
 import jetbrains.mps.util.NameUtil;

diff --git a/...brains/mps/smodel/apiadapter/dependencies → ...jetbrains/mps/smodel/adapter/dependencies b/...brains/mps/smodel/apiadapter/dependencies → ...jetbrains/mps/smodel/adapter/dependencies
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dependenciesRoot>
-  <dependency className="jetbrains.mps.smodel.apiadapter.SConceptNodeAdapter" file="SConceptNodeAdapter.java">
+  <dependency className="jetbrains.mps.smodel.adapter.SConceptNodeAdapter" file="SConceptNodeAdapter.java">
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ISelector" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ListSequence" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.smodel.SNode" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SInterfaceConceptNodeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SInterfaceConceptNodeAdapter" />
     <classNode dependClassName="jetbrains.mps.util.NameUtil" />
     <classNode dependClassName="org.jetbrains.annotations.NotNull" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SInterfaceConcept" />
-    <classNode extendsClassName="jetbrains.mps.smodel.apiadapter.SConceptNodeAdapterBase" />
+    <classNode extendsClassName="jetbrains.mps.smodel.adapter.SConceptNodeAdapterBase" />
     <classNode extendsClassName="org.jetbrains.mps.openapi.language.SConcept" />
   </dependency>
-  <dependency className="jetbrains.mps.smodel.apiadapter.SConceptNodeAdapterBase" file="SConceptNodeAdapterBase.java">
+  <dependency className="jetbrains.mps.smodel.adapter.SConceptNodeAdapterBase" file="SConceptNodeAdapterBase.java">
     <classNode dependClassName="java.lang.IllegalArgumentException" />
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.Object" />
@@ -30,9 +30,9 @@
     <classNode dependClassName="jetbrains.mps.project.GlobalScope" />
     <classNode dependClassName="jetbrains.mps.smodel.Language" />
     <classNode dependClassName="jetbrains.mps.smodel.SNode" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SLanguageLanguageAdapter" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SLinkNodeAdapter" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SPropertyNodeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SLanguageLanguageAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SLinkNodeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SPropertyNodeAdapter" />
     <classNode dependClassName="jetbrains.mps.smodel.search.ConceptAndSuperConceptsScope" />
     <classNode dependClassName="jetbrains.mps.smodel.search.SModelSearchUtil" />
     <classNode dependClassName="jetbrains.mps.util.NameUtil" />
@@ -42,14 +42,14 @@
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SProperty" />
     <classNode extendsClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
   </dependency>
-  <dependency className="jetbrains.mps.smodel.apiadapter.SDataTypeAdapter" file="SDataTypeAdapter.java">
+  <dependency className="jetbrains.mps.smodel.adapter.SDataTypeAdapter" file="SDataTypeAdapter.java">
     <classNode dependClassName="java.lang.Object" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.smodel.SNode" />
     <classNode dependClassName="org.jetbrains.annotations.NotNull" />
     <classNode extendsClassName="org.jetbrains.mps.openapi.language.SDataType" />
   </dependency>
-  <dependency className="jetbrains.mps.smodel.apiadapter.SInterfaceConceptNodeAdapter" file="SInterfaceConceptNodeAdapter.java">
+  <dependency className="jetbrains.mps.smodel.adapter.SInterfaceConceptNodeAdapter" file="SInterfaceConceptNodeAdapter.java">
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.internal.collections.runtime.ISelector" />
@@ -58,10 +58,10 @@
     <classNode dependClassName="jetbrains.mps.smodel.SNode" />
     <classNode dependClassName="jetbrains.mps.util.NameUtil" />
     <classNode dependClassName="org.jetbrains.annotations.NotNull" />
-    <classNode extendsClassName="jetbrains.mps.smodel.apiadapter.SConceptNodeAdapterBase" />
+    <classNode extendsClassName="jetbrains.mps.smodel.adapter.SConceptNodeAdapterBase" />
     <classNode extendsClassName="org.jetbrains.mps.openapi.language.SInterfaceConcept" />
   </dependency>
-  <dependency className="jetbrains.mps.smodel.apiadapter.SLanguageLanguageAdapter" file="SLanguageLanguageAdapter.java">
+  <dependency className="jetbrains.mps.smodel.adapter.SLanguageLanguageAdapter" file="SLanguageLanguageAdapter.java">
     <classNode dependClassName="java.lang.Iterable" />
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="java.util.ArrayList" />
@@ -74,35 +74,47 @@
     <classNode dependClassName="jetbrains.mps.smodel.Language" />
     <classNode dependClassName="jetbrains.mps.smodel.LanguageAspect" />
     <classNode dependClassName="jetbrains.mps.smodel.SNode" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SConceptNodeAdapter" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SInterfaceConceptNodeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SConceptNodeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SInterfaceConceptNodeAdapter" />
     <classNode dependClassName="jetbrains.mps.util.NameUtil" />
     <classNode dependClassName="org.jetbrains.annotations.NotNull" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.module.SModule" />
     <classNode extendsClassName="org.jetbrains.mps.openapi.language.SLanguage" />
   </dependency>
-  <dependency className="jetbrains.mps.smodel.apiadapter.SLinkNodeAdapter" file="SLinkNodeAdapter.java">
+  <dependency className="jetbrains.mps.smodel.adapter.SLinkNodeAdapter" file="SLinkNodeAdapter.java">
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.kernel.model.SModelUtil" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
     <classNode dependClassName="jetbrains.mps.smodel.SNode" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SConceptNodeAdapter" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SInterfaceConceptNodeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SConceptNodeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SInterfaceConceptNodeAdapter" />
     <classNode dependClassName="jetbrains.mps.util.NameUtil" />
     <classNode dependClassName="org.jetbrains.annotations.NotNull" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SAbstractConcept" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SLinkScopeProvider" />
     <classNode extendsClassName="org.jetbrains.mps.openapi.language.SLink" />
   </dependency>
-  <dependency className="jetbrains.mps.smodel.apiadapter.SPropertyNodeAdapter" file="SPropertyNodeAdapter.java">
+  <dependency className="jetbrains.mps.smodel.adapter.SPrimitiveDataTypeAdapter" file="SPrimitiveDataTypeAdapter.java">
+    <classNode dependClassName="java.lang.Boolean" />
+    <classNode dependClassName="java.lang.Class" />
+    <classNode dependClassName="java.lang.Integer" />
+    <classNode dependClassName="java.lang.Object" />
+    <classNode dependClassName="java.lang.String" />
+    <classNode dependClassName="jetbrains.mps.smodel.SNode" />
+    <classNode dependClassName="jetbrains.mps.smodel.behaviour.BehaviorManager" />
+    <classNode extendsClassName="org.jetbrains.mps.openapi.language.SPrimitiveDataType" />
+  </dependency>
+  <dependency className="jetbrains.mps.smodel.adapter.SPropertyNodeAdapter" file="SPropertyNodeAdapter.java">
     <classNode dependClassName="java.lang.String" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations" />
+    <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations" />
     <classNode dependClassName="jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations" />
     <classNode dependClassName="jetbrains.mps.smodel.SNode" />
-    <classNode dependClassName="jetbrains.mps.smodel.apiadapter.SDataTypeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SDataTypeAdapter" />
+    <classNode dependClassName="jetbrains.mps.smodel.adapter.SPrimitiveDataTypeAdapter" />
     <classNode dependClassName="org.jetbrains.annotations.NotNull" />
     <classNode dependClassName="org.jetbrains.mps.openapi.language.SDataType" />
     <classNode extendsClassName="org.jetbrains.mps.openapi.language.SProperty" />