incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1098945 [9/25] - in /incubator/isis/trunk/viewer: bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/common...
Date Tue, 03 May 2011 07:18:38 GMT
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/FormWithTableSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/FormWithTableSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/FormWithTableSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/FormWithTableSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.combined;
 
 import java.util.List;
@@ -38,44 +37,44 @@ import org.apache.isis.viewer.dnd.view.b
 import org.apache.isis.viewer.dnd.view.composite.GridLayout;
 import org.apache.isis.viewer.dnd.view.composite.StackLayout;
 
-
 public class FormWithTableSpecification extends SplitViewSpecification {
 
     @Override
-    public Layout createLayout(Content content, Axes axes) {
+    public Layout createLayout(final Content content, final Axes axes) {
         return new StackLayout();
     }
 
     @Override
-    View createMainView(Axes axes, Content mainContent, final Content secondaryContent) {
-        View form1 = new FormSpecification() {
+    View createMainView(final Axes axes, final Content mainContent, final Content secondaryContent) {
+        final View form1 = new FormSpecification() {
             @Override
-            protected boolean include(Content content, int sequence) {
+            protected boolean include(final Content content, final int sequence) {
                 return !secondaryContent.getId().equals(content.getId());
             };
-            
+
             @Override
-            public Layout createLayout(Content content, Axes axes) {
-                GridLayout gridLayout = new GridLayout();
+            public Layout createLayout(final Content content, final Axes axes) {
+                final GridLayout gridLayout = new GridLayout();
                 gridLayout.setSize(2);
                 return gridLayout;
             }
         }.createView(mainContent, axes, -1);
         return form1;
     }
-    
+
     @Override
-    View createSecondaryView(Axes axes, final Content fieldContent) {
+    View createSecondaryView(final Axes axes, final Content fieldContent) {
         return new InternalTableSpecification().createView(fieldContent, axes, -1);
     }
 
     @Override
-    Content determineSecondaryContent(Content content) {
-        ObjectSpecification spec = content.getSpecification();
-        ObjectAdapter target = content.getAdapter();
-        AuthenticationSession session = IsisContext.getAuthenticationSession();
-        List<ObjectAssociation> fields = spec.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, target));
-        for (ObjectAssociation field : fields) {
+    Content determineSecondaryContent(final Content content) {
+        final ObjectSpecification spec = content.getSpecification();
+        final ObjectAdapter target = content.getAdapter();
+        final AuthenticationSession session = IsisContext.getAuthenticationSession();
+        final List<ObjectAssociation> fields =
+            spec.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, target));
+        for (final ObjectAssociation field : fields) {
             if (field.isOneToManyAssociation()) {
                 return Toolkit.getContentFactory().createFieldContent(field, target);
             }
@@ -83,48 +82,25 @@ public class FormWithTableSpecification 
         return null;
     }
 
-    
-    
-    
     /*
-    
-    @Override
-    protected void init() {
-        addSubviewDecorator(new FieldLabelsDecorator() {
-            public View decorate(Axes axes, View view) {
-                if (view.getContent().isCollection()) {
-                    return view;
-                } else {
-                    return super.decorate(axes, view);
-                }
-            }
-        });
-        addViewDecorator(new IconBorder.Factory());
-    }
-
-    @Override
-    protected SubviewSpec createFieldFactory() {
-        return new SubviewSpec() {
-            public View createView(final Content content, Axes axes, int sequence) {
-                if (content.isCollection()) {
-                    return new InternalTableSpecification().createView(content, axes, sequence);
-                } else {
-                    final ViewFactory factory = Toolkit.getViewFactory();
-                    int requirement = ViewRequirement.CLOSED | ViewRequirement.SUBVIEW;
-                    ViewRequirement viewRequirement = new ViewRequirement(content, requirement);
-                    return factory.createView(viewRequirement);
-                }
-            }
-        };
-    }
-*/
+     * 
+     * @Override protected void init() { addSubviewDecorator(new FieldLabelsDecorator() { public View decorate(Axes
+     * axes, View view) { if (view.getContent().isCollection()) { return view; } else { return super.decorate(axes,
+     * view); } } }); addViewDecorator(new IconBorder.Factory()); }
+     * 
+     * @Override protected SubviewSpec createFieldFactory() { return new SubviewSpec() { public View createView(final
+     * Content content, Axes axes, int sequence) { if (content.isCollection()) { return new
+     * InternalTableSpecification().createView(content, axes, sequence); } else { final ViewFactory factory =
+     * Toolkit.getViewFactory(); int requirement = ViewRequirement.CLOSED | ViewRequirement.SUBVIEW; ViewRequirement
+     * viewRequirement = new ViewRequirement(content, requirement); return factory.createView(viewRequirement); } } }; }
+     */
     @Override
     public String getName() {
         return "Form with table (experimental)";
     }
 
     @Override
-    boolean validField(ObjectAssociation field) {
+    boolean validField(final ObjectAssociation field) {
         return false;
     }
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewAccess.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewAccess.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewAccess.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewAccess.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.combined;
 
 import java.util.List;
@@ -25,12 +24,11 @@ import java.util.List;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.viewer.dnd.view.ViewAxis;
 
-
 public class SplitViewAccess implements ViewAxis {
 
     private final List<ObjectAssociation> fields;
 
-    public SplitViewAccess(List<ObjectAssociation> fields) {
+    public SplitViewAccess(final List<ObjectAssociation> fields) {
         this.fields = fields;
     }
 
@@ -39,4 +37,3 @@ public class SplitViewAccess implements 
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewBuilder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewBuilder.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.combined;
 
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -30,42 +29,45 @@ import org.apache.isis.viewer.dnd.view.W
 import org.apache.isis.viewer.dnd.view.composite.AbstractViewBuilder;
 import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
-
 class SplitViewBuilder extends AbstractViewBuilder {
 
     private final SplitViewSpecification splitViewSpecification;
 
-    public SplitViewBuilder(SplitViewSpecification splitViewSpecification) {
+    public SplitViewBuilder(final SplitViewSpecification splitViewSpecification) {
         this.splitViewSpecification = splitViewSpecification;
     }
 
-    public void createAxes(Axes axes, Content content) {
+    @Override
+    public void createAxes(final Axes axes, final Content content) {
         super.createAxes(axes, content);
         axes.add(new SplitViewAccess(splitViewSpecification.determineAvailableFields(content)));
     }
 
-    public void build(View view, Axes axes) {
+    @Override
+    public void build(final View view, final Axes axes) {
         if (view.getSubviews().length == 0) {
-            Content content = view.getContent();
+            final Content content = view.getContent();
             final Content fieldContent = splitViewSpecification.determineSecondaryContent(content);
 
-            View form1 = splitViewSpecification.createMainView(axes, content, fieldContent);
+            final View form1 = splitViewSpecification.createMainView(axes, content, fieldContent);
             view.addView(form1);
 
-            View labelledForm = splitViewSpecification.createSecondaryView(axes, fieldContent);
+            final View labelledForm = splitViewSpecification.createSecondaryView(axes, fieldContent);
             view.addView(labelledForm);
         }
     }
 
-    public void viewMenuOptions(UserActionSet options, View view) {
+    @Override
+    public void viewMenuOptions(final UserActionSet options, final View view) {
         super.viewMenuOptions(options, view);
 
-        SplitViewAccess axis = view.getViewAxes().getAxis(SplitViewAccess.class);
-        for (ObjectAssociation field : axis.getFields()) {
+        final SplitViewAccess axis = view.getViewAxes().getAxis(SplitViewAccess.class);
+        for (final ObjectAssociation field : axis.getFields()) {
             options.add(new UserActionAbstract("Select " + field.getName()) {
-                public void execute(Workspace workspace, View view, Location at) {}
+                @Override
+                public void execute(final Workspace workspace, final View view, final Location at) {
+                }
             });
         }
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.combined;
 
 import java.util.ArrayList;
@@ -36,7 +35,6 @@ import org.apache.isis.viewer.dnd.view.V
 import org.apache.isis.viewer.dnd.view.ViewRequirement;
 import org.apache.isis.viewer.dnd.view.composite.CompositeViewSpecification;
 
-
 public abstract class SplitViewSpecification extends CompositeViewSpecification {
 
     public SplitViewSpecification() {
@@ -44,9 +42,9 @@ public abstract class SplitViewSpecifica
     }
 
     @Override
-    public boolean canDisplay(ViewRequirement requirement) {
+    public boolean canDisplay(final ViewRequirement requirement) {
         if (requirement.isObject() && requirement.is(ViewRequirement.OPEN) && !requirement.isSubview()) {
-            Content fieldContent = determineSecondaryContent(requirement.getContent());
+            final Content fieldContent = determineSecondaryContent(requirement.getContent());
             return fieldContent != null && fieldContent.getAdapter() != null;
         } else {
             return false;
@@ -54,28 +52,25 @@ public abstract class SplitViewSpecifica
     }
 
     abstract View createMainView(Axes axes, Content mainContent, final Content secondaryContent);
-    
+
     abstract View createSecondaryView(Axes axes, final Content fieldContent);
 
     abstract Content determineSecondaryContent(Content content);
-    
-    
-    
-    
-    
-    Content field(ObjectAssociation field, Content content) {
-        ObjectSpecification spec = content.getSpecification();
-        ObjectAdapter target = content.getAdapter();
+
+    Content field(final ObjectAssociation field, final Content content) {
+        final ObjectSpecification spec = content.getSpecification();
+        final ObjectAdapter target = content.getAdapter();
         return Toolkit.getContentFactory().createFieldContent(field, target);
     }
 
-    List<ObjectAssociation> determineAvailableFields(Content content) {
-        ObjectSpecification spec = content.getSpecification();
-        ObjectAdapter target = content.getAdapter();
-        AuthenticationSession session = IsisContext.getAuthenticationSession();
-        List<ObjectAssociation> fields = spec.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, target));
-        List<ObjectAssociation> selectableFields = new ArrayList<ObjectAssociation>();
-        for (ObjectAssociation field : fields) {
+    List<ObjectAssociation> determineAvailableFields(final Content content) {
+        final ObjectSpecification spec = content.getSpecification();
+        final ObjectAdapter target = content.getAdapter();
+        final AuthenticationSession session = IsisContext.getAuthenticationSession();
+        final List<ObjectAssociation> fields =
+            spec.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, target));
+        final List<ObjectAssociation> selectableFields = new ArrayList<ObjectAssociation>();
+        for (final ObjectAssociation field : fields) {
             if (validField(field)) {
                 selectableFields.add(field);
             }
@@ -85,6 +80,4 @@ public abstract class SplitViewSpecifica
 
     abstract boolean validField(ObjectAssociation field);
 
-
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.combined;
 
 import java.util.List;
@@ -39,40 +38,40 @@ import org.apache.isis.viewer.dnd.view.b
 import org.apache.isis.viewer.dnd.view.border.LabelBorder;
 import org.apache.isis.viewer.dnd.view.composite.ColumnLayout;
 
-
 public class TwoPartViewSpecification extends SplitViewSpecification {
 
     @Override
-    public Layout createLayout(Content content, Axes axes) {
+    public Layout createLayout(final Content content, final Axes axes) {
         return new ColumnLayout();
     }
 
     @Override
-    View createMainView(Axes axes, Content mainContent, final Content secondaryContent) {
-        View form1 = new FormSpecification() {
+    View createMainView(final Axes axes, final Content mainContent, final Content secondaryContent) {
+        final View form1 = new FormSpecification() {
             @Override
-            protected boolean include(Content content, int sequence) {
+            protected boolean include(final Content content, final int sequence) {
                 return !secondaryContent.getId().equals(content.getId());
             };
         }.createView(mainContent, axes, -1);
         return form1;
     }
-    
+
     @Override
-    View createSecondaryView(Axes axes, final Content fieldContent) {
-        View form = new InternalFormSpecification().createView(fieldContent, axes, -1);
-        View labelledForm = LabelBorder.createFieldLabelBorder(new LabelAxis(), form);
+    View createSecondaryView(final Axes axes, final Content fieldContent) {
+        final View form = new InternalFormSpecification().createView(fieldContent, axes, -1);
+        final View labelledForm = LabelBorder.createFieldLabelBorder(new LabelAxis(), form);
         return labelledForm;
     }
 
     @Override
     @Deprecated
-    Content determineSecondaryContent(Content content) {
-        ObjectSpecification spec = content.getSpecification();
-        ObjectAdapter target = content.getAdapter();
-        AuthenticationSession session = IsisContext.getAuthenticationSession();
-        List<ObjectAssociation> fields = spec.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, target));
-        for (ObjectAssociation field : fields) {
+    Content determineSecondaryContent(final Content content) {
+        final ObjectSpecification spec = content.getSpecification();
+        final ObjectAdapter target = content.getAdapter();
+        final AuthenticationSession session = IsisContext.getAuthenticationSession();
+        final List<ObjectAssociation> fields =
+            spec.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, target));
+        for (final ObjectAssociation field : fields) {
             if (validField(field)) {
                 return Toolkit.getContentFactory().createFieldContent(field, target);
             }
@@ -81,15 +80,13 @@ public class TwoPartViewSpecification ex
     }
 
     @Override
-    boolean validField(ObjectAssociation field) {
+    boolean validField(final ObjectAssociation field) {
         return field.isOneToOneAssociation() && !field.getSpecification().isParseable();
     }
 
-    
     @Override
     public String getName() {
         return "Two part object (experimental)";
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableCompositeViewBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableCompositeViewBorder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableCompositeViewBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableCompositeViewBorder.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import java.util.Enumeration;
@@ -39,18 +38,18 @@ import org.apache.isis.viewer.dnd.view.b
 import org.apache.isis.viewer.dnd.view.composite.CompositeViewDecorator;
 import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
-
 public class ConfigurableCompositeViewBorder extends AbstractBorder {
 
     public static class Factory implements CompositeViewDecorator {
         private final ElementFactory elementSpecification;
 
-        public Factory(ElementFactory elementSpecification) {
+        public Factory(final ElementFactory elementSpecification) {
             this.elementSpecification = elementSpecification;
         }
 
-        public View decorate(View view, Axes axes) {
-            ConfigurationAxis axis = new ConfigurationAxis();
+        @Override
+        public View decorate(final View view, final Axes axes) {
+            final ConfigurationAxis axis = new ConfigurationAxis();
             // TODO load previously saved settings for the type of elements
             // axis.loadSettings(view.getContent());
             axes.add(axis);
@@ -60,33 +59,37 @@ public class ConfigurableCompositeViewBo
 
     private ViewSpecification elementSpecification;
 
-    protected ConfigurableCompositeViewBorder(View view, ElementFactory elementFactory) {
+    protected ConfigurableCompositeViewBorder(final View view, final ElementFactory elementFactory) {
         super(view);
     }
 
-    public void loadOptions(Options viewOptions) {
+    @Override
+    public void loadOptions(final Options viewOptions) {
         super.loadOptions(viewOptions);
-        String elementsClass = viewOptions.getString("elements");
-        if (elementsClass != null ) {
-                ViewSpecification specification;
-                if (elementsClass.startsWith("user:")) {
-                    String name = elementsClass.substring("user:".length());
-                    String wrappedSpecificationClass = Properties.getUserViewSpecificationOptions(name).getString("wrapped-specification");
-                    ViewSpecification wrappedSpectification = (ViewSpecification) InstanceUtil.createInstance(wrappedSpecificationClass);
-                    specification = new UserViewSpecification(wrappedSpectification, name);
-                } else {
-                    specification = (ViewSpecification) InstanceUtil.createInstance(elementsClass);
-                }
-                if (specification != null) {
-                    getViewAxes().getAxis(ConfigurationAxis.class).setElementSpecification(specification);
-                }
+        final String elementsClass = viewOptions.getString("elements");
+        if (elementsClass != null) {
+            ViewSpecification specification;
+            if (elementsClass.startsWith("user:")) {
+                final String name = elementsClass.substring("user:".length());
+                final String wrappedSpecificationClass =
+                    Properties.getUserViewSpecificationOptions(name).getString("wrapped-specification");
+                final ViewSpecification wrappedSpectification =
+                    (ViewSpecification) InstanceUtil.createInstance(wrappedSpecificationClass);
+                specification = new UserViewSpecification(wrappedSpectification, name);
+            } else {
+                specification = (ViewSpecification) InstanceUtil.createInstance(elementsClass);
+            }
+            if (specification != null) {
+                getViewAxes().getAxis(ConfigurationAxis.class).setElementSpecification(specification);
+            }
         }
     }
-    
-    public void saveOptions(Options viewOptions) {
+
+    @Override
+    public void saveOptions(final Options viewOptions) {
         super.saveOptions(viewOptions);
         if (elementSpecification != null) {
-            boolean isUserSpecification = elementSpecification instanceof UserViewSpecification;
+            final boolean isUserSpecification = elementSpecification instanceof UserViewSpecification;
             String name;
             if (isUserSpecification) {
                 name = "user:" + elementSpecification.getName();
@@ -96,42 +99,43 @@ public class ConfigurableCompositeViewBo
             viewOptions.addOption("elements", name);
         }
     }
-    
-    
-    public void viewMenuOptions(UserActionSet menuOptions) {
+
+    @Override
+    public void viewMenuOptions(final UserActionSet menuOptions) {
         super.viewMenuOptions(menuOptions);
-        UserActionSet subOptions = menuOptions.addNewActionSet("Elements as");
-        View firstSubview = getSubviews()[0];
-        int status = ViewRequirement.OPEN | ViewRequirement.CLOSED | ViewRequirement.SUBVIEW | ViewRequirement.FIXED;
-        ViewRequirement viewRequirement = new ViewRequirement(firstSubview.getContent(), status);
-        Enumeration<ViewSpecification> possibleViews = Toolkit.getViewFactory().availableViews(viewRequirement);
+        final UserActionSet subOptions = menuOptions.addNewActionSet("Elements as");
+        final View firstSubview = getSubviews()[0];
+        final int status =
+            ViewRequirement.OPEN | ViewRequirement.CLOSED | ViewRequirement.SUBVIEW | ViewRequirement.FIXED;
+        final ViewRequirement viewRequirement = new ViewRequirement(firstSubview.getContent(), status);
+        final Enumeration<ViewSpecification> possibleViews = Toolkit.getViewFactory().availableViews(viewRequirement);
         while (possibleViews.hasMoreElements()) {
             addElementAsOption(subOptions, possibleViews.nextElement());
         }
     }
 
-    private void addElementAsOption(UserActionSet subOptions, final ViewSpecification specification) {
+    private void addElementAsOption(final UserActionSet subOptions, final ViewSpecification specification) {
         if (specification != elementSpecification) {
             subOptions.add(new UserActionAbstract(specification.getName()) {
-                public void execute(Workspace workspace, View view, Location at) {
+                @Override
+                public void execute(final Workspace workspace, final View view, final Location at) {
                     replaceElementViews(specification, view);
                 }
             });
         }
     }
 
-    private void replaceElementViews(final ViewSpecification specification, View view) {
+    private void replaceElementViews(final ViewSpecification specification, final View view) {
         elementSpecification = specification;
         removeAllSubviews(view);
         getViewAxes().getAxis(ConfigurationAxis.class).setElementSpecification(specification);
         invalidateContent();
     }
 
-    private void removeAllSubviews(View view) {
+    private void removeAllSubviews(final View view) {
         final View[] subviews = view.getSubviews();
-        for (int i = 0; i < subviews.length; i++) {
-            view.removeView(subviews[i]);
+        for (final View subview : subviews) {
+            view.removeView(subview);
         }
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableFieldBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableFieldBorder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableFieldBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableFieldBorder.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import java.util.Enumeration;
@@ -45,31 +44,34 @@ import org.apache.isis.viewer.dnd.view.b
 import org.apache.isis.viewer.dnd.view.option.ReplaceViewOption;
 import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
-
 public class ConfigurableFieldBorder extends AbstractBorder {
     public static final class Factory implements SubviewDecorator {
-        public ViewAxis createAxis(Content content) {
+        @Override
+        public ViewAxis createAxis(final Content content) {
             return null;
         }
 
-        public View decorate(Axes axes, View view) {
+        @Override
+        public View decorate(final Axes axes, final View view) {
             return new ConfigurableFieldBorder(view);
         }
     }
 
     private static final int BORDER = 10;
 
-    protected ConfigurableFieldBorder(View view) {
+    protected ConfigurableFieldBorder(final View view) {
         super(view);
         right = BORDER;
     }
 
-    public void viewMenuOptions(UserActionSet menuOptions) {
+    @Override
+    public void viewMenuOptions(final UserActionSet menuOptions) {
         super.viewMenuOptions(menuOptions);
 
         menuOptions.add(new UserActionAbstract("Hide") {
-            public void execute(Workspace workspace, View view, Location at) {
-                View parent = wrappedView.getParent();
+            @Override
+            public void execute(final Workspace workspace, final View view, final Location at) {
+                final View parent = wrappedView.getParent();
                 wrappedView = new BlankView(getContent());
                 wrappedView.setParent(parent);
                 wrappedView.setView(ConfigurableFieldBorder.this);
@@ -79,37 +81,42 @@ public class ConfigurableFieldBorder ext
         });
 
         menuOptions.add(new UserActionAbstract("Show label") {
-            public void execute(Workspace workspace, View view, Location at) {
+            @Override
+            public void execute(final Workspace workspace, final View view, final Location at) {
                 if (wrappedView instanceof LabelBorder) {
                     wrappedView = ((LabelBorder) wrappedView).getWrapped();
                 } else {
-                    wrappedView = LabelBorder.createFieldLabelBorder(view.getParent().getViewAxes().getAxis(LabelAxis.class), wrappedView);
+                    wrappedView =
+                        LabelBorder.createFieldLabelBorder(view.getParent().getViewAxes().getAxis(LabelAxis.class),
+                            wrappedView);
                 }
                 wrappedView.setView(ConfigurableFieldBorder.this);
                 getView().invalidateLayout();
             }
         });
 
-        
-        
-        replaceOptions(Toolkit.getViewFactory().availableViews(new ViewRequirement(getContent(), ViewRequirement.OPEN | ViewRequirement.CLOSED | ViewRequirement.SUBVIEW)),
-                menuOptions); // openSubviews(content, this), options);
+        replaceOptions(
+            Toolkit.getViewFactory().availableViews(
+                new ViewRequirement(getContent(), ViewRequirement.OPEN | ViewRequirement.CLOSED
+                    | ViewRequirement.SUBVIEW)), menuOptions); // openSubviews(content, this), options);
 
     }
 
     // TODO copied from AbstractView
     protected void replaceOptions(final Enumeration possibleViews, final UserActionSet options) {
         if (possibleViews.hasMoreElements()) {
-            UserActionSet suboptions = options.addNewActionSet("Replace with");
+            final UserActionSet suboptions = options.addNewActionSet("Replace with");
             while (possibleViews.hasMoreElements()) {
                 final ViewSpecification specification = (ViewSpecification) possibleViews.nextElement();
 
                 if (specification != getSpecification()) {
                     final UserAction viewAs = new ReplaceViewOption(specification) {
-                        protected void replace(View view, View withReplacement) {
-                            View parent = wrappedView.getParent();
-                            wrappedView = LabelBorder.createFieldLabelBorder(view.getParent().getViewAxes().getAxis(LabelAxis.class),
-                                    withReplacement);
+                        @Override
+                        protected void replace(final View view, final View withReplacement) {
+                            final View parent = wrappedView.getParent();
+                            wrappedView =
+                                LabelBorder.createFieldLabelBorder(
+                                    view.getParent().getViewAxes().getAxis(LabelAxis.class), withReplacement);
                             wrappedView.setParent(parent);
                             wrappedView.setView(ConfigurableFieldBorder.this);
                             invalidateLayout();
@@ -118,7 +125,7 @@ public class ConfigurableFieldBorder ext
                     suboptions.add(viewAs);
                 }
             }
-        }   
+        }
     }
 
     @Override
@@ -130,8 +137,8 @@ public class ConfigurableFieldBorder ext
             final Size s = getSize();
             final int xExtent = s.getWidth();
             if (state.isViewIdentified()) {
-                canvas.drawSolidRectangle(xExtent - BORDER + 1, top, BORDER - 2, s.getHeight() - 2 * top, Toolkit
-                        .getColor(ColorsAndFonts.COLOR_SECONDARY3));
+                canvas.drawSolidRectangle(xExtent - BORDER + 1, top, BORDER - 2, s.getHeight() - 2 * top,
+                    Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
             }
         }
     }
@@ -151,4 +158,3 @@ public class ConfigurableFieldBorder ext
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableObjectViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableObjectViewSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableObjectViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurableObjectViewSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import org.apache.isis.viewer.dnd.view.Axes;
@@ -38,25 +37,25 @@ public class ConfigurableObjectViewSpeci
         builder = new ObjectFieldBuilder(new StandardFields());
         addSubviewDecorator(new FieldLabelsDecorator());
         addSubviewDecorator(new ConfigurableFieldBorder.Factory());
-        addViewDecorator(new  GridLayoutControlBorder.Factory());
+        addViewDecorator(new GridLayoutControlBorder.Factory());
         addViewDecorator(new IconBorder.Factory());
     }
-    
-    public boolean canDisplay(ViewRequirement requirement) {
+
+    @Override
+    public boolean canDisplay(final ViewRequirement requirement) {
         return requirement.isObject() && requirement.isOpen() && requirement.isExpandable() && requirement.isDesign();
     }
 
+    @Override
     public String getName() {
         return "Configurable (experimental)";
     }
+
     /*
-    protected View decorateView(View view) {
-        return new IconBorder(view);
-    }
-*/
-    public Layout createLayout(Content content, Axes axes) {
+     * protected View decorateView(View view) { return new IconBorder(view); }
+     */
+    @Override
+    public Layout createLayout(final Content content, final Axes axes) {
         return new GridLayout();
     }
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurationAxis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurationAxis.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurationAxis.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ConfigurationAxis.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import org.apache.isis.viewer.dnd.view.ViewAxis;
@@ -25,14 +24,12 @@ import org.apache.isis.viewer.dnd.view.V
 
 public class ConfigurationAxis implements ViewAxis {
     private ViewSpecification elementSpecification;
-    
-    public void setElementSpecification(ViewSpecification elementSpecification) {
+
+    public void setElementSpecification(final ViewSpecification elementSpecification) {
         this.elementSpecification = elementSpecification;
     }
-    
+
     public ViewSpecification getElementSpecification() {
         return elementSpecification;
     }
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/FieldLayoutRequirement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/FieldLayoutRequirement.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/FieldLayoutRequirement.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/FieldLayoutRequirement.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import org.apache.isis.viewer.dnd.view.View;
@@ -25,19 +24,15 @@ import org.apache.isis.viewer.dnd.view.V
 
 public class FieldLayoutRequirement {
     private View view;
-    
-    
+
     private boolean visible;
     private int columnSpan;
     private int rowSpan;
-    
-    
+
     private ViewSpecification spec;
     private boolean showLabel;
     private boolean mergeWithNext;
-    
+
     private boolean allowGrowing;
     private boolean allowScrolling;
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/GridListSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/GridListSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/GridListSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/GridListSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import org.apache.isis.viewer.dnd.view.Axes;
@@ -34,17 +33,18 @@ import org.apache.isis.viewer.dnd.view.c
 import org.apache.isis.viewer.dnd.view.composite.GridLayout;
 import org.apache.isis.viewer.dnd.view.composite.GridLayoutControlBorder;
 
-
 public class GridListSpecification extends CompositeViewSpecification implements ViewFactory {
 
     protected static class ElementFactory implements ViewFactory {
-        public View createView(final Content content, Axes axes, int sequence) {
+        @Override
+        public View createView(final Content content, final Axes axes, final int sequence) {
             final GlobalViewFactory factory = Toolkit.getViewFactory();
 
-            ViewSpecification elementSpecification = axes.getAxis(ConfigurationAxis.class).getElementSpecification();
+            final ViewSpecification elementSpecification =
+                axes.getAxis(ConfigurationAxis.class).getElementSpecification();
             if (elementSpecification == null) {
-                int defaultRequirement = ViewRequirement.CLOSED | ViewRequirement.SUBVIEW;
-                ViewRequirement viewRequirement = new ViewRequirement(content, defaultRequirement);
+                final int defaultRequirement = ViewRequirement.CLOSED | ViewRequirement.SUBVIEW;
+                final ViewRequirement viewRequirement = new ViewRequirement(content, defaultRequirement);
                 return factory.createView(viewRequirement);
             } else {
                 return elementSpecification.createView(content, axes, sequence);
@@ -65,16 +65,18 @@ public class GridListSpecification exten
         addViewDecorator(new GridLayoutControlBorder.Factory());
     }
 
-    public boolean canDisplay(ViewRequirement requirement) {
+    @Override
+    public boolean canDisplay(final ViewRequirement requirement) {
         return requirement.isCollection() && requirement.isOpen() && !requirement.isSubview() && requirement.isDesign();
     }
 
+    @Override
     public String getName() {
         return "Grid List";
     }
 
-    public Layout createLayout(Content content, Axes axes) {
+    @Override
+    public Layout createLayout(final Content content, final Axes axes) {
         return new GridLayout();
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewObjectField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewObjectField.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewObjectField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewObjectField.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -28,8 +27,9 @@ public class NewObjectField implements O
 
     private final ObjectAssociation field;
 
-    public NewObjectField(ObjectAssociation field) {
-        this.field = field;}
+    public NewObjectField(final ObjectAssociation field) {
+        this.field = field;
+    }
 
     public boolean includeLabel() {
         return true;
@@ -39,12 +39,13 @@ public class NewObjectField implements O
         return field;
     }
 
-    public void loadOptions(Options viewOptions) {}
+    @Override
+    public void loadOptions(final Options viewOptions) {
+    }
 
-    public void saveOptions(Options viewOptions) {
+    @Override
+    public void saveOptions(final Options viewOptions) {
         viewOptions.addOption("field", field.getId());
     }
 
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewObjectView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewObjectView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewObjectView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewObjectView.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import java.util.ArrayList;
@@ -43,45 +42,46 @@ public class NewObjectView extends Compo
     LabelAxis labelAxis = new LabelAxis();
     List<NewObjectField> fields = new ArrayList<NewObjectField>();
 
-    public NewObjectView(Content content, ViewSpecification specification) {
+    public NewObjectView(final Content content, final ViewSpecification specification) {
         super(content, specification);
     }
 
-    void addField(NewObjectField field) {
+    void addField(final NewObjectField field) {
         fields.add(field);
         addFieldView(field);
         invalidateContent();
     }
-    
+
     @Override
     protected void buildView() {
         if (getSubviews().length == 0) {
-            ObjectAdapter object = getContent().getAdapter();
-            List<ObjectAssociation> associations = getContent().getSpecification().getAssociations();
-           
-            
-            ObjectAssociation field = associations.get(0);
-            
+            final ObjectAdapter object = getContent().getAdapter();
+            final List<ObjectAssociation> associations = getContent().getSpecification().getAssociations();
+
+            final ObjectAssociation field = associations.get(0);
+
             addFieldView(object, field);
-            addFieldView(object, associations.get(2)); 
+            addFieldView(object, associations.get(2));
         }
     }
 
-    private void addFieldView(ObjectAdapter object, ObjectAssociation field) {
-        FieldContent fieldContent = (FieldContent) Toolkit.getContentFactory().createFieldContent(field, object);
-        ViewRequirement requirement= new ViewRequirement(fieldContent, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW);
+    private void addFieldView(final ObjectAdapter object, final ObjectAssociation field) {
+        final FieldContent fieldContent = (FieldContent) Toolkit.getContentFactory().createFieldContent(field, object);
+        final ViewRequirement requirement =
+            new ViewRequirement(fieldContent, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW);
         View fieldView = Toolkit.getViewFactory().createView(requirement);
-        
+
         fieldView = LabelBorder.createFieldLabelBorder(labelAxis, fieldView);
-        
+
         addView(fieldView);
     }
 
-
-    private void addFieldView(NewObjectField field) {
-        ObjectAdapter object = getContent().getAdapter();
-        FieldContent fieldContent = (FieldContent) Toolkit.getContentFactory().createFieldContent(field.getField(), object);
-        ViewRequirement requirement= new ViewRequirement(fieldContent, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW);
+    private void addFieldView(final NewObjectField field) {
+        final ObjectAdapter object = getContent().getAdapter();
+        final FieldContent fieldContent =
+            (FieldContent) Toolkit.getContentFactory().createFieldContent(field.getField(), object);
+        final ViewRequirement requirement =
+            new ViewRequirement(fieldContent, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW);
         View fieldView = Toolkit.getViewFactory().createView(requirement);
         if (field.includeLabel()) {
             fieldView = LabelBorder.createFieldLabelBorder(labelAxis, fieldView);
@@ -90,29 +90,27 @@ public class NewObjectView extends Compo
     }
 
     @Override
-    protected void doLayout(Size maximumSize) {
+    protected void doLayout(final Size maximumSize) {
         layout.layout(this, maximumSize);
     }
 
     @Override
-    protected Size requiredSize(Size availableSpace) {
+    protected Size requiredSize(final Size availableSpace) {
         return layout.getRequiredSize(this);
     }
 
     @Override
-    public void loadOptions(Options viewOptions) {
-        Options options = viewOptions.getOptions("fields");
-      //  options.options()
-       
+    public void loadOptions(final Options viewOptions) {
+        final Options options = viewOptions.getOptions("fields");
+        // options.options()
+
     }
-    
+
     @Override
-    public void saveOptions(Options viewOptions) {
-       for (NewObjectField field : fields) {
-           field.saveOptions(viewOptions.getOptions("fields"));
-       }
-        
+    public void saveOptions(final Options viewOptions) {
+        for (final NewObjectField field : fields) {
+            field.saveOptions(viewOptions.getOptions("fields"));
+        }
+
     }
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewViewSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/NewViewSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
@@ -31,47 +30,53 @@ import org.apache.isis.viewer.dnd.view.b
 import org.apache.isis.viewer.dnd.view.border.IconBorder;
 import org.apache.isis.viewer.dnd.view.composite.StackLayout;
 
-
 public class NewViewSpecification implements ViewSpecification {
 
-    protected Layout createLayout(Content content, Axes axes) {
+    protected Layout createLayout(final Content content, final Axes axes) {
         return new StackLayout();
     }
 
-    public boolean canDisplay(ViewRequirement requirement) {
+    @Override
+    public boolean canDisplay(final ViewRequirement requirement) {
         return requirement.isObject() && requirement.isOpen();
     }
 
+    @Override
     public String getName() {
         return "Object View";
     }
 
+    @Override
     public boolean isAligned() {
         return false;
     }
 
+    @Override
     public boolean isOpen() {
         return false;
     }
 
+    @Override
     public boolean isReplaceable() {
         return false;
     }
 
+    @Override
     public boolean isResizeable() {
         return false;
     }
 
+    @Override
     public boolean isSubView() {
         return false;
     }
 
-    public View createView(Content content, Axes axes, int sequence) {
-        NewObjectView view = new NewObjectView(content, this);
+    @Override
+    public View createView(final Content content, final Axes axes, final int sequence) {
+        final NewObjectView view = new NewObjectView(content, this);
         View view2 = new IconBorder(view, Toolkit.getText(ColorsAndFonts.TEXT_TITLE));
         view2 = new ViewDesignBorder(view2, view);
         return view2;
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/Panel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/Panel.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/Panel.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/Panel.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import java.util.ArrayList;
@@ -28,10 +27,11 @@ import org.apache.isis.viewer.dnd.drawin
 import org.apache.isis.viewer.dnd.drawing.Size;
 import org.apache.isis.viewer.dnd.view.View;
 
-
 public class Panel {
-    
-    private static enum Orientation {Undefined, Horizontal, Vertical}; 
+
+    private static enum Orientation {
+        Undefined, Horizontal, Vertical
+    };
 
     private static interface Content {
         public Size getRequiredSize(Size availableSpace);
@@ -48,27 +48,32 @@ public class Panel {
     private static class ViewContent implements Content {
         private final View view;
 
-        public ViewContent(View view) {
+        public ViewContent(final View view) {
             this.view = view;
         }
 
-        public Size getRequiredSize(Size availableSpace) {
+        @Override
+        public Size getRequiredSize(final Size availableSpace) {
             return view.getRequiredSize(availableSpace);
         }
 
-        public void layout(Size maximumSize) {
+        @Override
+        public void layout(final Size maximumSize) {
             view.layout();
         }
 
-        public void setLocation(Location location) {
+        @Override
+        public void setLocation(final Location location) {
             view.setLocation(location);
         }
 
-        public void setSize(Size size) {
+        @Override
+        public void setSize(final Size size) {
             view.setSize(size);
         }
 
-        public void debug(DebugBuilder debug) {
+        @Override
+        public void debug(final DebugBuilder debug) {
             debug.appendln(view.toString());
         }
     }
@@ -77,44 +82,49 @@ public class Panel {
         private final Panel panel;
         private Location location;
 
-        public PanelContent(Panel panel) {
+        public PanelContent(final Panel panel) {
             this.panel = panel;
         }
 
-        public Size getRequiredSize(Size availableSpace) {
+        @Override
+        public Size getRequiredSize(final Size availableSpace) {
             return panel.getRequiredSize(availableSpace);
         }
 
-        public void layout(Size maximumSize) {
+        @Override
+        public void layout(final Size maximumSize) {
             panel.layout(location, maximumSize);
         }
 
-        public void setLocation(Location location) {
+        @Override
+        public void setLocation(final Location location) {
             this.location = location;
         }
 
-        public void setSize(Size size) {
+        @Override
+        public void setSize(final Size size) {
         }
-        
-        public void debug(DebugBuilder debug) {
+
+        @Override
+        public void debug(final DebugBuilder debug) {
             panel.debug(debug);
         }
     }
 
     private List<Content> contents = new ArrayList<Content>();
     private Orientation orientation;
-    
-    public void debug(DebugBuilder debug) {
+
+    public void debug(final DebugBuilder debug) {
         debug.appendln("orientation", orientation);
         debug.appendln("size", getRequiredSize(Size.createMax()));
         debug.indent();
-        for (Content content : contents) {
+        for (final Content content : contents) {
             content.debug(debug);
         }
         debug.unindent();
     }
 
-    public void addView(View view, PanelView.Position position) {
+    public void addView(final View view, final PanelView.Position position) {
         if (contents.isEmpty() || position == null) {
             addToContents(view, false);
         } else if (position == PanelView.Position.East || position == PanelView.Position.West) {
@@ -126,10 +136,10 @@ public class Panel {
             } else {
                 replaceViewsWithPanel(view, position == PanelView.Position.West);
             }
-         } else if (position == PanelView.Position.South || position == PanelView.Position.North) {
-             if (orientation == Orientation.Undefined) {
-                 orientation = Orientation.Vertical;
-             }
+        } else if (position == PanelView.Position.South || position == PanelView.Position.North) {
+            if (orientation == Orientation.Undefined) {
+                orientation = Orientation.Vertical;
+            }
             if (orientation == Orientation.Horizontal) {
                 replaceViewsWithPanel(view, position == PanelView.Position.North);
             } else {
@@ -138,7 +148,7 @@ public class Panel {
         }
     }
 
-    private void addToContents(View view, boolean atBeginning) {
+    private void addToContents(final View view, final boolean atBeginning) {
         if (atBeginning) {
             contents.add(0, new ViewContent(view));
         } else {
@@ -146,8 +156,8 @@ public class Panel {
         }
     }
 
-    private void replaceViewsWithPanel(View view, boolean atBeginning) {
-        Panel panel = new Panel();
+    private void replaceViewsWithPanel(final View view, final boolean atBeginning) {
+        final Panel panel = new Panel();
         panel.contents = contents;
         contents = new ArrayList<Content>();
         contents.add(new PanelContent(panel));
@@ -156,29 +166,29 @@ public class Panel {
         orientation = orientation == Orientation.Horizontal ? Orientation.Vertical : Orientation.Horizontal;
     }
 
-    public void layout(Size maximumSize) {
-        Location location = new Location();
+    public void layout(final Size maximumSize) {
+        final Location location = new Location();
         layout(location, maximumSize);
     }
 
-    private void layout(Location location, Size maximumSize) {
-        for (Content content : contents) {
+    private void layout(final Location location, final Size maximumSize) {
+        for (final Content content : contents) {
             content.setLocation(new Location(location));
-            Size requiredSize = content.getRequiredSize(maximumSize);
+            final Size requiredSize = content.getRequiredSize(maximumSize);
             content.setSize(requiredSize);
             content.layout(maximumSize);
             if (orientation == Orientation.Horizontal) {
                 location.add(requiredSize.getWidth(), 0);
             } else {
-                location.add(0, requiredSize.getHeight());                
+                location.add(0, requiredSize.getHeight());
             }
         }
     }
 
-    public Size getRequiredSize(Size availableSpace) {
-        Size size = new Size();
-        for (Content content : contents) {
-            Size requiredSize = content.getRequiredSize(availableSpace);
+    public Size getRequiredSize(final Size availableSpace) {
+        final Size size = new Size();
+        for (final Content content : contents) {
+            final Size requiredSize = content.getRequiredSize(availableSpace);
             if (orientation == Orientation.Horizontal) {
                 size.extendWidth(requiredSize.getWidth());
                 size.ensureHeight(requiredSize.getHeight());
@@ -191,4 +201,3 @@ public class Panel {
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/PanelView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/PanelView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/PanelView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/PanelView.java Tue May  3 07:18:19 2011
@@ -17,11 +17,9 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Size;
 import org.apache.isis.viewer.dnd.view.Axes;
@@ -31,20 +29,18 @@ import org.apache.isis.viewer.dnd.view.V
 import org.apache.isis.viewer.dnd.view.ViewDrag;
 import org.apache.isis.viewer.dnd.view.ViewRequirement;
 import org.apache.isis.viewer.dnd.view.ViewSpecification;
-import org.apache.isis.viewer.dnd.view.border.IconBorder;
-import org.apache.isis.viewer.dnd.view.border.LineBorder;
 import org.apache.isis.viewer.dnd.view.composite.CompositeView;
 
-
 public class PanelView extends CompositeView {
     public static enum Position {
         North, South, East, West
     };
 
-    private Panel panel = new Panel();
+    private final Panel panel = new Panel();
     private ViewSpecification initialViewSpecification;;
-    
-    public void debug(DebugBuilder debug) {
+
+    @Override
+    public void debug(final DebugBuilder debug) {
         super.debug(debug);
         debug.appendln("Panel");
         debug.indent();
@@ -52,43 +48,44 @@ public class PanelView extends Composite
         debug.unindent();
     }
 
-    public void setInitialViewSpecification(ViewSpecification initialViewSpecification) {
+    public void setInitialViewSpecification(final ViewSpecification initialViewSpecification) {
         this.initialViewSpecification = initialViewSpecification;
     }
 
-    public PanelView(Content content, ViewSpecification specification) {
+    public PanelView(final Content content, final ViewSpecification specification) {
         super(content, specification);
     }
 
+    @Override
     protected void buildView() {
-//        addView(getContent(), initialViewSpecification, null);
-        View newView = initialViewSpecification.createView(getContent(), new Axes(), 0);
+        // addView(getContent(), initialViewSpecification, null);
+        final View newView = initialViewSpecification.createView(getContent(), new Axes(), 0);
         panel.addView(newView, null);
         addView(newView);
     }
-    
-    
 
-    protected void doLayout(Size maximumSize) {
+    @Override
+    protected void doLayout(final Size maximumSize) {
         panel.layout(maximumSize);
     }
 
-    public Size requiredSize(Size availableSpace) {
+    @Override
+    public Size requiredSize(final Size availableSpace) {
         return panel.getRequiredSize(availableSpace);
     }
 
     @Override
-    public void drop(ViewDrag drag) {
+    public void drop(final ViewDrag drag) {
         if (drag.getSourceView() == getView() || !contains(drag.getSourceView())) {
             super.drop(drag);
         } else {
-            Location dropAt = drag.getLocation();
+            final Location dropAt = drag.getLocation();
             dropAt.subtract(getLocation());
-            int x = dropAt.getX();
-            int y = dropAt.getY();
-            int borderWdth = 45;
-            int left = getSize().getWidth() - borderWdth;
-            int bottom = getSize().getHeight() - borderWdth;
+            final int x = dropAt.getX();
+            final int y = dropAt.getY();
+            final int borderWdth = 45;
+            final int left = getSize().getWidth() - borderWdth;
+            final int bottom = getSize().getHeight() - borderWdth;
             if (y < borderWdth) {
                 addView(drag.getSourceView().getContent(), Position.North);
             } else if (y > bottom) {
@@ -101,17 +98,17 @@ public class PanelView extends Composite
         }
     }
 
-    public void addView(Content content, Position position) {
-        ViewRequirement requirement = new ViewRequirement(content, ViewRequirement.OPEN | ViewRequirement.SUBVIEW);
-        ViewSpecification viewSpecification = Toolkit.getViewFactory().availableViews(requirement).nextElement();
+    public void addView(final Content content, final Position position) {
+        final ViewRequirement requirement =
+            new ViewRequirement(content, ViewRequirement.OPEN | ViewRequirement.SUBVIEW);
+        final ViewSpecification viewSpecification = Toolkit.getViewFactory().availableViews(requirement).nextElement();
         addView(content, viewSpecification, position);
     }
 
-    public void addView(Content content, ViewSpecification specification, Position position) {
-        View newView = specification.createView(content, new Axes(), 0);
-        //     newView = new LineBorder(newView);
+    public void addView(final Content content, final ViewSpecification specification, final Position position) {
+        final View newView = specification.createView(content, new Axes(), 0);
+        // newView = new LineBorder(newView);
         panel.addView(newView, position);
         addView(newView);
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/PanelViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/PanelViewSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/PanelViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/PanelViewSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
@@ -31,41 +30,47 @@ import org.apache.isis.viewer.dnd.view.V
 import org.apache.isis.viewer.dnd.view.border.IconBorder;
 
 public class PanelViewSpecification implements ViewSpecification {
-    
-    public boolean canDisplay(ViewRequirement requirement) {
-        return requirement.isObject() && requirement.isOpen()&& requirement.isExpandable() && requirement.isDesign();
+
+    @Override
+    public boolean canDisplay(final ViewRequirement requirement) {
+        return requirement.isObject() && requirement.isOpen() && requirement.isExpandable() && requirement.isDesign();
     }
 
+    @Override
     public String getName() {
         return "Panel (experimental)";
     }
 
+    @Override
     public boolean isAligned() {
         return false;
     }
 
+    @Override
     public boolean isOpen() {
         return true;
     }
 
+    @Override
     public boolean isReplaceable() {
         return false;
     }
 
+    @Override
     public boolean isResizeable() {
         return false;
     }
 
+    @Override
     public boolean isSubView() {
         return false;
     }
 
-    public View createView(Content content, Axes axes, int sequence) {
-        PanelView wrappedView = new PanelView(content, this);
+    @Override
+    public View createView(final Content content, final Axes axes, final int sequence) {
+        final PanelView wrappedView = new PanelView(content, this);
         wrappedView.setInitialViewSpecification(new InternalFormSpecification());
-        View newView = new IconBorder(wrappedView, Toolkit.getText(ColorsAndFonts.TEXT_TITLE));
+        final View newView = new IconBorder(wrappedView, Toolkit.getText(ColorsAndFonts.TEXT_TITLE));
         return newView;
     }
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ViewDesignBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ViewDesignBorder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ViewDesignBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/configurable/ViewDesignBorder.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
 import java.util.List;
@@ -30,33 +29,32 @@ import org.apache.isis.viewer.dnd.view.W
 import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
 import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
-
 public class ViewDesignBorder extends AbstractBorder {
-    private NewObjectView viewUnderControl;
-    
-    protected ViewDesignBorder(View view, NewObjectView view2) {
+    private final NewObjectView viewUnderControl;
+
+    protected ViewDesignBorder(final View view, final NewObjectView view2) {
         super(view);
         viewUnderControl = view2;
     }
-    
+
     private NewObjectView getNewObjectView() {
         return viewUnderControl;
     }
-    
+
     @Override
-    public void viewMenuOptions(UserActionSet menuOptions) {
+    public void viewMenuOptions(final UserActionSet menuOptions) {
         super.viewMenuOptions(menuOptions);
 
-    //    ObjectAdapter object = getContent().getAdapter();
-        List<ObjectAssociation> associations = getContent().getSpecification().getAssociations();
-       
-        for (ObjectAssociation objectAssociation : associations) {
+        // ObjectAdapter object = getContent().getAdapter();
+        final List<ObjectAssociation> associations = getContent().getSpecification().getAssociations();
+
+        for (final ObjectAssociation objectAssociation : associations) {
             final ObjectAssociation f = objectAssociation;
-            UserActionAbstract action = new UserActionAbstract("Add field " + objectAssociation.getName()) {
+            final UserActionAbstract action = new UserActionAbstract("Add field " + objectAssociation.getName()) {
 
                 @Override
-                public void execute(Workspace workspace, View view, Location at) {
-                    NewObjectField field = new NewObjectField(f);
+                public void execute(final Workspace workspace, final View view, final Location at) {
+                    final NewObjectField field = new NewObjectField(f);
                     getNewObjectView().addField(field);
                 }
             };
@@ -64,4 +62,3 @@ public class ViewDesignBorder extends Ab
         }
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogFocusManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogFocusManager.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogFocusManager.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogFocusManager.java Tue May  3 07:18:19 2011
@@ -17,31 +17,29 @@
  *  under the License.
  */
 
+package org.apache.isis.viewer.dnd.dialog;
 
-package org.apache.isis.viewer.dnd.dialog;
-
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.base.AbstractFocusManager;
 import org.apache.isis.viewer.dnd.view.border.ButtonBorder;
-
-
-public class ActionDialogFocusManager extends AbstractFocusManager {
-    private final ButtonBorder buttonBorder;
-
-    public ActionDialogFocusManager(final ButtonBorder buttonBorder) {
-        super(buttonBorder.getView());
-        this.buttonBorder = buttonBorder;
-
-    }
-
-    @Override
-    protected View[] getChildViews() {
-        final View[] subviews = container.getSubviews();
-        final View[] buttons = buttonBorder.getButtons();
-
-        final View[] views = new View[subviews.length + buttons.length];
-        System.arraycopy(subviews, 0, views, 0, subviews.length);
-        System.arraycopy(buttons, 0, views, subviews.length, buttons.length);
-        return views;
-    }
-}
+
+public class ActionDialogFocusManager extends AbstractFocusManager {
+    private final ButtonBorder buttonBorder;
+
+    public ActionDialogFocusManager(final ButtonBorder buttonBorder) {
+        super(buttonBorder.getView());
+        this.buttonBorder = buttonBorder;
+
+    }
+
+    @Override
+    protected View[] getChildViews() {
+        final View[] subviews = container.getSubviews();
+        final View[] buttons = buttonBorder.getButtons();
+
+        final View[] views = new View[subviews.length + buttons.length];
+        System.arraycopy(subviews, 0, views, 0, subviews.length);
+        System.arraycopy(buttons, 0, views, subviews.length, buttons.length);
+        return views;
+    }
+}

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java Tue May  3 07:18:19 2011
@@ -17,10 +17,8 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.dialog;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
@@ -50,20 +48,23 @@ import org.apache.isis.viewer.dnd.view.c
 import org.apache.isis.viewer.dnd.view.composite.StackLayout;
 import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
 import org.apache.isis.viewer.dnd.view.control.CancelAction;
-
+import org.apache.log4j.Logger;
 
 public class ActionDialogSpecification extends CompositeViewSpecification {
     private static final Logger LOG = Logger.getLogger(ActionDialogSpecification.class);
 
     private static class DialogFormSubviews implements ViewFactory {
 
-        public View createView(final Content content, Axes axes, int fieldNumber) {
+        @Override
+        public View createView(final Content content, final Axes axes, final int fieldNumber) {
             if (content instanceof TextParseableParameter) {
                 final GlobalViewFactory factory = Toolkit.getViewFactory();
-                return factory.createView(new ViewRequirement(content, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW));
+                return factory
+                    .createView(new ViewRequirement(content, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW));
             } else if (content instanceof ObjectParameter) {
                 final GlobalViewFactory factory = Toolkit.getViewFactory();
-                return factory.createView(new ViewRequirement(content, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW));
+                return factory
+                    .createView(new ViewRequirement(content, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW));
             }
 
             return null;
@@ -84,8 +85,7 @@ public class ActionDialogSpecification e
             final View[] subviews = view.getSubviews();
             final StringBuffer missingFields = new StringBuffer();
             final StringBuffer invalidFields = new StringBuffer();
-            for (int i = 0; i < subviews.length; i++) {
-                final View field = subviews[i];
+            for (final View field : subviews) {
                 final ParameterContent content = ((ParameterContent) field.getContent());
                 final boolean isEmpty = content.getAdapter() == null;
                 if (content.isRequired() && isEmpty) {
@@ -116,11 +116,13 @@ public class ActionDialogSpecification e
             return actionContent.disabled();
         }
 
+        @Override
         public void execute(final Workspace workspace, final View view, final Location at) {
             final BackgroundTask task = new BackgroundTask() {
+                @Override
                 public void execute() {
-                    ActionContent actionContent = ((ActionContent) view.getContent());
-                    ObjectAdapter result = actionContent.execute();
+                    final ActionContent actionContent = ((ActionContent) view.getContent());
+                    final ObjectAdapter result = actionContent.execute();
                     LOG.debug("action invoked with result " + result);
                     if (result != null) {
                         view.objectActionResult(result, new Placement(view.getAbsoluteLocation()));
@@ -129,10 +131,12 @@ public class ActionDialogSpecification e
                     view.getFeedbackManager().showMessagesAndWarnings();
                 }
 
+                @Override
                 public String getName() {
                     return ((ActionContent) view.getContent()).getActionName();
                 }
 
+                @Override
                 public String getDescription() {
                     return "Running action " + getName() + " on  " + view.getContent().getAdapter();
                 }
@@ -163,31 +167,37 @@ public class ActionDialogSpecification e
         }
 
         @Override
-        protected void move(final Location at) {}
+        protected void move(final Location at) {
+        }
     }
 
     public ActionDialogSpecification() {
         builder = new ActionFieldBuilder(new DialogFormSubviews());
         addSubviewDecorator(new ParametersLabelDecorator());
         addViewDecorator(new CompositeViewDecorator() {
-            public View decorate(View view, Axes axes) {
+            @Override
+            public View decorate(final View view, final Axes axes) {
                 // TODO reintroduce the 'Apply' notion, but under control from the method declaration
                 final ButtonAction[] actions = new ButtonAction[] { new ExecuteAndCloseAction(), new CancelAction() };
-                final ButtonBorder buttonBorder = new ButtonBorder(actions, new IconBorder(view, Toolkit.getText(ColorsAndFonts.TEXT_TITLE_SMALL)));
+                final ButtonBorder buttonBorder =
+                    new ButtonBorder(actions, new IconBorder(view, Toolkit.getText(ColorsAndFonts.TEXT_TITLE_SMALL)));
                 buttonBorder.setFocusManager(new ActionDialogFocusManager(buttonBorder));
                 return buttonBorder;
             }
         });
     }
 
-    public Layout createLayout(Content content, Axes axes) {
+    @Override
+    public Layout createLayout(final Content content, final Axes axes) {
         return new StackLayout();
     }
 
-    public boolean canDisplay(ViewRequirement requirement) {
+    @Override
+    public boolean canDisplay(final ViewRequirement requirement) {
         return requirement.getContent() instanceof ActionContent;
     }
 
+    @Override
     public String getName() {
         return "Action Dialog";
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java Tue May  3 07:18:19 2011
@@ -17,11 +17,8 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.dialog;
 
-
-import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -35,7 +32,7 @@ import org.apache.isis.viewer.dnd.view.a
 import org.apache.isis.viewer.dnd.view.action.ParameterContent;
 import org.apache.isis.viewer.dnd.view.action.TextParseableParameter;
 import org.apache.isis.viewer.dnd.view.composite.AbstractViewBuilder;
-
+import org.apache.log4j.Logger;
 
 public class ActionFieldBuilder extends AbstractViewBuilder {
     private static final Logger LOG = Logger.getLogger(ActionFieldBuilder.class);
@@ -46,7 +43,7 @@ public class ActionFieldBuilder extends 
     }
 
     @Override
-    public void build(final View view, Axes axes) {
+    public void build(final View view, final Axes axes) {
         Assert.assertEquals(view.getView(), view);
 
         final ActionContent actionContent = ((ActionContent) view.getContent());
@@ -58,7 +55,7 @@ public class ActionFieldBuilder extends 
 
     }
 
-    private View createFieldView(final View view, final ParameterContent parameter, int sequence) {
+    private View createFieldView(final View view, final ParameterContent parameter, final int sequence) {
         final View fieldView = subviewDesign.createView(parameter, null, sequence);
         if (fieldView == null) {
             throw new IsisException("All parameters must be shown");
@@ -100,7 +97,8 @@ public class ActionFieldBuilder extends 
 
             if (content instanceof ObjectParameter) {
                 if (subviewsObject != invocationsObject) {
-                    final ObjectParameter parameter = new ObjectParameterImpl((ObjectParameterImpl) content, invocationsObject);
+                    final ObjectParameter parameter =
+                        new ObjectParameterImpl((ObjectParameterImpl) content, invocationsObject);
                     final View fieldView = createFieldView(view, parameter, i);
                     view.replaceView(subview, decorateSubview(view.getViewAxes(), fieldView));
                 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ParametersLabelDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ParametersLabelDecorator.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ParametersLabelDecorator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ParametersLabelDecorator.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.dialog;
 
 import org.apache.isis.viewer.dnd.view.Axes;
@@ -30,13 +29,15 @@ import org.apache.isis.viewer.dnd.view.b
 import org.apache.isis.viewer.dnd.view.border.LabelBorder;
 
 public class ParametersLabelDecorator implements SubviewDecorator {
-    
-    public ViewAxis createAxis(Content content) {
+
+    @Override
+    public ViewAxis createAxis(final Content content) {
         return new LabelAxis();
     }
 
-    public View decorate(Axes axes, View view) {
-        LabelAxis axis = (LabelAxis) axes.getAxis(LabelAxis.class);
+    @Override
+    public View decorate(final Axes axes, final View view) {
+        final LabelAxis axis = axes.getAxis(LabelAxis.class);
         if (view.getContent().isObject() && !view.getContent().isTextParseable()) {
             return DroppableLabelBorder.createObjectParameterLabelBorder(axis, view);
         } else {
@@ -44,5 +45,3 @@ public class ParametersLabelDecorator im
         }
     }
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Background.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Background.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Background.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Background.java Tue May  3 07:18:19 2011
@@ -17,11 +17,8 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.drawing;
 
-
-
 /**
  * A strategy for rendering the background of the application window.
  */

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java Tue May  3 07:18:19 2011
@@ -17,25 +17,23 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.drawing;
 
 import org.apache.log4j.Logger;
 
-
 /**
- * Bounds represent a rectangular area on the screen. The top-left corner is represented by the location
- * (available using getLocation(), and getX() and getY()). The extent of the bounds is specified by its height
- * and width (available using getHeight() and getWidth()). The bottom-right point is the offset from the
- * top-left point by width -1 and hieght - 1 pixels.
+ * Bounds represent a rectangular area on the screen. The top-left corner is represented by the location (available
+ * using getLocation(), and getX() and getY()). The extent of the bounds is specified by its height and width (available
+ * using getHeight() and getWidth()). The bottom-right point is the offset from the top-left point by width -1 and
+ * hieght - 1 pixels.
  * 
  * For example a bounds created as follows
  * 
  * new Bounds(5, 10, 10, 20)
  * 
- * Would represent a rectangle at location (5, 10), with a width of 10 pixels and a height of 20. Note, hower
- * that the lower-right corner would be at (14, 29), as there are 10 pixels between pixel 5 and pixel 14, and
- * 20 between 10 and 29.
+ * Would represent a rectangle at location (5, 10), with a width of 10 pixels and a height of 20. Note, hower that the
+ * lower-right corner would be at (14, 29), as there are 10 pixels between pixel 5 and pixel 14, and 20 between 10 and
+ * 29.
  */
 public class Bounds {
     Logger LOG = Logger.getLogger("Bounds");
@@ -184,9 +182,8 @@ public class Bounds {
     }
 
     /**
-     * Determines whether this bounds overlaps the specified bounds. If any area is shared by the two bounds
-     * then this will return true. As the edges of the bounds are of a finite size the bounds overlap if any
-     * of the edges overlap.
+     * Determines whether this bounds overlaps the specified bounds. If any area is shared by the two bounds then this
+     * will return true. As the edges of the bounds are of a finite size the bounds overlap if any of the edges overlap.
      */
     public boolean intersects(final Bounds bounds) {
         final int tx1 = this.x;
@@ -195,14 +192,16 @@ public class Bounds {
         final int ox2 = bounds.x + bounds.width - 1;
 
         // tx1 < ox1 < tx2 || tx1 < ox2 < tx2
-        final boolean xOverlap = (tx1 <= ox1 && ox1 <= tx2) || (tx1 <= ox2 && ox1 <= tx2) || (ox1 <= tx1 && tx1 <= ox2)
+        final boolean xOverlap =
+            (tx1 <= ox1 && ox1 <= tx2) || (tx1 <= ox2 && ox1 <= tx2) || (ox1 <= tx1 && tx1 <= ox2)
                 || (ox1 <= tx2 && tx1 <= ox2);
 
         final int ty1 = this.y;
         final int ty2 = this.y + this.height - 1;
         final int oy1 = bounds.y;
         final int oy2 = bounds.y + bounds.height - 1;
-        final boolean yOverlap = (ty1 <= oy1 && oy1 <= ty2) || (ty1 <= oy2 && oy1 <= ty2) || (oy1 <= ty1 && ty1 <= oy2)
+        final boolean yOverlap =
+            (ty1 <= oy1 && oy1 <= ty2) || (ty1 <= oy2 && oy1 <= ty2) || (oy1 <= ty1 && ty1 <= oy2)
                 || (oy1 <= ty2 && ty1 <= oy2);
         return xOverlap && yOverlap;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Canvas.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Canvas.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Canvas.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Canvas.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.drawing;
 
 public interface Canvas {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Color.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Color.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Color.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/drawing/Color.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.drawing;
 
 public interface Color {



Mime
View raw message