Skip to content

Commit

Permalink
Renamed files #22
Browse files Browse the repository at this point in the history
  • Loading branch information
meri committed Mar 27, 2014
1 parent 9341888 commit fc2d544
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.github.sommeri.less4j.core.ast.Expression;
import com.github.sommeri.less4j.utils.InStringCssPrinter;

public class LessStringsEvaluator implements EmbeddedScripting {
public class EmbeddedLessGenerator implements EmbeddedScriptGenerator {

public LessStringsEvaluator() {
public EmbeddedLessGenerator() {
super();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.github.sommeri.less4j.core.ast.Expression;

public interface EmbeddedScripting {
public interface EmbeddedScriptGenerator {

String toScriptExpression(Expression value, LessProblems problemsHandler);

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/github/sommeri/less4j/LessCompiler.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class Configuration {
private LessSource cssResultLocation;
private boolean linkSourceMap = true;
private List<LessFunction> functionPackages = new ArrayList<LessFunction>();
private EmbeddedScripting embeddedScripting;
private EmbeddedScriptGenerator embeddedScripting;

/**
* This is needed in for source map.
Expand Down Expand Up @@ -70,11 +70,11 @@ public void addCustomFunction(LessFunction functionPackage) {
this.functionPackages.add(functionPackage);
}

public EmbeddedScripting getEmbeddedScripting() {
public EmbeddedScriptGenerator getEmbeddedScripting() {
return embeddedScripting;
}

public void setEmbeddedScripting(EmbeddedScripting embeddedScripting) {
public void setEmbeddedScripting(EmbeddedScriptGenerator embeddedScripting) {
this.embeddedScripting = embeddedScripting;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import java.util.Iterator;
import java.util.List;

import com.github.sommeri.less4j.EmbeddedScripting;
import com.github.sommeri.less4j.EmbeddedScriptGenerator;
import com.github.sommeri.less4j.LessCompiler.Configuration;
import com.github.sommeri.less4j.LessStringsEvaluator;
import com.github.sommeri.less4j.EmbeddedLessGenerator;
import com.github.sommeri.less4j.core.ast.ASTCssNode;
import com.github.sommeri.less4j.core.ast.ASTCssNodeType;
import com.github.sommeri.less4j.core.ast.AbstractVariableDeclaration;
Expand Down Expand Up @@ -59,7 +59,7 @@ public class ExpressionEvaluator {
private List<FunctionsPackage> functions = new ArrayList<FunctionsPackage>();
private StringInterpolator stringInterpolator;
private StringInterpolator embeddedScriptInterpolator;
private EmbeddedScripting embeddedScripting;
private EmbeddedScriptGenerator embeddedScripting;

public ExpressionEvaluator(ProblemsHandler problemsHandler, Configuration configuration) {
this(new NullScope(), problemsHandler, configuration);
Expand All @@ -71,7 +71,7 @@ public ExpressionEvaluator(IScope scope, ProblemsHandler problemsHandler, Config
this.problemsHandler = problemsHandler;
arithmeticCalculator = new ArithmeticCalculator(problemsHandler);
colorsCalculator = new ColorsCalculator(problemsHandler);
embeddedScripting = configuration.getEmbeddedScripting() == null ? new LessStringsEvaluator() : configuration.getEmbeddedScripting();
embeddedScripting = configuration.getEmbeddedScripting() == null ? new EmbeddedLessGenerator() : configuration.getEmbeddedScripting();
stringInterpolator = new StringInterpolator(problemsHandler);
embeddedScriptInterpolator = new StringInterpolator(embeddedScripting, problemsHandler);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.regex.Pattern;

import com.github.sommeri.less4j.EmbeddedScripting;
import com.github.sommeri.less4j.LessStringsEvaluator;
import com.github.sommeri.less4j.EmbeddedScriptGenerator;
import com.github.sommeri.less4j.EmbeddedLessGenerator;
import com.github.sommeri.less4j.core.ast.Expression;
import com.github.sommeri.less4j.core.ast.Variable;
import com.github.sommeri.less4j.core.compiler.expressions.ExpressionEvaluator;
Expand All @@ -13,14 +13,14 @@
public class StringInterpolator extends AbstractStringReplacer<ExpressionEvaluator> {

private static final Pattern STR_INTERPOLATION = Pattern.compile("@\\{([^\\{\\}@])*\\}");
private final EmbeddedScripting embeddedScriptEvaluator;
private final EmbeddedScriptGenerator embeddedScriptEvaluator;
private final ProblemsHandler problemsHandler;

public StringInterpolator(ProblemsHandler problemsHandler) {
this(new LessStringsEvaluator(), problemsHandler);
this(new EmbeddedLessGenerator(), problemsHandler);
}

public StringInterpolator(EmbeddedScripting embeddedScriptEvaluator, ProblemsHandler problemsHandler) {
public StringInterpolator(EmbeddedScriptGenerator embeddedScriptEvaluator, ProblemsHandler problemsHandler) {
this.embeddedScriptEvaluator = embeddedScriptEvaluator;
this.problemsHandler = problemsHandler;
}
Expand Down

0 comments on commit fc2d544

Please sign in to comment.