You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2014/09/09 21:11:29 UTC
svn commit: r1623870 - in
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: internal/util/
internal/util/rb_trees/ util/
Author: schor
Date: Tue Sep 9 19:11:29 2014
New Revision: 1623870
URL: http://svn.apache.org/r1623870
Log:
no Jira, fix misc javadoc issues
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2IntHashMap.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JSONizable.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JsonContentHandlerJacksonWrapper.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2IntHashMap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2IntHashMap.java?rev=1623870&r1=1623869&r2=1623870&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2IntHashMap.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2IntHashMap.java Tue Sep 9 19:11:29 2014
@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
import org.apache.uima.jcas.impl.JCasHashMap;
/**
- * A map<int, int>
+ * A map<int, int>
*
* based on JCasHashMap, but without the multi-threading support
*
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java?rev=1623870&r1=1623869&r2=1623870&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java Tue Sep 9 19:11:29 2014
@@ -25,7 +25,7 @@ import org.apache.uima.internal.util.Int
import org.apache.uima.internal.util.IntListIterator;
/**
- * A map<int, int>
+ * A map<int, int>
*
* uses IntArrayRBTcommon
*
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java?rev=1623870&r1=1623869&r2=1623870&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java Tue Sep 9 19:11:29 2014
@@ -21,7 +21,7 @@ package org.apache.uima.internal.util.rb
/**
- * map<int, int> uses separate objects (IntRBTNode) as nodes
+ * map<int, int%gt; uses separate objects (IntRBTNode) as nodes
*
* See the {@link org.apache.uima.internal.util.rb_trees.RedBlackTree RedBlackTree} class. This is a
* specialized instance with ints as elements.
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JSONizable.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JSONizable.java?rev=1623870&r1=1623869&r2=1623870&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JSONizable.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JSONizable.java Tue Sep 9 19:11:29 2014
@@ -43,7 +43,7 @@ public interface JSONizable {
*
* @param aWriter
* a Writer to which the JSON string will be written
- * @throws SAXException
+ * @throws SAXException -
*/
public void toJSON(Writer aWriter) throws SAXException;
@@ -54,7 +54,7 @@ public interface JSONizable {
* @param aWriter
* a Writer to which the JSON string will be written
* @param isFormattedOutput set to true for prettyprinting, default is false
- * @throws SAXException
+ * @throws SAXException -
*/
public void toJSON(Writer aWriter, boolean isFormattedOutput) throws SAXException;
@@ -63,7 +63,7 @@ public interface JSONizable {
*
* @param aOutputStream
* an OutputStream to which the JSON string will be written, in UTF-8 encoding.
- * @throws SAXException
+ * @throws SAXException -
*/
public void toJSON(OutputStream aOutputStream) throws SAXException;
@@ -73,7 +73,7 @@ public interface JSONizable {
* @param aOutputStream
* an OutputStream to which the JSON string will be written, in UTF-8 encoding.
* @param isFormattedOutput set to true for prettyprinting, default is false
- * @throws SAXException
+ * @throws SAXException -
*/
public void toJSON(OutputStream aOutputStream, boolean isFormattedOutput) throws SAXException;
@@ -82,7 +82,7 @@ public void toJSON(OutputStream aOutputS
*
* @param file
* a file to which the JSON string will be written, in UTF-8 encoding.
- * @throws SAXException
+ * @throws SAXException -
*/
public void toJSON(File file) throws SAXException;
@@ -92,7 +92,7 @@ public void toJSON(OutputStream aOutputS
* @param file
* a file to which the JSON string will be written, in UTF-8 encoding.
* @param isFormattedOutput set to true for prettyprinting, default is false
- * @throws SAXException
+ * @throws SAXException -
*/
public void toJSON(File file, boolean isFormattedOutput) throws SAXException;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JsonContentHandlerJacksonWrapper.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JsonContentHandlerJacksonWrapper.java?rev=1623870&r1=1623869&r2=1623870&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JsonContentHandlerJacksonWrapper.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JsonContentHandlerJacksonWrapper.java Tue Sep 9 19:11:29 2014
@@ -132,7 +132,8 @@ public class JsonContentHandlerJacksonWr
* Makes a Json content handler, using a specified JsonFactory instance that can
* be configured according to the Jackson implementation.
* The resulting content handler will send its output to the specified destination
- * @param destination - can be a File, an OutputStream, or a Writer
+ * @param jsonFactory -
+ * @param o - where the output goes
* @throws SAXException wrapping an IOException
*/
public JsonContentHandlerJacksonWrapper(JsonFactory jsonFactory, Object o) throws SAXException {
@@ -143,7 +144,8 @@ public class JsonContentHandlerJacksonWr
* Makes a Json content handler, and
* specifies a prettyprinting boolean flag (default is no prettyprinting).
* The resulting content handler will send its output to the specified destination
- * @param destination - can be a File, an OutputStream, or a Writer
+ * @param o - where the output goes
+ * @param isFormattedOutput -
* @throws SAXException wrapping an IOException
*/
public JsonContentHandlerJacksonWrapper(Object o, boolean isFormattedOutput) throws SAXException {
@@ -155,7 +157,9 @@ public class JsonContentHandlerJacksonWr
* be configured according to the Jackson implementation, and
* specifies a prettyprinting boolean flag (default is no prettyprinting).
* The resulting content handler will send its output to the specified destination
- * @param destination - can be a File, an OutputStream, or a Writer
+ * @param jsonFactory -
+ * @param o where the output goes
+ * @param isFormattedOutput - true for pretty printing
* @throws SAXException wrapping an IOException
*/
public JsonContentHandlerJacksonWrapper(JsonFactory jsonFactory, Object o, boolean isFormattedOutput) throws SAXException {