You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2011/01/03 16:07:23 UTC
svn commit: r1054642 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/
wicket-core/src/main/java/org/apache/wicket/markup/html/basic/
wicket-core/src/main/java/org/apache/wicket/markup/html/form/
wicket-core/src/main/java/org/apache/wick...
Author: jdonnerstag
Date: Mon Jan 3 15:07:22 2011
New Revision: 1054642
URL: http://svn.apache.org/viewvc?rev=1054642&view=rev
Log:
minor, non-functional changes. Mostly javadoc
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/Label.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java?rev=1054642&r1=1054641&r2=1054642&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java Mon Jan 3 15:07:22 2011
@@ -201,7 +201,6 @@ public class ConverterLocator implements
return (IConverter<C>)new DefaultConverter<String>(String.class);
}
-
// Get type converter for class
final IConverter<C> converter = get(type);
if (converter == null)
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/Label.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/Label.java?rev=1054642&r1=1054641&r2=1054642&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/Label.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/Label.java Mon Jan 3 15:07:22 2011
@@ -104,18 +104,27 @@ public class Label extends WebComponent
super(id, model);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
replaceComponentTagBody(markupStream, openTag, getDefaultModelObjectAsString());
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
- // always transform the tag to <span></span> so even labels defined as <span/> render
- tag.setType(TagType.OPEN);
+ if (tag.isOpenClose())
+ {
+ // always transform the tag to <span></span> so even labels defined as <span/> render
+ tag.setType(TagType.OPEN);
+ }
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=1054642&r1=1054641&r2=1054642&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java Mon Jan 3 15:07:22 2011
@@ -1131,11 +1131,11 @@ public abstract class FormComponent<T> e
}
else
{
- final IConverter converter = getConverter(getType());
+ final IConverter<T> converter = getConverter(getType());
try
{
- convertedInput = (T)converter.convertToObject(getInput(), getLocale());
+ convertedInput = converter.convertToObject(getInput(), getLocale());
}
catch (ConversionException e)
{
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java?rev=1054642&r1=1054641&r2=1054642&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java Mon Jan 3 15:07:22 2011
@@ -137,6 +137,9 @@ public class Fragment extends WebMarkupC
super.onComponentTag(tag);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java?rev=1054642&r1=1054641&r2=1054642&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java Mon Jan 3 15:07:22 2011
@@ -33,7 +33,7 @@ import org.apache.wicket.model.IModel;
* A panel is a reusable component that holds markup and other components.
* <p>
* Whereas WebMarkupContainer is an inline container like
- *
+ *
* <pre>
* ...
* <span wicket:id="xxx">
@@ -42,20 +42,20 @@ import org.apache.wicket.model.IModel;
* </span>
* ...
* </pre>
- *
+ *
* a Panel has its own associated markup file and the container content is taken from that file,
* like:
- *
+ *
* <pre>
* <span wicket:id="mypanel"/>
- *
+ *
* TestPanel.html
* <wicket:panel>
* <span wicket:id="mylabel">My label</span>
* ....
* </wicket:panel>
* </pre>
- *
+ *
* @author Jonathan Locke
* @author Juergen Donnerstag
*/
@@ -133,13 +133,13 @@ public abstract class Panel extends WebM
/**
* Re-useable helper
- *
+ *
*/
public static class PanelMarkupHelper
{
/**
* @see org.apache.wicket.MarkupContainer#getMarkup(org.apache.wicket.Component)
- *
+ *
* @param parent
* @param child
* @return The markup associated with the child
@@ -174,9 +174,8 @@ public abstract class Panel extends WebM
/**
* Search for <wicket:panel ...> on the same level.
- *
+ *
* @param markup
- * @param name
* @return null, if not found
*/
private final static IMarkupFragment findPanelTag(final IMarkupFragment markup)
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java?rev=1054642&r1=1054641&r2=1054642&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java Mon Jan 3 15:07:22 2011
@@ -17,7 +17,6 @@
package org.apache.wicket.model;
-
/**
* AbstractReadOnlyModel is an adapter base class for implementing models which have no detach logic
* and are read-only.
@@ -29,10 +28,6 @@ package org.apache.wicket.model;
*/
public abstract class AbstractReadOnlyModel<T> implements IModel<T>
{
-
- /**
- *
- */
private static final long serialVersionUID = 1L;
/**
@@ -56,18 +51,18 @@ public abstract class AbstractReadOnlyMo
}
/**
- * @see java.lang.Object#toString()
+ * {@inheritDoc}
*/
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder("Model:classname=[");
+ StringBuilder sb = new StringBuilder("Model:classname=[");
sb.append(getClass().getName()).append("]");
return sb.toString();
}
/**
- * @see org.apache.wicket.model.IDetachable#detach()
+ * {@inheritDoc}
*/
public void detach()
{
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java?rev=1054642&r1=1054641&r2=1054642&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java Mon Jan 3 15:07:22 2011
@@ -49,6 +49,11 @@ public class WebSession extends Session
private static final Logger logger = LoggerFactory.getLogger(WebSession.class);
+ public static WebSession get()
+ {
+ return (WebSession)Session.get();
+ }
+
/**
* Filter that returns all component scoped messages ({@link FeedbackMessage#getReporter()} !=
* null).
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java?rev=1054642&r1=1054641&r2=1054642&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java Mon Jan 3 15:07:22 2011
@@ -42,6 +42,8 @@ import org.apache.wicket.IClusterable;
* @author Eelco Hillenius
* @author Jonathan Locke
*
+ * @param <C>
+ * The object to convert from and to String
*/
public interface IConverter<C> extends IClusterable
{