Removed BaseObject (delete ODB again)

Author: Treeku

src/resources/objects/cell/CellObject.java

@@ -22,17 +22,17 @@
 package resources.objects.cell;
 
 import protocol.swg.UpdateCellPermissionMessage;
-import resources.objects.object.BaseObject;
 
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
 @Persistent(version=0)
-public class CellObject extends BaseObject {
+public class CellObject extends SWGObject {
 
 	private int cellNumber = 0;
 	@NotPersistent

src/resources/objects/intangible/IntangibleObject.java

@@ -21,17 +21,16 @@
  ******************************************************************************/
 package resources.objects.intangible;
 
-import resources.objects.object.BaseObject;
-
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
 @Persistent(version=0)
-public class IntangibleObject extends BaseObject {
+public class IntangibleObject extends SWGObject {
 
 	private int genericInt;
 

src/resources/objects/object/BaseObject.java

@@ -21,18 +21,17 @@
  ******************************************************************************/
 package resources.objects.staticobject;
 
-import resources.objects.object.BaseObject;
-
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
 @Persistent(version=0)
-public class StaticObject extends BaseObject {
+public class StaticObject extends SWGObject {
 
 	@NotPersistent
 	private StaticMessageBuilder messageBuilder;

src/resources/objects/staticobject/StaticObject.java

@@ -33,19 +33,19 @@
 import protocol.swg.objectControllerObjects.ShowFlyText;
 
 import resources.common.RGB;
-import resources.objects.object.BaseObject;
 import resources.objects.creature.CreatureObject;
 
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
 @Persistent(version=0)
-public class TangibleObject extends BaseObject {
+public class TangibleObject extends SWGObject {
 
 	// TODO: Thread safety
 

src/resources/objects/tangible/TangibleObject.java

@@ -23,13 +23,14 @@
 
 import com.sleepycat.persist.model.Persistent;
 
+import engine.clients.Client;
+import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
-import resources.objects.object.BaseObject;
 
 @Persistent(version=0)
-public class UniverseObject extends BaseObject {
+public class UniverseObject extends SWGObject {
 
 	public UniverseObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
 		super(objectID, planet, position, orientation, Template);
@@ -38,5 +39,11 @@ public UniverseObject(long objectID, Planet planet, Point3D position, Quaternion
 	public UniverseObject() {
 		super();
 	}
+
+	@Override
+	public void sendBaselines(Client arg0) {
+		// TODO Auto-generated method stub
+		
+	}
 
 }

src/resources/objects/universe/UniverseObject.java

@@ -21,21 +21,17 @@
  ******************************************************************************/
 package resources.objects.weapon;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import resources.objects.tangible.TangibleObject;
 
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
-import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=1)
+@Persistent(version=0)
 public class WeaponObject extends TangibleObject {
 
 	// TODO: Thread safety