You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by cm...@apache.org on 2013/08/07 14:01:34 UTC

[2/2] git commit: formatting fixed

formatting fixed


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/db8f6942
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/db8f6942
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/db8f6942

Branch: refs/heads/master
Commit: db8f69429a194bfa26e32e68228952d3d0a7efae
Parents: c276f09
Author: Carl-Eric Menzel <cm...@wicketbuch.de>
Authored: Wed Aug 7 13:59:43 2013 +0200
Committer: Carl-Eric Menzel <cm...@wicketbuch.de>
Committed: Wed Aug 7 14:00:36 2013 +0200

----------------------------------------------------------------------
 .../ajax/AbstractDefaultAjaxBehavior.java       |  2 +-
 .../ajax/attributes/ThrottlingSettings.java     | 31 ++++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/db8f6942/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
index 85f950c..8c7acaf 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
@@ -140,7 +140,7 @@ public abstract class AbstractDefaultAjaxBehavior extends AbstractAjaxBehavior
 		for (AjaxRequestTarget.IListener listener : ajaxRequestTargetListeners)
 		{
 			listener.updateAjaxAttributes(attributes);
-		}
+			}
 		updateAjaxAttributes(attributes);
 		return attributes;
 	}

http://git-wip-us.apache.org/repos/asf/wicket/blob/db8f6942/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
index a724b3d..079b586 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
@@ -16,13 +16,14 @@
  */
 package org.apache.wicket.ajax.attributes;
 
+import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.util.io.IClusterable;
 import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.time.Duration;
 
 /**
  * Class to keep track of throttling settings.
- *
+ * 
  * @author ivaynberg
  */
 public class ThrottlingSettings implements IClusterable
@@ -35,9 +36,11 @@ public class ThrottlingSettings implements IClusterable
 
 	/**
 	 * Construct.
-	 *
-	 * @param id    throttle id
-	 * @param delay throttle delay
+	 * 
+	 * @param id
+	 *            throttle id
+	 * @param delay
+	 *            throttle delay
 	 */
 	public ThrottlingSettings(final String id, final Duration delay)
 	{
@@ -46,12 +49,14 @@ public class ThrottlingSettings implements IClusterable
 
 	/**
 	 * Construct.
-	 *
-	 * @param id    throttle id
-	 * @param delay the amount of time the action should be postponed
-	 * @param postponeTimerOnUpdate postpone timer
+	 * 
+	 * @param id
+	 *            throttle id
+	 * @param delay
+	 *            the amount of time the action should be postponed
 	 */
-	public ThrottlingSettings(final String id, final Duration delay, final boolean postponeTimerOnUpdate)
+	public ThrottlingSettings(final String id, final Duration delay,
+		final boolean postponeTimerOnUpdate)
 	{
 		this.id = Args.notNull(id, "id");
 		this.delay = Args.notNull(delay, "delay");
@@ -85,10 +90,10 @@ public class ThrottlingSettings implements IClusterable
 	}
 
 	/**
-	 * If it is set to true, then the timer is reset each time the throttle function
-	 * gets called. Use this behaviour if you want something to happen at X milliseconds
-	 * after the <strong>last</strong> call to throttle. If the parameter is not set, or set to false,
-	 * then the timer is not reset.
+	 * If it is set to true, then the timer is reset each time the throttle function gets called.
+	 * Use this behaviour if you want something to happen at X milliseconds after the
+	 * <strong>last</strong> call to throttle. If the parameter is not set, or set to false, then
+	 * the timer is not reset.
 	 */
 	public boolean getPostponeTimerOnUpdate()
 	{


Re: [2/2] git commit: formatting fixed

Posted by Martin Grigorov <mg...@apache.org>.
On Wed, Aug 7, 2013 at 2:01 PM, <cm...@apache.org> wrote:

> formatting fixed
>
>
> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/db8f6942
> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/db8f6942
> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/db8f6942
>
> Branch: refs/heads/master
> Commit: db8f69429a194bfa26e32e68228952d3d0a7efae
> Parents: c276f09
> Author: Carl-Eric Menzel <cm...@wicketbuch.de>
> Authored: Wed Aug 7 13:59:43 2013 +0200
> Committer: Carl-Eric Menzel <cm...@wicketbuch.de>
> Committed: Wed Aug 7 14:00:36 2013 +0200
>
> ----------------------------------------------------------------------
>  .../ajax/AbstractDefaultAjaxBehavior.java       |  2 +-
>  .../ajax/attributes/ThrottlingSettings.java     | 31 ++++++++++++--------
>  2 files changed, 19 insertions(+), 14 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/db8f6942/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
> b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
> index 85f950c..8c7acaf 100644
> ---
> a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
> +++
> b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
> @@ -140,7 +140,7 @@ public abstract class AbstractDefaultAjaxBehavior
> extends AbstractAjaxBehavior
>                 for (AjaxRequestTarget.IListener listener :
> ajaxRequestTargetListeners)
>                 {
>                         listener.updateAjaxAttributes(attributes);
> -               }
> +                       }
>

Eclipse settings are wrong here.


>                 updateAjaxAttributes(attributes);
>                 return attributes;
>         }
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/db8f6942/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
> b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
> index a724b3d..079b586 100644
> ---
> a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
> +++
> b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/ThrottlingSettings.java
> @@ -16,13 +16,14 @@
>   */
>  package org.apache.wicket.ajax.attributes;
>
> +import org.apache.wicket.markup.html.WebComponent;
>  import org.apache.wicket.util.io.IClusterable;
>  import org.apache.wicket.util.lang.Args;
>  import org.apache.wicket.util.time.Duration;
>
>  /**
>   * Class to keep track of throttling settings.
> - *
> + *
>   * @author ivaynberg
>   */
>  public class ThrottlingSettings implements IClusterable
> @@ -35,9 +36,11 @@ public class ThrottlingSettings implements IClusterable
>
>         /**
>          * Construct.
> -        *
> -        * @param id    throttle id
> -        * @param delay throttle delay
> +        *
> +        * @param id
> +        *            throttle id
> +        * @param delay
> +        *            throttle delay
>          */
>         public ThrottlingSettings(final String id, final Duration delay)
>         {
> @@ -46,12 +49,14 @@ public class ThrottlingSettings implements IClusterable
>
>         /**
>          * Construct.
> -        *
> -        * @param id    throttle id
> -        * @param delay the amount of time the action should be postponed
> -        * @param postponeTimerOnUpdate postpone timer
> +        *
> +        * @param id
> +        *            throttle id
> +        * @param delay
> +        *            the amount of time the action should be postponed
>          */
> -       public ThrottlingSettings(final String id, final Duration delay,
> final boolean postponeTimerOnUpdate)
> +       public ThrottlingSettings(final String id, final Duration delay,
> +               final boolean postponeTimerOnUpdate)
>         {
>                 this.id = Args.notNull(id, "id");
>                 this.delay = Args.notNull(delay, "delay");
> @@ -85,10 +90,10 @@ public class ThrottlingSettings implements IClusterable
>         }
>
>         /**
> -        * If it is set to true, then the timer is reset each time the
> throttle function
> -        * gets called. Use this behaviour if you want something to happen
> at X milliseconds
> -        * after the <strong>last</strong> call to throttle. If the
> parameter is not set, or set to false,
> -        * then the timer is not reset.
> +        * If it is set to true, then the timer is reset each time the
> throttle function gets called.
> +        * Use this behaviour if you want something to happen at X
> milliseconds after the
> +        * <strong>last</strong> call to throttle. If the parameter is not
> set, or set to false, then
> +        * the timer is not reset.
>          */
>         public boolean getPostponeTimerOnUpdate()
>         {
>
>