You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2017/05/25 07:35:02 UTC
wicket git commit: WICKET-6368 solved some of the indent problems
Repository: wicket
Updated Branches:
refs/heads/master 14b310040 -> 5a228b314
WICKET-6368 solved some of the indent problems
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5a228b31
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5a228b31
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5a228b31
Branch: refs/heads/master
Commit: 5a228b314c9644f9776a47b2f3ee99ffae48346d
Parents: 14b3100
Author: Andrea Del Bene <an...@innoteam.it>
Authored: Thu May 25 09:34:09 2017 +0200
Committer: Andrea Del Bene <an...@innoteam.it>
Committed: Thu May 25 09:34:09 2017 +0200
----------------------------------------------------------------------
.../asciidoc/keepControl/keepControl_10.adoc | 10 ++--
.../asciidoc/keepControl/keepControl_6.adoc | 8 +--
.../asciidoc/modelsforms/modelsforms_7.adoc | 60 ++++++++++----------
.../asciidoc/modelsforms/modelsforms_8.adoc | 6 +-
4 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5a228b31/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_10.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_10.adoc b/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_10.adoc
index 4b73c7b..c8181c3 100644
--- a/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_10.adoc
+++ b/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_10.adoc
@@ -11,10 +11,10 @@ Component _org.apache.wicket.markup.html.border.Border_ is a special purpose con
<wicket:border>
<div>
foo<br />
- <wicket:body/><br />
- buz <br />
+ <wicket:body/><br />
+ buz <br />
- </div>
+ </div>
</wicket:border>
<!-- everything below </wicket:border> tag will be discarded...-->
</body>
@@ -71,8 +71,8 @@ Border Markup:
<wicket:border>
<div>
<div wicket:id="childMarkup"></div>
- <wicket:body/><br />
- </div>
+ <wicket:body/><br />
+ </div>
</wicket:border>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/5a228b31/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_6.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_6.adoc b/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_6.adoc
index dc6bde0..7eaa0d0 100644
--- a/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_6.adoc
+++ b/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_6.adoc
@@ -7,16 +7,16 @@ Considering the markup of a generic panel, we can use _<wicket:head>_ tag in thi
----
<wicket:head>
<script type="text/javascript">
- function myPanelFunction(){
- }
- </script>
+ function myPanelFunction(){
+ }
+ </script>
<style>
.myPanelClass{
font-weight: bold;
color: red;
}
- </style>
+ </style>
</wicket:head>
<body>
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/wicket/blob/5a228b31/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_7.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_7.adoc b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_7.adoc
index d925aa5..44d34e9 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_7.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_7.adoc
@@ -30,47 +30,47 @@ WARNING: The following model is provided for example purposes only and is not in
----
public class JpaLoadableModel<T> extends LoadableDetachableModel<T> {
- private EntityManagerFactory entityManagerFactory;
- private Class<T> entityClass;
- private Serializable identifier;
- private List<Object> constructorParams;
+ private EntityManagerFactory entityManagerFactory;
+ private Class<T> entityClass;
+ private Serializable identifier;
+ private List<Object> constructorParams;
- public JpaLoadableModel(EntityManagerFactory entityManagerFactory, T entity) {
+ public JpaLoadableModel(EntityManagerFactory entityManagerFactory, T entity) {
- super();
+ super();
- PersistenceUnitUtil util = entityManagerFactory.getPersistenceUnitUtil();
+ PersistenceUnitUtil util = entityManagerFactory.getPersistenceUnitUtil();
- this.entityManagerFactory = entityManagerFactory;
- this.entityClass = (Class<T>) entity.getClass();
- this.identifier = (Serializable) util.getIdentifier(entity);
+ this.entityManagerFactory = entityManagerFactory;
+ this.entityClass = (Class<T>) entity.getClass();
+ this.identifier = (Serializable) util.getIdentifier(entity);
- setObject(entity);
- }
+ setObject(entity);
+ }
- @Override
- protected T load() {
- T entity = null;
+ @Override
+ protected T load() {
+ T entity = null;
- if(identifier != null) {
- EntityManager entityManager = entityManagerFactory.createEntityManager();
- entity = entityManager.find(entityClass, identifier);
- }
- return entity;
- }
+ if(identifier != null) {
+ EntityManager entityManager = entityManagerFactory.createEntityManager();
+ entity = entityManager.find(entityClass, identifier);
+ }
+ return entity;
+ }
- @Override
- protected void onDetach() {
- super.onDetach();
+ @Override
+ protected void onDetach() {
+ super.onDetach();
- T entity = getObject();
- PersistenceUnitUtil persistenceUtil = entityManagerFactory.getPersistenceUnitUtil();
+ T entity = getObject();
+ PersistenceUnitUtil persistenceUtil = entityManagerFactory.getPersistenceUnitUtil();
- if(entity == null) return;
+ if(entity == null) return;
- identifier = (Serializable) persistenceUtil.getIdentifier(entity);
- }
- }
+ identifier = (Serializable) persistenceUtil.getIdentifier(entity);
+ }
+}
----
The constructor of the model takes as input two parameters: an implementation of the JPA interface javax.persistence.EntityManagerFactory to manage JPA entities and the entity that must be handled by this model. Inside its constructor the model saves the class of the entity and its id (which could be null if the entity has not been persisted yet). These two informations are required to retrieve the entity at a later time and are used by the load method.
http://git-wip-us.apache.org/repos/asf/wicket/blob/5a228b31/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc
index 8d99611..63fec8d 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc
@@ -21,10 +21,10 @@ public class ComponetTwoModels extends Component{
@Override
public void onDetach() {
- if(beeModel != null)
- beeModel.detach();
+ if(beeModel != null)
+ beeModel.detach();
- super.onDetach();
+ super.onDetach();
}
}
----