Sass mixin cleanup (author: seba)

Change-Id: Ie462d5e213d4e81430143aa9d0708fac6b8d77d4

diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java
index 3eda2fcdc6379be0385a9ae5117c390c4138ddab..d3e53c5cd4a841ce354aa82efe362c628a0c7049 100644 (file)
--- a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java
@@ -26,7 +26,6 @@ import org.w3c.css.sac.SACMediaList;
 import com.vaadin.sass.ScssStylesheet;
 import com.vaadin.sass.parser.LexicalUnitImpl;
 import com.vaadin.sass.tree.ForNode;
-import com.vaadin.sass.tree.MixinDefNode;
 import com.vaadin.sass.tree.VariableNode;
 import com.vaadin.sass.tree.WhileNode;
 import com.vaadin.sass.tree.controldirective.EachDefNode;
@@ -40,8 +39,6 @@ public interface SCSSDocumentHandler extends DocumentHandler {
 
     void endMixinDirective(String name, Collection<VariableNode> args);
 
-    MixinDefNode mixinDirective(String name, String args, String body);
-
     void debugDirective();
 
     ForNode forDirective(String var, String from, String to, boolean exclusive,

diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
index a0e9db75511b79d002fb2607f34cfe78dc9df159..4acbc8d4d6b5bca4c69582811a92143371d0548a 100644 (file)
--- a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
@@ -213,12 +213,6 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
         nodeStack.peek().appendChild(node);
     }
 
-    @Override
-    public MixinDefNode mixinDirective(String name, String args, String body) {
-        MixinDefNode node = new MixinDefNode(name, args, body);
-        return node;
-    }
-
     @Override
     public void startNestedProperties(String name) {
         NestPropertiesNode node = new NestPropertiesNode(name);

diff --git a/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java b/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java
index 6e8f689ed18dc71cc5c5079644c696c8e78cb0bb..0cffbc3203fba00a06316205c341b2633b2e0551 100644 (file)
--- a/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java
@@ -26,7 +26,6 @@ public class MixinDefNode extends Node implements IVariableNode {
 
     private String name;
     private ArrayList<VariableNode> arglist;
-    private String args;
     private String body;
 
     public MixinDefNode(String name, Collection<VariableNode> args) {
@@ -38,16 +37,10 @@ public class MixinDefNode extends Node implements IVariableNode {
         }
     }
 
-    public MixinDefNode(String name, String args, String body) {
-        this.name = name;
-        this.args = args;
-        this.body = body;
-    }
-
     @Override
     public String toString() {
-        return "Mixin Definition Node: {name: " + name + ", args: " + args
-                + ", body: " + body + "}";
+        return "Mixin Definition Node: {name: " + name + ", args: "
+                + arglist.size() + ", body: " + body + "}";
     }
 
     public String getName() {