You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2014/08/12 01:17:02 UTC
svn commit: r1617380 - in /jspwiki/trunk: ChangeLog
jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki-war/src/main/java/org/apache/wiki/forms/FormInput.java
Author: juanpablo
Date: Mon Aug 11 23:17:02 2014
New Revision: 1617380
URL: http://svn.apache.org/r1617380
Log:
* 2.10.2-svn-6
* Fixed JSPWIKI-855: NullPointerException in FormInput.java:92, patch provided by Jürgen Weber - thanks!
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormInput.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1617380&r1=1617379&r2=1617380&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Mon Aug 11 23:17:02 2014
@@ -1,3 +1,9 @@
+2014-08-12 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.10.2-svn-6
+
+ * Fixed JSPWIKI-855: NullPointerException in FormInput.java:92, patch provided by Jürgen Weber - thanks!
+
2014-07-31 Harry Metske (metskem@apache.org)
* 2.10.2-svn-5
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1617380&r1=1617379&r2=1617380&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Mon Aug 11 23:17:02 2014
@@ -72,8 +72,8 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "5";
-
+ public static final String BUILD = "6";
+
/**
* This is the generic version string you should use when printing out the version. It is of
* the form "VERSION.REVISION.MINORREVISION[-POSTFIX][-BUILD]".
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormInput.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormInput.java?rev=1617380&r1=1617379&r2=1617380&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormInput.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/forms/FormInput.java Mon Aug 11 23:17:02 2014
@@ -43,6 +43,8 @@ public class FormInput extends FormEleme
/** Parameter name for setting the size of the input field. Value is <tt>{@value}</tt>. */
public static final String PARAM_SIZE = "size";
+ public static final String PARAM_CHECKED = "checked";
+
/**
* Generates a dynamic form element on the WikiPage.
*
@@ -55,6 +57,7 @@ public class FormInput extends FormEleme
String inputValue = params.get( PARAM_VALUE );
String inputType = params.get( PARAM_TYPE );
String size = params.get( PARAM_SIZE );
+ String checked = params.get( PARAM_CHECKED );
ResourceBundle rb = Preferences.getBundle( ctx, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
if ( inputName == null ) {
@@ -88,9 +91,8 @@ public class FormInput extends FormEleme
Element field = XhtmlUtil.input(inputType,HANDLERPARAM_PREFIX + inputName,inputValue);
- String checked = params.get("checked");
field.setAttribute(XHTML.ATTR_class,
- String.valueOf(TextUtil.isPositive(checked) || checked.equalsIgnoreCase("checked")));
+ String.valueOf(TextUtil.isPositive(checked) || "checked".equalsIgnoreCase(checked)));
String oldValue = previousValues.get( inputName );
if ( oldValue != null )