From 17cd3902b9b943ae8bb340c62baef1f866cef8c2 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Thu, 27 Oct 2011 17:27:05 +0400
Subject: [PATCH] version changed

---
 pom.xml                                       | 20 +++++--
 .../android/calculator/math/Factorial.java    | 59 -------------------
 2 files changed, 16 insertions(+), 63 deletions(-)
 delete mode 100644 src/main/java/org/solovyev/android/calculator/math/Factorial.java

diff --git a/pom.xml b/pom.xml
index e7c475ff..c54147fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
 	<groupId>org.solovyev.android</groupId>
 	<artifactId>calculator</artifactId>
-	<version>0.0.1</version>
+	<version>1.1.4</version>
 
 	<packaging>pom</packaging>
 
@@ -46,13 +46,25 @@
 		</dependency>
 
 		<dependency>
-			<groupId>jscl-meditor</groupId>
-			<artifactId>jscl-meditor</artifactId>
-			<version>2.3.5</version>
+			<groupId>org.solovyev</groupId>
+			<artifactId>jscl</artifactId>
+			<version>0.0.1</version>
+			<!--<exclusions>
+				<exclusion>
+					<artifactId>xercesImpl</artifactId>
+					<groupId>xerces</groupId>
+				</exclusion>
+			</exclusions>-->
 			<scope>system</scope>
 			<systemPath>${additionalLibs}/jscl.jar</systemPath>
 		</dependency>
 
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.2</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.simpleframework</groupId>
 			<artifactId>simple-xml</artifactId>
diff --git a/src/main/java/org/solovyev/android/calculator/math/Factorial.java b/src/main/java/org/solovyev/android/calculator/math/Factorial.java
deleted file mode 100644
index 15f35452..00000000
--- a/src/main/java/org/solovyev/android/calculator/math/Factorial.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
- * For more information, please, contact se.solovyev@gmail.com
- * or visit http://se.solovyev.org
- */
-
-package org.solovyev.android.calculator.math;
-
-import jscl.math.Generic;
-import jscl.math.NotIntegrableException;
-import jscl.math.Variable;
-import jscl.math.function.Function;
-
-/**
- * User: serso
- * Date: 9/26/11
- * Time: 12:58 PM
- */
-public class Factorial extends Function {
-
-	public Factorial(Generic[] parameter) {
-		super("fact", parameter);
-	}
-
-	@Override
-	public Generic evaluate() {
-        return expressionValue();
-	}
-
-	@Override
-	public Generic evalelem() {
-		return null;
-	}
-
-	@Override
-	public Generic evalsimp() {
-		return null;
-	}
-
-	@Override
-	public Generic evalnum() {
-		return null;
-	}
-
-	@Override
-	public Generic antiderivative(int n) throws NotIntegrableException {
-		throw new UnsupportedOperationException("Not implemented yet!");
-	}
-
-	@Override
-	public Generic derivative(int n) {
-		throw new UnsupportedOperationException("Not implemented yet!");
-	}
-
-	@Override
-	protected Variable newinstance() {
-		return new Factorial(null);
-	}
-}