Author: jalkanen
Date: Sun Jun 29 11:48:37 2008
New Revision: 672661
URL: http://svn.apache.org/viewvc?rev=672661&view=rev
Log:
Fixed some minor issues with javadoc generation.
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiPageRenameEvent.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java
Modified: incubator/jspwiki/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=672661&r1=672660&r2=672661&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Sun Jun 29 11:48:37 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="webdocs/|wikipages/|images/" kind="src"
output="build" path="src"/>
+ <classpathentry excluding="**/package.html|images/|webdocs/|wikipages/"
kind="src" output="build" path="src"/>
<classpathentry excluding="etc/|build/|reports/|lib/" kind="src"
output="tests/build" path="tests"/>
<classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-api.jar"/>
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=672661&r1=672660&r2=672661&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Jun 29 11:48:37 2008
@@ -273,6 +273,7 @@
<link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
<link href="http://www.jdom.org/docs/apidocs/"/>
<classpath refid="path.base" />
+ <classpath refid="path.tests" />
</javadoc>
</target>
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java?rev=672661&r1=672660&r2=672661&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java
Sun Jun 29 11:48:37 2008
@@ -32,7 +32,7 @@
/**
* Handles logins made from within JSPWiki.
- * @see AuthenticationManager#getWikiSession(HttpServletRequest)
+ * @see
com.ecyrd.jspwiki.WikiSession#getWikiSession(WikiEngine,HttpServletRequest)
* @author Andrew Jaquith
* @since 2.3
*/
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiPageRenameEvent.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiPageRenameEvent.java?rev=672661&r1=672660&r2=672661&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiPageRenameEvent.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiPageRenameEvent.java
Sun Jun 29 11:48:37 2008
@@ -37,7 +37,7 @@
private static final long serialVersionUID = 1L;
/** Indicates a page rename event. This is based on events
- * generated by [EMAIL PROTECTED] com.ecyrd.jspwiki.PageRenamer}. */
+ * generated by [EMAIL PROTECTED] com.ecyrd.jspwiki.content.PageRenamer}.
*/
public static final int PAGE_RENAMED = 28;
private String m_oldpagename = null;
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java?rev=672661&r1=672660&r2=672661&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java
Sun Jun 29 11:48:37 2008
@@ -62,8 +62,9 @@
}
/**
- [EMAIL PROTECTED]
+ * [EMAIL PROTECTED]
*/
+ @Override
public synchronized void load( InputStream inStream ) throws IOException
{
// Load the file itself into a string
@@ -76,8 +77,8 @@
/**
* Loads properties from a file opened by a supplied Reader.
*
- * @param in [EMAIL PROTECTED]
- * @throws [EMAIL PROTECTED]
+ * @param in The reader to read properties from
+ * @throws IOException in case something goes wrong.
*/
public synchronized void load( Reader in ) throws IOException
{
@@ -90,6 +91,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @Override
public synchronized Object setProperty( String key, String value )
{
return put(key, value);
@@ -98,6 +100,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @Override
public synchronized void store( OutputStream out, String comments ) throws
IOException
{
byte[] bytes = m_propertyString.getBytes("ISO-8859-1");
@@ -108,6 +111,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @Override
public synchronized Object put( Object arg0, Object arg1 )
{
// Write the property to the stored string
@@ -121,6 +125,7 @@
* [EMAIL PROTECTED]
*/
@SuppressWarnings("unchecked")
+ @Override
public synchronized void putAll( Map arg0 )
{
// Shove all of the entries into the property string
@@ -137,6 +142,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @Override
public synchronized Object remove( Object key )
{
// Remove from the property string
@@ -149,6 +155,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @Override
public synchronized String toString()
{
return m_propertyString;
