You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/03/24 19:53:51 UTC
[1/2] git commit: Use Java 7 multicatch
Repository: wicket
Updated Branches:
refs/heads/master cfcabb579 -> d850e208e
Use Java 7 multicatch
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ac668879
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ac668879
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ac668879
Branch: refs/heads/master
Commit: ac6688794a0d74a8787814370ee803c3b0efbaaf
Parents: cfcabb5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 24 10:33:49 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 24 10:33:49 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/jmx/Initializer.java | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ac668879/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
index 27f4c33..581c04c 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
@@ -214,19 +214,8 @@ public class Initializer implements IInitializer
ObjectName sessionsBeanName = new ObjectName(domain + ":type=RequestLogger");
register(application, sessionsBean, sessionsBeanName);
}
- catch (MalformedObjectNameException e)
- {
- throw new WicketRuntimeException(e);
- }
- catch (InstanceAlreadyExistsException e)
- {
- throw new WicketRuntimeException(e);
- }
- catch (MBeanRegistrationException e)
- {
- throw new WicketRuntimeException(e);
- }
- catch (NotCompliantMBeanException e)
+ catch (MalformedObjectNameException | InstanceAlreadyExistsException |
+ MBeanRegistrationException | NotCompliantMBeanException e)
{
throw new WicketRuntimeException(e);
}
[2/2] git commit: WICKET-5542 Remove final from
TextArea.onComponentTagBody()
Posted by mg...@apache.org.
WICKET-5542 Remove final from TextArea.onComponentTagBody()
(cherry picked from commit 32022fdb9e1d2996ac12c7ef3ff13a954ebbbee7)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d850e208
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d850e208
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d850e208
Branch: refs/heads/master
Commit: d850e208ef1e9c3c1abf97b1e37f3a005d7512c4
Parents: ac66887
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 24 19:53:02 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 24 19:53:37 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/markup/html/form/TextArea.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d850e208/wicket-core/src/main/java/org/apache/wicket/markup/html/form/TextArea.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/TextArea.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/TextArea.java
index 6415188..9d5e4cc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/TextArea.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/TextArea.java
@@ -60,7 +60,7 @@ public class TextArea<T> extends AbstractTextComponent<T>
* @see org.apache.wicket.Component#onComponentTagBody(MarkupStream, ComponentTag)
*/
@Override
- public final void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
checkComponentTag(openTag, "textarea");
@@ -82,4 +82,4 @@ public class TextArea<T> extends AbstractTextComponent<T>
}
replaceComponentTagBody(markupStream, openTag, value);
}
-}
\ No newline at end of file
+}