Merge pull request scala-ide#461 from skyluc/3.0.x-juno-compatible-ke…

…pler 3.0.x juno compatible kepler
dragos · Jul 10, 2013 · eff8147 · eff8147
2 parents 9406bbf + 90e097a
commit eff8147
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/org.scala-ide.sdt.core.tests/META-INF/MANIFEST.MF b/org.scala-ide.sdt.core.tests/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Bundle-ClassPath: .,
 Require-Bundle: org.scala-ide.scala.library,
  org.aspectj.weaver,
  org.eclipse.equinox.weaving.aspectj,
- org.eclipse.pde.core;resolution:=optional
+ org.eclipse.pde.core;resolution:=optional,
+ org.junit
 Export-Package: 
  scala.tools.eclipse.testsetup
diff --git a/org.scala-ide.sdt.core/META-INF/MANIFEST.MF b/org.scala-ide.sdt.core/META-INF/MANIFEST.MF
@@ -44,7 +44,6 @@ Require-Bundle:
  org.scala-refactoring.library,
  org.scala-ide.sbt.full.library;bundle-version="[0.13,0.14)",
  scalariform,
- org.junit4;bundle-version="4.5.0",
  org.eclipse.ui.browser;bundle-version="3.3.0"
 Import-Package: 
  com.ibm.icu.text;apply-aspects:=false;org.eclipse.swt.graphics;apply-aspects:=false,

diff --git a/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaSourceViewerConfiguration.scala b/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaSourceViewerConfiguration.scala
@@ -13,8 +13,10 @@ import org.eclipse.jdt.core.{ IJavaProject, IJavaElement, ICodeAssist }
 import org.eclipse.jdt.internal.ui.JavaPlugin
 import org.eclipse.jdt.internal.ui.javaeditor.{ IClassFileEditorInput, ICompilationUnitDocumentProvider, JavaElementHyperlinkDetector }
 import org.eclipse.jdt.internal.ui.text.ContentAssistPreference
-import org.eclipse.jdt.internal.ui.text.java.{ JavaAutoIndentStrategy, JavaStringAutoIndentStrategy, SmartSemicolonAutoEditStrategy }
-import org.eclipse.jdt.internal.ui.text.java.hover.{ AbstractJavaEditorTextHover, BestMatchHover }
+import org.eclipse.jdt.internal.ui.text.java.JavaAutoIndentStrategy
+import org.eclipse.jdt.internal.ui.text.java.SmartSemicolonAutoEditStrategy
+import org.eclipse.jdt.internal.ui.text.java.hover.AbstractJavaEditorTextHover
+import org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover
 import org.eclipse.jdt.internal.ui.text.javadoc.JavaDocAutoIndentStrategy
 import org.eclipse.jdt.ui.text.{ JavaSourceViewerConfiguration, IJavaPartitions }
 import org.eclipse.jface.preference.IPreferenceStore
@@ -135,7 +137,7 @@ class ScalaSourceViewerConfiguration(store: IPreferenceStore, scalaPreferenceSto
          case IJavaPartitions.JAVA_DOC | IJavaPartitions.JAVA_MULTI_LINE_COMMENT | ScalaPartitions.SCALADOC_CODE_BLOCK =>
            Array(new CommentAutoIndentStrategy(partitioning))
          case IJavaPartitions.JAVA_STRING =>
-            Array(new SmartSemicolonAutoEditStrategy(partitioning), new JavaStringAutoIndentStrategy(partitioning))
+            Array(new SmartSemicolonAutoEditStrategy(partitioning))
          case IJavaPartitions.JAVA_CHARACTER | IDocument.DEFAULT_CONTENT_TYPE =>
             Array(new SmartSemicolonAutoEditStrategy(partitioning), new ScalaAutoIndentStrategy(partitioning, getProject, sourceViewer, new JdtPreferenceProvider(getProject)), new BracketAutoEditStrategy(ScalaPlugin.prefStore))
          case _ =>

diff --git a/org.scala-ide.sdt.debug.tests/META-INF/MANIFEST.MF b/org.scala-ide.sdt.debug.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.scala-ide.scala.library,
  org.aspectj.weaver,
  org.eclipse.equinox.weaving.aspectj,
- org.scala-ide.sdt.core
+ org.scala-ide.sdt.core,
+ org.junit
 Import-Package: scala.tools.eclipse.testsetup
 Bundle-ClassPath: .,
  target/lib/mockito-all-1.9.5.jar
diff --git a/org.scala-ide.sdt.debug/META-INF/MANIFEST.MF b/org.scala-ide.sdt.debug/META-INF/MANIFEST.MF
@@ -44,7 +44,7 @@ Require-Bundle:
  org.scala-refactoring.library,
  org.scala-ide.sbt.full.library;bundle-version="[0.13,0.14)",
  scalariform,
- org.junit4;bundle-version="4.5.0",
+ org.junit,
  org.eclipse.ui.browser,
  org.scala-ide.sdt.core,
  org.scala-ide.equinox-weaving-launcher;bundle-version="[1.1.0,2.0.0)";resolution:=optional