From c6836dead9dfba61fca4b206d80b71bf4ed1c54c Mon Sep 17 00:00:00 2001
From: CharonInferar <CharonInferar@aol.de>
Date: Sun, 6 Apr 2014 14:49:22 +0200
Subject: [PATCH] Clean up

SurveyCommand is now done fully over the Jython interface consistent to
client command handling
---
 .gitignore                              |  4 ++
 scripts/radial/vehicle.py               |  1 -
 scripts/radial/vehicleDeed.py           |  3 --
 src/services/SurveyService.java         |  1 -
 src/services/command/SurveyCommand.java | 53 -------------------------
 5 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 src/services/command/SurveyCommand.java

diff --git a/.gitignore b/.gitignore
index 3b0a4c33..89882a7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,10 @@ clientdata/quest/
 # PSWG Object Databases
 odb/building/je.info.*
 odb/creature/je.info.*
+odb/doids/je.info.*
+odb/guild/je.info.*
+odb/mails/je.info.*
+odb/oids/je.info.*
 odb/chatRooms/je.info.*
 odb/resourcehistory/je.info.*
 odb/resourceroots/je.info.*
diff --git a/scripts/radial/vehicle.py b/scripts/radial/vehicle.py
index 404ba4bb..ca1f4311 100644
--- a/scripts/radial/vehicle.py
+++ b/scripts/radial/vehicle.py
@@ -11,7 +11,6 @@ def createRadial(core, owner, target, radials):
 def handleSelection(core, owner, target, option):
 	if target:
 		if option == 21 or option == 40:
-			owner.sendSystemMessage('21', 0)
 			core.objectService.useObject(owner, target)
 		if option == 60:
 			core.objectService.destroyObject(target)
diff --git a/scripts/radial/vehicleDeed.py b/scripts/radial/vehicleDeed.py
index aaab4889..633eb6db 100644
--- a/scripts/radial/vehicleDeed.py
+++ b/scripts/radial/vehicleDeed.py
@@ -8,10 +8,7 @@ def createRadial(core, owner, target, radials):
 	return
 	
 def handleSelection(core, owner, target, option):
-	if option == 7 and target:
-		owner.sendSystemMessage('7', 0)
 	if option == 61 and target:
-		owner.sendSystemMessage('61', 0)
 		core.objectService.useObject(owner, target)
 	if option == 15 and target:
 		core.objectService.destroyObject(target)
diff --git a/src/services/SurveyService.java b/src/services/SurveyService.java
index 1620a6cc..1f14fe8d 100644
--- a/src/services/SurveyService.java
+++ b/src/services/SurveyService.java
@@ -44,7 +44,6 @@ import resources.objects.resource.ResourceRoot;
 import resources.objects.tangible.TangibleObject;
 import resources.objects.tool.SurveyTool;
 import resources.objects.waypoint.WaypointObject;
-import services.command.SurveyCommand;
 import services.sui.SUIWindow;
 import services.sui.SUIWindow.SUICallback;
 import services.sui.SUIWindow.Trigger;
diff --git a/src/services/command/SurveyCommand.java b/src/services/command/SurveyCommand.java
deleted file mode 100644
index b88884f0..00000000
--- a/src/services/command/SurveyCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 <Project SWG>
- * 
- * This File is part of NGECore2.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
- * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
- ******************************************************************************/
-package services.command;
-
-import engine.clientdata.ClientFileManager;
-import engine.clientdata.visitors.DatatableVisitor;
-
-public class SurveyCommand extends BaseSWGCommand {
-	
-
-	public SurveyCommand(String commandName) {
-		super(commandName);
-		// ToDo: check against datatables
-		try {
-			DatatableVisitor visitor = ClientFileManager.loadFile("datatables/crafting/component.iff", DatatableVisitor.class);
-			
-			for(int i = 0; i < visitor.getRowCount(); i++) {		
-					}
-			
-			DatatableVisitor visitor2 = ClientFileManager.loadFile("datatables/command/command_table.iff", DatatableVisitor.class);
-
-			for(int i = 0; i < visitor2.getRowCount(); i++) {
-				if(visitor2.getObject(i, 0) != null) {
-					if(((String) visitor2.getObject(i, 0)).equalsIgnoreCase(commandName)) {						
-					}
-				} 
-			}
-			
-		} catch (InstantiationException | IllegalAccessException e) {
-			e.printStackTrace();
-		}
-	}
-
-}