You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/04/26 20:24:13 UTC
svn commit: r1096837 [8/14] - in /incubator/isis/trunk:
core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/
core/metamodel/src/main/java/org/apache/isis/core/meta...
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.runtimecontext;
-package org.apache.isis.core.metamodel.runtimecontext;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -31,28 +30,28 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
import org.apache.isis.core.metamodel.spec.SpecificationLookup;
import org.apache.isis.core.metamodel.spec.SpecificationLookupDelegator;
-
-
-public abstract class RuntimeContextAbstract implements RuntimeContext, SpecificationLoaderAware, DomainObjectContainerAware {
-
- private SpecificationLookupDelegator specificationLookupDelegator;
- private DomainObjectContainer container;
- private Properties properties;
-
- public RuntimeContextAbstract() {
- this.specificationLookupDelegator = new SpecificationLookupDelegator();
- }
-
- @Override
- public void injectInto(Object candidate) {
- if (RuntimeContextAware.class.isAssignableFrom(candidate.getClass())) {
- RuntimeContextAware cast = RuntimeContextAware.class.cast(candidate);
- cast.setRuntimeContext(this);
+
+public abstract class RuntimeContextAbstract implements RuntimeContext, SpecificationLoaderAware,
+ DomainObjectContainerAware {
+
+ private final SpecificationLookupDelegator specificationLookupDelegator;
+ private DomainObjectContainer container;
+ private Properties properties;
+
+ public RuntimeContextAbstract() {
+ this.specificationLookupDelegator = new SpecificationLookupDelegator();
+ }
+
+ @Override
+ public void injectInto(final Object candidate) {
+ if (RuntimeContextAware.class.isAssignableFrom(candidate.getClass())) {
+ final RuntimeContextAware cast = RuntimeContextAware.class.cast(candidate);
+ cast.setRuntimeContext(this);
}
injectSubcomponentsInto(candidate);
- }
+ }
- protected void injectSubcomponentsInto(Object candidate) {
+ protected void injectSubcomponentsInto(final Object candidate) {
getAdapterMap().injectInto(candidate);
getAuthenticationSessionProvider().injectInto(candidate);
getDependencyInjector().injectInto(candidate);
@@ -63,61 +62,58 @@ public abstract class RuntimeContextAbst
getQuerySubmitter().injectInto(candidate);
getServicesProvider().injectInto(candidate);
getSpecificationLookup().injectInto(candidate);
- }
-
-
- @Override
- public SpecificationLookup getSpecificationLookup() {
- return specificationLookupDelegator;
- }
-
- /**
- * Is injected into when the reflector is {@link ObjectReflectorAbstract#init() initialized}.
- */
- @Override
- public void setSpecificationLoader(final SpecificationLoader specificationLoader) {
- this.specificationLookupDelegator.setDelegate(new SpecificationLookup() {
-
+ }
+
+ @Override
+ public SpecificationLookup getSpecificationLookup() {
+ return specificationLookupDelegator;
+ }
+
+ /**
+ * Is injected into when the reflector is {@link ObjectReflectorAbstract#init() initialized}.
+ */
+ @Override
+ public void setSpecificationLoader(final SpecificationLoader specificationLoader) {
+ this.specificationLookupDelegator.setDelegate(new SpecificationLookup() {
+
@Override
- public void injectInto(Object candidate) {
+ public void injectInto(final Object candidate) {
specificationLoader.injectInto(candidate);
}
-
+
@Override
- public ObjectSpecification loadSpecification(Class<?> cls) {
+ public ObjectSpecification loadSpecification(final Class<?> cls) {
return specificationLoader.loadSpecification(cls);
}
- });
- }
-
-
- protected DomainObjectContainer getContainer() {
- return container;
- }
- /**
- * So that {@link #injectDependenciesInto(Object)} can also inject the {@link DomainObjectContainer}.
- */
- @Override
- public void setContainer(DomainObjectContainer container) {
- this.container = container;
- }
-
- public void setProperties(Properties properties) {
- this.properties = properties;
- }
-
- public String getProperty(String name) {
- return properties.getProperty(name);
- }
-
- public List<String> getPropertyNames() {
- List<String> list= new ArrayList<String>();
- for (Object key : properties.keySet()) {
- list.add((String) key);
- }
- return list;
- }
-
-
-
-}
+ });
+ }
+
+ protected DomainObjectContainer getContainer() {
+ return container;
+ }
+
+ /**
+ * So that {@link #injectDependenciesInto(Object)} can also inject the {@link DomainObjectContainer}.
+ */
+ @Override
+ public void setContainer(final DomainObjectContainer container) {
+ this.container = container;
+ }
+
+ public void setProperties(final Properties properties) {
+ this.properties = properties;
+ }
+
+ public String getProperty(final String name) {
+ return properties.getProperty(name);
+ }
+
+ public List<String> getPropertyNames() {
+ final List<String> list = new ArrayList<String>();
+ for (final Object key : properties.keySet()) {
+ list.add((String) key);
+ }
+ return list;
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java Tue Apr 26 18:24:05 2011
@@ -17,11 +17,10 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.runtimecontext;
-package org.apache.isis.core.metamodel.runtimecontext;
-
-public interface RuntimeContextAware {
-
- public void setRuntimeContext(final RuntimeContext runtimeContext);
-
-}
+public interface RuntimeContextAware {
+
+ public void setRuntimeContext(final RuntimeContext runtimeContext);
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java Tue Apr 26 18:24:05 2011
@@ -17,24 +17,23 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.runtimecontext.noruntime;
-package org.apache.isis.core.metamodel.runtimecontext.noruntime;
-
import java.io.IOException;
import org.apache.isis.core.commons.authentication.AuthenticationSessionAbstract;
import org.apache.isis.core.commons.encoding.DataInputExtended;
-
-public class AuthenticationSessionNoRuntime extends AuthenticationSessionAbstract {
-
- private static final long serialVersionUID = 1L;
-
- public AuthenticationSessionNoRuntime() {
- super("metamodel", "dummy");
- }
-
- public AuthenticationSessionNoRuntime(DataInputExtended input) throws IOException {
- super(input);
- }
-
-}
+
+public class AuthenticationSessionNoRuntime extends AuthenticationSessionAbstract {
+
+ private static final long serialVersionUID = 1L;
+
+ public AuthenticationSessionNoRuntime() {
+ super("metamodel", "dummy");
+ }
+
+ public AuthenticationSessionNoRuntime(final DataInputExtended input) throws IOException {
+ super(input);
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.runtimecontext.noruntime;
-package org.apache.isis.core.metamodel.runtimecontext.noruntime;
-
import java.util.Collections;
import java.util.List;
@@ -48,28 +47,28 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.ObjectInstantiator;
import org.apache.isis.core.metamodel.spec.ObjectInstantiatorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
- private DependencyInjector dependencyInjector;
- private AuthenticationSessionProviderAbstract authenticationSessionProvider;
- private AdapterMapAbstract adapterMap;
- private ObjectInstantiatorAbstract objectInstantiator;
- private ObjectDirtierAbstract objectDirtier;
- private ObjectPersistorAbstract objectPersistor;
- private DomainObjectServicesAbstract domainObjectServices;
- private QuerySubmitterAbstract querySubmitter;
+public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
+
+ private final DependencyInjector dependencyInjector;
+ private final AuthenticationSessionProviderAbstract authenticationSessionProvider;
+ private final AdapterMapAbstract adapterMap;
+ private final ObjectInstantiatorAbstract objectInstantiator;
+ private final ObjectDirtierAbstract objectDirtier;
+ private final ObjectPersistorAbstract objectPersistor;
+ private final DomainObjectServicesAbstract domainObjectServices;
+ private final QuerySubmitterAbstract querySubmitter;
public RuntimeContextNoRuntime() {
dependencyInjector = new DependencyInjectorAbstract() {
-
+
/**
- * Unlike most of the methods in this implementation, does nothing (because
- * this will always be called, even in a no-runtime context).
+ * Unlike most of the methods in this implementation, does nothing (because this will always be called, even
+ * in a no-runtime context).
*/
@Override
- public void injectDependenciesInto(Object domainObject) {
-
+ public void injectDependenciesInto(final Object domainObject) {
+
}
};
authenticationSessionProvider = new AuthenticationSessionProviderAbstract() {
@@ -81,80 +80,81 @@ public class RuntimeContextNoRuntime ext
adapterMap = new AdapterMapAbstract() {
@Override
- public ObjectAdapter getAdapterFor(Object pojo) {
+ public ObjectAdapter getAdapterFor(final Object pojo) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public ObjectAdapter adapterFor(Object pojo, ObjectAdapter ownerAdapter, IdentifiedHolder identifiedHolder) {
+ public ObjectAdapter adapterFor(final Object pojo, final ObjectAdapter ownerAdapter,
+ final IdentifiedHolder identifiedHolder) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public ObjectAdapter adapterForAggregated(Object domainObject, ObjectAdapter parent) {
+ public ObjectAdapter adapterForAggregated(final Object domainObject, final ObjectAdapter parent) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public ObjectAdapter adapterFor(Object domainObject) {
+ public ObjectAdapter adapterFor(final Object domainObject) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
};
objectInstantiator = new ObjectInstantiatorAbstract() {
-
+
@Override
- public Object instantiate(Class<?> cls) throws ObjectInstantiationException {
+ public Object instantiate(final Class<?> cls) throws ObjectInstantiationException {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
};
objectDirtier = new ObjectDirtierAbstract() {
@Override
- public void objectChanged(Object object) {
+ public void objectChanged(final Object object) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public void objectChanged(ObjectAdapter adapter) {
+ public void objectChanged(final ObjectAdapter adapter) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
};
objectPersistor = new ObjectPersistorAbstract() {
@Override
- public void remove(ObjectAdapter adapter) {
+ public void remove(final ObjectAdapter adapter) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public void makePersistent(ObjectAdapter adapter) {
+ public void makePersistent(final ObjectAdapter adapter) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
};
domainObjectServices = new DomainObjectServicesAbstract() {
@Override
- public void warnUser(String message) {
+ public void warnUser(final String message) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public void resolve(Object parent, Object field) {
+ public void resolve(final Object parent, final Object field) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public void resolve(Object parent) {
+ public void resolve(final Object parent) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public void raiseError(String message) {
+ public void raiseError(final String message) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public void informUser(String message) {
+ public void informUser(final String message) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@@ -164,7 +164,7 @@ public class RuntimeContextNoRuntime ext
}
@Override
- public String getProperty(String name) {
+ public String getProperty(final String name) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@@ -174,7 +174,7 @@ public class RuntimeContextNoRuntime ext
}
@Override
- public ObjectAdapter createTransientInstance(ObjectSpecification spec) {
+ public ObjectAdapter createTransientInstance(final ObjectSpecification spec) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@@ -183,33 +183,34 @@ public class RuntimeContextNoRuntime ext
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
- public ObjectAdapter createAggregatedInstance(ObjectSpecification spec, ObjectAdapter parent) {
+ @Override
+ public ObjectAdapter createAggregatedInstance(final ObjectSpecification spec, final ObjectAdapter parent) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
};
querySubmitter = new QuerySubmitterAbstract() {
@Override
- public <T> ObjectAdapter firstMatchingQuery(Query<T> query) {
+ public <T> ObjectAdapter firstMatchingQuery(final Query<T> query) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public <T> List<ObjectAdapter> allMatchingQuery(Query<T> query) {
+ public <T> List<ObjectAdapter> allMatchingQuery(final Query<T> query) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
};
}
- /////////////////////////////////////////////
- // Components
- /////////////////////////////////////////////
+ // ///////////////////////////////////////////
+ // Components
+ // ///////////////////////////////////////////
@Override
public AuthenticationSessionProvider getAuthenticationSessionProvider() {
return authenticationSessionProvider;
}
-
+
@Override
public AdapterMap getAdapterMap() {
return adapterMap;
@@ -219,7 +220,7 @@ public class RuntimeContextNoRuntime ext
public ObjectInstantiator getObjectInstantiator() {
return objectInstantiator;
}
-
+
@Override
public ObjectDirtier getObjectDirtier() {
return objectDirtier;
@@ -244,31 +245,30 @@ public class RuntimeContextNoRuntime ext
public DependencyInjector getDependencyInjector() {
return dependencyInjector;
}
-
-
- /////////////////////////////////////////////
- // allInstances, allMatching*
- /////////////////////////////////////////////
- public List<ObjectAdapter> allInstances(ObjectSpecification noSpec) {
+ // ///////////////////////////////////////////
+ // allInstances, allMatching*
+ // ///////////////////////////////////////////
+
+ public List<ObjectAdapter> allInstances(final ObjectSpecification noSpec) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
// ///////////////////////////////////////////
- // getServices, injectDependenciesInto
- /////////////////////////////////////////////
+ // getServices, injectDependenciesInto
+ // ///////////////////////////////////////////
- @Override
+ @Override
public ServicesProvider getServicesProvider() {
- return new ServicesProviderAbstract() {
- /**
- * Just returns an empty array.
- */
- @Override
+ return new ServicesProviderAbstract() {
+ /**
+ * Just returns an empty array.
+ */
+ @Override
public List<ObjectAdapter> getServices() {
- return Collections.emptyList();
- }
- };
- }
-
-}
+ return Collections.emptyList();
+ }
+ };
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceUtil.java Tue Apr 26 18:24:05 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.metamodel.services;
import java.lang.reflect.InvocationTargetException;
@@ -25,10 +24,10 @@ import java.lang.reflect.Method;
import org.apache.isis.core.commons.exceptions.IsisException;
-
public final class ServiceUtil {
-
- private ServiceUtil(){}
+
+ private ServiceUtil() {
+ }
public static String id(final Object object) {
final Class<?> cls = object.getClass();
@@ -49,4 +48,3 @@ public final class ServiceUtil {
}
}
}
-
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java Tue Apr 26 18:24:05 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.metamodel.services;
import java.util.List;
@@ -26,17 +25,15 @@ import org.apache.isis.applib.DomainObje
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.commons.components.SessionScopedComponent;
-
/**
* The repository of services, also able to inject into any object.
- *
+ *
* <p>
- * The {@link #getContainer() domain object container} is always injected but
- * is not a {@link #getRegisteredServices() registered service}.
+ * The {@link #getContainer() domain object container} is always injected but is not a {@link #getRegisteredServices()
+ * registered service}.
*/
public interface ServicesInjector extends SessionScopedComponent, Injectable {
-
// ///////////////////////////////////////////////////////////////////////////
// Container
// ///////////////////////////////////////////////////////////////////////////
@@ -45,38 +42,34 @@ public interface ServicesInjector extend
/**
* Container to inject.
- *
+ *
* <p>
* This itself is injected.
*/
public void setContainer(final DomainObjectContainer container);
-
// ///////////////////////////////////////////////////////////////////////////
// Services
// ///////////////////////////////////////////////////////////////////////////
/**
* Services to be injected.
- *
+ *
* <p>
- * Should automatically inject all services into each other (though calling
- * {@link #open()} will also do this).
- *
+ * Should automatically inject all services into each other (though calling {@link #open()} will also do this).
+ *
* @param services
*/
void setServices(List<Object> services);
-
/**
* All registered services, as an immutable {@link List}.
- *
+ *
* <p>
* Does not include the {@link #getContainer() container}.
*/
List<Object> getRegisteredServices();
-
// ///////////////////////////////////////////////////////////////////////////
// Injection (into contained objects)
// ///////////////////////////////////////////////////////////////////////////
@@ -91,8 +84,4 @@ public interface ServicesInjector extend
*/
void injectDependencies(List<Object> objects);
-
-
-
}
-
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.metamodel.services;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
@@ -39,7 +38,6 @@ import org.apache.log4j.Logger;
import com.google.common.collect.Lists;
-
public abstract class ServicesInjectorAbstract implements ServicesInjector {
private static final Logger LOG = Logger.getLogger(ServicesInjectorAbstract.class);
@@ -50,20 +48,25 @@ public abstract class ServicesInjectorAb
/**
* Ensure that all services are wired into each other.
*/
+ @Override
public void open() {
autowireServicesAndContainer();
}
- public void close() {}
+ @Override
+ public void close() {
+ }
// /////////////////////////////////////////////////////////
// Container
// /////////////////////////////////////////////////////////
+ @Override
public DomainObjectContainer getContainer() {
return container;
}
+ @Override
public void setContainer(final DomainObjectContainer container) {
ensureThatArg(container, is(not(nullValue())));
this.container = container;
@@ -73,12 +76,14 @@ public abstract class ServicesInjectorAb
// Services
// /////////////////////////////////////////////////////////
+ @Override
public void setServices(final List<Object> services) {
this.services.clear();
addServices(services);
autowireServicesAndContainer();
}
+ @Override
public List<Object> getRegisteredServices() {
return Collections.unmodifiableList(services);
}
@@ -102,15 +107,17 @@ public abstract class ServicesInjectorAb
// Inject Dependencies
// /////////////////////////////////////////////////////////
+ @Override
public void injectDependencies(final Object object) {
Assert.assertNotNull("no container", container);
Assert.assertNotNull("no services", services);
-
- List<Object> servicesCopy = Lists.newArrayList(services);
+
+ final List<Object> servicesCopy = Lists.newArrayList(services);
servicesCopy.add(container);
injectServices(object, servicesCopy);
}
+ @Override
public void injectDependencies(final List<Object> objects) {
for (final Object object : objects) {
injectDependencies(object);
@@ -124,9 +131,10 @@ public abstract class ServicesInjectorAb
/**
* That is, injecting this injector...
*/
- public void injectInto(Object candidate) {
+ @Override
+ public void injectInto(final Object candidate) {
if (ServicesInjectorAware.class.isAssignableFrom(candidate.getClass())) {
- ServicesInjectorAware cast = ServicesInjectorAware.class.cast(candidate);
+ final ServicesInjectorAware cast = ServicesInjectorAware.class.cast(candidate);
cast.setServicesInjector(this);
}
}
@@ -146,12 +154,12 @@ public abstract class ServicesInjectorAb
}
final Class<?>[] parameterTypes = methods[j].getParameterTypes();
if (parameterTypes.length != 1 || parameterTypes[0] == Object.class
- || !parameterTypes[0].isAssignableFrom(serviceClass)) {
+ || !parameterTypes[0].isAssignableFrom(serviceClass)) {
continue;
}
-
+
methods[j].setAccessible(true);
-
+
invokeSetMethod(methods[j], object, service);
}
}
@@ -161,13 +169,13 @@ public abstract class ServicesInjectorAb
try {
method.invoke(target, parameters);
} catch (final SecurityException e) {
- throw new MetaModelException(String.format("Cannot access the %s method in %s", method.getName(), target.getClass()
- .getName()));
+ throw new MetaModelException(String.format("Cannot access the %s method in %s", method.getName(), target
+ .getClass().getName()));
} catch (final IllegalArgumentException e1) {
throw new MetaModelException(e1);
} catch (final IllegalAccessException e1) {
- throw new MetaModelException(String.format("Cannot access the %s method in %s", method.getName(), target.getClass()
- .getName()));
+ throw new MetaModelException(String.format("Cannot access the %s method in %s", method.getName(), target
+ .getClass().getName()));
} catch (final InvocationTargetException e) {
final Throwable targetException = e.getTargetException();
if (targetException instanceof RuntimeException) {
@@ -192,4 +200,3 @@ public abstract class ServicesInjectorAb
}
}
-
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAware.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAware.java Tue Apr 26 18:24:05 2011
@@ -17,13 +17,10 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.services;
-package org.apache.isis.core.metamodel.services;
-
-public interface ServicesInjectorAware {
-
- public void setServicesInjector(ServicesInjector servicesInjector);
-
-}
-
-
+public interface ServicesInjectorAware {
+
+ public void setServicesInjector(ServicesInjector servicesInjector);
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java Tue Apr 26 18:24:05 2011
@@ -17,15 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.metamodel.services;
-
-
public class ServicesInjectorDefault extends ServicesInjectorAbstract {
public ServicesInjectorDefault() {
}
}
-
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerAware.java Tue Apr 26 18:24:05 2011
@@ -17,13 +17,12 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.services.container;
-package org.apache.isis.core.metamodel.services.container;
-
import org.apache.isis.applib.DomainObjectContainer;
-
-public interface DomainObjectContainerAware {
-
- void setContainer(DomainObjectContainer container);
-
-}
+
+public interface DomainObjectContainerAware {
+
+ void setContainer(DomainObjectContainer container);
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java Tue Apr 26 18:24:05 2011
@@ -55,7 +55,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.SpecificationLookupAware;
public class DomainObjectContainerDefault implements DomainObjectContainer, QuerySubmitterAware, ObjectDirtierAware,
- DomainObjectServicesAware, ObjectPersistorAware, SpecificationLookupAware, AuthenticationSessionProviderAware, AdapterMapAware {
+ DomainObjectServicesAware, ObjectPersistorAware, SpecificationLookupAware, AuthenticationSessionProviderAware,
+ AdapterMapAware {
private ObjectDirtier objectDirtier;
private ObjectPersistor objectPersistor;
@@ -88,14 +89,17 @@ public class DomainObjectContainerDefaul
return (T) adapter.getObject();
}
}
-
+
@Override
@SuppressWarnings("unchecked")
- public <T> T newAggregatedInstance(Object parent, Class<T> ofClass) {
+ public <T> T newAggregatedInstance(final Object parent, final Class<T> ofClass) {
final ObjectSpecification spec = getSpecificationLookup().loadSpecification(ofClass);
// TODO check aggregation is supported
if (!spec.isAggregated()) {
- throw new IsisException("Cannot instantiate an object unless it is marked as Aggregated using the newAggregatedInstance method"); // TODO proper type
+ throw new IsisException(
+ "Cannot instantiate an object unless it is marked as Aggregated using the newAggregatedInstance method"); // TODO
+ // proper
+ // type
}
final ObjectAdapter adapter = doCreateAggregatedInstance(spec, parent);
return (T) adapter.getObject();
@@ -106,7 +110,7 @@ public class DomainObjectContainerDefaul
*/
@Override
public <T> T newPersistentInstance(final Class<T> ofClass) {
- T newInstance = newTransientInstance(ofClass);
+ final T newInstance = newTransientInstance(ofClass);
persist(newInstance);
return newInstance;
}
@@ -129,9 +133,9 @@ public class DomainObjectContainerDefaul
protected ObjectAdapter doCreateTransientInstance(final ObjectSpecification spec) {
return getDomainObjectServices().createTransientInstance(spec);
}
-
- private ObjectAdapter doCreateAggregatedInstance(ObjectSpecification spec, Object parent) {
- ObjectAdapter parentAdapter = getAdapterMap().getAdapterFor(parent);
+
+ private ObjectAdapter doCreateAggregatedInstance(final ObjectSpecification spec, final Object parent) {
+ final ObjectAdapter parentAdapter = getAdapterMap().getAdapterFor(parent);
return getDomainObjectServices().createAggregatedInstance(spec, parentAdapter);
}
@@ -201,7 +205,7 @@ public class DomainObjectContainerDefaul
@Override
public String validate(final Object domainObject) {
final ObjectAdapter adapter = getAdapterMap().adapterFor(domainObject);
- InteractionResult validityResult = adapter.getSpecification().isValidResult(adapter);
+ final InteractionResult validityResult = adapter.getSpecification().isValidResult(adapter);
return validityResult.getReason();
}
@@ -251,10 +255,10 @@ public class DomainObjectContainerDefaul
return user;
}
- private List<RoleMemento> asRoleMementos(List<String> roles) {
- List<RoleMemento> mementos = new ArrayList<RoleMemento>();
+ private List<RoleMemento> asRoleMementos(final List<String> roles) {
+ final List<RoleMemento> mementos = new ArrayList<RoleMemento>();
if (roles != null) {
- for (String role : roles) {
+ for (final String role : roles) {
mementos.add(new RoleMemento(role));
}
}
@@ -266,13 +270,13 @@ public class DomainObjectContainerDefaul
// //////////////////////////////////////////////////////////////////
@Override
- public String getProperty(String name) {
+ public String getProperty(final String name) {
return getDomainObjectServices().getProperty(name);
}
@Override
- public String getProperty(String name, String defaultValue) {
- String value = getProperty(name);
+ public String getProperty(final String name, final String defaultValue) {
+ final String value = getProperty(name);
return value == null ? defaultValue : value;
}
@@ -313,7 +317,7 @@ public class DomainObjectContainerDefaul
public <T> List<T> allMatches(final Class<T> cls, final Filter<T> filter) {
final List<T> allInstances = allInstances(cls);
final List<T> filtered = new ArrayList<T>();
- for (T instance : allInstances) {
+ for (final T instance : allInstances) {
if (filter.accept(instance)) {
filtered.add(instance);
}
@@ -334,7 +338,7 @@ public class DomainObjectContainerDefaul
@Override
public <T> List<T> allMatches(final Query<T> query) {
- List<ObjectAdapter> allMatching = getQuerySubmitter().allMatchingQuery(query);
+ final List<ObjectAdapter> allMatching = getQuerySubmitter().allMatchingQuery(query);
return AdapterUtils.unwrap(allMatching);
}
@@ -345,7 +349,7 @@ public class DomainObjectContainerDefaul
@Override
public <T> T firstMatch(final Class<T> cls, final Filter<T> filter) {
final List<T> allInstances = allInstances(cls);
- for (T instance : allInstances) {
+ for (final T instance : allInstances) {
if (filter.accept(instance)) {
return instance;
}
@@ -368,7 +372,7 @@ public class DomainObjectContainerDefaul
@Override
@SuppressWarnings("unchecked")
public <T> T firstMatch(final Query<T> query) {
- ObjectAdapter firstMatching = getQuerySubmitter().firstMatchingQuery(query);
+ final ObjectAdapter firstMatching = getQuerySubmitter().firstMatchingQuery(query);
return (T) AdapterUtils.unwrap(firstMatching);
}
@@ -425,7 +429,7 @@ public class DomainObjectContainerDefaul
}
@Override
- public void setQuerySubmitter(QuerySubmitter querySubmitter) {
+ public void setQuerySubmitter(final QuerySubmitter querySubmitter) {
this.querySubmitter = querySubmitter;
}
@@ -434,7 +438,7 @@ public class DomainObjectContainerDefaul
}
@Override
- public void setDomainObjectServices(DomainObjectServices domainObjectServices) {
+ public void setDomainObjectServices(final DomainObjectServices domainObjectServices) {
this.domainObjectServices = domainObjectServices;
}
@@ -443,7 +447,7 @@ public class DomainObjectContainerDefaul
}
@Override
- public void setSpecificationLookup(SpecificationLookup specificationLookup) {
+ public void setSpecificationLookup(final SpecificationLookup specificationLookup) {
this.specificationLookup = specificationLookup;
}
@@ -452,7 +456,7 @@ public class DomainObjectContainerDefaul
}
@Override
- public void setAuthenticationSessionProvider(AuthenticationSessionProvider authenticationSessionProvider) {
+ public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
this.authenticationSessionProvider = authenticationSessionProvider;
}
@@ -461,7 +465,7 @@ public class DomainObjectContainerDefaul
}
@Override
- public void setAdapterMap(AdapterMap adapterManager) {
+ public void setAdapterMap(final AdapterMap adapterManager) {
this.adapterMap = adapterManager;
}
@@ -470,7 +474,7 @@ public class DomainObjectContainerDefaul
}
@Override
- public void setObjectDirtier(ObjectDirtier objectDirtier) {
+ public void setObjectDirtier(final ObjectDirtier objectDirtier) {
this.objectDirtier = objectDirtier;
}
@@ -479,7 +483,7 @@ public class DomainObjectContainerDefaul
}
@Override
- public void setObjectPersistor(ObjectPersistor objectPersistor) {
+ public void setObjectPersistor(final ObjectPersistor objectPersistor) {
this.objectPersistor = objectPersistor;
}
}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryCardinality.java Tue Apr 26 18:24:05 2011
@@ -17,17 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.services.container.query;
-package org.apache.isis.core.metamodel.services.container.query;
-
-
-public enum QueryCardinality {
- /**
- * Query can return multiple instances.
- */
- MULTIPLE,
- /**
- * Query should return only a single instance (or possible none).
- */
- SINGLE
+public enum QueryCardinality {
+ /**
+ * Query can return multiple instances.
+ */
+ MULTIPLE,
+ /**
+ * Query should return only a single instance (or possible none).
+ */
+ SINGLE
}
\ No newline at end of file
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByPattern.java Tue Apr 26 18:24:05 2011
@@ -17,40 +17,38 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.services.container.query;
-package org.apache.isis.core.metamodel.services.container.query;
-
import java.io.Serializable;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryBuiltInAbstract;
-
-
-/**
- * Although implements {@link Query} and thus is ought to be {@link Serializable},
- * it will be converted into a <tt>PersistenceQuery</tt> in the runtime for remoting purposes
- * and so does not need to be (and indeed isn't).
- *
- * <p>
- * See discussion in {@link QueryBuiltInAbstract} for further details.
- */
-public class QueryFindByPattern<T> extends QueryBuiltInAbstract<T> {
-
- private static final long serialVersionUID = 1L;
-
- private final T pattern;
-
- public QueryFindByPattern(final Class<T> type, T pattern) {
- super(type);
- this.pattern = pattern;
- }
-
- public T getPattern() {
- return pattern;
- }
-
- public String getDescription() {
- return getResultTypeName() + " (matching pattern)";
- }
-
-}
+
+/**
+ * Although implements {@link Query} and thus is ought to be {@link Serializable}, it will be converted into a
+ * <tt>PersistenceQuery</tt> in the runtime for remoting purposes and so does not need to be (and indeed isn't).
+ *
+ * <p>
+ * See discussion in {@link QueryBuiltInAbstract} for further details.
+ */
+public class QueryFindByPattern<T> extends QueryBuiltInAbstract<T> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final T pattern;
+
+ public QueryFindByPattern(final Class<T> type, final T pattern) {
+ super(type);
+ this.pattern = pattern;
+ }
+
+ public T getPattern() {
+ return pattern;
+ }
+
+ @Override
+ public String getDescription() {
+ return getResultTypeName() + " (matching pattern)";
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/query/QueryFindByTitle.java Tue Apr 26 18:24:05 2011
@@ -17,40 +17,39 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.services.container.query;
-package org.apache.isis.core.metamodel.services.container.query;
-
import java.io.Serializable;
import java.text.MessageFormat;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryBuiltInAbstract;
-
-
-/**
- * Although implements {@link Query} and thus is intended to be (and indeed is) {@link Serializable},
- * it will be converted into a <tt>PersistenceQuery</tt> in the runtime for remoting purposes.
- *
- * <p>
- * See discussion in {@link QueryBuiltInAbstract} for further details.
- */
-public class QueryFindByTitle<T> extends QueryBuiltInAbstract<T> {
-
- private static final long serialVersionUID = 1L;
-
- private final String title;
-
- public QueryFindByTitle(final Class<T> type, final String title) {
- super(type);
- this.title = title;
- }
-
- public String getTitle() {
- return title;
- }
-
- public String getDescription() {
- return MessageFormat.format("{0} (matching title: '{1}')", getResultTypeName(), getTitle());
- }
-
-}
+
+/**
+ * Although implements {@link Query} and thus is intended to be (and indeed is) {@link Serializable}, it will be
+ * converted into a <tt>PersistenceQuery</tt> in the runtime for remoting purposes.
+ *
+ * <p>
+ * See discussion in {@link QueryBuiltInAbstract} for further details.
+ */
+public class QueryFindByTitle<T> extends QueryBuiltInAbstract<T> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String title;
+
+ public QueryFindByTitle(final Class<T> type, final String title) {
+ super(type);
+ this.title = title;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ @Override
+ public String getDescription() {
+ return MessageFormat.format("{0} (matching title: '{1}')", getResultTypeName(), getTitle());
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java Tue Apr 26 18:24:05 2011
@@ -17,19 +17,12 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
-
-
-public enum ActionType {
- DEBUG,
- SET,
- EXPLORATION,
- PROTOTYPE,
- USER;
-
- public String getName() {
- return name();
+public enum ActionType {
+ DEBUG, SET, EXPLORATION, PROTOTYPE, USER;
+
+ public String getName() {
+ return name();
}
-}
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DefaultProvider.java Tue Apr 26 18:24:05 2011
@@ -17,15 +17,14 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
-public interface DefaultProvider {
-
- /**
- * Default value to be provided for properties or parameters that are not declared as <tt>@Optional</tt>
- * but where the UI has not (yet) provided a value.
- */
- Object getDefaultValue();
-
-}
+public interface DefaultProvider {
+
+ /**
+ * Default value to be provided for properties or parameters that are not declared as <tt>@Optional</tt> but where
+ * the UI has not (yet) provided a value.
+ */
+ Object getDefaultValue();
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java Tue Apr 26 18:24:05 2011
@@ -17,19 +17,18 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
-/**
- * Anything in the metamodel that has a description.
- */
-public interface Described {
-
- /**
- * Returns a description of how the member is used - this complements the help text.
- *
- * @see #getHelp()
- */
- String getDescription();
-
-}
+/**
+ * Anything in the metamodel that has a description.
+ */
+public interface Described {
+
+ /**
+ * Returns a description of how the member is used - this complements the help text.
+ *
+ * @see #getHelp()
+ */
+ String getDescription();
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Dirtiable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Dirtiable.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Dirtiable.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Dirtiable.java Tue Apr 26 18:24:05 2011
@@ -17,37 +17,35 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-
-public interface Dirtiable {
-
- /**
- * Clear the dirty flag so that a call to <tt>isDirty()</tt>, and before <tt>markDirty()</tt> is called,
- * will return false;
- *
- * @see #isDirty(ObjectAdapter)
- * @see #markDirty(ObjectAdapter)
- */
- void clearDirty(ObjectAdapter object);
-
- /**
- * Checks if the specified object has been changed, and hence needs persisting.
- *
- * @see #markDirty(ObjectAdapter)
- * @see #clearDirty(ObjectAdapter)
- */
- boolean isDirty(ObjectAdapter object);
-
- /**
- * Mark the specified object as having been changed, and hence needing persisting.
- *
- * @see #isDirty(ObjectAdapter)
- * @see #clearDirty(ObjectAdapter)
- */
- void markDirty(ObjectAdapter object);
-
-}
+
+public interface Dirtiable {
+
+ /**
+ * Clear the dirty flag so that a call to <tt>isDirty()</tt>, and before <tt>markDirty()</tt> is called, will return
+ * false;
+ *
+ * @see #isDirty(ObjectAdapter)
+ * @see #markDirty(ObjectAdapter)
+ */
+ void clearDirty(ObjectAdapter object);
+
+ /**
+ * Checks if the specified object has been changed, and hence needs persisting.
+ *
+ * @see #markDirty(ObjectAdapter)
+ * @see #clearDirty(ObjectAdapter)
+ */
+ boolean isDirty(ObjectAdapter object);
+
+ /**
+ * Mark the specified object as having been changed, and hence needing persisting.
+ *
+ * @see #isDirty(ObjectAdapter)
+ * @see #clearDirty(ObjectAdapter)
+ */
+ void markDirty(ObjectAdapter object);
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ElementSpecificationProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ElementSpecificationProvider.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ElementSpecificationProvider.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ElementSpecificationProvider.java Tue Apr 26 18:24:05 2011
@@ -17,12 +17,10 @@
package org.apache.isis.core.metamodel.spec;
/**
- * A mechanism to provide the {@link ObjectSpecification type}
- * of a (stand-alone) collection.
+ * A mechanism to provide the {@link ObjectSpecification type} of a (stand-alone) collection.
*
* <p>
- * Introduced to decouple the <tt>facets</tt> package from
- * the <tt>spec</tt> package.
+ * Introduced to decouple the <tt>facets</tt> package from the <tt>spec</tt> package.
*/
public interface ElementSpecificationProvider {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Hierarchical.java Tue Apr 26 18:24:05 2011
@@ -17,46 +17,42 @@
* under the License.
*/
-
-package org.apache.isis.core.metamodel.spec;
+package org.apache.isis.core.metamodel.spec;
import java.util.List;
-
-public interface Hierarchical {
-
-
- /**
- * Returns true if the <tt>subclasses()</tt> method will return an array of
- * one or more elements (ie, not an empty array).
- */
- boolean hasSubclasses();
-
- /**
- * Get the list of specifications for all the interfaces that the class
- * represented by this specification implements.
- */
- List<ObjectSpecification> interfaces();
-
- /**
- * Determines if this specification represents the same specification, or a
- * subclass, of the specified specification.
- *
- * <p>
- * <tt>subSpec.isOfType(superSpec)</tt> is equivalent to
- * {@link Class#isAssignableFrom(Class) Java's}
- * <tt>superType.isAssignableFrom(subType)</tt>.
- */
- boolean isOfType(ObjectSpecification specification);
-
- /**
- * Get the list of specifications for the subclasses of the class
- * represented by this specification
- */
- List<ObjectSpecification> subclasses();
-
- /**
- * Get the specification for this specification's class's superclass.
- */
- ObjectSpecification superclass();
-
-}
+
+public interface Hierarchical {
+
+ /**
+ * Returns true if the <tt>subclasses()</tt> method will return an array of one or more elements (ie, not an empty
+ * array).
+ */
+ boolean hasSubclasses();
+
+ /**
+ * Get the list of specifications for all the interfaces that the class represented by this specification
+ * implements.
+ */
+ List<ObjectSpecification> interfaces();
+
+ /**
+ * Determines if this specification represents the same specification, or a subclass, of the specified
+ * specification.
+ *
+ * <p>
+ * <tt>subSpec.isOfType(superSpec)</tt> is equivalent to {@link Class#isAssignableFrom(Class) Java's}
+ * <tt>superType.isAssignableFrom(subType)</tt>.
+ */
+ boolean isOfType(ObjectSpecification specification);
+
+ /**
+ * Get the list of specifications for the subclasses of the class represented by this specification
+ */
+ List<ObjectSpecification> subclasses();
+
+ /**
+ * Get the specification for this specification's class's superclass.
+ */
+ ObjectSpecification superclass();
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java Tue Apr 26 18:24:05 2011
@@ -17,32 +17,30 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-/**
- * Represents an instance of some element of the meta-model.
- *
- * <p>
- * Currently the only sub-interface is {@link ObjectAdapter}. However,
- * the intention is for associations, actions and action parameters to also
- * inherit from this interface.
- */
-public interface Instance {
-
- /**
- * Returns the specification that details the structure of this instance.
- */
- Specification getSpecification();
-
- /**
- * The owning {@link ObjectAdapter} of this instance.
- *
- * <p>
- * In the case of the {@link ObjectAdapter} interface, just returns <tt>null</tt>.
- */
- ObjectAdapter getOwner();
-
-}
+
+/**
+ * Represents an instance of some element of the meta-model.
+ *
+ * <p>
+ * Currently the only sub-interface is {@link ObjectAdapter}. However, the intention is for associations, actions and
+ * action parameters to also inherit from this interface.
+ */
+public interface Instance {
+
+ /**
+ * Returns the specification that details the structure of this instance.
+ */
+ Specification getSpecification();
+
+ /**
+ * The owning {@link ObjectAdapter} of this instance.
+ *
+ * <p>
+ * In the case of the {@link ObjectAdapter} interface, just returns <tt>null</tt>.
+ */
+ ObjectAdapter getOwner();
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,58 +17,54 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-
-public abstract class InstanceAbstract implements Instance {
-
- private final ObjectAdapter owner;
- private Specification specification;
-
-
- protected InstanceAbstract() {
- this(null, null);
- }
-
- protected InstanceAbstract(final ObjectAdapter owner) {
- this(owner, null);
- }
-
- protected InstanceAbstract(final ObjectAdapter owner, final Specification specification) {
- this.owner = owner;
- this.specification = specification;
- }
-
+
+public abstract class InstanceAbstract implements Instance {
+
+ private final ObjectAdapter owner;
+ private Specification specification;
+
+ protected InstanceAbstract() {
+ this(null, null);
+ }
+
+ protected InstanceAbstract(final ObjectAdapter owner) {
+ this(owner, null);
+ }
+
+ protected InstanceAbstract(final ObjectAdapter owner, final Specification specification) {
+ this.owner = owner;
+ this.specification = specification;
+ }
+
@Override
- public final ObjectAdapter getOwner() {
- return owner;
- }
-
+ public final ObjectAdapter getOwner() {
+ return owner;
+ }
+
@Override
- public Specification getSpecification() {
- if (specification == null) {
- specification = loadSpecification();
- }
- return specification;
- }
-
- /**
- * Allows the specification to be lazily loaded.
- */
- protected Specification loadSpecification() {
- return null;
- }
-
- /**
- * Allows subclasses to get specification without necessarily
- * triggering {@link #loadSpecification() loading} if not
- * yet known.
- */
- protected final Specification getSpecificationNoLoad() {
- return specification;
- }
-
-}
+ public Specification getSpecification() {
+ if (specification == null) {
+ specification = loadSpecification();
+ }
+ return specification;
+ }
+
+ /**
+ * Allows the specification to be lazily loaded.
+ */
+ protected Specification loadSpecification() {
+ return null;
+ }
+
+ /**
+ * Allows subclasses to get specification without necessarily triggering {@link #loadSpecification() loading} if not
+ * yet known.
+ */
+ protected final Specification getSpecificationNoLoad() {
+ return specification;
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
import java.util.Collections;
import java.util.List;
@@ -41,23 +40,19 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import com.google.common.collect.Lists;
-
-
-public class ObjectActionSet implements ObjectAction {
-
- private final String name;
- private final String id;
- private final List<ObjectAction> actions;
-
- public ObjectActionSet(
- final String id,
- final String name,
- final List<ObjectAction> actions) {
- this.id = id;
- this.name = name;
- this.actions = actions;
- }
-
+
+public class ObjectActionSet implements ObjectAction {
+
+ private final String name;
+ private final String id;
+ private final List<ObjectAction> actions;
+
+ public ObjectActionSet(final String id, final String name, final List<ObjectAction> actions) {
+ this.id = id;
+ this.name = name;
+ this.actions = actions;
+ }
+
@Override
public String getId() {
return id;
@@ -67,146 +62,149 @@ public class ObjectActionSet implements
public String getName() {
return name;
}
-
+
@Override
public FeatureType getFeatureType() {
return FeatureType.ACTION;
}
-
- // /////////////////////////////////////////////////////////////
- // description, actions
- // /////////////////////////////////////////////////////////////
-
- @Override
- public List<ObjectAction> getActions() {
- return actions;
- }
-
- @Override
- public String getDescription() {
- return "";
- }
-
- @Override
- public Identifier getIdentifier() {
- return null;
- }
-
- @Override
- public String getHelp() {
- return "";
- }
-
- @Override
- public ObjectSpecification getOnType() {
- return null;
- }
-
- @Override
- public ObjectSpecification getReturnType() {
- return null;
- }
-
- @Override
- public Target getTarget() {
- return Target.DEFAULT;
- }
-
- @Override
- public ActionType getType() {
- return ActionType.SET;
- }
-
- @Override
- public boolean hasReturn() {
- return false;
- }
-
- @Override
- public boolean isContributed() {
- return false;
- }
-
- /**
- * Always returns <tt>null</tt>.
- */
- @Override
- public ObjectSpecification getSpecification() {
- return null;
- }
-
- // /////////////////////////////////////////////////////////////
- // target
- // /////////////////////////////////////////////////////////////
-
- @Override
- public ObjectAdapter realTarget(final ObjectAdapter target) {
- return null;
- }
-
- // /////////////////////////////////////////////////////////////
- // execute
- // /////////////////////////////////////////////////////////////
-
- @Override
- public ObjectAdapter execute(final ObjectAdapter target, final ObjectAdapter[] parameters) {
- throw new UnexpectedCallException();
- }
-
- // /////////////////////////////////////////////////////////////
- // facets
- // /////////////////////////////////////////////////////////////
-
- /**
- * Does nothing
- */
- @Override
- public <T extends Facet> T getFacet(final Class<T> cls) {
- return null;
- }
-
- /**
- * Does nothing
- */
- @Override
- public Class<? extends Facet>[] getFacetTypes() {
- return new Class[0];
- }
-
- /**
- * Does nothing
- */
- @Override
- public List<Facet> getFacets(final Filter<Facet> filter) {
- return Lists.newArrayList();
- }
-
- /**
- * Does nothing
- */
- @Override
- public void addFacet(final Facet facet) {}
-
- /**
- * Does nothing
- */
- @Override
- public void addFacet(final MultiTypedFacet facet) {}
-
- /**
- * Does nothing
- */
- @Override
- public void removeFacet(final Facet facet) {}
-
- /**
- * Does nothing
- */
- @Override
- public boolean containsFacet(final Class<? extends Facet> facetType) {
- return false;
- }
-
+
+ // /////////////////////////////////////////////////////////////
+ // description, actions
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public List<ObjectAction> getActions() {
+ return actions;
+ }
+
+ @Override
+ public String getDescription() {
+ return "";
+ }
+
+ @Override
+ public Identifier getIdentifier() {
+ return null;
+ }
+
+ @Override
+ public String getHelp() {
+ return "";
+ }
+
+ @Override
+ public ObjectSpecification getOnType() {
+ return null;
+ }
+
+ @Override
+ public ObjectSpecification getReturnType() {
+ return null;
+ }
+
+ @Override
+ public Target getTarget() {
+ return Target.DEFAULT;
+ }
+
+ @Override
+ public ActionType getType() {
+ return ActionType.SET;
+ }
+
+ @Override
+ public boolean hasReturn() {
+ return false;
+ }
+
+ @Override
+ public boolean isContributed() {
+ return false;
+ }
+
+ /**
+ * Always returns <tt>null</tt>.
+ */
+ @Override
+ public ObjectSpecification getSpecification() {
+ return null;
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // target
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public ObjectAdapter realTarget(final ObjectAdapter target) {
+ return null;
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // execute
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public ObjectAdapter execute(final ObjectAdapter target, final ObjectAdapter[] parameters) {
+ throw new UnexpectedCallException();
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // facets
+ // /////////////////////////////////////////////////////////////
+
+ /**
+ * Does nothing
+ */
+ @Override
+ public <T extends Facet> T getFacet(final Class<T> cls) {
+ return null;
+ }
+
+ /**
+ * Does nothing
+ */
+ @Override
+ public Class<? extends Facet>[] getFacetTypes() {
+ return new Class[0];
+ }
+
+ /**
+ * Does nothing
+ */
+ @Override
+ public List<Facet> getFacets(final Filter<Facet> filter) {
+ return Lists.newArrayList();
+ }
+
+ /**
+ * Does nothing
+ */
+ @Override
+ public void addFacet(final Facet facet) {
+ }
+
+ /**
+ * Does nothing
+ */
+ @Override
+ public void addFacet(final MultiTypedFacet facet) {
+ }
+
+ /**
+ * Does nothing
+ */
+ @Override
+ public void removeFacet(final Facet facet) {
+ }
+
+ /**
+ * Does nothing
+ */
+ @Override
+ public boolean containsFacet(final Class<? extends Facet> facetType) {
+ return false;
+ }
+
/**
* Does nothing
*/
@@ -215,162 +213,155 @@ public class ObjectActionSet implements
return false;
}
- /**
- * Does nothing
- */
- @Override
- public void removeFacet(final Class<? extends Facet> facetType) {}
-
- // /////////////////////////////////////////////////////////////
- // parameters
- // /////////////////////////////////////////////////////////////
-
- @Override
- public int getParameterCount() {
- return 0;
- }
-
- @Override
- public List<ObjectActionParameter> getParameters() {
- return Collections.emptyList();
- }
-
- @Override
- public List<ObjectSpecification> getParameterTypes() {
- return Collections.emptyList();
- }
-
-
- @Override
- public List<ObjectActionParameter> getParameters(final Filter<ObjectActionParameter> filter) {
- return Collections.emptyList();
- }
-
- @Override
- public boolean promptForParameters(final ObjectAdapter target) {
- return false;
- }
-
- // /////////////////////////////////////////////////////////////
- // visibility
- // /////////////////////////////////////////////////////////////
-
- @Override
- public boolean isAlwaysHidden() {
- return false;
- }
-
- /**
- * Does nothing, but shouldn't be called.
- */
- @Override
- public VisibilityContext<?> createVisibleInteractionContext(
- final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod,
- final ObjectAdapter targetObjectAdapter) {
- return null;
- }
-
- @Override
- public Consent isVisible(final AuthenticationSession session, final ObjectAdapter target) {
- return Allow.DEFAULT;
- }
-
- // /////////////////////////////////////////////////////////////
- // usability
- // /////////////////////////////////////////////////////////////
-
- @Override
- public UsabilityContext<?> createUsableInteractionContext(
- final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod,
- final ObjectAdapter target) {
- return null;
- }
-
- @Override
- public Consent isUsable(final AuthenticationSession session, final ObjectAdapter target) {
- return Allow.DEFAULT;
- }
-
- // /////////////////////////////////////////////////////////////
- // validity
- // /////////////////////////////////////////////////////////////
-
- @Override
- public ActionInvocationContext createActionInvocationInteractionContext(
- final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod,
- final ObjectAdapter object,
- final ObjectAdapter[] candidateArguments) {
- return null;
- }
-
- @Override
- public Consent isProposedArgumentSetValid(final ObjectAdapter object, final ObjectAdapter[] parameters) {
- throw new UnexpectedCallException();
- }
-
- // /////////////////////////////////////////////////////////////
- // defaults
- // /////////////////////////////////////////////////////////////
-
- @Override
- public ObjectAdapter[] getDefaults(final ObjectAdapter target) {
- throw new UnexpectedCallException();
- }
-
- // /////////////////////////////////////////////////////////////
- // options
- // /////////////////////////////////////////////////////////////
-
- @Override
- public ObjectAdapter[][] getChoices(final ObjectAdapter target) {
- throw new UnexpectedCallException();
- }
-
-
- // /////////////////////////////////////////////////////////////
- // isAction, isAssociation
- // /////////////////////////////////////////////////////////////
-
- @Override
- public boolean isAction() {
- return true;
- }
-
- @Override
- public boolean isPropertyOrCollection() {
- return false;
- }
- @Override
- public boolean isOneToManyAssociation() {
- return false;
- }
- @Override
- public boolean isOneToOneAssociation() {
- return false;
- }
-
-
- // /////////////////////////////////////////////////////////////
- // debug
- // /////////////////////////////////////////////////////////////
-
- @Override
- public String debugData() {
- return "";
- }
-
-
- // /////////////////////////////////////////////////////////////
- // getInstance
- // /////////////////////////////////////////////////////////////
-
- @Override
- public Instance getInstance(ObjectAdapter adapter) {
- ObjectAction specification = this;
- return adapter.getInstance(specification);
- }
+ /**
+ * Does nothing
+ */
+ @Override
+ public void removeFacet(final Class<? extends Facet> facetType) {
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // parameters
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public int getParameterCount() {
+ return 0;
+ }
+
+ @Override
+ public List<ObjectActionParameter> getParameters() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List<ObjectSpecification> getParameterTypes() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List<ObjectActionParameter> getParameters(final Filter<ObjectActionParameter> filter) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public boolean promptForParameters(final ObjectAdapter target) {
+ return false;
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // visibility
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public boolean isAlwaysHidden() {
+ return false;
+ }
+
+ /**
+ * Does nothing, but shouldn't be called.
+ */
+ @Override
+ public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session,
+ final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
+ return null;
+ }
+
+ @Override
+ public Consent isVisible(final AuthenticationSession session, final ObjectAdapter target) {
+ return Allow.DEFAULT;
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // usability
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session,
+ final InteractionInvocationMethod invocationMethod, final ObjectAdapter target) {
+ return null;
+ }
+
+ @Override
+ public Consent isUsable(final AuthenticationSession session, final ObjectAdapter target) {
+ return Allow.DEFAULT;
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // validity
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public ActionInvocationContext createActionInvocationInteractionContext(final AuthenticationSession session,
+ final InteractionInvocationMethod invocationMethod, final ObjectAdapter object,
+ final ObjectAdapter[] candidateArguments) {
+ return null;
+ }
+
+ @Override
+ public Consent isProposedArgumentSetValid(final ObjectAdapter object, final ObjectAdapter[] parameters) {
+ throw new UnexpectedCallException();
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // defaults
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public ObjectAdapter[] getDefaults(final ObjectAdapter target) {
+ throw new UnexpectedCallException();
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // options
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public ObjectAdapter[][] getChoices(final ObjectAdapter target) {
+ throw new UnexpectedCallException();
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // isAction, isAssociation
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public boolean isAction() {
+ return true;
+ }
+
+ @Override
+ public boolean isPropertyOrCollection() {
+ return false;
+ }
+
+ @Override
+ public boolean isOneToManyAssociation() {
+ return false;
+ }
+
+ @Override
+ public boolean isOneToOneAssociation() {
+ return false;
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // debug
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public String debugData() {
+ return "";
+ }
+
+ // /////////////////////////////////////////////////////////////
+ // getInstance
+ // /////////////////////////////////////////////////////////////
+
+ @Override
+ public Instance getInstance(final ObjectAdapter adapter) {
+ final ObjectAction specification = this;
+ return adapter.getInstance(specification);
+ }
-}
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java Tue Apr 26 18:24:05 2011
@@ -19,8 +19,9 @@ package org.apache.isis.core.metamodel.s
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public final class ObjectAdapterUtils {
-
- private ObjectAdapterUtils (){}
+
+ private ObjectAdapterUtils() {
+ }
public static Object unwrapObject(final ObjectAdapter adapter) {
if (adapter == null) {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiationException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiationException.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiationException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiationException.java Tue Apr 26 18:24:05 2011
@@ -17,26 +17,25 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
-public class ObjectInstantiationException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public ObjectInstantiationException() {
- }
-
- public ObjectInstantiationException(String message) {
- super(message);
- }
-
- public ObjectInstantiationException(Throwable cause) {
- super(cause);
- }
-
- public ObjectInstantiationException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
+public class ObjectInstantiationException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
+ public ObjectInstantiationException() {
+ }
+
+ public ObjectInstantiationException(final String message) {
+ super(message);
+ }
+
+ public ObjectInstantiationException(final Throwable cause) {
+ super(cause);
+ }
+
+ public ObjectInstantiationException(final String message, final Throwable cause) {
+ super(message, cause);
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java Tue Apr 26 18:24:05 2011
@@ -29,5 +29,4 @@ public interface ObjectInstantiator exte
*/
Object instantiate(Class<?> cls) throws ObjectInstantiationException;
-
}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiatorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiatorAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiatorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiatorAbstract.java Tue Apr 26 18:24:05 2011
@@ -16,13 +16,12 @@
*/
package org.apache.isis.core.metamodel.spec;
-
public abstract class ObjectInstantiatorAbstract implements ObjectInstantiator {
@Override
- public void injectInto(Object candidate) {
+ public void injectInto(final Object candidate) {
if (ObjectInstantiatorAware.class.isAssignableFrom(candidate.getClass())) {
- ObjectInstantiatorAware cast = ObjectInstantiatorAware.class.cast(candidate);
+ final ObjectInstantiatorAware cast = ObjectInstantiatorAware.class.cast(candidate);
cast.setObjectInstantiator(this);
}
}
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiatorAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiatorAware.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiatorAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiatorAware.java Tue Apr 26 18:24:05 2011
@@ -17,11 +17,10 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.spec;
-package org.apache.isis.core.metamodel.spec;
-
-public interface ObjectInstantiatorAware {
-
- public void setObjectInstantiator(final ObjectInstantiator objectInstantiator);
-
-}
+public interface ObjectInstantiatorAware {
+
+ public void setObjectInstantiator(final ObjectInstantiator objectInstantiator);
+
+}