java code format tabsize fix
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c1525197 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c1525197 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c1525197 Branch: refs/heads/reference-guide Commit: c1525197e45a9cdcd6b1b083a62e7bc538f22ffe Parents: 0c4b09a Author: Michael Mosmann <mich...@mosmann.de> Authored: Fri Feb 15 19:09:06 2013 +0100 Committer: Michael Mosmann <mich...@mosmann.de> Committed: Fri Feb 15 19:09:06 2013 +0100 ---------------------------------------------------------------------- .../reference/models/SerializableModelPage.java | 12 +++--- .../models/dynamic/CustomModelFormPage.java | 30 +++++++------- .../src/documentation/source/conf.py | 2 +- .../src/documentation/source/exts/includecode.py | 5 ++ .../src/documentation/source/index.rst | 2 +- .../src/documentation/source/models.rst | 1 + 6 files changed, 29 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c1525197/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/SerializableModelPage.java ---------------------------------------------------------------------- diff --git a/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/SerializableModelPage.java b/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/SerializableModelPage.java index 2cbfdbc..51189ab 100644 --- a/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/SerializableModelPage.java +++ b/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/SerializableModelPage.java @@ -11,11 +11,11 @@ public class SerializableModelPage extends WebPage { public SerializableModelPage() { -//#docu -IModel<String> message = Model.of("any message"); -message.setObject("current time: " + new Date()); - -add(new Label("message", message)); -//#docu + //#docu + IModel<String> message = Model.of("any message"); + message.setObject("current time: " + new Date()); + + add(new Label("message", message)); + //#docu } } http://git-wip-us.apache.org/repos/asf/wicket/blob/c1525197/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/dynamic/CustomModelFormPage.java ---------------------------------------------------------------------- diff --git a/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/dynamic/CustomModelFormPage.java b/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/dynamic/CustomModelFormPage.java index 6e951a8..e47bdc0 100644 --- a/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/dynamic/CustomModelFormPage.java +++ b/wicket-reference-guide/models/src/main/java/org/apache/wicket/reference/models/dynamic/CustomModelFormPage.java @@ -13,22 +13,22 @@ public class CustomModelFormPage extends WebPage Form<Void> personForm = new Form<Void>("form"); -//#customModel -personForm.add(new RequiredTextField<String>("personName", new Model<String>() -{ - @Override - public String getObject() - { - return person.getName(); - } + //#customModel + personForm.add(new RequiredTextField<String>("personName", new Model<String>() + { + @Override + public String getObject() + { + return person.getName(); + } - @Override - public void setObject(String object) - { - person.setName(object); - } -})); -//#customModel + @Override + public void setObject(String object) + { + person.setName(object); + } + })); + //#customModel add(personForm); } http://git-wip-us.apache.org/repos/asf/wicket/blob/c1525197/wicket-reference-guide/src/documentation/source/conf.py ---------------------------------------------------------------------- diff --git a/wicket-reference-guide/src/documentation/source/conf.py b/wicket-reference-guide/src/documentation/source/conf.py index 7859b072..f3f713d 100644 --- a/wicket-reference-guide/src/documentation/source/conf.py +++ b/wicket-reference-guide/src/documentation/source/conf.py @@ -88,7 +88,6 @@ pygments_style = 'sphinx' # A list of ignored prefixes for module index sorting. #modindex_common_prefix = [] - # -- Options for HTML output --------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for @@ -244,3 +243,4 @@ texinfo_documents = [ #texinfo_show_urls = 'footnote' highlight_language = 'java' + http://git-wip-us.apache.org/repos/asf/wicket/blob/c1525197/wicket-reference-guide/src/documentation/source/exts/includecode.py ---------------------------------------------------------------------- diff --git a/wicket-reference-guide/src/documentation/source/exts/includecode.py b/wicket-reference-guide/src/documentation/source/exts/includecode.py index 7a98848..54d19e1 100644 --- a/wicket-reference-guide/src/documentation/source/exts/includecode.py +++ b/wicket-reference-guide/src/documentation/source/exts/includecode.py @@ -26,6 +26,7 @@ class IncludeCode(Directive): 'encoding': directives.encoding, 'prepend': directives.unchanged_required, 'append': directives.unchanged_required, + 'tabsize': directives.unchanged_required, } def run(self): @@ -82,7 +83,11 @@ class IncludeCode(Directive): within = set() res = [] excluding = False + tabReplacement=''; + for i in range(0,int(self.options.get('tabsize',2))): + tabReplacement = tabReplacement + ' '; for line in lines: + line = line.replace('\t', tabReplacement) index = line.find(marker) if index >= 0: section_name = line[index+lenm:].strip() http://git-wip-us.apache.org/repos/asf/wicket/blob/c1525197/wicket-reference-guide/src/documentation/source/index.rst ---------------------------------------------------------------------- diff --git a/wicket-reference-guide/src/documentation/source/index.rst b/wicket-reference-guide/src/documentation/source/index.rst index cab9e61..016f0c3 100644 --- a/wicket-reference-guide/src/documentation/source/index.rst +++ b/wicket-reference-guide/src/documentation/source/index.rst @@ -9,7 +9,7 @@ Contents: helloworld application components - models + All about Models <models> converter requestcycle behaviors http://git-wip-us.apache.org/repos/asf/wicket/blob/c1525197/wicket-reference-guide/src/documentation/source/models.rst ---------------------------------------------------------------------- diff --git a/wicket-reference-guide/src/documentation/source/models.rst b/wicket-reference-guide/src/documentation/source/models.rst index 7dad2a3..14fa1e8 100644 --- a/wicket-reference-guide/src/documentation/source/models.rst +++ b/wicket-reference-guide/src/documentation/source/models.rst @@ -37,6 +37,7 @@ Simple Models The HelloWorld example program demonstrates the simplest model type in Wicket: .. includecode:: ../../../helloworld/src/main/java/org/apache/wicket/reference/helloworld/HelloWorld.java#docu + :tabsize: 2 The constructor for this page constructs a Label component. The first parameter to the Label component's constructor is the Wicket id, which associates the Label with a tag in the HelloWorld.html markup file:
