incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1049995 [1/5] - in /incubator/isis/trunk/applib/src: main/java/org/apache/isis/applib/ main/java/org/apache/isis/applib/adapters/ main/java/org/apache/isis/applib/annotation/ main/java/org/apache/isis/applib/clock/ main/java/org/apache/isi...
Date Thu, 16 Dec 2010 14:55:56 GMT
Author: danhaywood
Date: Thu Dec 16 14:55:52 2010
New Revision: 1049995

URL: http://svn.apache.org/viewvc?rev=1049995&view=rev
Log:
code cleanup for applib (ISIS-21)

Modified:
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractDomainObject.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractFactoryAndRepository.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractService.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/ApplicationException.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Filter.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/RepositoryException.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Bounded.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/DescribedAs.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Disabled.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Encodable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Executed.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Exploration.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Hidden.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Ignore.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Immutable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Mask.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MaxLength.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MultiLine.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MustSatisfy.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Named.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotInServiceMenu.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersistable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersisted.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Optional.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Parseable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Plural.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Prototype.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/RegEx.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypeOf.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypicalLength.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/When.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/AccessEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionInvocationEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionUsabilityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionVisibilityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionAccessEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionAddToEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionMethodEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionRemoveFromEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionUsabilityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionVisibilityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ObjectTitleEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ObjectValidityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ParseValueEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/PropertyAccessEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/PropertyModifyEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/PropertyUsabilityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/PropertyVisibilityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ProposedHolderEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/UsabilityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/VisibilityEvent.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/package-info.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/FixtureClock.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/FixtureType.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/InstallableFixture.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/UserProfileFixture.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/userprofile/UserProfileService.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/fixtures/userprofile/UserProfileServiceAware.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/AlwaysImmutable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/Bounded.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/ImmutableOncePersisted.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/ImmutableUntilPersisted.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/NeverImmutable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/NonPersistable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/marker/ProgramPersistable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/profiles/Perspective.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/profiles/Profile.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/query/Query.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/query/QueryBuiltInAbstract.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/security/RoleMemento.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/snapshot/Snapshottable.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/spec/Specification.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/spec/SpecificationAnd.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/spec/SpecificationNot.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/spec/SpecificationOr.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/NameUtils.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/Reasons.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/TitleBufferException.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Color.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Date.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/DateTime.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Magnitude.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Time.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/ContainedObjectTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/FactoryAndRepositoryTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/SomeDomainClass.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/TestDomainObject.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/fixtures/FixtureClockInstantiationTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/spec/SpecificationAbstractTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/util/TitleTestObject.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/ColorTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/DateTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/DateTimeTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/MoneyTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/PercentageTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/TestClock.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/TimeStampTest.java
    incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/TimeTest.java

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 import java.util.List;
@@ -26,7 +25,6 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.security.UserMemento;
 
-
 /**
  * Convenience super class for all classes that wish to interact with the container.
  * 
@@ -34,158 +32,162 @@ import org.apache.isis.applib.security.U
  */
 public abstract class AbstractContainedObject {
 
-
-	// {{ factory methods
+    // {{ factory methods
     @Hidden
     protected <T> T newTransientInstance(final Class<T> ofType) {
         return getContainer().newTransientInstance(ofType);
     }
+
     // }}
 
-	// {{ allInstances, allMatches
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#allInstances(Class)
-	 */
+    // {{ allInstances, allMatches
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#allInstances(Class)
+     */
     protected <T> List<T> allInstances(final Class<T> ofType) {
         return getContainer().allInstances(ofType);
     }
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#allMatches(Class, Filter)
-	 */
-	protected <T> List<T> allMatches(final Class<T> ofType, final Filter<T> filter) {
-		return getContainer().allMatches(ofType, filter);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#allMatches(Class, Object)
-	 */
-	protected <T> List<T> allMatches(final Class<T> ofType, final T pattern) {
-		return getContainer().allMatches(ofType, pattern);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#allMatches(Class, String)
-	 */
-	protected <T> List<T> allMatches(final Class<T> ofType, final String title) {
-		return getContainer().allMatches(ofType, title);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#allMatches(Query)
-	 */
-	protected <T> List<T> allMatches(final Query<T> query) {
-		return getContainer().allMatches(query);
-	}
-	// }}
-
-	// {{ firstMatch
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#firstMatch(Class, Filter)
-	 */
-	protected <T> T firstMatch(final Class<T> ofType, final Filter<T> filter) {
-		return getContainer().firstMatch(ofType, filter);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#firstMatch(Class, Object)
-	 */
-	protected <T> T firstMatch(final Class<T> ofType, final T pattern) {
-		return getContainer().firstMatch(ofType, pattern);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#firstMatch(Class, String)
-	 */
-	protected <T> T firstMatch(final Class<T> ofType, final String title) {
-		return getContainer().firstMatch(ofType, title);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#firstMatch(Query)
-	 */
-	protected <T> T firstMatch(final Query<T> query) {
-		return getContainer().firstMatch(query);
-	}
-	// }}
-
-	
-	// {{ uniqueMatch
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#uniqueMatch(Class, Filter)
-	 */
-	protected <T> T uniqueMatch(final Class<T> ofType, final Filter<T> filter) {
-		return getContainer().uniqueMatch(ofType, filter);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#uniqueMatch(Class, String)
-	 */
-	protected <T> T uniqueMatch(final Class<T> ofType, final String title) {
-		return getContainer().uniqueMatch(ofType, title);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#uniqueMatch(Class, Object)
-	 */
-	protected <T> T uniqueMatch(final Class<T> ofType, final T pattern) {
-		return getContainer().uniqueMatch(ofType, pattern);
-	}
-
-	/**
-	 * Convenience method that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#uniqueMatch(Query)
-	 */
-	protected <T> T uniqueMatch(final Query<T> query) {
-		return getContainer().uniqueMatch(query);
-	}
-	// }}
 
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#allMatches(Class, Filter)
+     */
+    protected <T> List<T> allMatches(final Class<T> ofType, final Filter<T> filter) {
+        return getContainer().allMatches(ofType, filter);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#allMatches(Class, Object)
+     */
+    protected <T> List<T> allMatches(final Class<T> ofType, final T pattern) {
+        return getContainer().allMatches(ofType, pattern);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#allMatches(Class, String)
+     */
+    protected <T> List<T> allMatches(final Class<T> ofType, final String title) {
+        return getContainer().allMatches(ofType, title);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#allMatches(Query)
+     */
+    protected <T> List<T> allMatches(final Query<T> query) {
+        return getContainer().allMatches(query);
+    }
+
+    // }}
+
+    // {{ firstMatch
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#firstMatch(Class, Filter)
+     */
+    protected <T> T firstMatch(final Class<T> ofType, final Filter<T> filter) {
+        return getContainer().firstMatch(ofType, filter);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#firstMatch(Class, Object)
+     */
+    protected <T> T firstMatch(final Class<T> ofType, final T pattern) {
+        return getContainer().firstMatch(ofType, pattern);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#firstMatch(Class, String)
+     */
+    protected <T> T firstMatch(final Class<T> ofType, final String title) {
+        return getContainer().firstMatch(ofType, title);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#firstMatch(Query)
+     */
+    protected <T> T firstMatch(final Query<T> query) {
+        return getContainer().firstMatch(query);
+    }
+
+    // }}
+
+    // {{ uniqueMatch
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#uniqueMatch(Class, Filter)
+     */
+    protected <T> T uniqueMatch(final Class<T> ofType, final Filter<T> filter) {
+        return getContainer().uniqueMatch(ofType, filter);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#uniqueMatch(Class, String)
+     */
+    protected <T> T uniqueMatch(final Class<T> ofType, final String title) {
+        return getContainer().uniqueMatch(ofType, title);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#uniqueMatch(Class, Object)
+     */
+    protected <T> T uniqueMatch(final Class<T> ofType, final T pattern) {
+        return getContainer().uniqueMatch(ofType, pattern);
+    }
+
+    /**
+     * Convenience method that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#uniqueMatch(Query)
+     */
+    protected <T> T uniqueMatch(final Query<T> query) {
+        return getContainer().uniqueMatch(query);
+    }
+
+    // }}
 
     // {{ isValid, validate
-	/**
-	 * Convenience methods that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#isValid(Object)
-	 */
-    protected boolean isValid(Object domainObject) {
-    	return getContainer().isValid(domainObject);
-    }
-	/**
-	 * Convenience methods that delegates to {@link DomainObjectContainer}.
-	 * 
-	 * @see DomainObjectContainer#validate(Object)
-	 */
-    protected String validate(Object domainObject) {
-    	return getContainer().validate(domainObject);
+    /**
+     * Convenience methods that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#isValid(Object)
+     */
+    protected boolean isValid(final Object domainObject) {
+        return getContainer().isValid(domainObject);
+    }
+
+    /**
+     * Convenience methods that delegates to {@link DomainObjectContainer}.
+     * 
+     * @see DomainObjectContainer#validate(Object)
+     */
+    protected String validate(final Object domainObject) {
+        return getContainer().validate(domainObject);
     }
+
     // }}
 
-	// {{ isPersistent, persist, remove
+    // {{ isPersistent, persist, remove
     /**
      * Whether the provided object is persistent.
      */
@@ -198,8 +200,7 @@ public abstract class AbstractContainedO
      * Save provided object to the persistent object store.
      * 
      * <p>
-     * If the object {@link #isPersistent(Object) is persistent} already, then
-     * will throw an exception.
+     * If the object {@link #isPersistent(Object) is persistent} already, then will throw an exception.
      * 
      * @see #persistIfNotAlready(Object)
      */
@@ -225,10 +226,9 @@ public abstract class AbstractContainedO
     protected void remove(final Object persistentDomainObject) {
         getContainer().remove(persistentDomainObject);
     }
-	// }}
-	
-	
-	
+
+    // }}
+
     // {{ Error/Warning Methods
     /**
      * Display the specified message to the user, in a non-intrusive fashion.
@@ -238,8 +238,8 @@ public abstract class AbstractContainedO
     }
 
     /**
-     * Display the specified message as a warning to the user, in a more visible fashion, but without
-     * requiring explicit acknowledgement.
+     * Display the specified message as a warning to the user, in a more visible fashion, but without requiring explicit
+     * acknowledgement.
      */
     protected void warnUser(final String message) {
         getContainer().warnUser(message);
@@ -251,38 +251,41 @@ public abstract class AbstractContainedO
     protected void raiseError(final String message) {
         getContainer().raiseError(message);
     }
+
     // }}
 
     // {{ Security Methods
     protected UserMemento getUser() {
         return getContainer().getUser();
     }
+
     // }}
-    
+
     // {{ Injected: Container
     /**
-	 * @uml.property  name="container"
-	 * @uml.associationEnd  
-	 */
+     * @uml.property name="container"
+     * @uml.associationEnd
+     */
     private DomainObjectContainer container;
 
     /**
-	 * This field is not persisted, nor displayed to the user.
-	 * @uml.property  name="container"
-	 */
+     * This field is not persisted, nor displayed to the user.
+     * 
+     * @uml.property name="container"
+     */
     @Hidden
     protected DomainObjectContainer getContainer() {
         return this.container;
     }
 
     /**
-	 * Injected by the application container itself.
-	 * @uml.property  name="container"
-	 */
+     * Injected by the application container itself.
+     * 
+     * @uml.property name="container"
+     */
     public final void setContainer(final DomainObjectContainer container) {
         this.container = container;
     }
     // }}
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractDomainObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractDomainObject.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractDomainObject.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractDomainObject.java Thu Dec 16 14:55:52 2010
@@ -17,24 +17,22 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 import org.apache.isis.applib.annotation.Hidden;
 
-
 /**
  * Convenience super class for all domain objects that wish to interact with the container.
  * 
  * <p>
- * Subclassing is NOT mandatory; the methods in this superclass can be pushed down into domain objects and
- * another superclass used if required.
+ * Subclassing is NOT mandatory; the methods in this superclass can be pushed down into domain objects and another
+ * superclass used if required.
  * 
  * @see org.apache.isis.applib.DomainObjectContainer
  */
 public abstract class AbstractDomainObject extends AbstractContainedObject {
 
-	// {{ resolve, objectChanged
+    // {{ resolve, objectChanged
     /**
      * Resolve this object, populating references to other objects.
      */
@@ -58,9 +56,10 @@ public abstract class AbstractDomainObje
     protected void objectChanged() {
         getContainer().objectChanged(this);
     }
-	// }}
 
-	// {{ isPersistent, makePersistent (overloads)
+    // }}
+
+    // {{ isPersistent, makePersistent (overloads)
     /**
      * Whether this object is persistent.
      * 
@@ -76,8 +75,7 @@ public abstract class AbstractDomainObje
      * Save this object to the persistent object store.
      * 
      * <p>
-     * If the object {@link #isPersistent(Object) is persistent} already, then
-     * will throw an exception.
+     * If the object {@link #isPersistent(Object) is persistent} already, then will throw an exception.
      * 
      * @see #persistIfNotAlready(Object)
      * 
@@ -114,6 +112,5 @@ public abstract class AbstractDomainObje
         remove(this);
     }
     // }}
-    
-}
 
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractFactoryAndRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractFactoryAndRepository.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractFactoryAndRepository.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractFactoryAndRepository.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 public abstract class AbstractFactoryAndRepository extends AbstractService {
@@ -27,25 +26,21 @@ public abstract class AbstractFactoryAnd
      * Returns a new instance of the specified class that will have been persisted.
      * 
      * <p>
-     * This method isn't quite deprecated, but generally consider using
-     * {@link #newTransientInstance(Class)} instead.
+     * This method isn't quite deprecated, but generally consider using {@link #newTransientInstance(Class)} instead.
      */
     protected <T> T newPersistentInstance(final Class<T> ofClass) {
         return getContainer().newPersistentInstance(ofClass);
     }
+
     /**
      * Returns a new instance of the specified class that has the sane persisted state as the specified object.
      * 
      * <p>
-     * This method isn't quite deprecated, but generally consider using
-     * {@link #newTransientInstance(Class)} instead.
+     * This method isn't quite deprecated, but generally consider using {@link #newTransientInstance(Class)} instead.
      */
     protected <T> T newInstance(final Class<T> ofClass, final Object object) {
-    	return getContainer().newInstance(ofClass, object);
+        return getContainer().newInstance(ofClass, object);
     }
     // }}
-    
 
-	
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractService.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractService.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractService.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/AbstractService.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 public abstract class AbstractService extends AbstractContainedObject {
@@ -31,4 +30,3 @@ public abstract class AbstractService ex
     }
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/ApplicationException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/ApplicationException.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/ApplicationException.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/ApplicationException.java Thu Dec 16 14:55:52 2010
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 /**
- * Indicates that a problem has occurred within the application, as opposed to within a supporting framework
- * or system.
+ * Indicates that a problem has occurred within the application, as opposed to within a supporting framework or system.
  */
 public class ApplicationException extends RuntimeException {
     private static final long serialVersionUID = 1L;

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 import java.util.List;
@@ -25,16 +24,15 @@ import java.util.List;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.security.UserMemento;
 
-
-
 /**
- * Represents a container that the domain objects work within. It provides access to the persistence mechanism and user interface.
+ * Represents a container that the domain objects work within. It provides access to the persistence mechanism and user
+ * interface.
  */
 public interface DomainObjectContainer {
 
-    //////////////////////////////////////////////////////////////////
-	// resolve, objectChanged
-	//////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
+    // resolve, objectChanged
+    // ////////////////////////////////////////////////////////////////
 
     /**
      * Ensure that the specified object is completely loaded into memory.
@@ -45,8 +43,8 @@ public interface DomainObjectContainer {
     void resolve(Object domainObject);
 
     /**
-     * Ensure that the specified object is completely loaded into memory, though only if the supplied field
-     * reference is <tt>null</tt>.
+     * Ensure that the specified object is completely loaded into memory, though only if the supplied field reference is
+     * <tt>null</tt>.
      * 
      * <p>
      * This forces the lazy loading mechanism to load the object if it is not already loaded.
@@ -58,10 +56,9 @@ public interface DomainObjectContainer {
      */
     void objectChanged(Object domainObject);
 
-    
-	//////////////////////////////////////////////////////////////////
-	// flush, commit
-	//////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
+    // flush, commit
+    // ////////////////////////////////////////////////////////////////
 
     /**
      * Flush all changes to the object store.
@@ -81,9 +78,9 @@ public interface DomainObjectContainer {
      */
     void commit();
 
-	//////////////////////////////////////////////////////////////////
-	// new{Transient/Persistent}Instance
-	//////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
+    // new{Transient/Persistent}Instance
+    // ////////////////////////////////////////////////////////////////
 
     /**
      * Create a new instance of the specified class, but do not persist it.
@@ -95,25 +92,24 @@ public interface DomainObjectContainer {
     /**
      * Returns a new instance of the specified class that will have been persisted.
      */
-    <T> T newPersistentInstance(final Class<T> ofType) ;
-    
+    <T> T newPersistentInstance(final Class<T> ofType);
+
     /**
      * Returns a new instance of the specified class that has the sane persisted state as the specified object.
      */
     <T> T newInstance(final Class<T> ofType, final Object object);
 
-
-	//////////////////////////////////////////////////////////////////
-	// isValid, validate
-	//////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
+    // isValid, validate
+    // ////////////////////////////////////////////////////////////////
 
     /**
-     * Whether the object is in a valid state, that is that none of the validation of
-     * properties, collections and object-level is vetoing.
+     * Whether the object is in a valid state, that is that none of the validation of properties, collections and
+     * object-level is vetoing.
      * 
      * @see #validate(Object)
      */
-	boolean isValid(Object domainObject);
+    boolean isValid(Object domainObject);
 
     /**
      * The reason, if any why the object is in a invalid state
@@ -123,15 +119,14 @@ public interface DomainObjectContainer {
      * 
      * @see #isValid(Object)
      */
-	String validate(Object domainObject);
+    String validate(Object domainObject);
 
-	//////////////////////////////////////////////////////////////////
-	// isPersistent, persist, remove
-	//////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
+    // isPersistent, persist, remove
+    // ////////////////////////////////////////////////////////////////
 
     /**
-     * Determines if the specified object is persistent (that it is stored permanently outside of the virtual
-     * machine).
+     * Determines if the specified object is persistent (that it is stored permanently outside of the virtual machine).
      */
     boolean isPersistent(Object domainObject);
 
@@ -163,7 +158,7 @@ public interface DomainObjectContainer {
      * @param persistentDomainObject
      */
     void remove(Object persistentDomainObject);
-    
+
     /**
      * Removes (deletes) the domain object but only if is persistent.
      * 
@@ -171,14 +166,13 @@ public interface DomainObjectContainer {
      */
     void removeIfNotAlready(Object domainObject);
 
-    
-	//////////////////////////////////////////////////////////////////
-	// info, warn, error
-	//////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
+    // info, warn, error
+    // ////////////////////////////////////////////////////////////////
 
     /**
-     * Make the specified message available to the user. Note this will probably be displayed in transitory
-     * fashion, so is only suitable for useful but optional information.
+     * Make the specified message available to the user. Note this will probably be displayed in transitory fashion, so
+     * is only suitable for useful but optional information.
      * 
      * @see #warnUser(String)
      * @see #raiseError(String)
@@ -186,8 +180,8 @@ public interface DomainObjectContainer {
     void informUser(String message);
 
     /**
-     * Warn the user about a situation with the specified message. The container should guarantee to display
-     * this warning to the user, and will typically require acknowledgement.
+     * Warn the user about a situation with the specified message. The container should guarantee to display this
+     * warning to the user, and will typically require acknowledgement.
      * 
      * @see #raiseError(String)
      * @see #informUser(String)
@@ -195,218 +189,199 @@ public interface DomainObjectContainer {
     void warnUser(String message);
 
     /**
-     * Notify the user of an application error with the specified message. Note this will probably be
-     * displayed in an alarming fashion, so is only suitable for errors.  The user will typically
-     * be required to perform additional steps after the error (eg to inform the helpdesk).
+     * Notify the user of an application error with the specified message. Note this will probably be displayed in an
+     * alarming fashion, so is only suitable for errors. The user will typically be required to perform additional steps
+     * after the error (eg to inform the helpdesk).
      * 
      * @see #warnUser(String)
      * @see #informUser(String)
      */
     void raiseError(String message);
 
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
     // properties
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
 
     /**
      * Get the configuration property with the specified name.
      */
     String getProperty(String name);
-    
+
     /**
-     * Get the configuration property with the specified name and if it doesn't exist then return the specified default value.
+     * Get the configuration property with the specified name and if it doesn't exist then return the specified default
+     * value.
      */
     String getProperty(String name, String defaultValue);
-    
+
     /**
      * Get the names of all the available properties.
      */
     List<String> getPropertyNames();
 
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
     // security
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
 
     /**
-	 * Get the details about the current user.
-	 * @uml.property  name="user"
-	 * @uml.associationEnd  
-	 */
+     * Get the details about the current user.
+     * 
+     * @uml.property name="user"
+     * @uml.associationEnd
+     */
     UserMemento getUser();
 
-    
-    
-	//////////////////////////////////////////////////////////////////
-	// allInstances, allMatches, firstMatch, uniqueMatch
-	//////////////////////////////////////////////////////////////////
-
-	/**
-	 * Returns all the instances of the specified type (including subtypes).
-	 * 
-	 * <p>
-	 * If there are no instances the list will be empty. This method creates a
-	 * new {@link List} object each time it is called so the caller is free to
-	 * use or modify the returned {@link List}, but the changes will not be
-	 * reflected back to the repository.
-	 * 
-	 * <p>
-	 * This method should only be called where the number of instances is known to
-	 * be relatively low.
-	 */
+    // ////////////////////////////////////////////////////////////////
+    // allInstances, allMatches, firstMatch, uniqueMatch
+    // ////////////////////////////////////////////////////////////////
+
+    /**
+     * Returns all the instances of the specified type (including subtypes).
+     * 
+     * <p>
+     * If there are no instances the list will be empty. This method creates a new {@link List} object each time it is
+     * called so the caller is free to use or modify the returned {@link List}, but the changes will not be reflected
+     * back to the repository.
+     * 
+     * <p>
+     * This method should only be called where the number of instances is known to be relatively low.
+     */
     public <T> List<T> allInstances(Class<T> ofType);
 
+    /**
+     * Returns all the instances of the specified type (including subtypes) that the filter object accepts.
+     * 
+     * <p>
+     * If there are no instances the list will be empty. This method creates a new {@link List} object each time it is
+     * called so the caller is free to use or modify the returned {@link List}, but the changes will not be reflected
+     * back to the repository.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #allMatches(Query)} for
+     * production code.
+     */
+    public <T> List<T> allMatches(final Class<T> ofType, final Filter<T> filter);
 
-    
-	/**
-	 * Returns all the instances of the specified type (including subtypes) that
-	 * the filter object accepts.
-	 * 
-	 * <p>
-	 * If there are no instances the list will be empty. This method creates a
-	 * new {@link List} object each time it is called so the caller is free to
-	 * use or modify the returned {@link List}, but the changes will not be
-	 * reflected back to the repository.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #allMatches(Query)} for production code.
-	 */
-	public <T> List<T> allMatches(final Class<T> ofType, final Filter<T> filter);
-
-	/**
-	 * Returns all the instances of the specified type (including subtypes) that
-	 * have the given title.
-	 * 
-	 * <p>
-	 * If there are no instances the list will be empty. This method creates a
-	 * new {@link List} object each time it is called so the caller is free to
-	 * use or modify the returned {@link List}, but the changes will not be
-	 * reflected back to the repository.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #allMatches(Query)} for production code.
-	 */
+    /**
+     * Returns all the instances of the specified type (including subtypes) that have the given title.
+     * 
+     * <p>
+     * If there are no instances the list will be empty. This method creates a new {@link List} object each time it is
+     * called so the caller is free to use or modify the returned {@link List}, but the changes will not be reflected
+     * back to the repository.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #allMatches(Query)} for
+     * production code.
+     */
     public <T> List<T> allMatches(Class<T> ofType, String title);
 
-	/**
-	 * Returns all the instances of the specified type (including subtypes) that
-	 * match the given object: where any property that is set will be tested and
-	 * properties that are not set will be ignored.
-	 * 
-	 * <p>
-	 * If there are no instances the list will be empty. This method creates a
-	 * new {@link List} object each time it is called so the caller is free to
-	 * use or modify the returned {@link List}, but the changes will not be
-	 * reflected back to the repository.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #allMatches(Query)} for production code.
-	 */
+    /**
+     * Returns all the instances of the specified type (including subtypes) that match the given object: where any
+     * property that is set will be tested and properties that are not set will be ignored.
+     * 
+     * <p>
+     * If there are no instances the list will be empty. This method creates a new {@link List} object each time it is
+     * called so the caller is free to use or modify the returned {@link List}, but the changes will not be reflected
+     * back to the repository.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #allMatches(Query)} for
+     * production code.
+     */
     <T> List<T> allMatches(Class<T> ofType, T pattern);
 
-	/**
-	 * Returns all the instances that match the given {@link Query}.
-	 * 
-	 * <p>
-	 * If there are no instances the list will be empty. This method creates a
-	 * new {@link List} object each time it is called so the caller is free to
-	 * use or modify the returned {@link List}, but the changes will not be
-	 * reflected back to the repository.
-	 */
+    /**
+     * Returns all the instances that match the given {@link Query}.
+     * 
+     * <p>
+     * If there are no instances the list will be empty. This method creates a new {@link List} object each time it is
+     * called so the caller is free to use or modify the returned {@link List}, but the changes will not be reflected
+     * back to the repository.
+     */
     <T> List<T> allMatches(Query<T> query);
 
-    
-	/**
-	 * Returns the first instance of the specified type (including subtypes)
-	 * that matches the supplied {@link Filter}, or <tt>null</tt> if none.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #firstMatch(Query)} for production code.
-	 */
-	public <T> T firstMatch(final Class<T> ofType, final Filter<T> filter);
-    
-	/**
-	 * Returns the first instance of the specified type (including subtypes)
-	 * that matches the supplied title, or <tt>null</tt> if none.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #firstMatch(Query)} for production code.
-	 */
+    /**
+     * Returns the first instance of the specified type (including subtypes) that matches the supplied {@link Filter},
+     * or <tt>null</tt> if none.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #firstMatch(Query)} for
+     * production code.
+     */
+    public <T> T firstMatch(final Class<T> ofType, final Filter<T> filter);
+
+    /**
+     * Returns the first instance of the specified type (including subtypes) that matches the supplied title, or
+     * <tt>null</tt> if none.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #firstMatch(Query)} for
+     * production code.
+     */
     <T> T firstMatch(Class<T> ofType, String title);
 
-	/**
-	 * Returns the first instance of the specified type (including subtypes)
-	 * that matches the supplied object as a pattern, or <tt>null</tt> if none.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #firstMatch(Query)} for production code.
-	 */
+    /**
+     * Returns the first instance of the specified type (including subtypes) that matches the supplied object as a
+     * pattern, or <tt>null</tt> if none.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #firstMatch(Query)} for
+     * production code.
+     */
     <T> T firstMatch(Class<T> ofType, T pattern);
 
-	/**
-	 * Returns the first instance that matches the supplied query, 
-	 * or <tt>null</tt> if none.
-	 */
+    /**
+     * Returns the first instance that matches the supplied query, or <tt>null</tt> if none.
+     */
     <T> T firstMatch(Query<T> query);
-    
-    
-	/**
-	 * Find the only instance of the specified type (including subtypes) that
-	 * has the specified title.
-	 * 
-	 * <p>
-	 * If no instance is found then <tt>null</tt> will be return, while if there
-	 * is more that one instances a run-time exception will be thrown.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #uniqueMatch(Query)} for production code.
-	 */
-	public <T> T uniqueMatch(final Class<T> ofType, final Filter<T> filter);
-
-	/**
-	 * Find the only instance of the specified type (including subtypes) that
-	 * has the specified title.
-	 * 
-	 * <p>
-	 * If no instance is found then <tt>null</tt> will be returned, while if
-	 * there is more that one instances a run-time exception will be thrown.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #uniqueMatch(Query)} for production code.
-	 */
+
+    /**
+     * Find the only instance of the specified type (including subtypes) that has the specified title.
+     * 
+     * <p>
+     * If no instance is found then <tt>null</tt> will be return, while if there is more that one instances a run-time
+     * exception will be thrown.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #uniqueMatch(Query)} for
+     * production code.
+     */
+    public <T> T uniqueMatch(final Class<T> ofType, final Filter<T> filter);
+
+    /**
+     * Find the only instance of the specified type (including subtypes) that has the specified title.
+     * 
+     * <p>
+     * If no instance is found then <tt>null</tt> will be returned, while if there is more that one instances a run-time
+     * exception will be thrown.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #uniqueMatch(Query)} for
+     * production code.
+     */
     <T> T uniqueMatch(Class<T> ofType, String title);
 
-	/**
-	 * Find the only instance of the patterned object type (including subtypes)
-	 * that matches the set fields in the pattern object: where any property
-	 * that is set will be tested and properties that are not set will be
-	 * ignored.
-	 * 
-	 * <p>
-	 * If no instance is found then null will be return, while if there is more
-	 * that one instances a run-time exception will be thrown.
-	 * 
-	 * <p>
-	 * This method is useful during exploration/prototyping, but you may want to use
-	 * {@link #uniqueMatch(Query)} for production code.
-	 */
+    /**
+     * Find the only instance of the patterned object type (including subtypes) that matches the set fields in the
+     * pattern object: where any property that is set will be tested and properties that are not set will be ignored.
+     * 
+     * <p>
+     * If no instance is found then null will be return, while if there is more that one instances a run-time exception
+     * will be thrown.
+     * 
+     * <p>
+     * This method is useful during exploration/prototyping, but you may want to use {@link #uniqueMatch(Query)} for
+     * production code.
+     */
     <T> T uniqueMatch(Class<T> ofType, T pattern);
 
-	/**
-	 * Find the only instance that matches the provided query.
-	 * 
-	 * <p>
-	 * If no instance is found then null will be return, while if there is more
-	 * that one instances a run-time exception will be thrown.
-	 */
+    /**
+     * Find the only instance that matches the provided query.
+     * 
+     * <p>
+     * If no instance is found then null will be return, while if there is more that one instances a run-time exception
+     * will be thrown.
+     */
     <T> T uniqueMatch(Query<T> query);
 
-
 }

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Filter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Filter.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Filter.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Filter.java Thu Dec 16 14:55:52 2010
@@ -17,26 +17,25 @@
  *  under the License.
  */
 
+package org.apache.isis.applib;
 
-package org.apache.isis.applib;
-
-/**
- * For use by repository implementations to allow a set of objects returned by a back-end objectstore to be
- * filtered before being returned to the caller.
- * 
- * <p>
- * Note that this is different from the pattern or criteria object accepted by some repositories'
- * <tt>findXxx</tt> methods. Such criteria objects are implementation-specific to the configured objectstore
- * and allow it to return an already-filtered set of rows. (For example, a Hibernate-based ObjectStore would
- * accept a representation of a HQL query; an XML-based objectstore might accept an XPath query, etc.)
- */
-public interface Filter<T> {
-	
-    /**
-     * Whether or not the supplied pojo meets this criteria.
-     * 
-     * @param pojo
-     * @return <tt>true</tt> if this pojo is acceptable, <tt>false</tt> otherwise.
-     */
-    public boolean accept(T pojo);
-}
+/**
+ * For use by repository implementations to allow a set of objects returned by a back-end objectstore to be filtered
+ * before being returned to the caller.
+ * 
+ * <p>
+ * Note that this is different from the pattern or criteria object accepted by some repositories' <tt>findXxx</tt>
+ * methods. Such criteria objects are implementation-specific to the configured objectstore and allow it to return an
+ * already-filtered set of rows. (For example, a Hibernate-based ObjectStore would accept a representation of a HQL
+ * query; an XML-based objectstore might accept an XPath query, etc.)
+ */
+public interface Filter<T> {
+
+    /**
+     * Whether or not the supplied pojo meets this criteria.
+     * 
+     * @param pojo
+     * @return <tt>true</tt> if this pojo is acceptable, <tt>false</tt> otherwise.
+     */
+    public boolean accept(T pojo);
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java Thu Dec 16 14:55:52 2010
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 import org.apache.isis.applib.util.NameUtils;
 
-
 public class Identifier implements Comparable<Identifier> {
 
     /**
@@ -33,37 +31,37 @@ public class Identifier implements Compa
     }
 
     public static enum Depth {
-    	CLASS {
-			@Override
-			public String toIdentityString(Identifier identifier) {
-				return identifier.toClassIdentityString();
-			}
-		},
-    	CLASS_MEMBERNAME {
-			@Override
-			public String toIdentityString(Identifier identifier) {
-				return identifier.toClassAndNameIdentityString();
-			}
-		},
-    	CLASS_MEMBERNAME_PARMS {
-			@Override
-			public String toIdentityString(Identifier identifier) {
-				return identifier.toFullIdentityString();
-			}
-		},
-    	MEMBERNAME_ONLY {
-			@Override
-			public String toIdentityString(Identifier identifier) {
-				return identifier.toNameIdentityString();
-			}
-		},
-    	PARMS_ONLY {
-			@Override
-			public String toIdentityString(Identifier identifier) {
-				return identifier.toParmsIdentityString();
-			}
-		};
-		public abstract String toIdentityString(Identifier identifier);
+        CLASS {
+            @Override
+            public String toIdentityString(final Identifier identifier) {
+                return identifier.toClassIdentityString();
+            }
+        },
+        CLASS_MEMBERNAME {
+            @Override
+            public String toIdentityString(final Identifier identifier) {
+                return identifier.toClassAndNameIdentityString();
+            }
+        },
+        CLASS_MEMBERNAME_PARMS {
+            @Override
+            public String toIdentityString(final Identifier identifier) {
+                return identifier.toFullIdentityString();
+            }
+        },
+        MEMBERNAME_ONLY {
+            @Override
+            public String toIdentityString(final Identifier identifier) {
+                return identifier.toNameIdentityString();
+            }
+        },
+        PARMS_ONLY {
+            @Override
+            public String toIdentityString(final Identifier identifier) {
+                return identifier.toParmsIdentityString();
+            }
+        };
+        public abstract String toIdentityString(Identifier identifier);
     }
 
     public static Depth CLASS = Depth.CLASS;
@@ -72,7 +70,6 @@ public class Identifier implements Compa
     public static Depth MEMBERNAME_ONLY = Depth.MEMBERNAME_ONLY;
     public static Depth PARMS_ONLY = Depth.PARMS_ONLY;
 
-
     // ///////////////////////////////////////////////////////////////////////////
     // Factory methods
     // ///////////////////////////////////////////////////////////////////////////
@@ -85,32 +82,29 @@ public class Identifier implements Compa
         return new Identifier(className, "", new String[] {}, Type.CLASS);
     }
 
-    public static Identifier propertyOrCollectionIdentifier(final Class<?> declaringClass, final String propertyOrCollectionName) {
+    public static Identifier propertyOrCollectionIdentifier(final Class<?> declaringClass,
+        final String propertyOrCollectionName) {
         return propertyOrCollectionIdentifier(declaringClass.getCanonicalName(), propertyOrCollectionName);
     }
 
-    public static Identifier propertyOrCollectionIdentifier(final String declaringClassName, final String propertyOrCollectionName) {
-        return new Identifier(declaringClassName, propertyOrCollectionName, new String[] {}, Type.PROPERTY_OR_COLLECTION);
+    public static Identifier propertyOrCollectionIdentifier(final String declaringClassName,
+        final String propertyOrCollectionName) {
+        return new Identifier(declaringClassName, propertyOrCollectionName, new String[] {},
+            Type.PROPERTY_OR_COLLECTION);
     }
 
-    public static Identifier actionIdentifier(
-            final Class<?> declaringClass,
-            final String actionName,
-            final Class<?>[] parameterClasses) {
+    public static Identifier actionIdentifier(final Class<?> declaringClass, final String actionName,
+        final Class<?>[] parameterClasses) {
         return actionIdentifier(declaringClass.getCanonicalName(), actionName, toParameterStringArray(parameterClasses));
     }
 
-    public static Identifier actionIdentifier(
-            final String declaringClassName,
-            final String actionName,
-            final Class<?>[] parameterClasses) {
+    public static Identifier actionIdentifier(final String declaringClassName, final String actionName,
+        final Class<?>[] parameterClasses) {
         return actionIdentifier(declaringClassName, actionName, toParameterStringArray(parameterClasses));
     }
 
-    public static Identifier actionIdentifier(
-            final String declaringClassName,
-            final String actionName,
-            final String[] parameterClassNames) {
+    public static Identifier actionIdentifier(final String declaringClassName, final String actionName,
+        final String[] parameterClassNames) {
         return new Identifier(declaringClassName, actionName, parameterClassNames, Type.ACTION);
     }
 
@@ -177,7 +171,7 @@ public class Identifier implements Compa
 
     /**
      * Convenience method.
-     *
+     * 
      * @return
      */
     public boolean isPropertyOrCollection() {
@@ -189,46 +183,43 @@ public class Identifier implements Compa
     // ///////////////////////////////////////////////////////////////////////////
 
     public String toIdentityString(final Depth depth) {
-    	return depth.toIdentityString(this);
+        return depth.toIdentityString(this);
     }
 
     public String toClassIdentityString() {
         return toClassIdentityString(new StringBuilder()).toString();
     }
 
-    public StringBuilder toClassIdentityString(StringBuilder buf) {
+    public StringBuilder toClassIdentityString(final StringBuilder buf) {
         return buf.append(className);
     }
 
-
     public String toNameIdentityString() {
         return toNameIdentityString(new StringBuilder()).toString();
     }
 
-    public StringBuilder toNameIdentityString(StringBuilder buf) {
+    public StringBuilder toNameIdentityString(final StringBuilder buf) {
         return buf.append(memberName);
     }
 
-
     public String toClassAndNameIdentityString() {
         return toClassAndNameIdentityString(new StringBuilder()).toString();
     }
 
-    public StringBuilder toClassAndNameIdentityString(StringBuilder buf) {
-    	return toClassIdentityString(buf).append("#").append(memberName);
+    public StringBuilder toClassAndNameIdentityString(final StringBuilder buf) {
+        return toClassIdentityString(buf).append("#").append(memberName);
     }
 
-
     public String toParmsIdentityString() {
-    	return toParmsIdentityString(new StringBuilder()).toString();
+        return toParmsIdentityString(new StringBuilder()).toString();
     }
 
-    public StringBuilder toParmsIdentityString(StringBuilder buf) {
+    public StringBuilder toParmsIdentityString(final StringBuilder buf) {
         if (type == Type.ACTION) {
             buf.append('(');
             for (int i = 0; i < parameterNames.length; i++) {
                 if (i > 0) {
-                	buf.append(",");
+                    buf.append(",");
                 }
                 buf.append(parameterNames[i]);
             }
@@ -241,9 +232,9 @@ public class Identifier implements Compa
         return getMemberName() + toParmsIdentityString();
     }
 
-    public StringBuilder toNameParmsIdentityString(StringBuilder buf) {
-    	buf.append(getMemberName());
-    	toParmsIdentityString(buf);
+    public StringBuilder toNameParmsIdentityString(final StringBuilder buf) {
+        buf.append(getMemberName());
+        toParmsIdentityString(buf);
         return buf;
     }
 
@@ -265,6 +256,7 @@ public class Identifier implements Compa
     // compareTo
     // ///////////////////////////////////////////////////////////////////////////
 
+    @Override
     public int compareTo(final Identifier o2) {
         return toString().compareTo(o2.toString());
     }
@@ -282,17 +274,16 @@ public class Identifier implements Compa
             return true;
         }
         if (!(obj instanceof Identifier)) {
-        	return false;
+            return false;
         }
         final Identifier other = (Identifier) obj;
-		return equals(other);
+        return equals(other);
     }
 
-	public boolean equals(final Identifier other) {
-		return equals(other.className, className) &&
-		       equals(other.memberName, other.memberName) &&
-		       equals(other.parameterNames, parameterNames);
-	}
+    public boolean equals(final Identifier other) {
+        return equals(other.className, className) && equals(other.memberName, other.memberName)
+            && equals(other.parameterNames, parameterNames);
+    }
 
     private boolean equals(final String a, final String b) {
         if (a == b) {
@@ -313,7 +304,7 @@ public class Identifier implements Compa
             return false;
         } else if (a != null && b == null) {
             return false;
-        } else if (a != null && b != null){
+        } else if (a != null && b != null) {
             if (a.length != b.length) {
                 return false;
             }
@@ -328,7 +319,7 @@ public class Identifier implements Compa
 
     @Override
     public int hashCode() {
-    	return toString().hashCode();
+        return toString().hashCode();
     }
 
     // ///////////////////////////////////////////////////////////////////////////

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 /**

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/RepositoryException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/RepositoryException.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/RepositoryException.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/RepositoryException.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib;
 
 /**

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java Thu Dec 16 14:55:52 2010
@@ -17,52 +17,54 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.adapters;
 
-package org.apache.isis.applib.adapters;
-
-public abstract class AbstractValueSemanticsProvider<T> implements ValueSemanticsProvider<T> {
-
-    private boolean immutable;
-    private boolean equalByContent;
-
-    /**
-     * Defaults {@link #isImmutable()} to <tt>true</tt> and {@link #isEqualByContent()} to <tt>true</tt>
-     * also.
-     */
-    public AbstractValueSemanticsProvider() {
-        this(true, true);
-    }
-
-    public AbstractValueSemanticsProvider(final boolean immutable, final boolean equalByContent) {
-        this.immutable = immutable;
-        this.equalByContent = equalByContent;
-    }
-
-    public EncoderDecoder<T> getEncoderDecoder() {
-        return (EncoderDecoder<T>) (this instanceof EncoderDecoder ? this : null);
-    }
-
-    public Parser<T> getParser() {
-        return (Parser<T>) (this instanceof Parser ? this : null);
-    }
-
-    public DefaultsProvider<T> getDefaultsProvider() {
-        return (DefaultsProvider<T>) (this instanceof DefaultsProvider ? this : null);
-    }
-
-    /**
-     * Defaults to <tt>true</tt> if no-arg constructor is used.
-     */
-    public boolean isEqualByContent() {
-        return equalByContent;
-    }
-
-    /**
-     * Defaults to <tt>true</tt> if no-arg constructor is used.
-     */
-    public boolean isImmutable() {
-        return immutable;
-    }
-
-}
-
+public abstract class AbstractValueSemanticsProvider<T> implements ValueSemanticsProvider<T> {
+
+    private boolean immutable;
+    private boolean equalByContent;
+
+    /**
+     * Defaults {@link #isImmutable()} to <tt>true</tt> and {@link #isEqualByContent()} to <tt>true</tt> also.
+     */
+    public AbstractValueSemanticsProvider() {
+        this(true, true);
+    }
+
+    public AbstractValueSemanticsProvider(final boolean immutable, final boolean equalByContent) {
+        this.immutable = immutable;
+        this.equalByContent = equalByContent;
+    }
+
+    @Override
+    public EncoderDecoder<T> getEncoderDecoder() {
+        return (EncoderDecoder<T>) (this instanceof EncoderDecoder ? this : null);
+    }
+
+    @Override
+    public Parser<T> getParser() {
+        return (Parser<T>) (this instanceof Parser ? this : null);
+    }
+
+    @Override
+    public DefaultsProvider<T> getDefaultsProvider() {
+        return (DefaultsProvider<T>) (this instanceof DefaultsProvider ? this : null);
+    }
+
+    /**
+     * Defaults to <tt>true</tt> if no-arg constructor is used.
+     */
+    @Override
+    public boolean isEqualByContent() {
+        return equalByContent;
+    }
+
+    /**
+     * Defaults to <tt>true</tt> if no-arg constructor is used.
+     */
+    @Override
+    public boolean isImmutable() {
+        return immutable;
+    }
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.adapters;
 
 /**
@@ -26,19 +25,17 @@ package org.apache.isis.applib.adapters;
  * <p>
  * This interface is used in two complementary ways:
  * <ul>
- * <li> As one option, it allows objects to take control of their own default values, by implementing
- * directly. However, the instance is used as a factory for itself. The framework will instantiate an
- * instance, invoke the appropriate method method, and use the returned object. The instantiated instance
- * itself will be discarded.</li>
- * <li> Alternatively, an implementor of this interface can be nominated in the
- * {@link org.apache.isis.applib.annotations.Defaulted} annotation, allowing a class that needs to have a
- * default to indicate where its default comes from. </li>
+ * <li>As one option, it allows objects to take control of their own default values, by implementing directly. However,
+ * the instance is used as a factory for itself. The framework will instantiate an instance, invoke the appropriate
+ * method method, and use the returned object. The instantiated instance itself will be discarded.</li>
+ * <li>Alternatively, an implementor of this interface can be nominated in the
+ * {@link org.apache.isis.applib.annotations.Defaulted} annotation, allowing a class that needs to have a default to
+ * indicate where its default comes from.</li>
  * 
  * <p>
- * Whatever the class that implements this interface, it must also expose either a
- * <tt>public</tt> no-arg constructor, or (for implementations that also are <tt>Facet</tt>s) 
- * a <tt>public</tt> constructor that accepts a single <tt>FacetHolder</tt>.  This constructor allows the 
- * framework to instantiate the object reflectively.
+ * Whatever the class that implements this interface, it must also expose either a <tt>public</tt> no-arg constructor,
+ * or (for implementations that also are <tt>Facet</tt>s) a <tt>public</tt> constructor that accepts a single
+ * <tt>FacetHolder</tt>. This constructor allows the framework to instantiate the object reflectively.
  * 
  * @see Parser
  * @see EncoderDecoder
@@ -52,4 +49,3 @@ public interface DefaultsProvider<T> {
     T getDefaultValue();
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.adapters;
 
 /**
@@ -26,19 +25,17 @@ package org.apache.isis.applib.adapters;
  * <p>
  * This interface is used in two complementary ways:
  * <ul>
- * <li> As one option, it allows objects to take control of their own encoding/decoding, by implementing
- * directly. However, the instance is used as a factory for itself. The framework will instantiate an
- * instance, invoke the appropriate method method, and use the returned object. The instantiated instance
- * itself will be discarded.</li>
- * <li> Alternatively, an implementor of this interface can be nominated in the
- * {@link org.apache.isis.applib.annotation.Encodable} annotation, allowing a class that needs to be
- * encodeable to indicate how it can be encoded/decoded. </li>
+ * <li>As one option, it allows objects to take control of their own encoding/decoding, by implementing directly.
+ * However, the instance is used as a factory for itself. The framework will instantiate an instance, invoke the
+ * appropriate method method, and use the returned object. The instantiated instance itself will be discarded.</li>
+ * <li>Alternatively, an implementor of this interface can be nominated in the
+ * {@link org.apache.isis.applib.annotation.Encodable} annotation, allowing a class that needs to be encodeable to
+ * indicate how it can be encoded/decoded.</li>
  * 
  * <p>
- * Whatever the class that implements this interface, it must also expose either a
- * <tt>public</tt> no-arg constructor, or (for implementations that also are <tt>Facet</tt>s) 
- * a <tt>public</tt> constructor that accepts a single <tt>FacetHolder</tt>.  This constructor allows the 
- * framework to instantiate the object reflectively.
+ * Whatever the class that implements this interface, it must also expose either a <tt>public</tt> no-arg constructor,
+ * or (for implementations that also are <tt>Facet</tt>s) a <tt>public</tt> constructor that accepts a single
+ * <tt>FacetHolder</tt>. This constructor allows the framework to instantiate the object reflectively.
  * 
  * @see Parser
  * @see DefaultsProvider
@@ -50,9 +47,9 @@ public interface EncoderDecoder<T> {
      * Returns the provided object as an encoded string.
      * 
      * <p>
-     * Even if the class is self-encodeable, note that this method is always called on a new instance of the
-     * object created via the no-arg constructor. That is, the object shouldn't encode itself, it should
-     * encode the object provided to it.
+     * Even if the class is self-encodeable, note that this method is always called on a new instance of the object
+     * created via the no-arg constructor. That is, the object shouldn't encode itself, it should encode the object
+     * provided to it.
      */
     String toEncodedString(T toEncode);
 
@@ -67,4 +64,3 @@ public interface EncoderDecoder<T> {
     T fromEncodedString(String encodedString);
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.adapters;
 
 /**
@@ -43,4 +42,3 @@ public class EncodingException extends R
     }
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java Thu Dec 16 14:55:52 2010
@@ -17,55 +17,51 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.adapters;
 
 import org.apache.isis.applib.annotation.TypicalLength;
 
-
 /**
  * Provides a mechanism for parsing and rendering string representations of objects.
  * 
  * <p>
  * Specifically, this interface embodies three related capabilties:
  * <ul>
- * <li> to parse a string representation and convert to an object.
- * <li> to provide a string representation of the object, for use as its title.
- * <li> to indicate the typical length of such a string representation.
+ * <li>to parse a string representation and convert to an object.
+ * <li>to provide a string representation of the object, for use as its title.
+ * <li>to indicate the typical length of such a string representation.
  * </ul>
  * 
  * <p>
- * For custom-written (as opposed to third-party) value types, the ability for the {@link Parser} to provide a
- * title responsibilities overlap with other conventions for domain objects. Specifically, normally we write a
- * <tt>title()</tt> method to return a title. In such cases a typical implementation of {@link Parser} would
- * just delegate to the value type itself to obtain the title (ie invoking the <tt>title()</tt> method
- * directly rather than having the framework do this).
+ * For custom-written (as opposed to third-party) value types, the ability for the {@link Parser} to provide a title
+ * responsibilities overlap with other conventions for domain objects. Specifically, normally we write a
+ * <tt>title()</tt> method to return a title. In such cases a typical implementation of {@link Parser} would just
+ * delegate to the value type itself to obtain the title (ie invoking the <tt>title()</tt> method directly rather than
+ * having the framework do this).
  * 
  * <p>
- * Similarly, the ability to return a typical length also overlaps with the {@link TypicalLength} annotation;
- * which is why {@link TypicalLength} cannot be applied to types, only to properties and parameters.
+ * Similarly, the ability to return a typical length also overlaps with the {@link TypicalLength} annotation; which is
+ * why {@link TypicalLength} cannot be applied to types, only to properties and parameters.
  * 
  * <p>
- * For third-party value types, eg {@link http://timeandmoney.sourceforge.net/ Time-and-Money} there is no
- * ability to write <tt>title()</tt> methods or annotated with {@link TypicalLength}; so this is the main
- * reason that this interface has to deal with titles and lengths.
+ * For third-party value types, eg {@link http://timeandmoney.sourceforge.net/ Time-and-Money} there is no ability to
+ * write <tt>title()</tt> methods or annotated with {@link TypicalLength}; so this is the main reason that this
+ * interface has to deal with titles and lengths.
  * 
  * <p>
  * This interface is used in two complementary ways:
  * <ul>
- * <li> As one option, it allows objects to take control of their own parsing, by implementing directly.
- * However, the instance is used as a factory for itself. The framework will instantiate an instance, invoke
- * the appropriate method method, and use the returned object. The instantiated instance itself will be
- * discarded.</li>
- * <li> Alternatively, an implementor of this interface can be nominated in the
- * {@link org.apache.isis.applib.annotation.Parseable} annotation, allowing a class that needs to be
- * parseable to indicate how it can be parsed. </li>
+ * <li>As one option, it allows objects to take control of their own parsing, by implementing directly. However, the
+ * instance is used as a factory for itself. The framework will instantiate an instance, invoke the appropriate method
+ * method, and use the returned object. The instantiated instance itself will be discarded.</li>
+ * <li>Alternatively, an implementor of this interface can be nominated in the
+ * {@link org.apache.isis.applib.annotation.Parseable} annotation, allowing a class that needs to be parseable to
+ * indicate how it can be parsed.</li>
  * 
  * <p>
- * Whatever the class that implements this interface, it must also expose either a
- * <tt>public</tt> no-arg constructor, or (for implementations that also are <tt>Facet</tt>s) 
- * a <tt>public</tt> constructor that accepts a single <tt>FacetHolder</tt>.  This constructor allows the 
- * framework to instantiate the object reflectively.
+ * Whatever the class that implements this interface, it must also expose either a <tt>public</tt> no-arg constructor,
+ * or (for implementations that also are <tt>Facet</tt>s) a <tt>public</tt> constructor that accepts a single
+ * <tt>FacetHolder</tt>. This constructor allows the framework to instantiate the object reflectively.
  * 
  * @see DefaultsProvider
  * @see EncoderDecoder
@@ -79,9 +75,9 @@ public interface Parser<T> {
      * <p>
      * Note that here the implementing class is acting as a factory for itself.
      * 
-     * @param context -
-     *            the context in which the text is being parsed. For example +3 might mean add 3 to the
-     *            current number.
+     * @param context
+     *            - the context in which the text is being parsed. For example +3 might mean add 3 to the current
+     *            number.
      */
     T parseTextEntry(T context, String entry);
 
@@ -99,17 +95,16 @@ public interface Parser<T> {
      * The title of the object using a mask.
      */
     String displayTitleOf(T object, String usingMask);
-        
+
     /**
      * A title for the object that is valid but which may be easier to edit than the title provided by a
      * {@link org.apache.isis.metamodel.facets.object.ident.TitleFacet}.
      * 
      * <p>
-     * The idea here is that the viewer can display a parseable title for an existing object when, for
-     * example, the user initially clicks in the field. So, a date might be rendered via a {@link TitleFacet}
-     * as <tt>May 2, 2007</tt>, but its editable form might be <tt>20070502</tt>.
+     * The idea here is that the viewer can display a parseable title for an existing object when, for example, the user
+     * initially clicks in the field. So, a date might be rendered via a {@link TitleFacet} as <tt>May 2, 2007</tt>, but
+     * its editable form might be <tt>20070502</tt>.
      */
     String parseableTitleOf(T existing);
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.adapters;
 
 import java.math.BigDecimal;
@@ -30,25 +29,23 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.annotation.Parseable;
 import org.apache.isis.applib.annotation.Value;
 
-
 /**
  * Provides a mechanism for providing a set of value semantics.
  * 
  * <p>
- * As explained in the Javadoc of the {@link Value} annotation, value semantics only actually implies that the
- * type is {@link Aggregated aggregated}. However, values are very often also {@link Parseable},
- * {@link Encodable}, {@link Immutable} and implement {@link EqualByContent} semantics. In addition, there
- * may be a {@link Defaulted default value}.
+ * As explained in the Javadoc of the {@link Value} annotation, value semantics only actually implies that the type is
+ * {@link Aggregated aggregated}. However, values are very often also {@link Parseable}, {@link Encodable},
+ * {@link Immutable} and implement {@link EqualByContent} semantics. In addition, there may be a {@link Defaulted
+ * default value}.
  * 
  * <p>
  * This interface is used by {@link Value} to allow these semantics to be provided through a single point.
  * Alternatively, {@link Value} supports this information being provided via the configuration files.
  * 
  * <p>
- * Whatever the class that implements this interface, it must also expose either a
- * <tt>public</tt> no-arg constructor, or (for implementations that also are <tt>Facet</tt>s) 
- * a <tt>public</tt> constructor that accepts a single <tt>FacetHolder</tt>.  This constructor allows the 
- * framework to instantiate the object reflectively.
+ * Whatever the class that implements this interface, it must also expose either a <tt>public</tt> no-arg constructor,
+ * or (for implementations that also are <tt>Facet</tt>s) a <tt>public</tt> constructor that accepts a single
+ * <tt>FacetHolder</tt>. This constructor allows the framework to instantiate the object reflectively.
  * 
  * @see Parser
  * @see EncoderDecoder
@@ -89,10 +86,9 @@ public interface ValueSemanticsProvider<
      * Whether the value has {@link EqualByContent equal by content} semantics.
      * 
      * <p>
-     * If so, then it must implement <tt>equals(Object)</tt> and <tt>hashCode()</tt> consistently.
-     * Examples in the Java language that do this are {@link String} and {@link BigDecimal}, for example.
+     * If so, then it must implement <tt>equals(Object)</tt> and <tt>hashCode()</tt> consistently. Examples in the Java
+     * language that do this are {@link String} and {@link BigDecimal}, for example.
      */
     boolean isEqualByContent();
 
 }
-



Mime
View raw message