From 44f900cd4209dbe78a4fb8dc979d739fa340f876 Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Wed, 1 Oct 2014 16:34:03 +0200
Subject: [PATCH] [UWS] Remove commented old code.

---
 src/tap/TAPJob.java | 77 +++++----------------------------------------
 1 file changed, 8 insertions(+), 69 deletions(-)

diff --git a/src/tap/TAPJob.java b/src/tap/TAPJob.java
index eae3fe4..05c7f51 100644
--- a/src/tap/TAPJob.java
+++ b/src/tap/TAPJob.java
@@ -16,7 +16,8 @@ package tap;
  * You should have received a copy of the GNU Lesser General Public License
  * along with TAPLibrary.  If not, see <http://www.gnu.org/licenses/>.
  * 
- * Copyright 2012 - UDS/Centre de Données astronomiques de Strasbourg (CDS)
+ * Copyright 2012,2014 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
+ *                       Astronomisches Rechen Institut (ARI)
  */
 
 import java.util.List;
@@ -29,6 +30,12 @@ import uws.job.Result;
 import uws.job.UWSJob;
 import uws.job.user.JobOwner;
 
+/**
+ * TODO JAVADOC OF THE WHOLE CLASS!
+ * 
+ * @author Gr&eacute;gory Mantelet (CDS;ARI)
+ * @version 2.0 (10/2014)
+ */
 public class TAPJob extends UWSJob {
 
 	private static final long serialVersionUID = 1L;
@@ -63,8 +70,6 @@ public class TAPJob extends UWSJob {
 		super(owner, tapParams);
 		this.tapParams = tapParams;
 		tapParams.check();
-		//progression = ExecutionProgression.PENDING;
-		//loadTAPParams(tapParams);
 	}
 
 	public TAPJob(final String jobID, final JobOwner owner, final TAPParameters params, final long quote, final long startTime, final long endTime, final List<Result> results, final ErrorSummary error) throws TAPException{
@@ -73,21 +78,6 @@ public class TAPJob extends UWSJob {
 		this.tapParams.check();
 	}
 
-	/*protected void loadTAPParams(TAPParameters params) {
-		adqlQuery = params.query;
-		additionalParameters.put(TAPParameters.PARAM_QUERY, adqlQuery);
-
-		format = (params.format == null)?"application/x-votable+xml":params.format;
-		additionalParameters.put(TAPParameters.PARAM_FORMAT, format);
-
-		maxRec = params.maxrec;
-		additionalParameters.put(TAPParameters.PARAM_MAX_REC, maxRec+"");
-
-		upload = params.upload;
-		tablesToUpload = params.tablesToUpload;
-		additionalParameters.put(TAPParameters.PARAM_UPLOAD, upload);
-	}*/
-
 	/**
 	 * @return The tapParams.
 	 */
@@ -143,55 +133,4 @@ public class TAPJob extends UWSJob {
 		this.execReport = execReport;
 	}
 
-	/*
-	 * <p>Starts in an asynchronous manner this ADQLExecutor.</p>
-	 * <p>The execution will stop after the duration specified in the given {@link TAPJob}
-	 * (see {@link TAPJob#getExecutionDuration()}).</p>
-	 * 
-	 * @param output
-	 * @return
-	 * @throws IllegalStateException
-	 * @throws InterruptedException
-	 *
-	public synchronized final boolean startSync(final OutputStream output) throws IllegalStateException, InterruptedException, UWSException {
-		// TODO Set the output stream so that the result is written directly in the given output !
-		start();
-		System.out.println("Joining...");
-		thread.join(getExecutionDuration());
-		System.out.println("Aborting...");
-		thread.interrupt();
-		thread.join(getTimeToWaitForEnd());
-		return thread.isInterrupted();
-	}*/
-
-	@Override
-	protected void stop(){
-		if (!isStopped()){
-			//try {
-			stopping = true;
-			// TODO closeDBConnection();
-			super.stop();
-			/*} catch (TAPException e) {
-				getLogger().error("Impossible to cancel the query execution !", e);
-				return;
-			}*/
-		}
-	}
-
-	/*protected boolean deleteResultFiles(){
-		try{
-			// TODO service.deleteResults(this);
-			return true;
-		}catch(TAPException ex){
-			service.log(LogType.ERROR, "Job "+getJobId()+" - Can't delete results files: "+ex.getMessage());
-			return false;
-		}
-	}*/
-
-	@Override
-	public void clearResources(){
-		super.clearResources();
-		// TODO deleteResultFiles();
-	}
-
 }
-- 
GitLab