remove the not used interface IVariableNode and the stub implementations

of replaceVariables()

Author: volker

src/main/java/com/inet/sass/tree/BlockNode.java

@@ -27,7 +27,7 @@
 import com.inet.sass.selector.Selector;
 import com.inet.sass.visitor.BlockNodeHandler;
 
-public class BlockNode extends Node implements IVariableNode {
+public class BlockNode extends Node {
 
     private List<Selector> selectorList;
 
@@ -90,9 +90,7 @@ public String toString() {
         return "BlockNode [" + buildString(true, TO_STRING_STRATEGY) + "]";
     }
 
-    @Override
-    public void replaceVariables(ScssContext context) {
-
+    private void replaceVariables(ScssContext context) {
         if (selectorList == null || selectorList.isEmpty()) {
             return;
         }

src/main/java/com/inet/sass/tree/DefNode.java

@@ -18,7 +18,6 @@
 
 import com.inet.sass.Definition;
 import com.inet.sass.Scope;
-import com.inet.sass.ScssContext;
 import com.inet.sass.parser.ActualArgumentList;
 import com.inet.sass.parser.FormalArgumentList;
 
@@ -29,8 +28,7 @@
  * @author Vaadin
  * 
  */
-public abstract class DefNode extends Node implements Definition,
-        IVariableNode, NodeWithUrlContent {
+public abstract class DefNode extends Node implements Definition, NodeWithUrlContent {
     private String name;
     private FormalArgumentList arglist;
     private Scope definitionScope;
@@ -60,10 +58,6 @@ public boolean hasVariableArguments() {
         return arglist.hasVariableArguments();
     }
 
-    @Override
-    public void replaceVariables(ScssContext context) {
-    }
-
     public void replacePossibleArguments(ActualArgumentList actualArgumentList) {
         // TODO instead of modifying def, return a VariableArgumentList?
         arglist = arglist.replaceFormalArguments(actualArgumentList, true);

src/main/java/com/inet/sass/tree/ExtendNode.java

@@ -27,7 +27,7 @@
 import com.inet.sass.selector.Selector;
 import com.inet.sass.visitor.ExtendNodeHandler;
 
-public class ExtendNode extends Node implements IVariableNode {
+public class ExtendNode extends Node {
 
     private List<Selector> list;
     private boolean optional;
@@ -48,11 +48,6 @@ public List<Selector> getList() {
         return list;
     }
 
-    @Override
-    public void replaceVariables(ScssContext context) {
-
-    }
-
     @Override
     public String toString() {
         return "Extend node [" + getListAsString() + "]";

src/main/java/com/inet/sass/tree/IVariableNode.java

@@ -23,7 +23,7 @@
 import com.inet.sass.ScssContext;
 import com.inet.sass.parser.StringInterpolationSequence;
 
-public class KeyframesNode extends Node implements IVariableNode {
+public class KeyframesNode extends Node {
     private String keyframeName;
     private StringInterpolationSequence animationName;
 
@@ -51,16 +51,11 @@ public String toString() {
 
     @Override
     public Collection<Node> traverse(ScssContext context) {
-        replaceVariables(context);
+        animationName = animationName.replaceVariables(context);
         traverseChildren(context);
         return Collections.singleton((Node) this);
     }
 
-    @Override
-    public void replaceVariables(ScssContext context) {
-        animationName = animationName.replaceVariables(context);
-    }
-
     private String buildString(BuildStringStrategy strategy) {
         StringBuilder string = new StringBuilder();
         string.append(keyframeName).append(" ").append(animationName)

src/main/java/com/inet/sass/tree/KeyframesNode.java

@@ -23,7 +23,7 @@
 import com.inet.sass.handler.SCSSErrorHandler;
 import com.inet.sass.parser.SassListItem;
 
-public class MessageNode extends Node implements IVariableNode {
+public class MessageNode extends Node {
 
     public static enum MessageLevel {
         debug, warn, error;
@@ -37,11 +37,6 @@ public MessageNode( SassListItem message, MessageLevel level ) {
         this.level = level;
     }
 
-    @Override
-    public void replaceVariables( ScssContext context ) {
-        message = message.evaluateFunctionsAndExpressions( context, true );
-    }
-
     @Override
     public String printState() {
         return "";
@@ -55,7 +50,7 @@ public String toString() {
     @Override
     public Collection<Node> traverse( ScssContext context ) {
         SCSSErrorHandler handler = SCSSErrorHandler.get();
-        replaceVariables( context );
+        message = message.evaluateFunctionsAndExpressions( context, true );
         String msg = message.evaluateFunctionsAndExpressions( context, true ).unquotedString();
         switch( level ) {
             case debug:

src/main/java/com/inet/sass/tree/MessageNode.java

@@ -35,8 +35,7 @@
  * 
  * @author Vaadin
  */
-public class MixinNode extends Node implements IVariableNode,
-        NodeWithUrlContent {
+public class MixinNode extends Node implements NodeWithUrlContent {
 
     // these are the actual parameter values, not whether the definition node
     // uses varargs
@@ -67,15 +66,6 @@ public String getName() {
         return name;
     }
 
-    /**
-     * Replace variable references with their values in the argument list and
-     * name.
-     */
-    @Override
-    public void replaceVariables(ScssContext context) {
-        arglist = arglist.evaluateFunctionsAndExpressions(context, true);
-    }
-
     @Override
     public String printState() {
         return "name: " + getName() + " args: " + getArglist();
@@ -89,7 +79,7 @@ public String toString() {
     @Override
     public Collection<Node> traverse( ScssContext context ) {
         try {
-            replaceVariables( context );
+            arglist = arglist.evaluateFunctionsAndExpressions(context, true);
             expandVariableArguments();
             // inner scope is managed by MixinNodeHandler
             return MixinNodeHandler.traverse( context, this );

src/main/java/com/inet/sass/tree/MixinNode.java

@@ -24,7 +24,7 @@
 import com.inet.sass.ScssContext;
 import com.inet.sass.parser.StringInterpolationSequence;
 
-public class NestPropertiesNode extends Node implements IVariableNode {
+public class NestPropertiesNode extends Node {
 
     private StringInterpolationSequence name;
 
@@ -69,15 +69,10 @@ public RuleNode createNewRuleNodeFromChild(RuleNode child) {
         return newRuleNode;
     }
 
-    @Override
-    public void replaceVariables(ScssContext context) {
-        name = name.replaceVariables(context);
-    }
-
     @Override
     public Collection<Node> traverse(ScssContext context) {
         traverseChildren(context);
-        replaceVariables(context);
+        name = name.replaceVariables(context);
         return unNesting();
     }
 

src/main/java/com/inet/sass/tree/NestPropertiesNode.java

@@ -22,8 +22,7 @@
 import com.inet.sass.ScssContext;
 import com.inet.sass.parser.SassListItem;
 
-public class ReturnNode extends Node implements IVariableNode,
-        NodeWithUrlContent {
+public class ReturnNode extends Node implements NodeWithUrlContent {
 
     private SassListItem expr;
 
@@ -36,10 +35,6 @@ private ReturnNode(ReturnNode nodeToCopy) {
         expr = nodeToCopy.expr;
     }
 
-    @Override
-    public void replaceVariables(ScssContext context) {
-    }
-
     @Override
     public Collection<Node> traverse(ScssContext context) {
         // need to replace variables here to make sure all vars are in scope

src/main/java/com/inet/sass/tree/ReturnNode.java

@@ -24,7 +24,7 @@
 import com.inet.sass.parser.SassListItem;
 import com.inet.sass.parser.StringInterpolationSequence;
 
-public class RuleNode extends Node implements IVariableNode, NodeWithUrlContent {
+public class RuleNode extends Node implements NodeWithUrlContent {
 
     StringInterpolationSequence variable;
     SassListItem value;
@@ -84,10 +84,6 @@ public void setComment(String comment) {
         this.comment = comment;
     }
 
-    @Override
-    public void replaceVariables(ScssContext context) {
-    }
-
     @Override
     public Collection<Node> traverse(ScssContext context) {
         /*