Fixes scalastyle#18 luna support

matthewfarwell · Dec 4, 2014 · eee3498 · eee3498
1 parent 4cf9f3c
commit eee3498
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 48 deletions.
diff --git a/org.scalastyle.scalastyleplugin.core/.settings/org.scala-ide.sdt.core.prefs b/org.scalastyle.scalastyleplugin.core/.settings/org.scala-ide.sdt.core.prefs
@@ -0,0 +1,40 @@
+P=
+Xcheckinit=false
+Xdisable-assertions=false
+Xelide-below=-2147483648
+Xexperimental=false
+Xfatal-warnings=false
+Xfuture=false
+Xlog-implicits=false
+Xno-uescape=false
+Xplugin=
+Xplugin-disable=
+Xplugin-require=
+Xpluginsdir=misc/scala-devel/plugins
+Ypresentation-debug=false
+Ypresentation-delay=0
+Ypresentation-log=
+Ypresentation-replay=
+Ypresentation-verbose=false
+apiDiff=false
+compileorder=JavaThenScala
+deprecation=true
+eclipse.preferences.version=1
+explaintypes=false
+feature=false
+g=vars
+nameHashing=false
+no-specialization=false
+nowarn=false
+optimise=false
+recompileOnMacroDef=true
+relationsDebug=false
+scala.compiler.additionalParams=\ -Xsource\:2.10 -Ymacro-expand\:none
+scala.compiler.installation=-2063534949
+scala.compiler.sourceLevel=2.10
+scala.compiler.useProjectSettings=true
+stopBuildOnError=true
+target=jvm-1.6
+unchecked=false
+verbose=false
+withVersionClasspathValidator=true
diff --git a/org.scalastyle.scalastyleplugin.core/META-INF/MANIFEST.MF b/org.scalastyle.scalastyleplugin.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.scalastyle.scalastyleplugin.ScalastylePlugin
 Bundle-Vendor: Scalastyle
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime;bundle-version="[3.7.0,3.10.0)",
+ org.eclipse.core.runtime;bundle-version="[3.7.0,4.4.0)",
  org.eclipse.core.resources,
  org.eclipse.jface.text,
  org.eclipse.jdt.core,

diff --git a/org.scalastyle.scalastyleplugin.core/build.properties b/org.scalastyle.scalastyleplugin.core/build.properties
@@ -15,6 +15,6 @@ jars.compile.order = .,\
                      lib/config-1.2.0.jar
 jars.extra.classpath = lib/scalariform_2.10-0.1.5.jar,\
                        lib/scalastyle_2.10-0.6.0.jar,\
-                       lib/scala-library-2.10.0.jar \
+                       lib/scala-library-2.10.0.jar, \
                        lib/config-1.2.0.jar
 src.includes = bin/
diff --git a/...scalastyleplugin.core/src/org/scalastyle/scalastyleplugin/builder/ScalastyleBuilder.scala b/...scalastyleplugin.core/src/org/scalastyle/scalastyleplugin/builder/ScalastyleBuilder.scala
@@ -53,6 +53,10 @@ import org.scalastyle.WarningLevel
 import ScalastyleBuilder.createMarker
 import ScalastyleBuilder.root
 import com.typesafe.config.ConfigFactory
+import com.typesafe.config.ConfigParseOptions
+import java.io.FileOutputStream
+import java.io.File
+import java.io.PrintStream
 
 class EclipseFileSpec(name: String, encoding: String, val resource: IResource) extends RealFileSpec(name, Some(encoding))
 
@@ -190,8 +194,14 @@ trait IFilter {
 }
 
 class EclipseOutput extends Output[EclipseFileSpec] {
+  val c = ConfigFactory.parseResources("reference.conf")
 
-  private val messageHelper = new MessageHelper(ConfigFactory.load())
+  {
+    val f = new PrintStream(new FileOutputStream(new File("/tmp/file.txt")))
+    f.println("config=" + c.root().render())
+    f.close();
+  }
+  private val messageHelper = new MessageHelper(c)
 
   override def message(m: Message[EclipseFileSpec]): Unit = m match {
     case StartWork() => {}

diff --git a/....core/src/org/scalastyle/scalastyleplugin/preferences/ScalastyleConfigurationDialog.scala b/....core/src/org/scalastyle/scalastyleplugin/preferences/ScalastyleConfigurationDialog.scala
@@ -20,21 +20,29 @@ import org.eclipse.jface.dialogs.MessageDialog
 import org.eclipse.jface.dialogs.TitleAreaDialog
 import org.eclipse.jface.viewers.TableViewer
 import org.eclipse.jface.window.Window
+import org.eclipse.swt.SWT
 import org.eclipse.swt.layout.GridData
 import org.eclipse.swt.widgets.Button
 import org.eclipse.swt.widgets.Composite
 import org.eclipse.swt.widgets.Control
 import org.eclipse.swt.widgets.Shell
 import org.eclipse.swt.widgets.Text
-import org.eclipse.swt.SWT
+import org.scalastyle.ConfigurationChecker
+import org.scalastyle.DefinitionChecker
+import org.scalastyle.Level
+import org.scalastyle.MessageHelper
+import org.scalastyle.ParameterType
+import org.scalastyle.ScalastyleConfiguration
+import org.scalastyle.ScalastyleDefinition
 import org.scalastyle.scalastyleplugin.ExceptionUtils.handleError
+import org.scalastyle.scalastyleplugin.ScalastylePlugin
 import org.scalastyle.scalastyleplugin.StringUtils.isEmpty
-import org.scalastyle.scalastyleplugin.SwtUtils.ModelContentProvider
-import org.scalastyle.scalastyleplugin.SwtUtils.TableSorter
 import org.scalastyle.scalastyleplugin.SwtUtils.Container
 import org.scalastyle.scalastyleplugin.SwtUtils.DialogColumn
+import org.scalastyle.scalastyleplugin.SwtUtils.ModelContentProvider
 import org.scalastyle.scalastyleplugin.SwtUtils.PropertiesLabelProvider
 import org.scalastyle.scalastyleplugin.SwtUtils.TableLine
+import org.scalastyle.scalastyleplugin.SwtUtils.TableSorter
 import org.scalastyle.scalastyleplugin.SwtUtils.button
 import org.scalastyle.scalastyleplugin.SwtUtils.checkbox
 import org.scalastyle.scalastyleplugin.SwtUtils.composite
@@ -45,14 +53,7 @@ import org.scalastyle.scalastyleplugin.SwtUtils.label
 import org.scalastyle.scalastyleplugin.SwtUtils.table
 import org.scalastyle.scalastyleplugin.SwtUtils.text
 import org.scalastyle.scalastyleplugin.config.Persistence
-import org.scalastyle.scalastyleplugin.ScalastylePlugin
-import org.scalastyle.ConfigurationChecker
-import org.scalastyle.DefinitionChecker
-import org.scalastyle.Level
-import org.scalastyle.MessageHelper
-import org.scalastyle.ParameterType
-import org.scalastyle.ScalastyleConfiguration
-import org.scalastyle.ScalastyleDefinition
+
 import com.typesafe.config.ConfigFactory
 
 // scalastyle:off magic.number
@@ -117,7 +118,7 @@ class ScalastyleConfigurationDialog(parent: Shell, filename: String) extends Tit
   val file = Persistence.findConfiguration(filename)
   val configuration = ScalastyleConfiguration.readFromXml(file.get.getAbsolutePath())
   val model = new Model(definition, configuration)
-  val messageHelper = new MessageHelper(ConfigFactory.load())
+  val messageHelper = new MessageHelper(ConfigFactory.parseResources("reference.conf"))
   var nameText: Text = _
   var enableCommentFilterButton: Button = _
   var editButton: Button = _

diff --git a/...lugin.core/src/org/scalastyle/scalastyleplugin/preferences/ScalastylePreferencePage.scala b/...lugin.core/src/org/scalastyle/scalastyleplugin/preferences/ScalastylePreferencePage.scala
@@ -26,27 +26,30 @@ import org.eclipse.core.runtime.Status
 import org.eclipse.jface.preference.PreferencePage
 import org.eclipse.jface.viewers.TableViewer
 import org.eclipse.jface.window.Window
+import org.eclipse.swt.SWT
 import org.eclipse.swt.layout.GridData
 import org.eclipse.swt.widgets.Button
 import org.eclipse.swt.widgets.Composite
 import org.eclipse.swt.widgets.Control
 import org.eclipse.swt.widgets.Shell
-import org.eclipse.swt.SWT
+import org.eclipse.ui.IWorkbench
+import org.eclipse.ui.IWorkbenchPreferencePage
+import org.eclipse.ui.PlatformUI
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog
 import org.eclipse.ui.dialogs.ISelectionStatusValidator
 import org.eclipse.ui.dialogs.SaveAsDialog
 import org.eclipse.ui.model.WorkbenchContentProvider
 import org.eclipse.ui.model.WorkbenchLabelProvider
-import org.eclipse.ui.IWorkbench
-import org.eclipse.ui.IWorkbenchPreferencePage
-import org.eclipse.ui.PlatformUI
+import org.scalastyle.MessageHelper
+import org.scalastyle.ScalastyleConfiguration
 import org.scalastyle.scalastyleplugin.ExceptionUtils.handleError
-import org.scalastyle.scalastyleplugin.SwtUtils.TableSorter
+import org.scalastyle.scalastyleplugin.ScalastylePlugin
 import org.scalastyle.scalastyleplugin.SwtUtils.Container
 import org.scalastyle.scalastyleplugin.SwtUtils.DialogColumn
 import org.scalastyle.scalastyleplugin.SwtUtils.ModelContentProvider
 import org.scalastyle.scalastyleplugin.SwtUtils.PropertiesLabelProvider
 import org.scalastyle.scalastyleplugin.SwtUtils.TableLine
+import org.scalastyle.scalastyleplugin.SwtUtils.TableSorter
 import org.scalastyle.scalastyleplugin.SwtUtils.button
 import org.scalastyle.scalastyleplugin.SwtUtils.composite
 import org.scalastyle.scalastyleplugin.SwtUtils.gridData
@@ -56,9 +59,7 @@ import org.scalastyle.scalastyleplugin.SwtUtils.table
 import org.scalastyle.scalastyleplugin.config.Persistence
 import org.scalastyle.scalastyleplugin.config.WorkspaceConfiguration
 import org.scalastyle.scalastyleplugin.config.WorkspaceConfigurations
-import org.scalastyle.scalastyleplugin.ScalastylePlugin
-import org.scalastyle.MessageHelper
-import org.scalastyle.ScalastyleConfiguration
+
 import com.typesafe.config.ConfigFactory
 
 case class Configuration(location: String) extends TableLine
@@ -70,7 +71,7 @@ class ScalastylePreferencePage extends PreferencePage with IWorkbenchPreferenceP
 
   val LocationSorter = new TableSorter[Configuration, String](_.location, true)
   val classLoader = this.getClass().getClassLoader()
-  val messageHelper = new MessageHelper(ConfigFactory.load())
+  val messageHelper = new MessageHelper(ConfigFactory.parseResources("reference.conf"))
   val model = toConfigurations(Persistence.loadWorkspace())
 
   var editButton: Button = _

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.scalastyle</groupId>
   <artifactId>org.scalastyle.scalastyleplugin</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
+  <version>0.6.0</version>
   <packaging>pom</packaging>
   <description>Scalastyle Eclipse plugin</description>
 
@@ -143,6 +143,16 @@
 
 
   <profiles>
+    <profile>
+      <id>luna</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <eclipse.codename>luna</eclipse.codename>
+        <repo.eclipse>http://download.eclipse.org/releases/luna/</repo.eclipse>
+      </properties>
+    </profile>
     <profile>
       <id>kepler</id>
       <activation>

diff --git a/scripts/eclipse-director.sh b/scripts/eclipse-director.sh
@@ -13,27 +13,12 @@ kepler()
 	echo using kepler
 }
 
-juno()
+luna()
 {
-	eclipse_dir="/c/code/eclipse/juno/eclipse"
+	eclipse_dir="/home/mfarwell/dev/luna"
 
-	eclipse_repo="http://download.eclipse.org/releases/juno/"
-	echo using juno
-}
-
-indigo()
-{
-	eclipse_dir="/c/code/eclipse/eclipse-jee-indigo-SR2-win32-x86_64/eclipse"
-
-	eclipse_repo="http://download.eclipse.org/releases/indigo/"
-	echo using indigo
-}
-
-helios()
-{
-	eclipse_dir="/c/code/eclipse/eclipse-jee-helios-SR2-win32-scala/eclipse"
-	eclipse_repo="http://download.eclipse.org/releases/helios/"
-	echo using helios
+	eclipse_repo="http://download.eclipse.org/releases/luna/"
+	echo using luna
 }
 
 usage()
@@ -63,11 +48,9 @@ uninstall()
 }
 
 case $1 in
-helios)	helios; shift;;
-indigo)	indigo; shift;;
-juno)	juno; shift;;
+luna)	luna; shift;;
 kepler) kepler; shift;;
-*)	indigo;;
+*)	luna;;
 esac
 
 case $1 in