Author: jalkanen
Date: Sun Jun 8 02:32:42 2008
New Revision: 664473
URL: http://svn.apache.org/viewvc?rev=664473&view=rev
Log:
Various Java5 & comment fixes. Also fixed the local preferences to catch the
right kinds of errors.
Modified:
incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
incubator/jspwiki/trunk/src/com/ecyrd/management/SimpleMBean.java
Modified: incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs?rev=664473&r1=664472&r2=664473&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs Sun Jun 8
02:32:42 2008
@@ -1,4 +1,4 @@
-#Mon Apr 14 23:39:57 EEST 2008
+#Sun Jun 08 12:28:21 EEST 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -7,8 +7,74 @@
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java?rev=664473&r1=664472&r2=664473&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
Sun Jun 8 02:32:42 2008
@@ -122,8 +122,8 @@
//
try
{
- Class providerclass = ClassUtil.findClass(
"com.ecyrd.jspwiki.providers",
- classname );
+ Class<?> providerclass = ClassUtil.findClass(
"com.ecyrd.jspwiki.providers",
+ classname );
m_provider = (WikiAttachmentProvider)providerclass.newInstance();
@@ -544,7 +544,7 @@
return m_provider.listAllChanged( new Date(0L) );
}
- return new ArrayList();
+ return new ArrayList<Attachment>();
}
/**
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java?rev=664473&r1=664472&r2=664473&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java
Sun Jun 8 02:32:42 2008
@@ -347,7 +347,7 @@
{
try
{
- conn.close();
+ if( conn != null ) conn.close();
}
catch( Exception e )
{
@@ -434,7 +434,7 @@
{
try
{
- conn.close();
+ if( conn != null ) conn.close();
}
catch( Exception e )
{
@@ -544,7 +544,7 @@
{
try
{
- conn.close();
+ if( conn != null ) conn.close();
}
catch( Exception e )
{
@@ -573,7 +573,7 @@
{
try
{
- conn.close();
+ if( conn != null ) conn.close();
}
catch( Exception e )
{
@@ -652,7 +652,7 @@
{
try
{
- conn.close();
+ if( conn != null ) conn.close();
}
catch( Exception e )
{
@@ -797,7 +797,7 @@
{
try
{
- conn.close();
+ if( conn != null ) conn.close();
}
catch( Exception e )
{
@@ -897,7 +897,7 @@
{
try
{
- conn.close();
+ if( conn != null ) conn.close();
}
catch( Exception e )
{
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java?rev=664473&r1=664472&r2=664473&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java
Sun Jun 8 02:32:42 2008
@@ -46,6 +46,11 @@
m_engine = engine;
}
+ /**
+ * Returns the engine used by this provider.
+ *
+ * @return The engine
+ */
public WikiEngine getEngine()
{
return m_engine;
@@ -53,7 +58,7 @@
private Collection listAllPagesWithAttachments()
{
- ArrayList pageNames = new ArrayList();
+ ArrayList<String> pageNames = new ArrayList<String>();
try
{
@@ -76,7 +81,7 @@
Collections.sort( pageNames );
- ArrayList result = new ArrayList();
+ ArrayList<DirectoryItem> result = new ArrayList<DirectoryItem>();
for( Iterator i = pageNames.iterator(); i.hasNext(); )
{
@@ -93,7 +98,7 @@
log.debug("Listing attachments for page "+pageName);
- ArrayList result = new ArrayList();
+ ArrayList<DavItem> result = new ArrayList<DavItem>();
try
{
WikiPage page = m_engine.getPage( pageName );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java?rev=664473&r1=664472&r2=664473&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
Sun Jun 8 02:32:42 2008
@@ -33,7 +33,7 @@
* Manages progressing items. In general this class is used whenever JSPWiki
* is doing something which may require a long time. In addition, this
manager
* provides a JSON interface for finding remotely what the progress is. The
- * JSON object name is JSON_PROGRESSTRACKER = "[EMAIL PROTECTED]
JSON_PROGRESSTRACKER}".
+ * JSON object name is JSON_PROGRESSTRACKER = "[EMAIL PROTECTED]
#JSON_PROGRESSTRACKER}".
*
* @since 2.6
*/
Modified: incubator/jspwiki/trunk/src/com/ecyrd/management/SimpleMBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/management/SimpleMBean.java?rev=664473&r1=664472&r2=664473&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/management/SimpleMBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/management/SimpleMBean.java Sun Jun
8 02:32:42 2008
@@ -46,12 +46,12 @@
{
protected MBeanInfo m_beanInfo;
- private static Method findGetterSetter( Class clazz, String name, Class
parm )
+ private static Method findGetterSetter( Class<?> clazz, String name,
Class<?> parm )
{
try
{
- Class[] params = { parm };
- Class[] emptyparms = {};
+ Class<?>[] params = { parm };
+ Class<?>[] emptyparms = {};
Method m = clazz.getDeclaredMethod( name, parm != null ? params :
emptyparms );
@@ -65,6 +65,11 @@
return null;
}
+ /**
+ * Create a new SimpleMBean
+ *
+ * @throws NotCompliantMBeanException [EMAIL PROTECTED]
+ */
protected SimpleMBean() throws NotCompliantMBeanException
{
//
@@ -179,7 +184,17 @@
return "";
}
- public Object getAttribute(String name) throws AttributeNotFoundException,
MBeanException, ReflectionException
+ /**
+ * Gets an attribute using reflection from the MBean.
+ *
+ * @param name Name of the attribute to find.
+ * @return The value returned by the corresponding getXXX() call
+ * @throws AttributeNotFoundException If there is not such attribute
+ * @throws MBeanException
+ * @throws ReflectionException
+ */
+ public Object getAttribute(String name)
+ throws AttributeNotFoundException, MBeanException, ReflectionException
{
Method m;
Object res = null;
@@ -215,6 +230,12 @@
return res;
}
+ /**
+ * Gets multiple attributes at the same time.
+ *
+ * @param arg0 The attribute names to get
+ * @return A list of attributes
+ */
public AttributeList getAttributes(String[] arg0)
{
AttributeList list = new AttributeList();
@@ -245,11 +266,22 @@
return list;
}
+ /**
+ * Return the MBeanInfo structure.
+ *
+ * @return the MBeanInfo
+ */
public MBeanInfo getMBeanInfo()
{
return m_beanInfo;
}
+ /**
+ * Invokes a particular method.
+ *
+ * @param arg0 Method name
+ * @param arg1 A list of arguments for the invocation
+ */
public Object invoke(String arg0, Object[] arg1, String[] arg2)
throws MBeanException, ReflectionException
{
