Fixing typos and adding some more text for clarification.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@90850 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Jesus M. Castagnetto 2002-08-04 04:09:47 +00:00
parent 48fd1c391d
commit a8b53688ec
2 changed files with 12 additions and 10 deletions

View file

@ -1,9 +1,9 @@
&reference.objaggregation.functions.aggregate;
&reference.objaggregation.functions.aggregate-methods-by-list;
&reference.objaggregation.functions.aggregate-methods-by-regexp;
&reference.objaggregation.functions.aggregate-methods;
&reference.objaggregation.functions.aggregate-properties-by-list;
&reference.objaggregation.functions.aggregate-properties-by-regexp;
&reference.objaggregation.functions.aggregate-properties;
&reference.objaggregation.functions.deaggregate;
&reference.objaggregation.functions.aggregate;
&reference.objaggregation.functions.aggregation-info;
&reference.objaggregation.functions.deaggregate;

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.2 $ -->
<!-- $Revision: 1.3 $ -->
<reference id="ref.objaggregation">
<title>Object Aggregation/Composition Functions</title>
<titleabbrev>Object Aggregation</titleabbrev>
@ -10,11 +10,11 @@
&reftitle.intro;
<para>
In Object Oriented Programming, it is common to see the composition of
simple classes (and/or instances) into a more complex one. This is
simple classes (and/or instances) into a more complex one. This is a
flexible strategy for building complicated objects and object
hierachies, and can function as a dynamic alternative to multiple
hierachies and can function as a dynamic alternative to multiple
inheritance. There are two ways to perform class (and/or object)
composition, depending on the relationship between the composed
composition depending on the relationship between the composed
elements: Association and Aggregation.
</para>
<para>
@ -124,7 +124,7 @@ $output = $rep->generateReport();
<para>
Aggregation, on the other hand, implies encapsulation (hidding) of the
parts of the composition. We can aggregate classes by using a (static)
inner class (PHP does not support inner classes), in this case the
inner class (PHP does not yet support inner classes), in this case the
aggregated class definition is not accessible, except through the class
that contains it. The aggregation of instances (object aggregation)
involves the dynamic creation of subobjects inside an object, in the
@ -403,9 +403,11 @@ method: save
<para>
One point that we have not mention above, is that the process of
aggregation will not override existing properties or methods in the
objects. For example, the <classname>FileStorage</classname> defines a
<varname>$data</varname> property, and
<classname>WDDXStorage</classname>
objects. For example, the class <classname>FileStorage</classname> defines a
<varname>$data</varname> property, and the class
<classname>WDDXStorage</classname> also defines a similar property
which will not override the one in the object acquired during
instantiation from the class <classname>FileStorage</classname>.
</para>
</section>
</partintro>