incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1051971 [18/18] - in /incubator/isis/trunk: alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/java...
Date Wed, 22 Dec 2010 16:22:32 GMT
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java
(original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java
Wed Dec 22 16:22:08 2010
@@ -27,8 +27,8 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java
(original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java
Wed Dec 22 16:22:08 2010
@@ -74,7 +74,7 @@ public class PersistentObjectMapping imp
 
     @Override
     public String toString() {
-        return (specification == null ? "null" : specification.getSingularName()) + " : "
+ oid + " : " + version;
+        return (specification == null ? "null" : specification.getName()) + " : " + oid +
" : " + version;
     }
 
     public Version getVersion() {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java
(original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java
Wed Dec 22 16:22:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.html.task
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.viewer.html.component.Page;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
(original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
Wed Dec 22 16:22:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.viewer.html.task
 
 import java.util.List;
 
+import org.apache.isis.core.metamodel.adapter.AdapterUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.consent.Consent;
@@ -34,7 +35,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.util.IsisUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.viewer.html.component.Page;
@@ -96,7 +96,7 @@ public class EditTask extends Task {
         }
 
         final boolean isNew = object.getResolveState() == ResolveState.TRANSIENT;
-        newType = isNew ? getTarget(context).getSpecification().getSingularName() : null;
+        newType = isNew ? getTarget(context).getSpecification().getName() : null;
     }
 
     @Override
@@ -172,14 +172,14 @@ public class EditTask extends Task {
             
             if (fld.isOneToOneAssociation()) {
                 final OneToOneAssociation oneToOneAssociation = ((OneToOneAssociation) fld);
-                final Object entryPojo = IsisUtils.unwrap(entryAdapter);
+                final Object entryPojo = AdapterUtils.unwrap(entryAdapter);
                 if (entryPojo == null) {
                     if (oneToOneAssociation.get(targetAdapter) != null) {
                         oneToOneAssociation.clearAssociation(targetAdapter);
                     }
                 } else {
                     final ObjectAdapter currentAdapter = oneToOneAssociation.get(targetAdapter);
-                    final Object currentPojo = IsisUtils.unwrap(currentAdapter);
+                    final Object currentPojo = AdapterUtils.unwrap(currentAdapter);
                     if (currentAdapter == null || currentPojo == null || !currentPojo.equals(entryPojo))
{
                         oneToOneAssociation.setAssociation(targetAdapter, entryAdapter);
                     }

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
(original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
Wed Dec 22 16:22:08 2010
@@ -25,9 +25,9 @@ import java.util.List;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.spec.Persistability;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
 import org.apache.isis.viewer.html.action.Action;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java
(original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java
Wed Dec 22 16:22:08 2010
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.restful.v
 import nu.xom.Element;
 
 import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils;
+import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
(original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
Wed Dec 22 16:22:08 2010
@@ -31,8 +31,8 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.FacetFilters;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java
(original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java
Wed Dec 22 16:22:08 2010
@@ -17,6 +17,7 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -26,7 +27,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.restful.applib.resources.ObjectResource;
 import org.apache.isis.viewer.restful.viewer.Constants;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java
(original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java
Wed Dec 22 16:22:08 2010
@@ -14,12 +14,12 @@ import nu.xom.Element;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.restful.applib.resources.SpecsResource;
 import org.apache.isis.viewer.restful.viewer.html.HtmlClass;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java
(original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java
Wed Dec 22 16:22:08 2010
@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.google.inject.internal.Lists;
 
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectActionSet;
+import org.apache.isis.core.metamodel.spec.ObjectActionSet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java
Wed Dec 22 16:22:08 2010
@@ -120,7 +120,7 @@ public class DebugAction implements Acti
         view.appendRow("ID", spec.getIdentifier());
         view.appendRow("Full name", spec.getFullName());
         view.appendRow("Short name", spec.getShortName());
-        view.appendRow("Singular name", spec.getSingularName());
+        view.appendRow("Singular name", spec.getName());
         view.appendRow("Plural name", spec.getPluralName());
         view.appendRow("Description", spec.getDescription());
 
@@ -263,7 +263,7 @@ public class DebugAction implements Acti
         view.divider("Specifications");
         for (int j = 0; j < names.length; j++) {
             ObjectSpecification spec = IsisContext.getSpecificationLoader().loadSpecification(names[j]);
-            String name = spec.getSingularName();
+            String name = spec.getName();
             view.appendRow(name, specificationLink(spec));
         }
     }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java
Wed Dec 22 16:22:08 2010
@@ -65,7 +65,7 @@ public class EditAction implements Actio
             Version formVersion = context.getVersion(version);
             if (formVersion != null && adapterVersion.different(formVersion)) {
                 
-                IsisContext.getMessageBroker().addMessage("The " + adapter.getSpecification().getSingularName()
+ " was edited " +
+                IsisContext.getMessageBroker().addMessage("The " + adapter.getSpecification().getName()
+ " was edited " +
                 		"by another user (" + adapterVersion.getUser() +  "). Please  make your
changes based on their changes.");
 
                 String view = context.getParameter(ERRORS);

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java
Wed Dec 22 16:22:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.viewer.scimpi.di
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectActionSet;
+import org.apache.isis.core.metamodel.spec.ObjectActionSet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.runtime.context.IsisContext;

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java
Wed Dec 22 16:22:08 2010
@@ -60,11 +60,11 @@ public class Members extends AbstractEle
         
         ObjectSpecification specification = field == null ? object.getSpecification() : field.getSpecification();
         
-        request.appendHtml(specification.getSingularName() + " (" + specification.getFullName()
+ ") \n");
+        request.appendHtml(specification.getName() + " (" + specification.getFullName() +
") \n");
         List<ObjectAssociation> fields = specification.getAssociations();
         for (ObjectAssociation fld : fields) {
             if (!fld.isAlwaysHidden()) {
-                request.appendHtml("   " + fld.getId() + " - '" + fld.getName() + "' ->
"+  fld.getSpecification().getSingularName() + (fld.isOneToManyAssociation() ? " (collection
of)" : "") + "\n" );
+                request.appendHtml("   " + fld.getId() + " - '" + fld.getName() + "' ->
"+  fld.getSpecification().getName() + (fld.isOneToManyAssociation() ? " (collection of)"
: "") + "\n" );
             }
         }
         request.appendHtml("   --------------\n");
@@ -76,12 +76,12 @@ public class Members extends AbstractEle
                 if (!first) {
                     request.appendHtml(", ");
                 }
-                request.appendHtml(parameter.getSpecification().getSingularName());
+                request.appendHtml(parameter.getSpecification().getName());
                 first = false;
             }
             request.appendHtml(")"  + " - '" + action.getName() + "'");
             if (action.getSpecification() != null) {
-                request.appendHtml(" -> " + action.getSpecification().getSingularName()
+ ")" );
+                request.appendHtml(" -> " + action.getSpecification().getName() + ")"
);
             }
             request.appendHtml("\n" );
         }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java
Wed Dec 22 16:22:08 2010
@@ -41,10 +41,10 @@ public class Specification extends Abstr
             String id = request.getOptionalProperty("object");
             ObjectAdapter object = request.getContext().getMappedObjectOrResult(id);
             ObjectSpecification specification = object.getSpecification();
-            request.appendHtml(specification.getSingularName() + " (" + specification.getFullName()
+ ") \n");
+            request.appendHtml(specification.getName() + " (" + specification.getFullName()
+ ") \n");
             List<ObjectAssociation> fields = specification.getAssociations();
             for (int i = 0; i < fields.size(); i++) {
-                request.appendHtml("    " + fields.get(i).getName() + " (" + fields.get(i).getSpecification().getSingularName()
+ ") \n" );
+                request.appendHtml("    " + fields.get(i).getName() + " (" + fields.get(i).getSpecification().getName()
+ ") \n" );
                 
             }
             

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
Wed Dec 22 16:22:08 2010
@@ -49,7 +49,7 @@ public class ElementType extends Abstrac
         }
         
         TypeOfFacet facet =  (TypeOfFacet) collection.getTypeOfFacet();
-        String name = facet.valueSpec().getSingularName();
+        String name = facet.valueSpec().getName();
         
         request.appendHtml(name);
     }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java
Wed Dec 22 16:22:08 2010
@@ -45,7 +45,7 @@ public class Type extends AbstractElemen
         request.appendDebug(" for " + object); 
         
         ObjectSpecification specification = object.getSpecification();
-        String name = showPlural != null ? specification.getPluralName() : specification.getSingularName();
+        String name = showPlural != null ? specification.getPluralName() : specification.getName();
         
         request.appendHtml(name);
     }

Modified: incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java
(original)
+++ incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java
Wed Dec 22 16:22:08 2010
@@ -23,18 +23,18 @@ package org.apache.isis.viewer.wicket.me
 
 import java.lang.reflect.Method;
 
+import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.FacetUtil;
 import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.java5.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.viewer.wicket.applib.WizardPageDescription;
 
 
 public class WizardPageDescriptionAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract
{
 
     public WizardPageDescriptionAnnotationFacetFactory() {
-        super(ObjectFeatureType.PROPERTIES_ONLY);
+        super(FeatureType.PROPERTIES_ONLY);
     }
 
     @Override

Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/nof/SpecificationLoaderAccessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/nof/SpecificationLoaderAccessor.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/nof/SpecificationLoaderAccessor.java
(original)
+++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/nof/SpecificationLoaderAccessor.java
Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.viewer.wicket.model.nof;
 
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 
 public interface SpecificationLoaderAccessor {
 

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
(original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.viewer.wicket.ui;
 
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.wicket.model.nof.SpecificationLoaderAccessor;
 import org.apache.wicket.Component;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsFactory.java
(original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsFactory.java
Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.viewer.wicket.ui.components.collectioncontents.icons;
 
+import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.progmodel.facets.object.ident.icon.IconFacet;
 import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java
(original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java
Wed Dec 22 16:22:08 2010
@@ -29,10 +29,10 @@ import org.apache.wicket.markup.html.ima
 import com.google.inject.Inject;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.core.progmodel.facets.object.ident.icon.IconFacet;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.model.models.ActionModel;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
(original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
Wed Dec 22 16:22:08 2010
@@ -147,7 +147,7 @@ public class CssMenuBuilder  {
 
 	/**
 	 * It's a bit hokey to have to do this, but the
-	 * {@link ObjectSpecification#getServiceActionsFor(ObjectActionType...)
+	 * {@link ObjectSpecification#getServiceActionsReturning(ObjectActionType...)
 	 * method we call} on {@link ObjectSpecification}, while nicely
 	 * traversing the services for us, unfortunately does not pass us back the
 	 * service adapters also.

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
(original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
Wed Dec 22 16:22:08 2010
@@ -39,10 +39,10 @@ import org.apache.wicket.model.Model;
 import com.google.common.collect.Lists;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.core.progmodel.facets.object.ident.icon.IconFacet;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -405,7 +405,7 @@ public class EntityLink extends FormComp
     private static void addServiceActionsFor(ObjectSpecification noSpec,
             ObjectActionType actionType, List<ObjectAction> actionList) {
         final List<ObjectAction> serviceActionsFor = noSpec
-                .getServiceActionsFor(actionType);
+                .getServiceActionsReturning(actionType);
         actionList.addAll(serviceActionsFor);
     }
 

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
(original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
Wed Dec 22 16:22:08 2010
@@ -26,7 +26,7 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.viewer.wicket.model.models.ApplicationActionsModel;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java
(original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java
Wed Dec 22 16:22:08 2010
@@ -47,7 +47,7 @@ import org.apache.isis.applib.Identifier
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectActionSet;
+import org.apache.isis.core.metamodel.spec.ObjectActionSet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;



Mime
View raw message