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 2015/05/27 07:48:28 UTC
[5/5] wicket git commit: Merge branch 'pr-120-feature/debugbar'
Merge branch 'pr-120-feature/debugbar'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/549827f9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/549827f9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/549827f9
Branch: refs/heads/master
Commit: 549827f9fe41be3611ba9ac84e0db507c7e1e149
Parents: a30f3ca 6087046
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 27 08:47:59 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 27 08:47:59 2015 +0300
----------------------------------------------------------------------
.../migrate/StringResourceModelMigration.java | 5 +--
.../wicket/devutils/debugbar/DebugBar.java | 13 +++++++
.../devutils/debugbar/wicket-debugbar.css | 11 ++++++
.../wicket/devutils/debugbar/wicket-debugbar.js | 40 ++++++++++++++++++++
4 files changed, 65 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/549827f9/wicket-core/src/main/java/org/apache/wicket/migrate/StringResourceModelMigration.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/migrate/StringResourceModelMigration.java
index 6e8a6a7,e8d1d57..7431254
--- a/wicket-core/src/main/java/org/apache/wicket/migrate/StringResourceModelMigration.java
+++ b/wicket-core/src/main/java/org/apache/wicket/migrate/StringResourceModelMigration.java
@@@ -37,7 -37,7 +37,6 @@@ import org.apache.wicket.model.StringRe
* </pre>
*
* and then use your IDE's <i>Inline Method</i> refactoring support to use the new fluent API.
- *
- *
* @since 7.0.0
*/
public class StringResourceModelMigration
@@@ -45,10 -45,10 +44,8 @@@
/**
* @deprecated use 'inline method' to get rid of the deprecation warning and complete the
* migration to Wicket 7 API.
-- */
-- /*
* Original JavaDoc:
- *
+ *
* Creates a new string resource model using the supplied parameters. <p> The relative component
* parameter should generally be supplied, as without it resources can not be obtained from
* resource bundles that are held relative to a particular component or page. However, for