Simpler solution to the aliasing problem than a bundle fragment.

scala-ide · Jun 27, 2010 · 60ef2e8 · 60ef2e8
1 parent 317a7c5
commit 60ef2e8
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 75 deletions.
diff --git a/ch.epfl.lamp.sdt.core/.gitignore b/ch.epfl.lamp.sdt.core/.gitignore
diff --git a/ch.epfl.lamp.sdt.core/.project b/ch.epfl.lamp.sdt.core/.project
diff --git a/ch.epfl.lamp.sdt.core/META-INF/MANIFEST.MF b/ch.epfl.lamp.sdt.core/META-INF/MANIFEST.MF
diff --git a/ch.epfl.lamp.sdt.core/build.properties b/ch.epfl.lamp.sdt.core/build.properties
diff --git a/ch.epfl.lamp.sdt.core/fragment.xml b/ch.epfl.lamp.sdt.core/fragment.xml
diff --git a/ch.epfl.lamp.sdt.core/pom.xml b/ch.epfl.lamp.sdt.core/pom.xml
diff --git a/org.scala-ide.build/pom.xml b/org.scala-ide.build/pom.xml
@@ -21,7 +21,6 @@
     <module>../org.scala-ide.sdt.weaving.feature</module>
     <module>../org.scala-ide.sdt.aspects</module>
     <module>../org.scala-ide.sdt.core</module>
-    <module>../ch.epfl.lamp.sdt.core</module>
     <module>../org.scala-ide.sdt.feature</module>
     <module>../org.scala-ide.sdt.update-site</module>
   </modules>

diff --git a/org.scala-ide.sdt.core/plugin.xml b/org.scala-ide.sdt.core/plugin.xml
@@ -210,6 +210,11 @@
             natureId="org.scala-ide.sdt.core.scalanature"
             icon="icons/full/ovr16/scala_co.gif"
             id="org.scala-ide.sdt.core.scalaNatureImage"/>
+      <!-- Retained for backwards compatibility -->
+	    <image
+			      natureId="ch.epfl.lamp.sdt.core.scalanature"
+			      icon="icons/full/ovr16/scala_co.gif"
+			      id="org.scala-ide.sdt.core.scalaNatureImage"/>
    </extension>
 
    <extension
@@ -250,6 +255,11 @@
             class="scala.tools.eclipse.ScalaClasspathContainerInitializer"
             id="org.scala-ide.sdt.launching.SCALA_CONTAINER">
       </classpathContainerInitializer>
+      <!-- Retained for backwards compatibility -->
+      <classpathContainerInitializer
+           class="scala.tools.eclipse.ScalaClasspathContainerInitializer"
+           id="ch.epfl.lamp.sdt.launching.SCALA_CONTAINER">
+      </classpathContainerInitializer>
    </extension>
    <extension point = "org.eclipse.debug.core.launchConfigurationTypes">
      <launchConfigurationType
@@ -323,6 +333,20 @@
          <run class="scala.tools.eclipse.ScalaBuilder"/>
       </builder>
    </extension>
+   <!-- Retained for backwards compatibility -->
+   <extension id="ch.epfl.lamp.sdt.core.scalanature" name="Scala Nature" point="org.eclipse.core.resources.natures">
+      <runtime>
+         <run class="scala.tools.eclipse.Nature"/>
+      </runtime>
+      <builder id="ch.epfl.lamp.sdt.core.scalabuilder"/>
+      <requires-nature id="org.eclipse.jdt.core.javanature"/>
+   </extension>
+   <!-- Retained for backwards compatibility -->
+   <extension id="ch.epfl.lamp.sdt.core.scalabuilder" name="Scala Builder" point="org.eclipse.core.resources.builders">
+      <builder hasNature="true">
+         <run class="scala.tools.eclipse.ScalaBuilder"/>
+      </builder>
+   </extension>
    <extension
          point="org.eclipse.ui.perspectiveExtensions">
       <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">