aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/fo/expr
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2007-07-18 17:37:14 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2007-07-18 17:37:14 +0000
commit4e921e05c7204e345525cf3e3312d8b8342d4b63 (patch)
tree05812a48470db3fa5acfb64156704485e86327ed /src/java/org/apache/fop/fo/expr
parent8fcc676984fbb4b8023f79a51dc2fb9fdff1bbb4 (diff)
downloadxmlgraphics-fop-4e921e05c7204e345525cf3e3312d8b8342d4b63.tar.gz
xmlgraphics-fop-4e921e05c7204e345525cf3e3312d8b8342d4b63.zip
* Javadoc update: use {@inheritDoc} instead of @see where applicable, removal of some @author tags
* Additional code cleanup: removal of unused imports (mainly in the fo.flow package) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@557337 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo/expr')
-rw-r--r--src/java/org/apache/fop/fo/expr/CMYKcolorFunction.java4
-rw-r--r--src/java/org/apache/fop/fo/expr/ICCColorFunction.java4
-rw-r--r--src/java/org/apache/fop/fo/expr/NumericProperty.java24
-rw-r--r--src/java/org/apache/fop/fo/expr/PropertyException.java2
-rw-r--r--src/java/org/apache/fop/fo/expr/PropertyInfo.java1
-rw-r--r--src/java/org/apache/fop/fo/expr/RGBColorFunction.java4
-rwxr-xr-xsrc/java/org/apache/fop/fo/expr/RelativeNumericProperty.java8
-rw-r--r--src/java/org/apache/fop/fo/expr/SystemColorFunction.java4
8 files changed, 25 insertions, 26 deletions
diff --git a/src/java/org/apache/fop/fo/expr/CMYKcolorFunction.java b/src/java/org/apache/fop/fo/expr/CMYKcolorFunction.java
index a66e8492a..ff3ca25eb 100644
--- a/src/java/org/apache/fop/fo/expr/CMYKcolorFunction.java
+++ b/src/java/org/apache/fop/fo/expr/CMYKcolorFunction.java
@@ -29,13 +29,13 @@ class CMYKcolorFunction extends FunctionBase {
/**
* cmyk takes four arguments.
- * @see org.apache.fop.fo.expr.Function#nbArgs()
+ * {@inheritDoc}
*/
public int nbArgs() {
return 4;
}
- /** @see org.apache.fop.fo.expr.Function */
+ /** {@inheritDoc} */
public Property eval(Property[] args,
PropertyInfo pInfo) throws PropertyException {
StringBuffer sb = new StringBuffer();
diff --git a/src/java/org/apache/fop/fo/expr/ICCColorFunction.java b/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
index fce073467..389bf42e9 100644
--- a/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
+++ b/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
@@ -32,13 +32,13 @@ class ICCColorFunction extends FunctionBase {
/**
* rgb-icc takes a variable number of arguments.
* At least 4 should be passed - returns -4
- * @see org.apache.fop.fo.expr.Function#nbArgs()
+ * {@inheritDoc}
*/
public int nbArgs() {
return -4;
}
- /** @see org.apache.fop.fo.expr.Function */
+ /** {@inheritDoc} */
public Property eval(Property[] args,
PropertyInfo pInfo) throws PropertyException {
StringBuffer sb = new StringBuffer();
diff --git a/src/java/org/apache/fop/fo/expr/NumericProperty.java b/src/java/org/apache/fop/fo/expr/NumericProperty.java
index 4c112964d..9c0b9e2ba 100644
--- a/src/java/org/apache/fop/fo/expr/NumericProperty.java
+++ b/src/java/org/apache/fop/fo/expr/NumericProperty.java
@@ -49,7 +49,7 @@ public class NumericProperty extends Property implements Numeric, Length {
/**
* Return the dimension.
- * @see Numeric#getDimension()
+ * {@inheritDoc}
*/
public int getDimension() {
return dim;
@@ -57,14 +57,14 @@ public class NumericProperty extends Property implements Numeric, Length {
/**
* Return the value.
- * @see Numeric#getNumericValue()
+ * {@inheritDoc}
*/
public double getNumericValue() {
return value;
}
/**
- * @see Numeric#getNumericValue(PercentBaseContext)
+ * {@inheritDoc}
*/
public double getNumericValue(PercentBaseContext context) {
return value;
@@ -72,33 +72,33 @@ public class NumericProperty extends Property implements Numeric, Length {
/**
* Return true of the numeric is absolute.
- * @see Numeric#isAbsolute()
+ * {@inheritDoc}
*/
public boolean isAbsolute() {
return true;
}
- /** @see org.apache.fop.fo.properties.Property#getNumeric() */
+ /** {@inheritDoc} */
public Numeric getNumeric() {
return this;
}
- /** @see org.apache.fop.fo.properties.Property#getNumber() */
+ /** {@inheritDoc} */
public Number getNumber() {
return new Double(value);
}
- /** @see org.apache.fop.datatypes.Numeric#getValue() */
+ /** {@inheritDoc} */
public int getValue() {
return (int) value;
}
- /** @see org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext) */
+ /** {@inheritDoc} */
public int getValue(PercentBaseContext context) {
return (int) value;
}
- /** @see org.apache.fop.fo.properties.Property#getLength() */
+ /** {@inheritDoc} */
public Length getLength() {
if (dim == 1) {
return this;
@@ -107,18 +107,18 @@ public class NumericProperty extends Property implements Numeric, Length {
return null;
}
- /** @see org.apache.fop.fo.properties.Property#getColor(FOUserAgent) */
+ /** {@inheritDoc} */
public Color getColor(FOUserAgent foUserAgent) {
// TODO: try converting to numeric number and then to color
return null;
}
- /** @see org.apache.fop.fo.properties.Property#getObject() */
+ /** {@inheritDoc} */
public Object getObject() {
return this;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
if (dim == 1) {
return (int) value + "mpt";
diff --git a/src/java/org/apache/fop/fo/expr/PropertyException.java b/src/java/org/apache/fop/fo/expr/PropertyException.java
index 3e4b5f9d1..d9a0b2edd 100644
--- a/src/java/org/apache/fop/fo/expr/PropertyException.java
+++ b/src/java/org/apache/fop/fo/expr/PropertyException.java
@@ -52,7 +52,7 @@ public class PropertyException extends FOPException {
this.propertyName = propertyName;
}
- /** @see java.lang.Throwable#getMessage()*/
+ /** {@inheritDoc} */
public String getMessage() {
if (propertyName != null) {
return super.getMessage() + "; property:'" + propertyName + "'";
diff --git a/src/java/org/apache/fop/fo/expr/PropertyInfo.java b/src/java/org/apache/fop/fo/expr/PropertyInfo.java
index dc104b465..491be64fc 100644
--- a/src/java/org/apache/fop/fo/expr/PropertyInfo.java
+++ b/src/java/org/apache/fop/fo/expr/PropertyInfo.java
@@ -45,7 +45,6 @@ public class PropertyInfo {
* Constructor
* @param maker Property.Maker object
* @param plist PropertyList object
- * @param fo FObj
*/
public PropertyInfo(PropertyMaker maker, PropertyList plist) {
this.maker = maker;
diff --git a/src/java/org/apache/fop/fo/expr/RGBColorFunction.java b/src/java/org/apache/fop/fo/expr/RGBColorFunction.java
index 805d8014f..6c6162731 100644
--- a/src/java/org/apache/fop/fo/expr/RGBColorFunction.java
+++ b/src/java/org/apache/fop/fo/expr/RGBColorFunction.java
@@ -30,7 +30,7 @@ import org.apache.fop.fo.properties.Property;
*/
class RGBColorFunction extends FunctionBase {
- /** @see org.apache.fop.fo.expr.Function#nbArgs() */
+ /** {@inheritDoc} */
public int nbArgs() {
return 3;
}
@@ -44,7 +44,7 @@ class RGBColorFunction extends FunctionBase {
return new RGBPercentBase();
}
- /** @see org.apache.fop.fo.expr.Function */
+ /** {@inheritDoc} */
public Property eval(Property[] args,
PropertyInfo pInfo) throws PropertyException {
FOUserAgent ua = (pInfo == null)
diff --git a/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java b/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
index b42cb11a7..ae140b6b7 100755
--- a/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
+++ b/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
@@ -128,14 +128,14 @@ public class RelativeNumericProperty extends Property implements Numeric, Length
/**
* Return the resolved (calculated) value of the expression.
- * @see org.apache.fop.datatypes.Numeric#getNumericValue()
+ * {@inheritDoc}
*/
public double getNumericValue() throws PropertyException {
return getResolved(null).getNumericValue(null);
}
/**
- * @see org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
+ * {@inheritDoc}
*/
public double getNumericValue(PercentBaseContext context) throws PropertyException {
return getResolved(context).getNumericValue(context);
@@ -172,7 +172,7 @@ public class RelativeNumericProperty extends Property implements Numeric, Length
}
/**
- * @see org.apache.fop.datatypes.Numeric#getValue()
+ * {@inheritDoc}
*/
public int getValue() {
try {
@@ -184,7 +184,7 @@ public class RelativeNumericProperty extends Property implements Numeric, Length
}
/**
- * @see org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext)
+ * {@inheritDoc}
*/
public int getValue(PercentBaseContext context) {
try {
diff --git a/src/java/org/apache/fop/fo/expr/SystemColorFunction.java b/src/java/org/apache/fop/fo/expr/SystemColorFunction.java
index ea9e4562e..5398b7051 100644
--- a/src/java/org/apache/fop/fo/expr/SystemColorFunction.java
+++ b/src/java/org/apache/fop/fo/expr/SystemColorFunction.java
@@ -28,12 +28,12 @@ import org.apache.fop.fo.properties.Property;
*/
class SystemColorFunction extends FunctionBase {
- /** @see org.apache.fop.fo.expr.Function#nbArgs() */
+ /** {@inheritDoc} */
public int nbArgs() {
return 1;
}
- /** @see org.apache.fop.fo.expr.Function */
+ /** {@inheritDoc} */
public Property eval(Property[] args,
PropertyInfo pInfo) throws PropertyException {
FOUserAgent ua = (pInfo == null)