Refactoring

Author: asual

pom.xml

@@ -52,6 +52,7 @@
 			<groupId>org.mozilla</groupId>
 			<artifactId>rhino</artifactId>
 			<version>1.7R4</version>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -88,7 +89,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
+				<version>3.1</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -155,7 +156,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.4</version>
 			</plugin>
 		</plugins>
 	</build>

src/main/java/com/asual/lesscss/LessOptions.java

@@ -56,19 +56,19 @@ public void setCharset(String charset) {
 		this.charset = charset;
 	}
 
-	public boolean isCss() {
+	public Boolean isCss() {
 		return css;
 	}
 
-	public void setCss(boolean css) {
+	public void setCss(Boolean css) {
 		this.css = css;
 	}
 
-	public boolean isCompress() {
+	public Boolean isCompress() {
 		return compress;
 	}
 
-	public void setCompress(boolean compress) {
+	public void setCompress(Boolean compress) {
 		this.compress = compress;
 	}
 

src/main/java/com/asual/lesscss/compiler/RhinoCompiler.java

@@ -19,7 +19,13 @@
 import com.asual.lesscss.loader.ResourceLoader;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.mozilla.javascript.*;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.NativeArray;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.UniqueTag;
 import org.mozilla.javascript.tools.shell.Global;
 
 import java.io.IOException;
@@ -30,10 +36,9 @@
 
 public class RhinoCompiler implements LessCompiler {
 
-	private Scriptable scope;
-	private final Function compile;
-
 	private final Log logger = LogFactory.getLog(getClass());
+	private final Scriptable scope;
+	private final Function compile;
 
 	public RhinoCompiler(LessOptions options, ResourceLoader loader, URL less, URL env, URL engine, URL cssmin, URL sourceMap) throws IOException {
 		Context cx = Context.enter();
@@ -78,24 +83,19 @@ public RhinoCompiler(LessOptions options, ResourceLoader loader, URL less, URL e
 	@Override
 	public String compile(String input, String location, boolean compress) throws LessException {
 		try {
-			return call(compile, new Object[]{input, location, compress});
-		}
-		catch (Exception e){
+			return (String) Context.call(null, compile, scope, scope,
+					new Object[]{input, location, compress});
+		} catch (Exception e) {
 			throw new LessException(parseLessException(e));
 		}
 	}
 
-	private String call(Function fn, Object[] args) {
-		return (String) Context.call(null, fn, scope, scope, args);
-	}
-
 	private boolean hasProperty(Scriptable value, String name) {
 		Object property = ScriptableObject.getProperty(value, name);
 		return property != null && !property.equals(UniqueTag.NOT_FOUND);
 	}
 
-	private LessException parseLessException(Exception root)
-			throws LessException {
+	private Exception parseLessException(Exception root) {
 		logger.debug("Parsing LESS Exception", root);
 		if (root instanceof JavaScriptException) {
 			Scriptable value = (Scriptable) ((JavaScriptException) root)
@@ -130,10 +130,10 @@ private LessException parseLessException(Exception root)
 					}
 				}
 			}
-			throw new LessException(message, type, filename, line, column,
+			return new LessException(message, type, filename, line, column,
 					extractList);
 		}
-		throw new LessException(root);
+		return root;
 	}
 
 }