Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing javadoc in jetty-util that JDK 1.7 complains about

This commit is contained in:
Joakim Erdfelt 2013-08-14 11:05:24 -07:00
parent e39b48c90d
commit 9da23cdba1
12 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-util/src/main/java/org/eclipse/jetty/util/B64Code.java
View File

@ -346,8 +346,7 @@ public class B64Code
* Base 64 decode as described in RFC 2045.
* <p>Unlike {@link #decode(char[])}, extra whitespace is ignored.
* @param encoded String to decode.
* @param output stream for decoded bytes
* @return byte array containing the decoded form of the input.
* @param bout stream for decoded bytes
* @throws IllegalArgumentException if the input is not a valid
* B64 encoding.
*/

8
jetty-util/src/main/java/org/eclipse/jetty/util/BlockingCallback.java
View File

@ -81,13 +81,11 @@ public class BlockingCallback implements Callback
}
}
/** Block until the FutureCallback is done or cancelled and
* after the return leave in the state as if a {@link #reset()} had been
* done.
/** Block until the Callback has succeeded or failed and
* after the return leave in the state to allow reuse.
* This is useful for code that wants to repeatable use a FutureCallback to convert
* an asynchronous API to a blocking API.
* @return
* @throws IOException
* @throws IOException if exception was caught during blocking, or callback was cancelled
*/
public void block() throws IOException
{

2
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java
View File

@ -35,7 +35,7 @@ package org.eclipse.jetty.util;
* task and a call the {@link #succeeded()} on this call back represents
* completion of the subtask. Only once all the subtasks are completed is
* the {@link Callback#succeeded()} method called on the {@link Callback} instance
* passed the the {@link #IteratingCallback(Callback)} constructor.</p>
* passed the the {@link #IteratingNestedCallback(Callback)} constructor.</p>
*
*/
public abstract class IteratingNestedCallback extends IteratingCallback

6
jetty-util/src/main/java/org/eclipse/jetty/util/MultiMap.java
View File

@ -228,8 +228,8 @@ public class MultiMap<V> extends HashMap<String,List<V>>
/**
* Merge values.
*
* @param the
* map to overlay on top of this one, merging together values if needed.
* @param map
* the map to overlay on top of this one, merging together values if needed.
* @return true if an existing key was merged with potentially new values, false if either no change was made, or there were only new keys.
*/
public boolean addAllValues(MultiMap<V> map)
@ -284,7 +284,7 @@ public class MultiMap<V> extends HashMap<String,List<V>>
* <p>
* NOTE: This is a SLOW operation, and is actively discouraged.
* @param value
* @return
* @return true if contains simple value
*/
public boolean containsSimpleValue(V value)
{

5
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
View File

@ -311,7 +311,6 @@ public class MultiPartInputStreamParser
/**
* Get the file, if any, the data has been written to.
* @return
*/
public File getFile ()
{
@ -353,8 +352,6 @@ public class MultiPartInputStreamParser
/**
* Get the already parsed parts.
*
* @return
*/
public Collection<Part> getParsedParts()
{
@ -401,7 +398,6 @@ public class MultiPartInputStreamParser
/**
* Parse, if necessary, the multipart data and return the list of Parts.
*
* @return
* @throws IOException
* @throws ServletException
*/
@ -424,7 +420,6 @@ public class MultiPartInputStreamParser
* Get the named Part.
*
* @param name
* @return
* @throws IOException
* @throws ServletException
*/

2
jetty-util/src/main/java/org/eclipse/jetty/util/Trie.java
View File

@ -49,7 +49,6 @@ public interface Trie<V>
/* ------------------------------------------------------------ */
/** Get and exact match from a String key
* @param s The key
* @return
*/
public V get(String s);
@ -58,7 +57,6 @@ public interface Trie<V>
* @param s The key
* @param offset The offset within the string of the key
* @param len the length of the key
* @return
*/
public V get(String s,int offset,int len);

1
jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
View File

@ -274,7 +274,6 @@ public class UrlEncoded extends MultiMap<String> implements Cloneable
* @param offset the offset within raw to decode from
* @param length the length of the section to decode
* @param map the {@link MultiMap} to populate
* @param buffer the buffer to decode into
*/
public static void decodeUtf8To(byte[] raw,int offset, int length, MultiMap<String> map)
{

2
jetty-util/src/main/java/org/eclipse/jetty/util/annotation/ManagedObject.java
View File

@ -39,8 +39,6 @@ public @interface ManagedObject
{
/**
* Description of the Managed Object
*
* @return
*/
String value() default "Not Specified";

2
jetty-util/src/main/java/org/eclipse/jetty/util/annotation/ManagedOperation.java
View File

@ -48,8 +48,6 @@ public @interface ManagedOperation
{
/**
* Description of the Managed Object
*
* @return
*/
String value() default "Not Specified";

2
jetty-util/src/main/java/org/eclipse/jetty/util/annotation/Name.java
View File

@ -39,13 +39,11 @@ public @interface Name
{
/**
* the name of the parameter
* @return
*/
String value();
/**
* the description of the parameter
* @return
*/
String description() default "";
}

1
jetty-util/src/main/java/org/eclipse/jetty/util/component/Container.java
View File

@ -46,7 +46,6 @@ public interface Container
/**
* Removes the given bean.
* @return whether the bean was removed
* @see #removeBeans()
*/
public boolean removeBean(Object o);

24
jetty-util/src/test/java/org/eclipse/jetty/util/MultiMapTest.java
View File

@ -102,7 +102,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#putValues(Object, List)}
* Tests {@link MultiMap#putValues(String, List)}
*/
@Test
public void testPutValues_List()
@ -122,7 +122,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#putValues(Object, String...)}
* Tests {@link MultiMap#putValues(String, String...)}
*/
@Test
public void testPutValues_StringArray()
@ -138,7 +138,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#putValues(Object, String...)}
* Tests {@link MultiMap#putValues(String, String...)}
*/
@Test
public void testPutValues_VarArgs()
@ -153,7 +153,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#add(Object, Object)}
* Tests {@link MultiMap#add(String, Object)}
*/
@Test
public void testAdd()
@ -176,7 +176,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#addValues(Object, List)}
* Tests {@link MultiMap#addValues(String, List)}
*/
@Test
public void testAddValues_List()
@ -202,7 +202,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#addValues(Object, List)}
* Tests {@link MultiMap#addValues(String, List)}
*/
@Test
public void testAddValues_List_Empty()
@ -225,7 +225,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#addValues(Object, String[])}
* Tests {@link MultiMap#addValues(String, Object[])}
*/
@Test
public void testAddValues_StringArray()
@ -248,7 +248,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#addValues(Object, String[])}
* Tests {@link MultiMap#addValues(String, Object[])}
*/
@Test
public void testAddValues_StringArray_Empty()
@ -271,7 +271,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#removeValue(Object, Object)}
* Tests {@link MultiMap#removeValue(String, Object)}
*/
@Test
public void testRemoveValue()
@ -293,7 +293,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#removeValue(Object, Object)}
* Tests {@link MultiMap#removeValue(String, Object)}
*/
@Test
public void testRemoveValue_InvalidItem()
@ -314,7 +314,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#removeValue(Object, Object)}
* Tests {@link MultiMap#removeValue(String, Object)}
*/
@Test
public void testRemoveValue_AllItems()
@ -344,7 +344,7 @@ public class MultiMapTest
}
/**
* Tests {@link MultiMap#removeValue(Object, Object)}
* Tests {@link MultiMap#removeValue(String, Object)}
*/
@Test
public void testRemoveValue_FromEmpty()