From 4c36c403b4cf3d0b1a6f3ea3070322c658bf5c78 Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Fri, 29 Jan 2016 20:34:35 +0100
Subject: [PATCH] [ADQL,TAP] Fix few javadoc links and correct an error message
typo.
---
src/adql/parser/ADQLQueryFactory.java | 4 ++--
src/adql/query/ADQLList.java | 2 +-
src/adql/query/operand/NegativeOperand.java | 2 +-
src/adql/query/operand/NumericConstant.java | 2 +-
src/adql/query/operand/Operation.java | 2 +-
src/adql/query/operand/StringConstant.java | 2 +-
src/adql/query/operand/WrappedOperand.java | 2 +-
src/tap/ADQLExecutor.java | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/adql/parser/ADQLQueryFactory.java b/src/adql/parser/ADQLQueryFactory.java
index e10931e..b4fce00 100644
--- a/src/adql/parser/ADQLQueryFactory.java
+++ b/src/adql/parser/ADQLQueryFactory.java
@@ -411,7 +411,7 @@ public class ADQLQueryFactory {
}
/**
- * @deprecated since 1.4 ; Former version's mistake: an ORDER BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createOrder(Identifier, boolean)} ; This function is no longer used by ADQLParser.
+ * @deprecated since 1.4 ; Former version's mistake: an ORDER BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createOrder(IdentifierItem, boolean)} ; This function is no longer used by ADQLParser.
*/
@Deprecated
public ADQLOrder createOrder(final IdentifierItems idItems, final boolean desc) throws Exception{
@@ -431,7 +431,7 @@ public class ADQLQueryFactory {
}
/**
- * @deprecated since 1.4 ; Former version's mistake: a GROUP BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createColRef(Identifier)} ; This function is no longer used by ADQLParser.
+ * @deprecated since 1.4 ; Former version's mistake: a GROUP BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createColRef(IdentifierItem)} ; This function is no longer used by ADQLParser.
*/
@Deprecated
public ColumnReference createColRef(final IdentifierItems idItems) throws Exception{
diff --git a/src/adql/query/ADQLList.java b/src/adql/query/ADQLList.java
index 2ffdaee..050fae6 100644
--- a/src/adql/query/ADQLList.java
+++ b/src/adql/query/ADQLList.java
@@ -195,7 +195,7 @@ public abstract class ADQLList< T extends ADQLObject > implements ADQLObject, It
/**
* Sets the position at which this {@link ADQLList} has been found in the original ADQL query string.
*
- * @param pos Position of this {@link ADQLList}.
+ * @param position Position of this {@link ADQLList}.
* @since 1.4
*/
public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/NegativeOperand.java b/src/adql/query/operand/NegativeOperand.java
index 7b4bc59..a524aae 100644
--- a/src/adql/query/operand/NegativeOperand.java
+++ b/src/adql/query/operand/NegativeOperand.java
@@ -93,7 +93,7 @@ public final class NegativeOperand implements ADQLOperand {
/**
* Sets the position at which this {@link NegativeOperand} has been found in the original ADQL query string.
*
- * @param pos Position of this {@link NegativeOperand}.
+ * @param position Position of this {@link NegativeOperand}.
* @since 1.4
*/
public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/NumericConstant.java b/src/adql/query/operand/NumericConstant.java
index 53e4937..edd39b9 100644
--- a/src/adql/query/operand/NumericConstant.java
+++ b/src/adql/query/operand/NumericConstant.java
@@ -176,7 +176,7 @@ public final class NumericConstant implements ADQLOperand {
/**
* Sets the position at which this {@link NumericConstant} has been found in the original ADQL query string.
*
- * @param pos Position of this {@link NumericConstant}.
+ * @param position Position of this {@link NumericConstant}.
* @since 1.4
*/
public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/Operation.java b/src/adql/query/operand/Operation.java
index 1418ae1..f8a0a73 100644
--- a/src/adql/query/operand/Operation.java
+++ b/src/adql/query/operand/Operation.java
@@ -194,7 +194,7 @@ public class Operation implements ADQLOperand {
/**
* Sets the position at which this {@link WrappedOperand} has been found in the original ADQL query string.
*
- * @param pos Position of this {@link WrappedOperand}.
+ * @param position Position of this {@link WrappedOperand}.
* @since 1.4
*/
public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/StringConstant.java b/src/adql/query/operand/StringConstant.java
index 998bda9..a01ccdf 100644
--- a/src/adql/query/operand/StringConstant.java
+++ b/src/adql/query/operand/StringConstant.java
@@ -73,7 +73,7 @@ public final class StringConstant implements ADQLOperand {
/**
* Sets the position at which this {@link StringConstant} has been found in the original ADQL query string.
*
- * @param pos Position of this {@link StringConstant}.
+ * @param position Position of this {@link StringConstant}.
* @since 1.4
*/
public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/WrappedOperand.java b/src/adql/query/operand/WrappedOperand.java
index ca36d7a..ff90fe1 100644
--- a/src/adql/query/operand/WrappedOperand.java
+++ b/src/adql/query/operand/WrappedOperand.java
@@ -80,7 +80,7 @@ public class WrappedOperand implements ADQLOperand {
/**
* Sets the position at which this {@link WrappedOperand} has been found in the original ADQL query string.
*
- * @param pos Position of this {@link WrappedOperand}.
+ * @param position Position of this {@link WrappedOperand}.
* @since 1.4
*/
public final void setPosition(final TextPosition position){
diff --git a/src/tap/ADQLExecutor.java b/src/tap/ADQLExecutor.java
index 841e023..a48e7af 100644
--- a/src/tap/ADQLExecutor.java
+++ b/src/tap/ADQLExecutor.java
@@ -676,7 +676,7 @@ public class ADQLExecutor {
}catch(IOException ioe){
// Propagate the exception:
- throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, ioe, "Impossible to write in the file into the result of the job " + report.jobID + " must be written!");
+ throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, ioe, "Impossible to write in the file into which the result of the job " + report.jobID + " must be written!");
}finally{
if (!completed){
// Delete the result file (it is either incomplete or incorrect ;
--
GitLab