summaryrefslogtreecommitdiffstats
path: root/documentation/application
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@gmail.com>2017-04-27 13:29:46 +0300
committerIlia Motornyi <elmot@vaadin.com>2017-04-27 13:29:46 +0300
commit254ee79c1d7304a5e2264d45ec094ce42b64ccf3 (patch)
treeaaf43139b9261a9cd2b2b1fe998673451faeccb2 /documentation/application
parente1e0cafa8ad52ca215931629752662c0d4fdd258 (diff)
downloadvaadin-framework-254ee79c1d7304a5e2264d45ec094ce42b64ccf3.tar.gz
vaadin-framework-254ee79c1d7304a5e2264d45ec094ce42b64ccf3.zip
Add documentation for Composite
Diffstat (limited to 'documentation/application')
-rw-r--r--documentation/application/application-architecture.asciidoc8
-rw-r--r--documentation/application/application-overview.asciidoc2
2 files changed, 5 insertions, 5 deletions
diff --git a/documentation/application/application-architecture.asciidoc b/documentation/application/application-architecture.asciidoc
index c2dec0443e..5e87ea8531 100644
--- a/documentation/application/application-architecture.asciidoc
+++ b/documentation/application/application-architecture.asciidoc
@@ -117,8 +117,8 @@ While extending layouts is an easy way to make component composition, it is a
good practice to encapsulate implementation details, such as the exact layout
component used. Otherwise, the users of such a composite could begin to rely on
such implementation details, which would make changes harder. For this purpose,
-Vaadin has a special [classname]#CustomComponent# wrapper, which hides the
-content representation.
+Vaadin has the special wrappers [classname]#Composite# and
+[classname]#CustomComponent#, which hide the content representation.
[source, java]
@@ -144,9 +144,9 @@ class MyView extends CustomComponent {
MyView myview = new MyView();
----
-For a more detailed description of the [classname]#CustomComponent#, see
+For a more detailed description of [classname]#Composite# and [classname]#CustomComponent#, see
<<dummy/../../../framework/components/components-customcomponent#components.customcomponent,"Composition
-with CustomComponent">>.
+with Composite and CustomComponent">>.
[[application.architecture.navigation]]
diff --git a/documentation/application/application-overview.asciidoc b/documentation/application/application-overview.asciidoc
index d6012f7ffa..0e653da9bd 100644
--- a/documentation/application/application-overview.asciidoc
+++ b/documentation/application/application-overview.asciidoc
@@ -107,7 +107,7 @@ Interface Components">>, for layout components, see
<<dummy/../../../framework/layout/layout-overview.asciidoc#layout.overview,"Managing
Layout">>, and for compositing components, see
<<dummy/../../../framework/components/components-customcomponent#components.customcomponent,"Composition
-with CustomComponent">>.
+with Composite and CustomComponent">>.
Events and Listeners:: Vaadin Framework follows an event-driven programming paradigm, in which events, and
listeners that handle the events, are the basis of handling user interaction in