diff options
author | Jesse Morgan <jesse@jesterpm.net> | 2011-03-05 00:33:40 +0000 |
---|---|---|
committer | Jesse Morgan <jesse@jesterpm.net> | 2011-03-05 00:33:40 +0000 |
commit | 5f27758d3a3543253019f558d8f672c5e8b71c2b (patch) | |
tree | 4a33121be9b11b9cb9584b56c99ec0c22b22d394 | |
parent | 6a4d24f95534d05aa526eb4b057397edcfc05067 (diff) |
Changed name of alden to common
-rw-r--r-- | src/common/CollidableObject.java (renamed from src/alden/CollidableObject.java) | 2 | ||||
-rw-r--r-- | src/common/CollisionDetector.java (renamed from src/alden/CollisionDetector.java) | 2 | ||||
-rw-r--r-- | src/common/CollisionInfo.java (renamed from src/alden/CollisionInfo.java) | 2 | ||||
-rw-r--r-- | src/common/Peer.java (renamed from src/alden/Peer.java) | 2 | ||||
-rw-r--r-- | src/common/PeerCoordinates.java (renamed from src/alden/PeerCoordinates.java) | 2 | ||||
-rw-r--r-- | src/common/PeerInformation.java (renamed from src/alden/PeerInformation.java) | 2 | ||||
-rw-r--r-- | src/common/PeerMessage.java (renamed from src/alden/PeerMessage.java) | 2 | ||||
-rw-r--r-- | src/common/UnQuat4f.java (renamed from src/alden/UnQuat4f.java) | 2 | ||||
-rw-r--r-- | src/tesseract/TesseractServer.java | 3 | ||||
-rw-r--r-- | src/tesseract/TesseractUI.java | 2 | ||||
-rw-r--r-- | src/tesseract/World.java | 5 | ||||
-rw-r--r-- | src/tesseract/objects/PhysicalObject.java | 2 | ||||
-rw-r--r-- | src/tesseract/objects/Polygon.java | 3 | ||||
-rw-r--r-- | src/tesseract/objects/Sphere.java | 3 |
14 files changed, 19 insertions, 15 deletions
diff --git a/src/alden/CollidableObject.java b/src/common/CollidableObject.java index 9745665..d95c8b3 100644 --- a/src/alden/CollidableObject.java +++ b/src/common/CollidableObject.java @@ -1,4 +1,4 @@ -package alden;
+package common;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/src/alden/CollisionDetector.java b/src/common/CollisionDetector.java index 84682b8..c4d03e8 100644 --- a/src/alden/CollisionDetector.java +++ b/src/common/CollisionDetector.java @@ -1,4 +1,4 @@ -package alden;
+package common;
import java.util.ArrayList;
diff --git a/src/alden/CollisionInfo.java b/src/common/CollisionInfo.java index dad74a5..6b81967 100644 --- a/src/alden/CollisionInfo.java +++ b/src/common/CollisionInfo.java @@ -1,4 +1,4 @@ -package alden;
+package common;
import javax.vecmath.*;
@SuppressWarnings("restriction")
diff --git a/src/alden/Peer.java b/src/common/Peer.java index 931cc10..732043b 100644 --- a/src/alden/Peer.java +++ b/src/common/Peer.java @@ -1,4 +1,4 @@ -package alden;
+package common;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/src/alden/PeerCoordinates.java b/src/common/PeerCoordinates.java index 4d0e445..13c32e1 100644 --- a/src/alden/PeerCoordinates.java +++ b/src/common/PeerCoordinates.java @@ -1,4 +1,4 @@ -package alden;
+package common;
import java.io.*;
public class PeerCoordinates implements Serializable {
diff --git a/src/alden/PeerInformation.java b/src/common/PeerInformation.java index 3d94f11..5721e35 100644 --- a/src/alden/PeerInformation.java +++ b/src/common/PeerInformation.java @@ -1,4 +1,4 @@ -package alden;
+package common;
import java.io.*;
import java.net.*;
diff --git a/src/alden/PeerMessage.java b/src/common/PeerMessage.java index a5af7de..4e292b9 100644 --- a/src/alden/PeerMessage.java +++ b/src/common/PeerMessage.java @@ -1,4 +1,4 @@ -package alden;
+package common;
import java.io.*;
import java.util.*;
diff --git a/src/alden/UnQuat4f.java b/src/common/UnQuat4f.java index 59295a9..f32546c 100644 --- a/src/alden/UnQuat4f.java +++ b/src/common/UnQuat4f.java @@ -1,4 +1,4 @@ -package alden;
+package common;
import javax.vecmath.*;
/**
diff --git a/src/tesseract/TesseractServer.java b/src/tesseract/TesseractServer.java index 3518c38..6899d7f 100644 --- a/src/tesseract/TesseractServer.java +++ b/src/tesseract/TesseractServer.java @@ -4,7 +4,8 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import alden.Peer; +import common.Peer; + /** * This class is not part of the deliverable. This class is simply a server to diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index 85f46a1..705dec6 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -44,11 +44,11 @@ import tesseract.newmenu.NewSurfBoardMenuItem; import tesseract.newmenu.NewToroidMenuItem; import tesseract.objects.PhysicalObject; import tesseract.objects.Sphere; -import alden.Peer; import com.sun.j3d.utils.picking.PickCanvas; import com.sun.j3d.utils.picking.PickResult; import com.sun.j3d.utils.universe.SimpleUniverse; +import common.Peer; /** * This class is the main UI for the Tesseract Project. diff --git a/src/tesseract/World.java b/src/tesseract/World.java index eb9d26b..9dc5f19 100644 --- a/src/tesseract/World.java +++ b/src/tesseract/World.java @@ -19,11 +19,12 @@ import javax.vecmath.Color3f; import javax.vecmath.Point3d; import javax.vecmath.Vector3f; +import common.CollidableObject; +import common.Peer; + import tesseract.forces.Force; import tesseract.objects.HalfSpace; import tesseract.objects.PhysicalObject; -import alden.CollidableObject; -import alden.Peer; /** * Model of the 3D world. diff --git a/src/tesseract/objects/PhysicalObject.java b/src/tesseract/objects/PhysicalObject.java index d4e4e3b..7b699e3 100644 --- a/src/tesseract/objects/PhysicalObject.java +++ b/src/tesseract/objects/PhysicalObject.java @@ -8,9 +8,9 @@ import javax.media.j3d.TransformGroup; import javax.vecmath.Quat4f; import javax.vecmath.Vector3f; -import alden.CollidableObject; import com.sun.j3d.utils.geometry.Primitive; +import common.CollidableObject; /** * This class is the parent of all objects in the world. diff --git a/src/tesseract/objects/Polygon.java b/src/tesseract/objects/Polygon.java index c8fcf53..7290e04 100644 --- a/src/tesseract/objects/Polygon.java +++ b/src/tesseract/objects/Polygon.java @@ -2,7 +2,8 @@ package tesseract.objects; import javax.media.j3d.Transform3D;
import javax.vecmath.*;
-import alden.CollidableObject;
+import common.CollidableObject;
+
public abstract class Polygon extends PhysicalObject {
public Vector3f normal;
diff --git a/src/tesseract/objects/Sphere.java b/src/tesseract/objects/Sphere.java index cb93041..719ecc0 100644 --- a/src/tesseract/objects/Sphere.java +++ b/src/tesseract/objects/Sphere.java @@ -4,7 +4,8 @@ import java.awt.Color; import javax.media.j3d.*;
import javax.vecmath.*;
-import alden.CollidableObject;
+import common.CollidableObject;
+
/**
* Sphere.
|