fixed maven build

raedle · Sep 21, 2011 · abd7bc9 · abd7bc9
1 parent b7e265f
commit abd7bc9
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/.settings/
+/.project
diff --git a/squidy-common/.gitignore b/squidy-common/.gitignore
@@ -0,0 +1,4 @@
+/.settings/
+/target/
+/.classpath
+/.project
diff --git a/squidy-common/pom.xml b/squidy-common/pom.xml
@@ -103,5 +103,25 @@
 	    	<artifactId>basex</artifactId>
 	    	<version>6.3.4-SNAPSHOT</version>
     	</dependency>
+    	<!-- 
+    	<dependency>
+    		<groupId>org.piccolo2d</groupId>
+    		<artifactId>piccolo2d-core</artifactId>
+    		<version>1.3.1</version>
+    		<type>bundle</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.piccolo2d</groupId>
+    		<artifactId>piccolo2d-extras</artifactId>
+    		<version>1.3.1</version>
+    		<type>bundle</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>org.piccolo2d</groupId>
+    		<artifactId>piccolo2d-complete</artifactId>
+    		<version>1.3</version>
+    		<type>pom</type>
+    	</dependency>
+    	-->
 	</dependencies>
 </project>
diff --git a/squidy-designer/.gitignore b/squidy-designer/.gitignore
@@ -0,0 +1,4 @@
+/.settings/
+/target/
+/.classpath
+/.project
diff --git a/squidy-designer/pom.xml b/squidy-designer/pom.xml
@@ -119,5 +119,10 @@
 			<artifactId>PDFRenderer</artifactId>
 			<version>1.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.jvnet.annox</groupId>
+			<artifactId>annox</artifactId>
+			<version>0.5.0</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/squidy-manager/.gitignore b/squidy-manager/.gitignore
@@ -0,0 +1,4 @@
+/.settings/
+/target/
+/.project
+/.classpath
diff --git a/squidy-manager/src/main/java/org/squidy/manager/util/MathUtility.java b/squidy-manager/src/main/java/org/squidy/manager/util/MathUtility.java
@@ -294,9 +294,9 @@ public double euclidDist(DataPosition3D d1,DataPosition3D d2){
 	public double euclidDist(Point3d d1,Point3d d2){
 		double dist = 0;
 		dist = Math.sqrt(
-				(d1.getX() - d2.getX())*(d1.getX() - d2.getX()) +
-				(d1.getY() - d2.getY())*(d1.getY() - d2.getY()) +
-				(d1.getZ() - d2.getZ())*(d1.getZ() - d2.getZ())
+				(d1.x - d2.x)*(d1.x - d2.x) +
+				(d1.y - d2.y)*(d1.y - d2.y) +
+				(d1.z - d2.z)*(d1.z - d2.z)
 				);
 
 		return dist;

diff --git a/squidy-nodes/.gitignore b/squidy-nodes/.gitignore
@@ -0,0 +1,4 @@
+/target/
+/.settings/
+/.project
+/.classpath