You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rw...@apache.org on 2003/02/02 22:46:20 UTC
cvs commit: jakarta-commons-sandbox/functor/xdocs index.xml
rwaldhoff 2003/02/02 13:46:19
Modified: functor build.xml
functor/src/java/org/apache/commons/functor package.html
functor/src/java/org/apache/commons/functor/adapter
package.html
functor/src/java/org/apache/commons/functor/core
package.html
functor/src/java/org/apache/commons/functor/core/composite
BinaryCompositeBinaryFunction.java
ConditionalBinaryFunction.java
ConditionalBinaryPredicate.java
ConditionalBinaryProcedure.java
ConditionalFunction.java ConditionalPredicate.java
ConditionalProcedure.java
ConditionalUnaryFunction.java
ConditionalUnaryPredicate.java
ConditionalUnaryProcedure.java
UnaryCompositeBinaryFunction.java package.html
functor/xdocs index.xml
Log:
* fixing jdk 1.4 javadoc warnings
* exclude *.html from "ant dist" generated jar
Revision Changes Path
1.5 +3 -2 jakarta-commons-sandbox/functor/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 31 Jan 2003 12:02:43 -0000 1.4
+++ build.xml 2 Feb 2003 21:46:18 -0000 1.5
@@ -196,7 +196,8 @@
todir="${dist.home}"/>
-->
<jar jarfile="${dist.home}/commons-${component.name}.jar"
- basedir="${build.home}/classes"/>
+ basedir="${build.home}/classes"
+ excludes="**/*.html"/>
</target>
1.2 +2 -2 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 27 Jan 2003 19:33:38 -0000 1.1
+++ package.html 2 Feb 2003 21:46:19 -0000 1.2
@@ -55,7 +55,7 @@
-->
<html><body>
<p>
-Basic functor interfaces
+Basic functor interfaces.
</p>
<p>
Implementors are encouraged, but not strictly required, to make each functor
1.2 +2 -2 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/adapter/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/adapter/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 27 Jan 2003 19:33:39 -0000 1.1
+++ package.html 2 Feb 2003 21:46:19 -0000 1.2
@@ -55,6 +55,6 @@
-->
<html><body>
<p>
-Classes that adapt one functor interface to another
+Classes that adapt one functor interface to another.
</p>
</body></html>
1.2 +2 -2 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 27 Jan 2003 19:33:40 -0000 1.1
+++ package.html 2 Feb 2003 21:46:19 -0000 1.2
@@ -55,6 +55,6 @@
-->
<html><body>
<p>
-Commonly used functor implementations
+Commonly used functor implementations.
</p>
</body></html>
1.2 +6 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
Index: BinaryCompositeBinaryFunction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BinaryCompositeBinaryFunction.java 1 Feb 2003 14:40:45 -0000 1.1
+++ BinaryCompositeBinaryFunction.java 2 Feb 2003 21:46:19 -0000 1.2
@@ -62,7 +62,10 @@
import org.apache.commons.functor.BinaryFunction;
/**
- * f(x,y) := f(g(x,y),h(x,y))
+ * A {@link BinaryFunction BinaryFunction} composed of
+ * three binary functions, <i>f</i>, <i>g</i> and <i>h</i>,
+ * evaluating the ordered parameters <i>x</i>, <i>y</i>
+ * to <code><i>f</i>(<i>g</i>(<i>x</i>,<i>y</i>),<i>h</i>(<i>x</i>,<i>y</i>))</code>.
* <p>
* Note that although this class implements
* {@link Serializable}, a given instance will
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
Index: ConditionalBinaryFunction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalBinaryFunction.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalBinaryFunction.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -64,7 +64,7 @@
/**
* A {@link BinaryFunction BinaryFunction}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given a {@link BinaryPredicate predicate}
* <i>p</i> and {@link BinaryFunction functions}
* <i>f</i> and <i>g</i>, {@link #evaluate evalautes}
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
Index: ConditionalBinaryPredicate.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalBinaryPredicate.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalBinaryPredicate.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -63,7 +63,7 @@
/**
* A {@link BinaryPredicate BinaryPredicate}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given three {@link BinaryPredicate predicates}
* <i>p</i>, <i>q</i>, <i>r</i>,
* {@link #test tests}
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
Index: ConditionalBinaryProcedure.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalBinaryProcedure.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalBinaryProcedure.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -64,7 +64,7 @@
/**
* A {@link BinaryProcedure BinaryProcedure}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given a {@link BinaryPredicate predicate}
* <i>p</i> and {@link BinaryProcedure procedures}
* <i>q</i> and <i>r</i>, {@link #run runs}
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalFunction.java
Index: ConditionalFunction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalFunction.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalFunction.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -64,7 +64,7 @@
/**
* A {@link Function Function}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given a {@link Predicate predicate}
* <i>p</i> and {@link Function functions}
* <i>f</i> and <i>g</i>, {@link #evaluate evalautes}
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java
Index: ConditionalPredicate.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalPredicate.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalPredicate.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -63,7 +63,7 @@
/**
* A {@link Predicate Predicate}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given three {@link Predicate predicates}
* <i>p</i>, <i>q</i>, <i>r</i>,
* {@link #test tests}
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java
Index: ConditionalProcedure.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalProcedure.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalProcedure.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -64,7 +64,7 @@
/**
* A {@link Procedure Procedure}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given a {@link Predicate predicate}
* <i>p</i> and {@link Procedure procedures}
* <i>q</i> and <i>r</i>, {@link #run runs}
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java
Index: ConditionalUnaryFunction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalUnaryFunction.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalUnaryFunction.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -64,7 +64,7 @@
/**
* A {@link UnaryFunction UnaryFunction}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given a {@link UnaryPredicate predicate}
* <i>p</i> and {@link UnaryFunction functions}
* <i>f</i> and <i>g</i>, {@link #evaluate evalautes}
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java
Index: ConditionalUnaryPredicate.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalUnaryPredicate.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalUnaryPredicate.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -63,7 +63,7 @@
/**
* A {@link UnaryPredicate UnaryPredicate}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given three {@link UnaryPredicate predicate}
* <i>p</i>, <i>q</i>, <i>r</i>,
* {@link #test tests}
1.3 +3 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java
Index: ConditionalUnaryProcedure.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionalUnaryProcedure.java 28 Jan 2003 12:00:29 -0000 1.2
+++ ConditionalUnaryProcedure.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -64,7 +64,7 @@
/**
* A {@link UnaryProcedure UnaryProcedure}
* similiar to Java's "ternary"
- * or "conditional" operator (<code>? :</code>).
+ * or "conditional" operator (<code>? :</code>).
* Given a {@link UnaryPredicate predicate}
* <i>p</i> and {@link UnaryProcedure procedures}
* <i>q</i> and <i>r</i>, {@link #run runs}
1.3 +7 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java
Index: UnaryCompositeBinaryFunction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnaryCompositeBinaryFunction.java 1 Feb 2003 14:40:45 -0000 1.2
+++ UnaryCompositeBinaryFunction.java 2 Feb 2003 21:46:19 -0000 1.3
@@ -62,7 +62,11 @@
import org.apache.commons.functor.UnaryFunction;
/**
- * f(x,y) := f(g(x),h(y))
+ * A {@link BinaryFunction BinaryFunction} composed of
+ * one binary function, <i>f</i>, and two unary
+ * functions, <i>g</i> and <i>h</i>,
+ * evaluating the ordered parameters <i>x</i>, <i>y</i>
+ * to <code><i>f</i>(<i>g</i>(<i>x</i>),<i>h</i>(<i>y</i>))</code>.
* <p>
* Note that although this class implements
* {@link Serializable}, a given instance will
1.2 +2 -2 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/composite/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 27 Jan 2003 19:33:40 -0000 1.1
+++ package.html 2 Feb 2003 21:46:19 -0000 1.2
@@ -55,6 +55,6 @@
-->
<html><body>
<p>
-Functors composed of other functors
+Functors composed of other functors.
</p>
</body></html>
1.2 +1 -1 jakarta-commons-sandbox/functor/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/xdocs/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 27 Jan 2003 19:33:44 -0000 1.1
+++ index.xml 2 Feb 2003 21:46:19 -0000 1.2
@@ -22,7 +22,7 @@
Haskell (<code>functor</code> is even a keyword in Haskell)
</li>
<li>C as function pointers</li>
- <li>C++'s Standard Template Library as functor objects</li>
+ <li>C++'s Standard Template Library as function objects</li>
<li>Ruby as blocks</li>
<li>etc.</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org