isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1053871 [20/22] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode...
Date Thu, 30 Dec 2010 12:30:25 GMT
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java Thu Dec 30 12:29:53 2010
@@ -23,15 +23,16 @@ package org.apache.isis.viewer.dnd.view.
 import java.util.Enumeration;
 
 import org.apache.log4j.Logger;
+
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.ConsentAbstract;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.ConsentAbstract;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.runtime.userprofile.Options;
 import org.apache.isis.viewer.dnd.drawing.Bounds;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
@@ -104,6 +105,7 @@ public abstract class AbstractView imple
         viewRoot = this;
     }
 
+    @Override
     public void addView(final View view) {
         throw new IsisException("Can't add views to " + this);
     }
@@ -112,14 +114,17 @@ public abstract class AbstractView imple
         id = nextId++;
     }
 
+    @Override
     public Consent canChangeValue() {
         return Veto.DEFAULT;
     }
 
+    @Override
     public boolean canFocus() {
         return true;
     }
 
+    @Override
     public boolean contains(final View view) {
         final View[] subviews = getSubviews();
         for (int i = 0; i < subviews.length; i++) {
@@ -130,6 +135,7 @@ public abstract class AbstractView imple
         return false;
     }
 
+    @Override
     public boolean containsFocus() {
         if (hasFocus()) {
             return true;
@@ -144,6 +150,7 @@ public abstract class AbstractView imple
         return false;
     }
 
+    @Override
     public void contentMenuOptions(final UserActionSet options) {
         options.setColor(Toolkit.getColor(ColorsAndFonts.COLOR_MENU_CONTENT));
 
@@ -156,6 +163,7 @@ public abstract class AbstractView imple
     /**
      * Returns debug details about this view.
      */
+    @Override
     public void debug(final DebugString debug) {
         final String name = getClass().getName();
         debug.appendln("Root: " + name.substring(name.lastIndexOf('.') + 1) + getId());
@@ -219,6 +227,7 @@ public abstract class AbstractView imple
     
     protected void appendDebug(final DebugString debug) {}
 
+    @Override
     public void debugStructure(final DebugString b) {
         b.appendln("Content", getContent() == null ? "none" : getContent());
         b.appendln("Required size ", getRequiredSize(Size.createMax()));
@@ -238,6 +247,7 @@ public abstract class AbstractView imple
         b.unindent();
     }
 
+    @Override
     public void dispose() {
         View parent = getParent();
         if (parent != null) {
@@ -245,18 +255,23 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void drag(final InternalDrag drag) {}
 
+    @Override
     public void drag(final ContentDrag contentDrag) {}
 
+    @Override
     public void drag(ViewDrag drag) {
         getViewManager().getSpy().addTrace(this, "view drag", drag);
     }
     
+    @Override
     public void dragCancel(final InternalDrag drag) {
         getFeedbackManager().showDefaultCursor();
     }
 
+    @Override
     public View dragFrom(final Location location) {
         final View subview = subviewFor(location);
         if (subview != null) {
@@ -267,10 +282,13 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void dragIn(final ContentDrag drag) {}
 
+    @Override
     public void dragOut(final ContentDrag drag) {}
 
+    @Override
     public DragEvent dragStart(final DragStart drag) {
         final View subview = subviewFor(drag.getLocation());
         if (subview != null) {
@@ -281,6 +299,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void dragTo(final InternalDrag drag) {}
 
     /**
@@ -291,6 +310,7 @@ public abstract class AbstractView imple
         canvas.drawSolidRectangle(0, 0, bounds.getWidth(), bounds.getHeight(), color);
     }
 
+    @Override
     public void draw(final Canvas canvas) {
         if (Toolkit.debug) {
             canvas.drawDebugOutline(new Bounds(getSize()), getBaseline(), Toolkit
@@ -298,17 +318,21 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void drop(final ContentDrag drag) {}
 
     /**
      * No default behaviour, views can only be dropped on workspace
      */
+    @Override
     public void drop(final ViewDrag drag) {
         getParent().drop(drag);
     }
 
+    @Override
     public void editComplete(boolean moveFocus, boolean toNextField) {}
 
+    @Override
     public void entered() {
         final Content cont = getContent();
         if (cont != null) {
@@ -319,8 +343,10 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void exited() {}
 
+    @Override
     public void firstClick(final Click click) {
         final View subview = subviewFor(click.getLocation());
         if (subview != null) {
@@ -329,10 +355,13 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void focusLost() {}
 
+    @Override
     public void focusReceived() {}
 
+    @Override
     public Location getAbsoluteLocation() {
         View parent = getParent();
         if (parent == null) {
@@ -349,34 +378,42 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public int getBaseline() {
         return 0;
     }
 
+    @Override
     public Bounds getBounds() {
         return new Bounds(x, y, width, height);
     }
 
+    @Override
     public Content getContent() {
         return content;
     }
 
+    @Override
     public FocusManager getFocusManager() {
         return getParent() == null ? null : getParent().getFocusManager();
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public Location getLocation() {
         return new Location(x, y);
     }
 
+    @Override
     public Padding getPadding() {
         return new Padding(0, 0, 0, 0);
     }
 
+    @Override
     public final View getParent() {
         // Assert.assertEquals(parent == null ? null : parent.getView(), parent);
         // return parent;
@@ -384,14 +421,17 @@ public abstract class AbstractView imple
         return parent == null ? null : parent.getView();
     }
 
+    @Override
     public Size getRequiredSize(final Size maximumSize) {
         return new Size(maximumSize);
     }
 
+    @Override
     public Size getSize() {
         return new Size(width, height);
     }
 
+    @Override
     public ViewSpecification getSpecification() {
         if (specification == null) {
             specification = new NonBuildingSpecification(this);
@@ -399,38 +439,47 @@ public abstract class AbstractView imple
         return specification;
     }
 
+    @Override
     public ViewState getState() {
         return state;
     }
 
+    @Override
     public View[] getSubviews() {
         return new View[0];
     }
 
+    @Override
     public final View getView() {
         return viewRoot;
     }
     
+    @Override
     public Axes getViewAxes() {
         return new Axes();
     }
     
+    @Override
     public Viewer getViewManager() {
         return Toolkit.getViewer();
     }
 
+    @Override
     public Feedback getFeedbackManager() {
         return Toolkit.getFeedbackManager();
     }
 
+    @Override
     public Workspace getWorkspace() {
         return getParent() == null ? null : getParent().getWorkspace();
     }
 
+    @Override
     public boolean hasFocus() {
         return getViewManager().hasFocus(getView());
     }
 
+    @Override
     public View identify(final Location location) {
         final View subview = subviewFor(location);
         if (subview == null) {
@@ -443,8 +492,10 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void invalidateContent() {}
 
+    @Override
     public void invalidateLayout() {
         View parent = getParent();
         if (parent != null) {
@@ -452,12 +503,16 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void keyPressed(final KeyboardAction key) {}
 
+    @Override
     public void keyReleased(KeyboardAction action) {}
 
+    @Override
     public void keyTyped(KeyboardAction action) {}
 
+    @Override
     public void layout() {}
 
     /**
@@ -471,6 +526,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void limitBoundsWithin(final Size size) {
         final int w = getView().getSize().getWidth();
         final int h = getView().getSize().getHeight();
@@ -495,10 +551,12 @@ public abstract class AbstractView imple
         getView().setLocation(new Location(x, y));
     }
 
+    @Override
     public void markDamaged() {
         markDamaged(getView().getBounds());
     }
 
+    @Override
     public void markDamaged(final Bounds bounds) {
         View parent = getParent();
         if (parent == null) {
@@ -512,6 +570,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void mouseDown(final Click click) {
         final View subview = subviewFor(click.getLocation());
         if (subview != null) {
@@ -520,6 +579,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void mouseMoved(final Location location) {
         final View subview = subviewFor(location);
         if (subview != null) {
@@ -528,6 +588,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void mouseUp(final Click click) {
         final View subview = subviewFor(click.getLocation());
         if (subview != null) {
@@ -536,6 +597,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void objectActionResult(final ObjectAdapter result, final Placement placement) {
         if (result != null) {
             final CollectionFacet facet = result.getSpecification().getFacet(CollectionFacet.class);
@@ -549,6 +611,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public View pickupContent(final Location location) {
         final View subview = subviewFor(location);
         if (subview != null) {
@@ -559,6 +622,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public View pickupView(final Location location) {
         final View subview = subviewFor(location);
         if (subview != null) {
@@ -574,20 +638,25 @@ public abstract class AbstractView imple
      * 
      * @see #draw(Canvas)
      */
+    @Override
     public void print(final Canvas canvas) {
         draw(canvas);
     }
 
+    @Override
     public void refresh() {}
 
+    @Override
     public void removeView(final View view) {
         throw new IsisException();
     }
 
+    @Override
     public void replaceView(final View toReplace, final View replacement) {
         throw new IsisException();
     }
 
+    @Override
     public void secondClick(final Click click) {
         final View subview = subviewFor(click.getLocation());
         if (subview != null) {
@@ -599,11 +668,13 @@ public abstract class AbstractView imple
     /**
      * Sets the location and size view the {@link #setLocation(Location)) and {@link #setSize(Size)) methods.
      */
+    @Override
     public void setBounds(final Bounds bounds) {
         setLocation(bounds.getLocation());
         setSize(bounds.getSize());
     }
 
+    @Override
     public void setFocusManager(final FocusManager focusManager) {
     }
 
@@ -611,11 +682,13 @@ public abstract class AbstractView imple
         this.content = content;
     }
 
+    @Override
     public void setLocation(final Location location) {
         x = location.getX();
         y = location.getY();
     }
 
+    @Override
     public final void setParent(final View parentView) {
         LOG.debug("set parent " + parentView + " for " + this);
         parent = parentView.getView();
@@ -623,6 +696,7 @@ public abstract class AbstractView imple
 
     public void setMaximumSize(final Size size) {}
 
+    @Override
     public void setSize(final Size size) {
         width = size.getWidth();
         height = size.getHeight();
@@ -632,6 +706,7 @@ public abstract class AbstractView imple
         this.specification = specification;
     }
 
+    @Override
     public final void setView(final View view) {
         this.viewRoot = view;
     }
@@ -641,10 +716,12 @@ public abstract class AbstractView imple
        // this.viewAxis = viewAxis;
     }
 
+    @Override
     public View subviewFor(final Location location) {
         return null;
     }
 
+    @Override
     public void thirdClick(final Click click) {
         final View subview = subviewFor(click.getLocation());
         if (subview != null) {
@@ -659,10 +736,13 @@ public abstract class AbstractView imple
         return name.substring(name.lastIndexOf('.') + 1) + getId() + ":" + getState() + ":" + getContent();
     }
 
+    @Override
     public void update(final ObjectAdapter object) {}
 
+    @Override
     public void updateView() {}
 
+    @Override
     public ViewAreaType viewAreaType(final Location location) {
         final View subview = subviewFor(location);
         if (subview != null) {
@@ -673,6 +753,7 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void viewMenuOptions(final UserActionSet options) {
         options.setColor(Toolkit.getColor(ColorsAndFonts.COLOR_MENU_VIEW));
 
@@ -696,6 +777,7 @@ public abstract class AbstractView imple
                     };
                 }
 
+                @Override
                 public void execute(final Workspace workspace, final View view, final Location at) {
                     undoStack.undoLastCommand();
                 }
@@ -704,19 +786,22 @@ public abstract class AbstractView imple
     }
 
     private void addViewDebugMenuItems(final UserActionSet options) {
-        options.add(new UserActionAbstract("Refresh view", ObjectActionType.DEBUG) {
+        options.add(new UserActionAbstract("Refresh view", ActionType.DEBUG) {
+            @Override
             public void execute(final Workspace workspace, final View view, final Location at) {
                 refresh();
             }
         });
 
-        options.add(new UserActionAbstract("Invalidate content", ObjectActionType.DEBUG) {
+        options.add(new UserActionAbstract("Invalidate content", ActionType.DEBUG) {
+            @Override
             public void execute(final Workspace workspace, final View view, final Location at) {
                 invalidateContent();
             }
         });
 
-        options.add(new UserActionAbstract("Invalidate layout", ObjectActionType.DEBUG) {
+        options.add(new UserActionAbstract("Invalidate layout", ActionType.DEBUG) {
+            @Override
             public void execute(final Workspace workspace, final View view, final Location at) {
                 invalidateLayout();
             }
@@ -725,7 +810,8 @@ public abstract class AbstractView imple
 
     private void addNewViewMenuItems(final UserActionSet options, final Content content) {
         if (getContent() instanceof ObjectContent) {
-            options.add(new UserActionAbstract("Use as default view for objects", ObjectActionType.USER) {
+            options.add(new UserActionAbstract("Use as default view for objects", ActionType.USER) {
+                @Override
                 public void execute(final Workspace workspace, final View view, final Location at) {
                     Properties.setStringOption("view.object-default", getSpecification().getName());
                     /*
@@ -736,7 +822,8 @@ public abstract class AbstractView imple
             });
         }
         if (getContent() instanceof CollectionContent) {
-            options.add(new UserActionAbstract("Use as default view for collection", ObjectActionType.USER) {
+            options.add(new UserActionAbstract("Use as default view for collection", ActionType.USER) {
+                @Override
                 public void execute(final Workspace workspace, final View view, final Location at) {
                     Properties.setStringOption("view.collection-default", getSpecification().getName());
                     /*
@@ -747,7 +834,8 @@ public abstract class AbstractView imple
             });
         }
         if (getContent() instanceof ObjectContent && !getSpecification().isOpen()) {
-            options.add(new UserActionAbstract("Use as default view for icon", ObjectActionType.USER) {
+            options.add(new UserActionAbstract("Use as default view for icon", ActionType.USER) {
+                @Override
                 public void execute(final Workspace workspace, final View view, final Location at) {
                     Properties.setStringOption("view.icon-default", getSpecification().getName());
                     /*
@@ -759,7 +847,8 @@ public abstract class AbstractView imple
         }
 
         if (getContent() instanceof RootObject || getContent() instanceof RootCollection) {
-            options.add(new UserActionAbstract("Use as default view for " + getContent().getSpecification().getName(), ObjectActionType.USER) {
+            options.add(new UserActionAbstract("Use as default view for " + getContent().getSpecification().getSingularName(), ActionType.USER) {
+                @Override
                 public void execute(final Workspace workspace, final View view, final Location at) {
                     Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
                     getView().saveOptions(viewOptions);
@@ -786,7 +875,8 @@ public abstract class AbstractView imple
             }
         });
         */
-        options.add(new UserActionAbstract("Save specification", ObjectActionType.USER) {
+        options.add(new UserActionAbstract("Save specification", ActionType.USER) {
+            @Override
             public void execute(final Workspace workspace, final View view, final Location at) {
                 Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
                 getView().saveOptions(viewOptions);
@@ -819,7 +909,8 @@ public abstract class AbstractView imple
             UserActionSet submenu = options.addNewActionSet("Create view from");
             while (possibleViews.hasMoreElements()) {
                 final ViewSpecification specification = (ViewSpecification) possibleViews.nextElement();
-                final UserActionAbstract viewAs = new UserActionAbstract(specification.getName(), ObjectActionType.USER) {
+                final UserActionAbstract viewAs = new UserActionAbstract(specification.getName(), ActionType.USER) {
+                    @Override
                     public void execute(final Workspace workspace, final View view, final Location at) {
                         ViewSpecification newSpec;
                         try {
@@ -859,8 +950,10 @@ public abstract class AbstractView imple
         }
     }
 
+    @Override
     public void loadOptions(Options viewOptions) {}
 
+    @Override
     public void saveOptions(Options viewOptions) {
 //        viewOptions.addOption("spec", getSpecification().getClass().getName());
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java Thu Dec 30 12:29:53 2010
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.dnd.view.
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.runtime.userprofile.Options;
 import org.apache.isis.viewer.dnd.drawing.Bounds;
 import org.apache.isis.viewer.dnd.drawing.Canvas;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java Thu Dec 30 12:29:53 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.viewer.dnd.view.base;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.viewer.dnd.drawing.Location;
@@ -136,7 +136,7 @@ public abstract class ObjectView extends
     public void contentMenuOptions(final UserActionSet options) {
         super.contentMenuOptions(options);
 
-        options.add(new UserActionAbstract("Reload", ObjectActionType.DEBUG) {
+        options.add(new UserActionAbstract("Reload", ActionType.DEBUG) {
             @Override
             public void execute(final Workspace workspace, final View view, final Location at) {
                 final ObjectAdapter object = getContent().getAdapter();

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java Thu Dec 30 12:29:53 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.viewer.dnd.view.border;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.viewer.dnd.drawing.Color;
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.viewer.dnd.drawing.Location;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java Thu Dec 30 12:29:53 2010
@@ -22,9 +22,9 @@ package org.apache.isis.viewer.dnd.view.
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.viewer.dnd.view.border;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.dnd.drawing.Bounds;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
 import org.apache.isis.viewer.dnd.drawing.Color;
@@ -753,7 +753,7 @@ public class ScrollBorder extends Abstra
     @Override
     public void viewMenuOptions(final UserActionSet menuOptions) {
         super.viewMenuOptions(menuOptions);
-        menuOptions.add(new UserActionAbstract("Reset scroll border", ObjectActionType.DEBUG) {
+        menuOptions.add(new UserActionAbstract("Reset scroll border", ActionType.DEBUG) {
             @Override
             public void execute(final Workspace workspace, final View view, final Location at) {
                 reset();

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java Thu Dec 30 12:29:53 2010
@@ -27,13 +27,12 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.ConsentAbstract;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.ConsentAbstract;
 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.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.drawing.ImageFactory;
@@ -103,8 +102,7 @@ public abstract class AbstractCollection
     @Override
     public ObjectSpecification getElementSpecification() {
         final ObjectAdapter collection = getCollection();
-        final TypeOfFacet facet = collection.getTypeOfFacet();
-        return facet.valueSpec();
+        return collection.getElementSpecification();
     }
 
     @Override
@@ -129,7 +127,7 @@ public abstract class AbstractCollection
          * 
          * if (option != null) { options.add(option); } }
          */
-        options.add(new UserActionAbstract("Clear resolved", ObjectActionType.DEBUG) {
+        options.add(new UserActionAbstract("Clear resolved", ActionType.DEBUG) {
             @Override
             public Consent disabled(final View component) {
                 return ConsentAbstract.allowIf(collection == null || collection.getResolveState() != ResolveState.TRANSIENT

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java Thu Dec 30 12:29:53 2010
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.dnd.view.
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.dnd.view.content.AbstractObjectContent;
 
@@ -41,6 +41,7 @@ public class CollectionElement extends A
         return true;
     }
 
+    @Override
     public boolean isOptionEnabled() {
         return false;
     }
@@ -60,19 +61,23 @@ public class CollectionElement extends A
         throw new IsisException("Invalid call");
     }
 
+    @Override
     public void debugDetails(final DebugString debug) {
         debug.appendln("element", adapter);
     }
 
+    @Override
     public String getId() {
         return "";
     }
 
+    @Override
     public String getDescription() {
-        return getSpecification().getName() + ": " + getObject().titleString() + " "
+        return getSpecification().getSingularName() + ": " + getObject().titleString() + " "
                 + getSpecification().getDescription();
     }
 
+    @Override
     public String getHelp() {
         return "";
     }
@@ -82,14 +87,17 @@ public class CollectionElement extends A
         return adapter;
     }
 
+    @Override
     public ObjectAdapter getAdapter() {
         return adapter;
     }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return adapter.getSpecification();
     }
 
+    @Override
     public boolean isTransient() {
         return adapter.isTransient();
     }
@@ -99,13 +107,14 @@ public class CollectionElement extends A
         throw new IsisException("Invalid call");
     }
 
+    @Override
     public String title() {
         return adapter.titleString();
     }
 
     @Override
     public String windowTitle() {
-        return getSpecification().getShortName();
+        return getSpecification().getShortIdentifier();
     }
 
     @Override
@@ -113,6 +122,7 @@ public class CollectionElement extends A
         return "" + adapter;
     }
 
+    @Override
     public ObjectAdapter[] getOptions() {
         return null;
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java Thu Dec 30 12:29:53 2010
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.dnd.view.
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.drawing.ImageFactory;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TypeComparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TypeComparator.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TypeComparator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TypeComparator.java Thu Dec 30 12:29:53 2010
@@ -27,11 +27,11 @@ public class TypeComparator implements C
     private String type;
 
     public void init(final ObjectAdapter element) {
-        type = element.getSpecification().getShortName();
+        type = element.getSpecification().getShortIdentifier();
     }
 
     public int compare(final ObjectAdapter sortedElement) {
-        final String sortedType = sortedElement.getSpecification().getShortName();
+        final String sortedType = sortedElement.getSpecification().getShortIdentifier();
         return sortedType.compareTo(type);
     }
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java Thu Dec 30 12:29:53 2010
@@ -27,8 +27,8 @@ import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.core.metamodel.adapter.AdapterUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.util.AdapterUtils;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java Thu Dec 30 12:29:53 2010
@@ -28,14 +28,14 @@ import org.apache.isis.core.commons.ensu
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.ConsentAbstract;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.ConsentAbstract;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Persistability;
 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.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -58,7 +58,7 @@ public abstract class AbstractObjectCont
     public static final class ExplorationInstances extends UserActionAbstract {
 
         public ExplorationInstances() {
-            super("Instances", ObjectActionType.EXPLORATION);
+            super("Instances", ActionType.EXPLORATION);
         }
 
         @Override
@@ -72,7 +72,7 @@ public abstract class AbstractObjectCont
             final ObjectAdapter object = view.getContent().getAdapter();
             final ObjectSpecification spec = object.getSpecification();
             final ObjectAdapter instances = IsisContext.getPersistenceSession().findInstances(
-                    new QueryFindAllInstances(spec.getFullName()), QueryCardinality.MULTIPLE);
+                    new QueryFindAllInstances(spec.getFullIdentifier()), QueryCardinality.MULTIPLE);
             workspace.objectActionResult(instances, new Placement(view));
         }
     }
@@ -80,7 +80,7 @@ public abstract class AbstractObjectCont
     public static final class ExplorationClone extends UserActionAbstract {
 
         public ExplorationClone() {
-            super("Clone", ObjectActionType.EXPLORATION);
+            super("Clone", ActionType.EXPLORATION);
         }
 
         @Override
@@ -114,7 +114,7 @@ public abstract class AbstractObjectCont
     public static final class DebugClearResolvedOption extends UserActionAbstract {
 
         private DebugClearResolvedOption() {
-            super("Clear resolved", ObjectActionType.DEBUG);
+            super("Clear resolved", ActionType.DEBUG);
         }
 
         @Override
@@ -182,7 +182,7 @@ public abstract class AbstractObjectCont
         }
         // TODO: use Facet for this test instead
         return new Veto(String.format("No empty field accepting object of type %s in %s", sourceAdapter.getSpecification()
-                .getName(), title()));
+                .getSingularName(), title()));
     }
 
     @Override
@@ -230,7 +230,7 @@ public abstract class AbstractObjectCont
     }
 
     private ObjectAction dropAction(final ObjectAdapter source, final ObjectAdapter target) {
-        ObjectAction action = target.getSpecification().getObjectAction(ObjectActionType.USER, null,
+        ObjectAction action = target.getSpecification().getObjectAction(ActionType.USER, null,
                 Arrays.asList( source.getSpecification() ));
         return action;
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java Thu Dec 30 12:29:53 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.viewer.dnd.view.Content;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java Thu Dec 30 12:29:53 2010
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.dnd.view.
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.view.Content;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java Thu Dec 30 12:29:53 2010
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.dnd.view.
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.dnd.view.Content;
 
@@ -56,23 +56,28 @@ public class RootObject extends Abstract
         throw new IsisException("Invalid call");
     }
 
+    @Override
     public void debugDetails(final DebugString debug) {
         debug.appendln("object", adapter);
     }
 
+    @Override
     public ObjectAdapter getAdapter() {
         return adapter;
     }
 
+    @Override
     public String getDescription() {
-        return getSpecification().getName() + ": " + getObject().titleString() + " "
+        return getSpecification().getSingularName() + ": " + getObject().titleString() + " "
                 + getSpecification().getDescription();
     }
 
+    @Override
     public String getHelp() {
         return "";
     }
 
+    @Override
     public String getId() {
         return "";
     }
@@ -82,10 +87,12 @@ public class RootObject extends Abstract
         return adapter;
     }
 
+    @Override
     public ObjectAdapter[] getOptions() {
         return null;
     }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return adapter.getSpecification();
     }
@@ -95,10 +102,12 @@ public class RootObject extends Abstract
         return true;
     }
 
+    @Override
     public boolean isOptionEnabled() {
         return false;
     }
 
+    @Override
     public boolean isTransient() {
         return adapter != null && adapter.isTransient();
     }
@@ -108,6 +117,7 @@ public class RootObject extends Abstract
         throw new IsisException("Invalid call");
     }
 
+    @Override
     public String title() {
         return adapter.titleString();
     }
@@ -119,6 +129,6 @@ public class RootObject extends Abstract
 
     @Override
     public String windowTitle() {
-        return (isTransient() ? "UNSAVED " : "") + getSpecification().getName();
+        return (isTransient() ? "UNSAVED " : "") + getSpecification().getSingularName();
     }
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.viewer.dnd.view.Content;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.viewer.dnd.view.control;
 
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.dnd.view.ButtonAction;
 import org.apache.isis.viewer.dnd.view.View;
 
@@ -56,8 +56,8 @@ public abstract class AbstractButtonActi
         return name;
     }
 
-    public ObjectActionType getType() {
-        return ObjectActionType.USER;
+    public ActionType getType() {
+        return ActionType.USER;
     }
 
     public boolean isDefault() {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java Thu Dec 30 12:29:53 2010
@@ -24,8 +24,8 @@ import java.awt.event.KeyEvent;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.runtime.userprofile.Options;
 import org.apache.isis.viewer.dnd.drawing.Bounds;
 import org.apache.isis.viewer.dnd.drawing.Canvas;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java Thu Dec 30 12:29:53 2010
@@ -26,10 +26,11 @@ import java.util.Enumeration;
 
 import org.apache.log4j.Appender;
 import org.apache.log4j.Logger;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.runtime.logging.SnapshotAppender;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.view.View;
@@ -42,7 +43,7 @@ import org.apache.isis.viewer.dnd.view.o
  */
 public class DebugDumpSnapshotOption extends UserActionAbstract {
     public DebugDumpSnapshotOption() {
-        super("Dump log snapshot", ObjectActionType.DEBUG);
+        super("Dump log snapshot", ActionType.DEBUG);
     }
 
     @Override

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOption.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOption.java Thu Dec 30 12:29:53 2010
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.service.PerspectiveContent;
@@ -41,7 +41,7 @@ import org.apache.isis.viewer.dnd.view.o
  */
 public class DebugOption extends UserActionAbstract {
     public DebugOption() {
-        super("Debug...", ObjectActionType.DEBUG);
+        super("Debug...", ActionType.DEBUG);
     }
 
     @Override

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java Thu Dec 30 12:29:53 2010
@@ -22,9 +22,10 @@ package org.apache.isis.viewer.dnd.view.
 
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.ConsentAbstract;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.ConsentAbstract;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.view.MenuOptions;
 import org.apache.isis.viewer.dnd.view.UserActionSet;
@@ -46,7 +47,7 @@ public class LoggingOptions implements M
     }
 
     private UserActionAbstract loggingOption(final String name, final Level level) {
-        return new UserActionAbstract("Log level " + level, ObjectActionType.DEBUG) {
+        return new UserActionAbstract("Log level " + level, ActionType.DEBUG) {
             @Override
             public Consent disabled(final View component) {
                 return ConsentAbstract.allowIf(LogManager.getRootLogger().getLevel() != level);

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToManyAssociationOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToManyAssociationOption.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToManyAssociationOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToManyAssociationOption.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.viewer.dnd.view.field;
 
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.Workspace;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToOneAssociationOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToOneAssociationOption.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToOneAssociationOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToOneAssociationOption.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.viewer.dnd.view.field;
 
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.Workspace;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java Thu Dec 30 12:29:53 2010
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.dnd.view.
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java Thu Dec 30 12:29:53 2010
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.dnd.view.
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -45,6 +45,7 @@ public class OneToManyFieldImpl extends 
         this.collection = object;
     }
 
+    @Override
     public Consent canDrop(final Content sourceContent) {
         if (sourceContent.getAdapter() instanceof ObjectAdapter) {
             final ObjectAdapter sourceAdapter = sourceContent.getAdapter();
@@ -66,7 +67,7 @@ public class OneToManyFieldImpl extends 
             if (!specification.isOfType(elementSpecification)) {
                 // TODO: move logic into Facet
                 return new Veto(String.format("Only objects of type %s are allowed in this collection", elementSpecification
-                        .getName()));
+                        .getSingularName()));
             }
             if (parentAdapter.isPersistent() && sourceAdapter.isTransient()) {
                 // TODO: move logic into Facet
@@ -95,6 +96,7 @@ public class OneToManyFieldImpl extends 
         super.debugDetails(debug);
     }
 
+    @Override
     public ObjectAdapter drop(final Content sourceContent) {
         final ObjectAdapter object = sourceContent.getAdapter();
         final ObjectAdapter parent = field.getParent();
@@ -113,24 +115,28 @@ public class OneToManyFieldImpl extends 
     @Override
     public String getDescription() {
         final String name = getFieldName();
-        String type = getField().getSpecification().getName();
+        String type = getField().getSpecification().getSingularName();
         type = name.indexOf(type) == -1 ? " (" + type + ")" : "";
         final String description = getOneToManyAssociation().getDescription();
         return name + type + " " + description;
     }
 
+    @Override
     public ObjectAssociation getField() {
         return field.getObjectAssociation();
     }
 
+    @Override
     public String getFieldName() {
         return field.getName();
     }
 
+    @Override
     public String getHelp() {
         return getOneToManyAssociation().getHelp();
     }
 
+    @Override
     public String getIconName() {
         return null;
         // return "internal-collection";
@@ -146,34 +152,42 @@ public class OneToManyFieldImpl extends 
         return icon;
     }
 
+    @Override
     public String getId() {
         return getOneToManyAssociation().getId();
     }
 
+    @Override
     public ObjectAdapter getAdapter() {
         return collection;
     }
 
+    @Override
     public OneToManyAssociation getOneToManyAssociation() {
         return (OneToManyAssociation) field.getObjectAssociation();
     }
 
+    @Override
     public ObjectAdapter getParent() {
         return field.getParent();
     }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return field.getSpecification();
     }
     
+    @Override
     public Consent isEditable() {
         return getField().isUsable(IsisContext.getAuthenticationSession(), getParent());
     }
 
+    @Override
     public boolean isMandatory() {
         return getOneToManyAssociation().isMandatory();
     }
 
+    @Override
     public boolean isTransient() {
         return false;
     }
@@ -182,6 +196,7 @@ public class OneToManyFieldImpl extends 
         throw new IsisException("Invalid call");
     }
 
+    @Override
     public final String title() {
         return field.getName();
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneField.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneField.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.viewer.dnd.view.field;
 
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.viewer.dnd.view.ObjectContent;
 import org.apache.isis.viewer.dnd.view.content.FieldContent;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java Thu Dec 30 12:29:53 2010
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.dnd.view.
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -75,7 +75,7 @@ public class OneToOneFieldImpl extends A
 
         if (!spec.isOfType(targetType)) {
             // TODO: move logic into Facet
-            return new Veto(String.format("Can only drop objects of type %s", targetType.getName()));
+            return new Veto(String.format("Can only drop objects of type %s", targetType.getSingularName()));
         }
 
         if (getParent().isPersistent() && adapter.isTransient()) {
@@ -92,23 +92,28 @@ public class OneToOneFieldImpl extends A
         getOneToOneAssociation().clearAssociation(getParent());
     }
 
+    @Override
     public void debugDetails(final DebugString debug) {
         field.debugDetails(debug);
         debug.appendln("object", adapter);
     }
 
+    @Override
     public String getFieldName() {
         return field.getName();
     }
 
+    @Override
     public ObjectAssociation getField() {
         return field.getObjectAssociation();
     }
 
+    @Override
     public Consent isEditable() {
         return getField().isUsable(IsisContext.getAuthenticationSession(), getParent());
     }
 
+    @Override
     public ObjectAdapter getAdapter() {
         return adapter;
     }
@@ -122,18 +127,22 @@ public class OneToOneFieldImpl extends A
         return (OneToOneAssociation) getField();
     }
 
+    @Override
     public ObjectAdapter[] getOptions() {
         return getOneToOneAssociation().getChoices(getParent());
     }
 
+    @Override
     public ObjectAdapter getParent() {
         return field.getParent();
     }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return getOneToOneAssociation().getSpecification();
     }
 
+    @Override
     public boolean isMandatory() {
         return getOneToOneAssociation().isMandatory();
     }
@@ -148,10 +157,12 @@ public class OneToOneFieldImpl extends A
         return true;
     }
 
+    @Override
     public boolean isOptionEnabled() {
         return getOneToOneAssociation().hasChoices();
     }
 
+    @Override
     public boolean isTransient() {
         return adapter != null && adapter.isTransient();
     }
@@ -169,6 +180,7 @@ public class OneToOneFieldImpl extends A
         getOneToOneAssociation().setAssociation(getParent(), object);
     }
 
+    @Override
     public String title() {
         return adapter == null ? "" : adapter.titleString();
     }
@@ -183,18 +195,21 @@ public class OneToOneFieldImpl extends A
         return field.getName() + " for " + field.getParent().titleString();
     }
 
+    @Override
     public String getId() {
         return getOneToOneAssociation().getName();
     }
 
+    @Override
     public String getDescription() {
         final String name = getFieldName();
-        String type = getField().getSpecification().getName();
+        String type = getField().getSpecification().getSingularName();
         type = name.indexOf(type) == -1 ? " (" + type + ")" : "";
         final String description = getOneToOneAssociation().getDescription();
         return name + type + " " + description;
     }
 
+    @Override
     public String getHelp() {
         return getOneToOneAssociation().getHelp();
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java Thu Dec 30 12:29:53 2010
@@ -23,9 +23,9 @@ package org.apache.isis.viewer.dnd.view.
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
 import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
@@ -83,7 +83,7 @@ public class TextParseableFieldImpl exte
         final String title = object == null ? "" : ": " + object.titleString();
         final String name = field.getName();
         final ObjectSpecification specification = getSpecification();
-        final String type = name.indexOf(specification.getShortName()) == -1 ? "" : " (" + specification.getShortName() + ")";
+        final String type = name.indexOf(specification.getShortIdentifier()) == -1 ? "" : " (" + specification.getShortIdentifier() + ")";
         final String description = getValueAssociation().getDescription();
         return name + type + title + " " + description;
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OptionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OptionContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OptionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OptionContent.java Thu Dec 30 12:29:53 2010
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.dnd.view.
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.drawing.ImageFactory;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java Thu Dec 30 12:29:53 2010
@@ -26,10 +26,10 @@ import java.util.Vector;
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
 import org.apache.isis.viewer.dnd.drawing.Color;
@@ -228,7 +228,7 @@ public class PopupMenu extends AbstractV
             final UserAction[] options,
             final int len,
             final Vector list,
-            final ObjectActionType type) {
+            final ActionType type) {
         final int initialSize = list.size();
         for (int i = 0; i < len; i++) {
             if (options[i].getType() == type) {
@@ -556,10 +556,10 @@ public class PopupMenu extends AbstractV
             items = new Item[] { Item.createNoOption() };
         } else {
             final Vector list = new Vector();
-            addItems(target, options, len, list, ObjectActionType.USER);
-            addItems(target, options, len, list, ObjectActionType.EXPLORATION);
-            addItems(target, options, len, list, ObjectActionType.PROTOTYPE);
-            addItems(target, options, len, list, ObjectActionType.DEBUG);
+            addItems(target, options, len, list, ActionType.USER);
+            addItems(target, options, len, list, ActionType.EXPLORATION);
+            addItems(target, options, len, list, ActionType.PROTOTYPE);
+            addItems(target, options, len, list, ActionType.DEBUG);
             items = new Item[list.size()];
             list.copyInto(items);
         }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenuContainer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenuContainer.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenuContainer.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenuContainer.java Thu Dec 30 12:29:53 2010
@@ -25,7 +25,7 @@ import java.util.Enumeration;
 import java.util.Vector;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
 import org.apache.isis.viewer.dnd.drawing.Color;
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
@@ -178,7 +178,7 @@ public class PopupMenuContainer extends 
         final boolean withPrototype = getViewManager().isRunningAsPrototype() && includePrototype;
         
 
-        final UserActionSet optionSet = new UserActionSetImpl(withExploration, withPrototype, includeDebug, ObjectActionType.USER);
+        final UserActionSet optionSet = new UserActionSetImpl(withExploration, withPrototype, includeDebug, ActionType.USER);
         if (forView) {
             target.viewMenuOptions(optionSet);
         } else {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/UserActionSetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/UserActionSetImpl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/UserActionSetImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/UserActionSetImpl.java Thu Dec 30 12:29:53 2010
@@ -24,10 +24,10 @@ import java.util.Vector;
 
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.viewer.dnd.drawing.Color;
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.viewer.dnd.drawing.Location;
@@ -48,9 +48,9 @@ public class UserActionSetImpl implement
     private final boolean includeExploration;
     private final boolean includePrototype;
     private final Vector options = new Vector();
-    private final ObjectActionType type;
+    private final ActionType type;
 
-    public UserActionSetImpl(final boolean includeExploration, final boolean includePrototype, final boolean includeDebug, final ObjectActionType type) {
+    public UserActionSetImpl(final boolean includeExploration, final boolean includePrototype, final boolean includeDebug, final ActionType type) {
     	this("", type, includeExploration, includePrototype, includeDebug, Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BASELINE)); 
     }
 
@@ -58,11 +58,11 @@ public class UserActionSetImpl implement
     	this(groupName, parent, parent.getType());
     }
 
-    private UserActionSetImpl(final String groupName, final UserActionSetImpl parent, final ObjectActionType type) {
+    private UserActionSetImpl(final String groupName, final UserActionSetImpl parent, final ActionType type) {
     	this(groupName, type, parent.includeExploration, parent.includePrototype, parent.includeDebug, parent.getColor());
     }
 
-    private UserActionSetImpl(final String groupName, final ObjectActionType type, final boolean includeExploration, final boolean includePrototype, final boolean includeDebug, final Color backgroundColor) {
+    private UserActionSetImpl(final String groupName, final ActionType type, final boolean includeExploration, final boolean includePrototype, final boolean includeDebug, final Color backgroundColor) {
         this.groupName = groupName;
         this.type = type;
         this.includeExploration = includeExploration;
@@ -77,7 +77,7 @@ public class UserActionSetImpl implement
         return set;
     }
 
-    public UserActionSet addNewActionSet(String name, ObjectActionType type) {
+    public UserActionSet addNewActionSet(String name, ActionType type) {
         UserActionSetImpl set = new UserActionSetImpl(name, this, type);
         add(set);
         return set;
@@ -87,11 +87,11 @@ public class UserActionSetImpl implement
      * Add the specified option if it is of the right type for this menu.
      */
     public void add(final UserAction option) {
-        final ObjectActionType section = option.getType();
-        if (section == ObjectActionType.USER || 
-        	(includeExploration && section == ObjectActionType.EXPLORATION) || 
-        	(includePrototype && section == ObjectActionType.PROTOTYPE) || 
-        	(includeDebug && section == ObjectActionType.DEBUG)) {
+        final ActionType section = option.getType();
+        if (section == ActionType.USER || 
+        	(includeExploration && section == ActionType.EXPLORATION) || 
+        	(includePrototype && section == ActionType.PROTOTYPE) || 
+        	(includeDebug && section == ActionType.DEBUG)) {
             options.addElement(option);
         }
     }
@@ -129,7 +129,7 @@ public class UserActionSetImpl implement
         return groupName;
     }
 
-    public ObjectActionType getType() {
+    public ActionType getType() {
         return type;
     }
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/ExceptionMessageContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/ExceptionMessageContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/ExceptionMessageContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/ExceptionMessageContent.java Thu Dec 30 12:29:53 2010
@@ -23,11 +23,11 @@ package org.apache.isis.viewer.dnd.view.
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.ExceptionHelper;
 import org.apache.isis.core.commons.exceptions.IsisApplicationException;
+import org.apache.isis.core.commons.lang.NameUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.util.NameUtils;
 import org.apache.isis.core.runtime.persistence.ConcurrencyException;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.view.Content;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/TextMessageContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/TextMessageContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/TextMessageContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/TextMessageContent.java Thu Dec 30 12:29:53 2010
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.dnd.view.
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.view.Content;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/DisposeObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/DisposeObjectOption.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/DisposeObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/DisposeObjectOption.java Thu Dec 30 12:29:53 2010
@@ -21,10 +21,10 @@
 package org.apache.isis.viewer.dnd.view.option;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.dnd.view.W
  */
 public class DisposeObjectOption extends UserActionAbstract {
     public DisposeObjectOption() {
-        super("Dispose Object", ObjectActionType.EXPLORATION);
+        super("Dispose Object", ActionType.EXPLORATION);
     }
 
     @Override

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/IconizeViewOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/IconizeViewOption.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/IconizeViewOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/IconizeViewOption.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.viewer.dnd.view.option;
 
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.view.Toolkit;
 import org.apache.isis.viewer.dnd.view.View;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/UserActionAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/UserActionAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/UserActionAbstract.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/UserActionAbstract.java Thu Dec 30 12:29:53 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.viewer.dnd.view.option;
 
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.view.UserAction;
 import org.apache.isis.viewer.dnd.view.View;
@@ -40,13 +40,13 @@ import org.apache.isis.viewer.dnd.view.W
 public abstract class UserActionAbstract implements UserAction {
     private String description;
     private String name;
-    private final ObjectActionType type;
+    private final ActionType type;
 
     public UserActionAbstract(final String name) {
-        this(name, ObjectActionType.USER);
+        this(name, ActionType.USER);
     }
 
-    public UserActionAbstract(final String name, final ObjectActionType type) {
+    public UserActionAbstract(final String name, final ActionType type) {
         this.name = name;
         this.type = type;
     }
@@ -72,7 +72,7 @@ public abstract class UserActionAbstract
         return name;
     }
 
-    public ObjectActionType getType() {
+    public ActionType getType() {
         return type;
     }
 



Mime
View raw message