SONARPLUGINS-2248 Upgrade to SSLR 1.15

Godin · Godin · commit 37bbc89d3327 · 2012-09-19T03:50:30.000+06:00
diff --git a/pom.xml b/pom.xml
@@ -65,6 +65,8 @@
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
 
     <sonar.version>3.0</sonar.version>
+    <sslr.version>1.15</sslr.version>
+
     <sonar.pluginClass>org.sonar.plugins.python.PythonPlugin</sonar.pluginClass>
     <sonar.pluginName>Python</sonar.pluginName>
   </properties>
@@ -85,17 +87,17 @@
       <dependency>
         <groupId>org.codehaus.sonar.sslr</groupId>
         <artifactId>sslr-core</artifactId>
-        <version>1.14</version>
+        <version>${sslr.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.sonar.sslr</groupId>
-        <artifactId>sslr-devkit</artifactId>
-        <version>1.14</version>
+        <artifactId>sslr-toolkit</artifactId>
+        <version>${sslr.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.sonar.sslr</groupId>
         <artifactId>sslr-testing-harness</artifactId>
-        <version>1.14</version>
+        <version>${sslr.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.sonar.sslr-squid-bridge</groupId>
diff --git a/sslr-python-toolkit/pom.xml b/sslr-python-toolkit/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.sonar.sslr</groupId>
-      <artifactId>sslr-devkit</artifactId>
+      <artifactId>sslr-toolkit</artifactId>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -55,7 +55,7 @@
               <includes>
                 <include>${project.groupId}:python-squid</include>
                 <include>org.codehaus.sonar.sslr:sslr-core</include>
-                <include>org.codehaus.sonar.sslr:sslr-devkit</include>
+                <include>org.codehaus.sonar.sslr:sslr-toolkit</include>
                 <include>org.codehaus.sonar:sonar-colorizer</include>
                 <include>org.codehaus.sonar:sonar-squid</include>
                 <include>org.codehaus.sonar:sonar-channel</include>
diff --git a/sslr-python-toolkit/src/main/java/org/sonar/python/toolkit/PythonToolkit.java b/sslr-python-toolkit/src/main/java/org/sonar/python/toolkit/PythonToolkit.java
@@ -20,13 +20,11 @@
 package org.sonar.python.toolkit;
 
 import com.google.common.collect.ImmutableList;
-import com.sonar.sslr.devkit.SsdkGui;
-import com.sonar.sslr.impl.Parser;
 import org.sonar.colorizer.KeywordsTokenizer;
 import org.sonar.colorizer.Tokenizer;
-import org.sonar.python.api.PythonGrammar;
 import org.sonar.python.api.PythonKeyword;
 import org.sonar.python.parser.PythonParser;
+import org.sonar.sslr.toolkit.Toolkit;
 
 import java.util.List;
 
@@ -37,11 +35,7 @@ private PythonToolkit() {
 
   public static void main(String[] args) {
     System.setProperty("com.apple.mrj.application.apple.menu.about.name", "SSDK");
-    Parser<PythonGrammar> parser = PythonParser.create();
-    SsdkGui toolkit = new SsdkGui(parser, getPythonTokenizers());
-    toolkit.setVisible(true);
-    toolkit.setSize(1000, 800);
-    toolkit.setTitle("SSLR Python Toolkit");
+    new Toolkit(PythonParser.create(), getPythonTokenizers(), "SSLR Python Toolkit").run();
   }
 
   public static List<Tokenizer> getPythonTokenizers() {
