svn commit: r1048984 - in /incubator/isis/trunk: applib/src/docbkx/guide/ applib/src/main/java/org/apache/isis/applib/annotation/ core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/ core/progmodel/src/main/java/org/apache...

[da...@apache.org]

Author: danhaywood
Date: Tue Dec 14 08:53:50 2010
New Revision: 1048984

URL: http://svn.apache.org/viewvc?rev=1048984&view=rev
Log:
removing some duplicate facets in progmodel, only need the ones in metamodel; some more on the applib docs

Removed:
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actcoll/typeof/TypeOfFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/help/HelpFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/hide/HiddenFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/naming/describedas/DescribedAsFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/naming/named/NamedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/CreatedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/LoadedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/LoadingCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/PersistedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/PersistingCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/RemovedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/RemovingCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/UpdatedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/UpdatingCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/MultilineStringValueFacet.java
Modified:
    incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java

Modified: incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml?rev=1048984&r1=1048983&r2=1048984&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml (original)
+++ incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml Tue Dec 14 08:53:50 2010
@@ -4726,7 +4726,7 @@ public class Customer {
 }</programlisting>
 
         <para>Compared to <classname>@MemberOrder</classname>, there is
-        (currentlyon) one additional advantage in that you can easily specify
+        (currently) one additional advantage in that you can easily specify
         groupings (which may be rendered by the viewer as sub-menus). This
         information may be used by the viewing mechanism to render actions
         into sub-menus.</para>

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java?rev=1048984&r1=1048983&r2=1048984&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java Tue Dec 14 08:53:50 2010
@@ -36,11 +36,6 @@ import java.lang.annotation.Target;
  * instances. So for example in the DnD viewer an aggregated object may not be drag/dropped into an empty
  * &quot;slot&quot;. Instead, the user would need to use copy/paste.
  * 
- * <p>
- * Note that aggregated objects are arbitrarily large and are usually mutable. {@link Value}s are similar
- * (the only thing that one can definitively say about a value is that it is an aggregate, however values are
- * typically small and are usually immutable.
- * 
  * @see Value
  */
 @Inherited