You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2009/02/21 20:09:35 UTC

svn commit: r746567 - in /incubator/jspwiki/trunk: .settings/ src/java/org/apache/wiki/ui/stripes/

Author: jalkanen
Date: Sat Feb 21 19:09:34 2009
New Revision: 746567

URL: http://svn.apache.org/viewvc?rev=746567&view=rev
Log:
Removing some validation errors & checkstyle problems.

Removed:
    incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.core.prefs
Modified:
    incubator/jspwiki/trunk/.settings/.jsdtscope
    incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs
    incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs
    incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
    incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
    incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.prefs
    incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java

Modified: incubator/jspwiki/trunk/.settings/.jsdtscope
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/.jsdtscope?rev=746567&r1=746566&r2=746567&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/.jsdtscope (original)
+++ incubator/jspwiki/trunk/.settings/.jsdtscope Sat Feb 21 19:09:34 2009
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/WebContent/scripts"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.FireFoxBrowserLibrary"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.wst.jsdt.USER_LIBRARY/mootools"/>
 	<classpathentry kind="output" path=""/>

Modified: incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs?rev=746567&r1=746566&r2=746567&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs Sat Feb 21 19:09:34 2009
@@ -1,6 +1,5 @@
-#Sat Nov 08 19:15:42 EET 2008
+#Sat Feb 21 19:40:26 EET 2009
 eclipse.preferences.version=1
-encoding//etc/i18n/templates/default_de.properties=ISO-8859-1
 encoding//src/wikipages/fi/ApprovalRequiredForPageChanges.txt=UTF-8
 encoding//src/wikipages/fi/ApprovalRequiredForUserProfiles.txt=UTF-8
 encoding//src/wikipages/fi/EditFindAndReplaceHelp.txt=UTF-8

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=746567&r1=746566&r2=746567&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs Sat Feb 21 19:09:34 2009
@@ -1,5 +1,13 @@
-#Fri Jan 30 00:36:44 EET 2009
+#Sat Feb 21 21:01:08 EET 2009
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -7,9 +15,84 @@
 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.maxProblemPerUnit=100
+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=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+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=ignore
+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=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+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=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+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=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+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.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -266,3 +349,5 @@
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error

Modified: incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs?rev=746567&r1=746566&r2=746567&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs Sat Feb 21 19:09:34 2009
@@ -1,5 +1,5 @@
 #Fri Jan 30 00:19:10 EET 2009
-XDOCLETBUILDERACTIVE=true
+XDOCLETBUILDERACTIVE=false
 XDOCLETHOME=
 XDOCLETUSEGLOBAL=true
 XDOCLETVERSION=1.2.1

Modified: incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=746567&r1=746566&r2=746567&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml Sat Feb 21 19:09:34 2009
@@ -5,5 +5,5 @@
   <fixed facet="jst.java"/>
   <installed facet="jst.java" version="5.0"/>
   <installed facet="jst.web" version="2.4"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
+  <!-- <installed facet="wst.jsdt.web" version="1.0"/> -->
 </faceted-project>

Modified: incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.prefs?rev=746567&r1=746566&r2=746567&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.prefs Sat Feb 21 19:09:34 2009
@@ -1,4 +1,4 @@
-#Fri Jan 30 11:36:11 EET 2009
+#Sat Feb 21 21:02:25 EET 2009
 eclipse.preferences.version=1
-formatter_profile=_JSPWiki Javascript Formatting Conventions
 formatter_settings_version=11
+org.eclipse.wst.jsdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java?rev=746567&r1=746566&r2=746567&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java Sat Feb 21 19:09:34 2009
@@ -350,9 +350,9 @@
     {
         boolean admin = false;
 
-        WikiEngine m_engine = getEngine();
-        admin = m_engine.getAuthorizationManager().checkPermission( getWikiSession(),
-                                                                    new AllPermission( m_engine.getApplicationName() ) );
+        WikiEngine engine = getEngine();
+        admin = engine.getAuthorizationManager().checkPermission( getWikiSession(),
+                                                                  new AllPermission( engine.getApplicationName() ) );
 
         return admin;
     }
@@ -404,8 +404,6 @@
      * (VIEW, EDIT, etc.)
      * 
      * @param arg The request context (one of the predefined contexts.)
-     * @throws IllegalStateException if the WikiEngine for this WikiContext has
-     *             not been previously set
      */
     public void setRequestContext( String arg )
     {