summaryrefslogtreecommitdiffstats
path: root/theme-compiler/src/com
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-10-04 16:15:53 +0300
committerMarc Englund <marc@vaadin.com>2012-10-04 16:15:53 +0300
commit879b0f9c2168c2f7a5f2d9e4f575e04f081e65c6 (patch)
treee2166d73bca0373b6147e3ff2a5719a475cae0fd /theme-compiler/src/com
parent43256e1e897313b4a323f6f231a699c108b8e0a7 (diff)
downloadvaadin-framework-879b0f9c2168c2f7a5f2d9e4f575e04f081e65c6.tar.gz
vaadin-framework-879b0f9c2168c2f7a5f2d9e4f575e04f081e65c6.zip
Sass mixin cleanup (author: seba)
Change-Id: Ie462d5e213d4e81430143aa9d0708fac6b8d77d4
Diffstat (limited to 'theme-compiler/src/com')
-rw-r--r--theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java3
-rw-r--r--theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java6
-rw-r--r--theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java11
3 files changed, 2 insertions, 18 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java
index 3eda2fcdc6..d3e53c5cd4 100644
--- 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 a0e9db7551..4acbc8d4d6 100644
--- a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
@@ -214,12 +214,6 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
}
@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);
nodeStack.peek().appendChild(node);
diff --git a/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java b/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java
index 6e8f689ed1..0cffbc3203 100644
--- 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() {