You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/10/05 23:22:10 UTC
[1/2] wicket git commit: Fix Javadoc warnings
Repository: wicket
Updated Branches:
refs/heads/master 44efdca26 -> 2aaffaef5
Fix Javadoc warnings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2c31db9d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2c31db9d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2c31db9d
Branch: refs/heads/master
Commit: 2c31db9dd6df119545b9614c5e3a546853199788
Parents: 44efdca
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 5 23:18:25 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 5 23:18:25 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/util/collections/IntHashMap.java | 2 +-
.../java/org/apache/wicket/util/convert/IConverter.java | 6 +++---
.../java/org/apache/wicket/util/convert/MaskConverter.java | 1 -
.../src/main/java/org/apache/wicket/util/diff/AddDelta.java | 4 ++--
.../main/java/org/apache/wicket/util/diff/ChangeDelta.java | 4 ++--
.../main/java/org/apache/wicket/util/diff/DeleteDelta.java | 6 +++---
.../java/org/apache/wicket/util/diff/DiffAlgorithm.java | 4 ++--
.../java/org/apache/wicket/util/resource/ResourceUtils.java | 2 +-
.../apache/wicket/util/string/AppendingStringBuffer.java | 4 ++--
.../org/apache/wicket/util/value/CopyOnWriteValueMap.java | 9 ---------
10 files changed, 16 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
index 7a8d180..24677fb 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
@@ -1036,7 +1036,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
* operations. It does not support the <tt>add</tt> or <tt>addAll</tt> operations.
*
* @return a collection view of the mappings contained in this map.
- * @see Map.Entry
+ * @see java.util.Map.Entry
*/
public Set<Entry<V>> entrySet()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
index 314294c..b641429 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
@@ -39,8 +39,8 @@ import org.apache.wicket.util.io.IClusterable;
* null value converters will not be invoked because no type conversion is necessary.
* </p>
*
- * @see org.apache.wicket.Component#getConverter(Class)
- * @see org.apache.wicket.Application#getConverterLocator()
+ * See org.apache.wicket.Component#getConverter(Class)
+ * See org.apache.wicket.Application#getConverterLocator()
*
* @author Eelco Hillenius
* @author Jonathan Locke
@@ -74,4 +74,4 @@ public interface IConverter<C> extends IClusterable
* @return The converted string value
*/
String convertToString(C value, Locale locale);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
index 2cae4c3..dcf29da 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/MaskConverter.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.util.convert;
-import java.awt.Component;
import java.text.ParseException;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
index 3c67c7c..0350112 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
@@ -103,7 +103,7 @@ public class AddDelta extends Delta
}
/**
- * @see org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuffer)
+ * @see org.apache.wicket.util.diff.Delta#toString(StringBuilder)
*/
@Override
public void toString(final StringBuilder s)
@@ -116,7 +116,7 @@ public class AddDelta extends Delta
}
/**
- * @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuffer, java.lang.String)
+ * @see org.apache.wicket.util.diff.Delta#toRCSString(StringBuilder, String)
*/
@Override
public void toRCSString(final StringBuilder s, final String EOL)
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
index bd63b47..19cbcd5 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
@@ -114,7 +114,7 @@ public class ChangeDelta extends Delta
}
/**
- * @see org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuffer)
+ * @see org.apache.wicket.util.diff.Delta#toString(StringBuilder)
*/
@Override
public void toString(final StringBuilder s)
@@ -130,7 +130,7 @@ public class ChangeDelta extends Delta
}
/**
- * @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuffer, java.lang.String)
+ * @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuilder, java.lang.String)
*/
@Override
public void toRCSString(final StringBuilder s, final String EOL)
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
index e755f32..30b8e37 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
@@ -102,7 +102,7 @@ public class DeleteDelta extends Delta
}
/**
- * @see org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuffer)
+ * @see org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuilder)
*/
@Override
public void toString(final StringBuilder s)
@@ -115,7 +115,7 @@ public class DeleteDelta extends Delta
}
/**
- * @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuffer, java.lang.String)
+ * @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuilder, java.lang.String)
*/
@Override
public void toRCSString(final StringBuilder s, final String EOL)
@@ -135,4 +135,4 @@ public class DeleteDelta extends Delta
{
visitor.visit(this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java
index 053f2d0..6189720 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java
@@ -68,7 +68,7 @@ public interface DiffAlgorithm
{
/**
* Computes the difference between the original sequence and the revised sequence and returns it
- * as a {@link org.suigeneris.jrcs.diff.Revision Revision} object.
+ * as a org.suigeneris.jrcs.diff.Revision Revision object.
* <p>
* The revision can be used to construct the revised sequence from the original sequence.
*
@@ -82,4 +82,4 @@ public interface DiffAlgorithm
*/
public abstract Revision diff(Object[] orig, Object[] rev)
throws DifferentiationFailedException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java
index 868b727..59ee9dd 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java
@@ -85,7 +85,7 @@ public class ResourceUtils
* E.g. {@code file_us_EN.min.js} will correctly determine a locale of {@code us_EN} by
* stripping the {@code .min} from the filename, the filename returned will be
* {@code file.min.js}, if you want the {@code .min} to be removed as well, use
- * {@link #getLocaleFromMinifiedFilename(String)} instead.
+ * {@link #getLocaleFromFilename(String)} instead.
*
* @param path
* The file path
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java b/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
index c89e45f..5113be1 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
@@ -831,7 +831,7 @@ public final class AppendingStringBuffer implements java.io.Serializable, CharSe
* <tt>length()</tt>, or if <tt>start</tt> is greater than <tt>end</tt>
*
* @since 1.4
- * @spec JSR-51
+ * Specification: JSR-51
*/
@Override
public CharSequence subSequence(final int start, final int end)
@@ -1754,4 +1754,4 @@ public final class AppendingStringBuffer implements java.io.Serializable, CharSe
{
count = 0;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2c31db9d/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java b/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
index 4becf35..6cbe048 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
@@ -349,15 +349,6 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
return wrapped.values();
}
- /**
- * @see IValueMap#toString()
- */
- @Override
- public String toString()
- {
- return super.toString();
- }
-
// //
// // getAs convenience methods
// //
[2/2] wicket git commit: Change the scope of Hamcrest library to fix
the javadoc build
Posted by mg...@apache.org.
Change the scope of Hamcrest library to fix the javadoc build
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2aaffaef
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2aaffaef
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2aaffaef
Branch: refs/heads/master
Commit: 2aaffaef54d1548093016c07c5162ca52a69eee7
Parents: 2c31db9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 5 23:21:38 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 5 23:21:38 2015 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2aaffaef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d0a8c43..ec708dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -493,13 +493,13 @@
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-junit</artifactId>
<version>${hamcrest.version}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
<version>${hamcrest.version}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>