incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1098662 [2/4] - in /incubator/isis/trunk/viewer/html/src: main/java/org/apache/isis/viewer/html/ main/java/org/apache/isis/viewer/html/action/ main/java/org/apache/isis/viewer/html/action/edit/ main/java/org/apache/isis/viewer/html/action/...
Date Mon, 02 May 2011 16:59:13 GMT
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java Mon May  2 16:59:09 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
 import org.apache.isis.viewer.html.component.ComponentAbstract;
 
-
 public class Heading extends ComponentAbstract {
     private final String title;
     private final int level;
@@ -38,6 +36,7 @@ public class Heading extends ComponentAb
         this.level = level;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writeTag(writer, "h" + level);
         writer.print(title);
@@ -47,4 +46,3 @@ public class Heading extends ComponentAb
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java Mon May  2 16:59:09 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
 import org.apache.isis.viewer.html.component.ComponentAbstract;
 
-
 class Html extends ComponentAbstract {
 
     private final String code;
@@ -33,8 +31,8 @@ class Html extends ComponentAbstract {
         this.code = code;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writer.print(code);
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java Mon May  2 16:59:09 2011
@@ -17,9 +17,14 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
+import static org.apache.isis.viewer.html.HtmlViewerConstants.FOOTER;
+import static org.apache.isis.viewer.html.HtmlViewerConstants.FOOTER_FILE;
+import static org.apache.isis.viewer.html.HtmlViewerConstants.HEADER;
+import static org.apache.isis.viewer.html.HtmlViewerConstants.HEADER_FILE;
+import static org.apache.isis.viewer.html.HtmlViewerConstants.STYLE_SHEET;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -41,9 +46,6 @@ import org.apache.isis.viewer.html.compo
 import org.apache.isis.viewer.html.component.Page;
 import org.apache.isis.viewer.html.component.Table;
 
-import static org.apache.isis.viewer.html.HtmlViewerConstants.*;
-
-
 public class HtmlComponentFactory implements ComponentFactory {
 
     private final String footer;
@@ -59,89 +61,100 @@ public class HtmlComponentFactory implem
         footer = file == null ? configuration.getString(FOOTER) : loadFile(file);
     }
 
+    @Override
     public Block createBlock(final String style, final String description) {
         return new Div(style, description);
     }
 
+    @Override
     public Component createBreadCrumbs(final String[] names, final boolean[] isLinked) {
         return new BreadCrumbs(names, isLinked);
     }
 
+    @Override
     public Component createCollectionIcon(final ObjectAssociation field, final ObjectAdapter collection, final String id) {
         return new CollectionLink(field, collection, field.getDescription(), id);
     }
 
+    @Override
     public DebugPane createDebugPane() {
         return new HtmlDebug();
     }
 
+    @Override
     public Component createEditOption(final String id) {
         return new ActionComponent("edit", "Edit Object", "Edit the current object", id, null, null);
     }
 
+    @Override
     public Component createRemoveOption(final String id, final String elementId, final String fieldName) {
         return new ActionComponent("remove", "Remove", "Remove item from collection", id, elementId, fieldName);
     }
 
+    @Override
     public Component createAddOption(final String id, final String fieldName) {
         return new ActionComponent("add", "Add Item", "Add item to collection", id, null, fieldName);
     }
 
+    @Override
     public Component createErrorMessage(final Exception e, final boolean isDebug) {
         return new ErrorMessage(e, isDebug);
     }
 
-    public Form createForm(final String id, final String actionName, final int step, final int noOfPages, final boolean isEditing) {
+    @Override
+    public Form createForm(final String id, final String actionName, final int step, final int noOfPages,
+        final boolean isEditing) {
         return new HtmlForm(id, actionName, step, noOfPages, isEditing);
     }
 
+    @Override
     public Component createHeading(final String name) {
         return new Heading(name, 4);
     }
 
+    @Override
     public Component createInlineBlock(final String style, final String text, final String description) {
         return new Span(style, text, description);
     }
 
+    @Override
     public Component createCheckboxBlock(final boolean isEditable, final boolean isSet) {
         return new Checkbox(isSet, isEditable);
     }
 
+    @Override
     public Component createSubmenu(final String menuName, final Component[] items) {
         return new Submenu(menuName, items);
     }
 
+    @Override
     public Component createLink(final String link, final String name, final String description) {
         return new Link(link, name, description);
     }
 
-    public Component createMenuItem(
-            final String actionId,
-            final String name,
-            final String description,
-            final String reasonDisabled,
-            final ActionType type,
-            final boolean hasParameters,
-            final String targetObjectId) {
+    @Override
+    public Component createMenuItem(final String actionId, final String name, final String description,
+        final String reasonDisabled, final ActionType type, final boolean hasParameters, final String targetObjectId) {
         return new MenuItem(actionId, name, description, reasonDisabled, type, hasParameters, targetObjectId);
     }
 
+    @Override
     public Component createCollectionIcon(final ObjectAdapter collection, final String collectionId) {
         return new CollectionIcon(collection, collection.getSpecification().getDescription(), collectionId);
     }
 
+    @Override
     public Component createObjectIcon(final ObjectAdapter object, final String objectId, final String style) {
         return new ObjectIcon(object, object.getSpecification().getDescription(), objectId, style);
     }
 
-    public Component createObjectIcon(
-            final ObjectAssociation field,
-            final ObjectAdapter object,
-            final String objectId,
-            final String style) {
+    @Override
+    public Component createObjectIcon(final ObjectAssociation field, final ObjectAdapter object, final String objectId,
+        final String style) {
         return new ObjectIcon(object, field.getDescription(), objectId, style);
     }
 
+    @Override
     public Page createPage() {
         return new DynamicHtmlPage(styleSheet, header, footer);
     }
@@ -150,20 +163,25 @@ public class HtmlComponentFactory implem
         return new LogonFormPage(styleSheet, header, footer, user, password);
     }
 
+    @Override
     public Component createService(final String objectId, final String title, final String iconName) {
         return new ServiceComponent(objectId, title, iconName);
     }
 
+    @Override
     public Table createTable(final int noColumns, final boolean withSelectorColumn) {
         return new HtmlTable(noColumns, withSelectorColumn);
     }
 
+    @Override
     public Component createUserSwap(final String name) {
         return new UserSwapLink(name);
 
     }
 
-    public Component createParseableField(final ObjectAssociation field, final ObjectAdapter value, final boolean isEditable) {
+    @Override
+    public Component createParseableField(final ObjectAssociation field, final ObjectAdapter value,
+        final boolean isEditable) {
         final BooleanValueFacet facet = field.getSpecification().getFacet(BooleanValueFacet.class);
         if (facet != null) {
             return createCheckboxBlock(isEditable, facet.isSet(value));
@@ -199,10 +217,10 @@ public class HtmlComponentFactory implem
             if (reader != null) {
                 try {
                     reader.close();
-                } catch (final IOException ignore) {}
+                } catch (final IOException ignore) {
+                }
             }
         }
         return content.toString();
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -25,12 +24,12 @@ import java.io.PrintWriter;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.viewer.html.component.DebugPane;
 
-
 public class HtmlDebug implements DebugPane {
     private static final String SPACES = "                                    ";
     private final StringBuffer debug = new StringBuffer();
     private int indent;
 
+    @Override
     public void addSection(final String title) {
         if (debug.length() > 0) {
             appendln("</pre>");
@@ -40,12 +39,14 @@ public class HtmlDebug implements DebugP
         appendln("</h2><pre>");
     }
 
+    @Override
     public void appendln(final String text) {
         debug.append(SPACES.substring(0, indent * 3));
         debug.append(text);
         debug.append("\n");
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         if (debug.length() > 0) {
             writer.print(debug.toString());
@@ -53,10 +54,12 @@ public class HtmlDebug implements DebugP
         }
     }
 
+    @Override
     public void indent() {
         indent++;
     }
 
+    @Override
     public void unindent() {
         if (indent == 0) {
             throw new IsisException();
@@ -64,4 +67,3 @@ public class HtmlDebug implements DebugP
         indent--;
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java Mon May  2 16:59:09 2011
@@ -17,16 +17,15 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 
-
 public class HtmlException extends IsisException {
     private static final long serialVersionUID = 1L;
 
-    public HtmlException() {}
+    public HtmlException() {
+    }
 
     public HtmlException(final String msg) {
         super(msg);
@@ -41,4 +40,3 @@ public class HtmlException extends IsisE
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -27,7 +26,6 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.viewer.html.component.ComponentComposite;
 import org.apache.isis.viewer.html.component.Form;
 
-
 public class HtmlForm extends ComponentComposite implements Form {
     private final boolean confirm;
     private final boolean hasNext;
@@ -39,13 +37,8 @@ public class HtmlForm extends ComponentC
         this(id, action, page, noOfPages, false, isEditing);
     }
 
-    private HtmlForm(
-            final String id,
-            final String action,
-            final int page,
-            final int noOfPages,
-            final boolean confirm,
-            final boolean isEditing) {
+    private HtmlForm(final String id, final String action, final int page, final int noOfPages, final boolean confirm,
+        final boolean isEditing) {
         this.id = id;
         this.confirm = confirm;
         this.isEditing = isEditing;
@@ -53,13 +46,8 @@ public class HtmlForm extends ComponentC
         hasNext = page < noOfPages - 1;
     }
 
-    private void addField(
-            final String label,
-            final String field,
-            final String description,
-            final boolean readOnly,
-            final boolean required,
-            final String errorMessage) {
+    private void addField(final String label, final String field, final String description, final boolean readOnly,
+        final boolean required, final String errorMessage) {
         String error = "";
         if (errorMessage != null) {
             error = "<span class=\"error\"> " + errorMessage + "</span>";
@@ -73,48 +61,44 @@ public class HtmlForm extends ComponentC
             }
         }
         add(new Html("<div class=\"field\" title=\"" + description + "\"><span class=\"label\">" + label
-                + "</span><span class=\"separator\">: </span> " + field + optional + error + "</div>"));
+            + "</span><span class=\"separator\">: </span> " + field + optional + error + "</div>"));
     }
 
-    public void addField(
-            final ObjectSpecification spec,
-            final String label,
-            final String title,
-            final String field,
-            final String value,
-            final int noLines,
-            final boolean wrap,
-            final int maxLength,
-            final int typicalLength,
-            final boolean required,
-            final String error) {
+    @Override
+    public void addField(final ObjectSpecification spec, final String label, final String title, final String field,
+        final String value, final int noLines, final boolean wrap, final int maxLength, final int typicalLength,
+        final boolean required, final String error) {
         String inputField;
         /*
-         * REVIEW the following qualification are a bit limited - it's the simplest thing than will work - we
-         * need to determine from the specification whether something is boolean type or a password.
+         * REVIEW the following qualification are a bit limited - it's the simplest thing than will work - we need to
+         * determine from the specification whether something is boolean type or a password.
          * 
          * Also see the note in the Form I/F.
          */
         boolean ignoreMandatory = false;
         if (spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(boolean.class))
-                || spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(Boolean.class))) {
+            || spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(Boolean.class))) {
             final String selected = (value != null && value.toLowerCase().equals("true")) ? "checked " : "";
-            inputField = "<input class=\"value\" type=\"checkbox\" name=\"" + field + "\"" + selected + " value=\"true\"/>";
+            inputField =
+                "<input class=\"value\" type=\"checkbox\" name=\"" + field + "\"" + selected + " value=\"true\"/>";
             ignoreMandatory = true;
         } else if (spec.getFullIdentifier().endsWith(".Password")) {
             final String typicalLengthStr = typicalLength == 0 ? "" : (" size=\"" + typicalLength + "\"");
             final String maxLengthStr = maxLength == 0 ? "" : (" maxlength=\"" + maxLength + "\"");
-            inputField = "<input class=\"value\" type=\"password\" name=\"" + field + "\"" + typicalLengthStr + maxLengthStr
+            inputField =
+                "<input class=\"value\" type=\"password\" name=\"" + field + "\"" + typicalLengthStr + maxLengthStr
                     + "value=\"" + value + "\"/>";
 
         } else if (noLines > 1) {
             final int w = typicalLength > 0 ? typicalLength / noLines : 50;
-            inputField = "<textarea class=\"value\" type=\"text\" name=\"" + field + "\" rows=\"" + noLines + "\" cols=\"" + w
+            inputField =
+                "<textarea class=\"value\" type=\"text\" name=\"" + field + "\" rows=\"" + noLines + "\" cols=\"" + w
                     + "\" wrap=\"" + (wrap ? "hard" : "off") + "\">" + value + "</textarea>";
         } else {
             final String typicalLengthStr = typicalLength == 0 ? "" : (" size=\"" + typicalLength + "\"");
             final String maxLengthStr = maxLength == 0 ? "" : (" maxlength=\"" + maxLength + "\"");
-            inputField = "<input class=\"value\" type=\"text\" name=\"" + field + "\"" + typicalLengthStr + maxLengthStr
+            inputField =
+                "<input class=\"value\" type=\"text\" name=\"" + field + "\"" + typicalLengthStr + maxLengthStr
                     + "value=\"" + value + "\"/>";
         }
         addField(label, inputField, title, ignoreMandatory, required, error);
@@ -124,15 +108,10 @@ public class HtmlForm extends ComponentC
         add(new Heading(fieldLabel, 4));
     }
 
-    public void addLookup(
-            final String fieldLabel,
-            final String description,
-            final String fieldId,
-            final int selectedIndex,
-            final String[] instances,
-            final String[] ids,
-            final boolean required,
-            final String errorMessage) {
+    @Override
+    public void addLookup(final String fieldLabel, final String description, final String fieldId,
+        final int selectedIndex, final String[] instances, final String[] ids, final boolean required,
+        final String errorMessage) {
         final StringBuffer testInputField = new StringBuffer();
         testInputField.append("<select class=\"value\" name=\"" + fieldId + "\">");
         if (!required) {
@@ -160,6 +139,7 @@ public class HtmlForm extends ComponentC
         addField(fieldLabel, testInputField.toString(), description, false, required, errorMessage);
     }
 
+    @Override
     public void addReadOnlyField(final String fieldLabel, final String title, final String description) {
         addField(fieldLabel, "<span class=\"value\">" + title + "</span>", description, true, false, null);
     }
@@ -207,4 +187,3 @@ public class HtmlForm extends ComponentC
         writer.println("<input type=\"hidden\" name=\"id\" value=\"" + id + "\"/>");
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -26,7 +25,6 @@ import org.apache.isis.viewer.html.compo
 import org.apache.isis.viewer.html.component.ComponentComposite;
 import org.apache.isis.viewer.html.component.Table;
 
-
 public class HtmlTable extends ComponentComposite implements Table {
     private String summary;
     private final TableHeader header;
@@ -47,6 +45,7 @@ public class HtmlTable extends Component
         return row;
     }
 
+    @Override
     public void setSummary(final String summary) {
         this.summary = summary;
     }
@@ -71,6 +70,7 @@ public class HtmlTable extends Component
         writer.println("</tr>");
     }
 
+    @Override
     public void addCell(final String value, final boolean truncate) {
         row.addCell(value, truncate);
         cellCount++;
@@ -79,10 +79,12 @@ public class HtmlTable extends Component
         }
     }
 
+    @Override
     public void addEmptyCell() {
         addCell(new Span("empty-cell", "", null));
     }
 
+    @Override
     public void addCell(final Component component) {
         row.add(component);
         cellCount++;
@@ -91,6 +93,7 @@ public class HtmlTable extends Component
         }
     }
 
+    @Override
     public void addColumnHeader(final String name) {
         header.addHeader(name);
         cellCount++;
@@ -99,6 +102,7 @@ public class HtmlTable extends Component
         }
     }
 
+    @Override
     public void addRowHeader(final Component component) {
         row = new Row();
         add(row);
@@ -107,4 +111,3 @@ public class HtmlTable extends Component
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java Mon May  2 16:59:09 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
 import org.apache.isis.viewer.html.component.Component;
 
-
 public class Link implements Component {
     private final String link;
     private final String name;
@@ -36,9 +34,9 @@ public class Link implements Component {
         this.description = description;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writer.print("<a class=\"link\" title=\"" + description + "\" href=\"" + link + ".app\">" + name + "</a>");
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -27,17 +26,12 @@ import org.apache.isis.viewer.html.compo
 import org.apache.isis.viewer.html.component.DebugPane;
 import org.apache.isis.viewer.html.component.ViewPane;
 
-
 public class LogonFormPage extends AbstractHtmlPage {
     private final String user;
     private final String password;
 
-    public LogonFormPage(
-            final String styleSheet,
-            final String header,
-            final String footer,
-            final String user,
-            final String password) {
+    public LogonFormPage(final String styleSheet, final String header, final String footer, final String user,
+        final String password) {
         super(styleSheet, header, footer);
         this.user = user;
         this.password = password;
@@ -56,10 +50,10 @@ public class LogonFormPage extends Abstr
         writer.println("<FORM ACTION=\"logon.app\" METHOD=\"post\">");
         writer.println("<div id=\"content\">");
         writer.println("<div class=\"field\"><span class=\"label\">User name</span>"
-                + "<span class=\"separator\">: </span><INPUT NAME=\"username\" value=\"" + user + "\"></DIV>");
+            + "<span class=\"separator\">: </span><INPUT NAME=\"username\" value=\"" + user + "\"></DIV>");
         writer.println("<div class=\"field\"><span class=\"label\">Password</span>"
-                + "<span class=\"separator\">: </span><INPUT TYPE=\"password\" NAME=\"password\" value=\"" + password
-                + "\"></DIV>");
+            + "<span class=\"separator\">: </span><INPUT TYPE=\"password\" NAME=\"password\" value=\"" + password
+            + "\"></DIV>");
         writer.println("<div class=\"action-button\"><INPUT TYPE=\"submit\" VALUE=\"Log in\" NAME=\"Log in\"></div>");
         writer.println("</div>");
         writer.println("</FORM>");
@@ -67,17 +61,22 @@ public class LogonFormPage extends Abstr
 
     }
 
+    @Override
     public Block getNavigation() {
         return null;
     }
 
+    @Override
     public ViewPane getViewPane() {
         return null;
     }
 
-    public void setCrumbs(final Component component) {}
+    @Override
+    public void setCrumbs(final Component component) {
+    }
 
-    public void setDebug(final DebugPane debugPane) {}
+    @Override
+    public void setDebug(final DebugPane debugPane) {
+    }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -25,7 +24,6 @@ import java.io.PrintWriter;
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.html.component.Component;
 
-
 public class MenuItem implements Component {
     private final String actionId;
     private final String actionName;
@@ -35,14 +33,8 @@ public class MenuItem implements Compone
     private final boolean takesParameters;
     private final ActionType type;
 
-    public MenuItem(
-            final String actionId,
-            final String actionName,
-            final String actionDescription,
-            final String reasonDisabled,
-            final ActionType type,
-            final boolean takesParameters,
-            final String objectId) {
+    public MenuItem(final String actionId, final String actionName, final String actionDescription,
+        final String reasonDisabled, final ActionType type, final boolean takesParameters, final String objectId) {
         this.actionId = actionId;
         this.actionName = actionName;
         this.actionDescription = actionDescription;
@@ -52,6 +44,7 @@ public class MenuItem implements Compone
         this.objectId = objectId;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writer.print("<div class=\"menu-item\">");
         if (isEmpty(reasonDisabled)) {
@@ -100,4 +93,3 @@ public class MenuItem implements Compone
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -27,8 +26,6 @@ import org.apache.isis.viewer.html.compo
 import org.apache.isis.viewer.html.image.ImageLookup;
 import org.apache.isis.viewer.html.request.Request;
 
-
-
 public class ObjectIcon implements Component {
     private final ObjectAdapter element;
     private final String id;
@@ -72,4 +69,3 @@ public class ObjectIcon implements Compo
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -25,7 +24,6 @@ import java.io.PrintWriter;
 import org.apache.isis.viewer.html.component.Component;
 import org.apache.isis.viewer.html.component.ComponentComposite;
 
-
 class Row extends ComponentComposite {
 
     private static final int TRUNCATE_LENGTH = 18;
@@ -55,4 +53,3 @@ class Row extends ComponentComposite {
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -25,7 +24,6 @@ import java.io.PrintWriter;
 import org.apache.isis.viewer.html.component.Component;
 import org.apache.isis.viewer.html.image.ImageLookup;
 
-
 public class ServiceComponent implements Component {
 
     private final String id;
@@ -38,6 +36,7 @@ public class ServiceComponent implements
         this.iconName = iconName;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writer.print("<div class=\"item\">");
 
@@ -54,4 +53,3 @@ public class ServiceComponent implements
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -25,7 +24,6 @@ import java.io.PrintWriter;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.isis.viewer.html.component.Component;
 
-
 public class Span implements Component {
     private final String className;
     private final String value;
@@ -37,6 +35,7 @@ public class Span implements Component {
         this.description = description;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writer.print("<span class=\"");
         writer.print(className);
@@ -48,9 +47,8 @@ public class Span implements Component {
         }
         writer.print(">");
         if (value != null) {
-            writer.print( StringEscapeUtils.escapeHtml(value) );
+            writer.print(StringEscapeUtils.escapeHtml(value));
         }
         writer.print("</span>");
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java Mon May  2 16:59:09 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
 import org.apache.isis.viewer.html.component.Component;
 
-
 public class Submenu implements Component {
 
     private final String menuName;
@@ -35,14 +33,14 @@ public class Submenu implements Componen
         this.items = items;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writer.println("<div class=\"submenu-item\">");
         writer.println(menuName);
-        for (int j = 0; j < items.length; j++) {
-            items[j].write(writer);
+        for (final Component item : items) {
+            item.write(writer);
         }
         writer.println("</div>");
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -25,7 +24,6 @@ import java.io.PrintWriter;
 import org.apache.isis.viewer.html.component.Component;
 import org.apache.isis.viewer.html.component.ComponentComposite;
 
-
 class TableHeader extends ComponentComposite {
 
     @Override
@@ -39,4 +37,3 @@ class TableHeader extends ComponentCompo
         add(new Html(string));
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java Mon May  2 16:59:09 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
 import org.apache.isis.viewer.html.component.ComponentAbstract;
 
-
 class TextBlock extends ComponentAbstract {
     StringBuffer buffer = new StringBuffer();
 
@@ -32,7 +30,8 @@ class TextBlock extends ComponentAbstrac
         append(text);
     }
 
-    public TextBlock() {}
+    public TextBlock() {
+    }
 
     public void append(final String string) {
         buffer.append(string);
@@ -44,6 +43,7 @@ class TextBlock extends ComponentAbstrac
         buffer.append("</b>");
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writeTag(writer, "p class=\"unknown\"");
         writer.print(buffer.toString());
@@ -51,4 +51,3 @@ class TextBlock extends ComponentAbstrac
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java Mon May  2 16:59:09 2011
@@ -17,30 +17,29 @@
  *  under the License.
  */
 
+/**
+ * 
+ */
+package org.apache.isis.viewer.html.component.html;
+
+import java.io.PrintWriter;
 
-/**
- * 
- */
-package org.apache.isis.viewer.html.component.html;
-
-import java.io.PrintWriter;
-
 import org.apache.isis.viewer.html.component.Component;
-
-
-final class UserSwapLink implements Component {
-    private final String name;
-
-    UserSwapLink(final String name) {
-        this.name = name;
-    }
-
-    public void write(final PrintWriter writer) {
-        writer.print("<a class=\"user\" href=\"setuser.app?name=");
-        writer.print(name);
-        writer.print("\" title=\"Change user to " + name);
-        writer.print("\">");
-        writer.print(name);
-        writer.println("</a>");
-    }
-}
+
+final class UserSwapLink implements Component {
+    private final String name;
+
+    UserSwapLink(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public void write(final PrintWriter writer) {
+        writer.print("<a class=\"user\" href=\"setuser.app?name=");
+        writer.print(name);
+        writer.print("\" title=\"Change user to " + name);
+        writer.print("\">");
+        writer.print(name);
+        writer.println("</a>");
+    }
+}

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
@@ -29,16 +28,16 @@ import org.apache.isis.viewer.html.compo
 import org.apache.isis.viewer.html.component.ViewPane;
 import org.apache.isis.viewer.html.image.ImageLookup;
 
-
 public class ViewDiv extends ComponentComposite implements ViewPane {
     private String iconName;
     private String objectId;
     private Component[] menu = new Component[0];
     private String title;
-    private List<String> messages = new ArrayList<String>();
-    private List<String> warnings = new ArrayList<String>();
+    private final List<String> messages = new ArrayList<String>();
+    private final List<String> warnings = new ArrayList<String>();
     private String description;
 
+    @Override
     public void setIconName(final String iconName) {
         this.iconName = iconName;
     }
@@ -47,15 +46,18 @@ public class ViewDiv extends ComponentCo
         this.objectId = objectId;
     }
 
+    @Override
     public void setMenu(final Component[] menu) {
         this.menu = menu;
     }
 
+    @Override
     public void setTitle(final String title, final String description) {
         this.title = title;
         this.description = description;
     }
 
+    @Override
     public void setWarningsAndMessages(final List<String> messages, final List<String> warnings) {
         this.messages.addAll(messages);
         this.warnings.addAll(warnings);
@@ -79,12 +81,12 @@ public class ViewDiv extends ComponentCo
     private void writeMessages(final PrintWriter writer) {
         if (warnings.size() > 0 || messages.size() > 0) {
             writer.print("<div class=\"message-header\">");
-            for (String warning: warnings) {
+            for (final String warning : warnings) {
                 writer.print("<div class=\"warning\">");
                 writer.print(warning);
                 writer.println("</div>");
             }
-            for (String message: messages) {
+            for (final String message : messages) {
                 writer.print("<div class=\"message\">");
                 writer.print(message);
                 writer.println("</div>");
@@ -96,8 +98,8 @@ public class ViewDiv extends ComponentCo
     private void writeMenu(final PrintWriter writer) {
         writer.println("<div id=\"menu\">");
         writer.println("<h3>Actions</h3>");
-        for (int j = 0; j < menu.length; j++) {
-            menu[j].write(writer);
+        for (final Component element : menu) {
+            element.write(writer);
         }
         writer.println("</div>");
     }
@@ -130,4 +132,3 @@ public class ViewDiv extends ComponentCo
         writer.println("</div>");
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java Mon May  2 16:59:09 2011
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.component.html;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 
-
 public class WebViewerException extends IsisException {
     private static final long serialVersionUID = 1L;
 
@@ -43,4 +41,3 @@ public class WebViewerException extends 
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.context;
 
 import java.util.Enumeration;
@@ -33,7 +32,6 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
 
-
 /**
  * Has value semantics based on the value semantics of the underlying list that it wraps.
  */
@@ -79,8 +77,7 @@ public class CollectionMapping {
     }
 
     /**
-     * Value semantics based on the identity of the underlying list that this
-     * wraps. 
+     * Value semantics based on the identity of the underlying list that this wraps.
      */
     @Override
     public int hashCode() {
@@ -93,16 +90,16 @@ public class CollectionMapping {
             return true;
         }
         if (other == null) {
-        	return false;
+            return false;
         }
         if (other.getClass() != this.getClass()) {
-        	return false;
+            return false;
         }
-        return equals((CollectionMapping)other);
+        return equals((CollectionMapping) other);
     }
 
     public boolean equals(final CollectionMapping other) {
-    	return this.list.equals(other.list);
+        return this.list.equals(other.list);
     }
 
     public boolean contains(final String id) {
@@ -119,22 +116,19 @@ public class CollectionMapping {
     public Enumeration elements() {
         return list.elements();
     }
-    
-    public void remove(String existingId) {
-        for (Object entry : list) {
+
+    public void remove(final String existingId) {
+        for (final Object entry : list) {
             if (entry.equals(existingId)) {
                 list.remove(existingId);
                 break;
             }
         }
     }
-    
-    
 
-    
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // Dependencies (from context)
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
     private static AdapterManager getAdapterManager() {
         return getPersistenceSession().getAdapterManager();
@@ -145,4 +139,3 @@ public class CollectionMapping {
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.context;
 
 import java.util.ArrayList;
@@ -26,11 +25,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Stack;
-import java.util.Map.Entry;
-
-import org.apache.log4j.Logger;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -52,7 +49,7 @@ import org.apache.isis.viewer.html.crumb
 import org.apache.isis.viewer.html.crumb.TaskCrumb;
 import org.apache.isis.viewer.html.request.Request;
 import org.apache.isis.viewer.html.task.Task;
-
+import org.apache.log4j.Logger;
 
 public class Context {
     private static final Logger LOG = Logger.getLogger(Context.class);
@@ -61,13 +58,13 @@ public class Context {
     private final ObjectHistory history = new ObjectHistory();
     private boolean isValid;
     private int max;
-    private final Map<String,CollectionMapping> collectionMap = new HashMap<String,CollectionMapping>();
-    private final Map<String,ObjectMapping> objectMap = new HashMap<String,ObjectMapping>();
-    private final Map<String,ObjectMapping> serviceMap = new HashMap<String,ObjectMapping>();
+    private final Map<String, CollectionMapping> collectionMap = new HashMap<String, CollectionMapping>();
+    private final Map<String, ObjectMapping> objectMap = new HashMap<String, ObjectMapping>();
+    private final Map<String, ObjectMapping> serviceMap = new HashMap<String, ObjectMapping>();
     private final Stack<Crumb> crumbs = new Stack<Crumb>();
     private final List<String> messages = new ArrayList<String>();
     private final List<String> warnings = new ArrayList<String>();
-    
+
     private AuthenticationSession session;
 
     public Context(final ComponentFactory factory) {
@@ -116,10 +113,10 @@ public class Context {
         debug.appendln("is task", isTask());
 
         debug.appendln("crumbs (" + crumbs.size() + ")");
-        
+
         debug.indent();
         for (int i = 0; i < crumbs.size(); i++) {
-            final Crumb crumb = (Crumb) crumbs.get(i);
+            final Crumb crumb = crumbs.get(i);
             debug.appendln(i + 1 + ". " + crumb);
             debug.indent();
             crumb.debug(debug);
@@ -128,7 +125,7 @@ public class Context {
         debug.unindent();
 
         debug.startSection("Objects");
-        for(String id: objectMap.keySet()) {
+        for (final String id : objectMap.keySet()) {
             final ObjectMapping object = objectMap.get(id);
             debug.appendln(id + " -> " + object.getOid());
             debug.indent();
@@ -138,7 +135,7 @@ public class Context {
         debug.endSection();
 
         debug.startSection("Collections");
-        for(String id: collectionMap.keySet()) {
+        for (final String id : collectionMap.keySet()) {
             final CollectionMapping coll = collectionMap.get(id);
             debug.appendln(id + " -> collection of " + coll.getElementSpecification().getPluralName());
             coll.debug(debug);
@@ -173,27 +170,27 @@ public class Context {
     }
 
     /**
-     * Returns an array of instances of the specified type that are currently known in the current context, ie
-     * have been recently seen by the user.
+     * Returns an array of instances of the specified type that are currently known in the current context, ie have been
+     * recently seen by the user.
      * 
      * <p>
      * These will be resolved if required, with a transaction created (and ended) if required.
      */
     public ObjectAdapter[] getKnownInstances(final ObjectSpecification type) {
-    	
-    	final List<ObjectAdapter> instances = new ArrayList<ObjectAdapter>();
 
-		for(String id: objectMap.keySet()) {
-		    final ObjectAdapter adapter = getMappedObject(id);
-		    IsisContext.getPersistenceSession().resolveImmediately(adapter);
-		    if (adapter.getSpecification().isOfType(type)) {
-		        instances.add(adapter);
-		    }
-		}
-		
-		final ObjectAdapter[] array = new ObjectAdapter[instances.size()];
-		instances.toArray(array);
-		return array;
+        final List<ObjectAdapter> instances = new ArrayList<ObjectAdapter>();
+
+        for (final String id : objectMap.keySet()) {
+            final ObjectAdapter adapter = getMappedObject(id);
+            IsisContext.getPersistenceSession().resolveImmediately(adapter);
+            if (adapter.getSpecification().isOfType(type)) {
+                instances.add(adapter);
+            }
+        }
+
+        final ObjectAdapter[] array = new ObjectAdapter[instances.size()];
+        instances.toArray(array);
+        return array;
     }
 
     private String addToMap(final Map map, final Object object) {
@@ -216,8 +213,8 @@ public class Context {
         return id;
     }
 
-    private String findExistingId(final Map<String,?> map, final Object object) {
-        for(String id: map.keySet()) {
+    private String findExistingId(final Map<String, ?> map, final Object object) {
+        for (final String id : map.keySet()) {
             if (object.equals(map.get(id))) {
                 return id;
             }
@@ -246,7 +243,7 @@ public class Context {
         // ensure resolved if currently a ghost;
         // start/end xactn if required
         if (object.isPersistent() && object.getResolveState().isGhost()) {
-        	IsisContext.getPersistenceSession().resolveImmediately(object);
+            IsisContext.getPersistenceSession().resolveImmediately(object);
         }
 
         try {
@@ -255,7 +252,7 @@ public class Context {
             LOG.info("concurrency conflict: " + e.getMessage());
             messages.clear();
             messages.add(e.getMessage());
-            messages.add("Reloaded object " + object.titleString()); 
+            messages.add("Reloaded object " + object.titleString());
             updateVersion(object);
         }
         return object;
@@ -283,7 +280,7 @@ public class Context {
         }
 
         // REVIEW does this take us back to the right object?
-        final Crumb crumb = (Crumb) crumbs.get(crumbs.size() - 1);
+        final Crumb crumb = crumbs.get(crumbs.size() - 1);
         return crumb.changeContext();
     }
 
@@ -304,7 +301,7 @@ public class Context {
     }
 
     public String mapObject(final ObjectAdapter adapter) {
-        ObjectMapping mapping = objectMapping(adapter);
+        final ObjectMapping mapping = objectMapping(adapter);
         return addToMap(objectMap, mapping);
     }
 
@@ -341,7 +338,7 @@ public class Context {
         final int size = crumbs.size();
         final Crumb[] taskList = new Crumb[size];
         for (int i = 0; i < crumbs.size(); i++) {
-            taskList[i] = (Crumb) crumbs.get(i);
+            taskList[i] = crumbs.get(i);
         }
         return taskList;
     }
@@ -363,7 +360,7 @@ public class Context {
         return messages;
     }
 
-    public String getMessage(int i) {
+    public String getMessage(final int i) {
         return messages.get(i);
     }
 
@@ -371,11 +368,10 @@ public class Context {
         return warnings;
     }
 
-    public String getWarning(int i) {
+    public String getWarning(final int i) {
         return warnings.get(i);
     }
 
-
     public void setMessagesAndWarnings(final List<String> messages, final List<String> warnings) {
         this.messages.clear();
         this.messages.addAll(messages);
@@ -397,7 +393,7 @@ public class Context {
         while (crumbs.size() - 1 > id) {
             crumbs.pop();
         }
-        final Crumb c = (Crumb) crumbs.lastElement();
+        final Crumb c = crumbs.lastElement();
         return c.changeContext();
     }
 
@@ -415,18 +411,17 @@ public class Context {
 
         final Map newCollectionMap = new HashMap();
         final Map newObjectMap = new HashMap();
-        
 
-        Iterator<HistoryEntry> elements = history.elements();
+        final Iterator<HistoryEntry> elements = history.elements();
         while (elements.hasNext()) {
-            HistoryEntry entry = elements.next();
+            final HistoryEntry entry = elements.next();
             if (entry.type == HistoryEntry.OBJECT) {
                 final Object item = objectMap.get(entry.id);
                 newObjectMap.put(entry.id, item);
                 LOG.debug("copied object map " + entry.id + " for " + item);
                 ((ObjectMapping) item).updateVersion();
             } else if (entry.type == HistoryEntry.COLLECTION) {
-                final CollectionMapping coll = (CollectionMapping) collectionMap.get(entry.id);
+                final CollectionMapping coll = collectionMap.get(entry.id);
                 newCollectionMap.put(entry.id, coll);
                 LOG.debug("copied collection map for " + coll);
                 final Enumeration e1 = coll.elements();
@@ -470,15 +465,15 @@ public class Context {
     }
 
     public void init() {
-        AdapterManager adapterManager = IsisContext.getPersistenceSession().getAdapterManager();
-        List<Object> services = getUserProfile().getPerspective().getServices();
-        for (Object service : services) {
-            ObjectAdapter serviceAdapter = adapterManager.adapterFor(service); 
+        final AdapterManager adapterManager = IsisContext.getPersistenceSession().getAdapterManager();
+        final List<Object> services = getUserProfile().getPerspective().getServices();
+        for (final Object service : services) {
+            final ObjectAdapter serviceAdapter = adapterManager.adapterFor(service);
             if (serviceAdapter == null) {
-            	LOG.warn("unable to find service: " + service + "; skipping");
-            	continue;
+                LOG.warn("unable to find service: " + service + "; skipping");
+                continue;
             }
-			mapObject(serviceAdapter);
+            mapObject(serviceAdapter);
         }
         serviceMap.putAll(objectMap);
     }
@@ -496,43 +491,38 @@ public class Context {
             objectMap.put(id, mapping);
         }
     }
-    
+
     public void processChanges() {
-        List<ObjectAdapter> disposedObjects = IsisContext.getUpdateNotifier().getDisposedObjects();
-        for (ObjectAdapter adapter : disposedObjects) {
-            ObjectMapping mapping = objectMapping(adapter);
+        final List<ObjectAdapter> disposedObjects = IsisContext.getUpdateNotifier().getDisposedObjects();
+        for (final ObjectAdapter adapter : disposedObjects) {
+            final ObjectMapping mapping = objectMapping(adapter);
             if (objectMap.containsValue(mapping)) {
-                String existingId = findExistingId(objectMap, mapping);
+                final String existingId = findExistingId(objectMap, mapping);
                 history.remove(existingId);
-                
-                
-                ArrayList<Crumb> relatedCrumbs = new ArrayList<Crumb>();
-                for (Crumb crumb : getCrumbs()) {
-            /*        if (crumb.isFor(existingId)) {
-                        relatedCrumbs.add(crumb);
-                    }
-          */      }
-                for (Crumb crumb : relatedCrumbs) {
+
+                final ArrayList<Crumb> relatedCrumbs = new ArrayList<Crumb>();
+                for (final Crumb crumb : getCrumbs()) {
+                    /*
+                     * if (crumb.isFor(existingId)) { relatedCrumbs.add(crumb); }
+                     */}
+                for (final Crumb crumb : relatedCrumbs) {
                     crumbs.remove(crumb);
                 }
-                
-            
-            for (CollectionMapping collection : collectionMap.values()) {
-                collection.remove(existingId);
-            } 
-            objectMap.remove(existingId);
+
+                for (final CollectionMapping collection : collectionMap.values()) {
+                    collection.remove(existingId);
+                }
+                objectMap.remove(existingId);
             }
         }
     }
-    
-    
-    //////////////////////////////////////////////////////
+
+    // ////////////////////////////////////////////////////
     // Dependencies (from context)
-    //////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////
 
-	private static UserProfile getUserProfile() {
-		return IsisContext.getUserProfile();
-	}
+    private static UserProfile getUserProfile() {
+        return IsisContext.getUserProfile();
+    }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java Mon May  2 16:59:09 2011
@@ -17,35 +17,33 @@
  *  under the License.
  */
 
+package org.apache.isis.viewer.html.context;
 
-package org.apache.isis.viewer.html.context;
-
-public class HistoryEntry {
-    public static final int OBJECT = 1;
-    public static final int COLLECTION = 2;
-
-    public final int type;
-    public final String id;
-
-    public HistoryEntry(final String idString, final int type) {
-        this.id = idString;
-        this.type = type;
-    }
-
-    @Override
-    public int hashCode() {
-        return id.hashCode();
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        return ((HistoryEntry) obj).id.equals(id);
-    }
-
-    @Override
-    public String toString() {
-        return (type == OBJECT ? "object " : "collection ") + id;
-    }
-
-}
-
+public class HistoryEntry {
+    public static final int OBJECT = 1;
+    public static final int COLLECTION = 2;
+
+    public final int type;
+    public final String id;
+
+    public HistoryEntry(final String idString, final int type) {
+        this.id = idString;
+        this.type = type;
+    }
+
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        return ((HistoryEntry) obj).id.equals(id);
+    }
+
+    @Override
+    public String toString() {
+        return (type == OBJECT ? "object " : "collection ") + id;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java Mon May  2 16:59:09 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.context;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.debug.DebugBuilder;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
@@ -32,7 +30,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.viewer.html.component.Block;
 import org.apache.isis.viewer.html.component.Component;
-
+import org.apache.log4j.Logger;
 
 public class ObjectHistory {
     private static final Logger LOG = Logger.getLogger(ObjectHistory.class);
@@ -60,25 +58,25 @@ public class ObjectHistory {
         final Block taskBar = context.getComponentFactory().createBlock("history", null);
         taskBar.add(context.getComponentFactory().createHeading("History"));
         for (int i = history.size() - 1; i >= 0; i--) {
-        	try {
-	            final HistoryEntry item = history.get(i);
-	            Component icon;
-	            if (item.type == HistoryEntry.OBJECT) {
-	                final ObjectAdapter object = context.getMappedObject(item.id);
-	                
-					IsisContext.getPersistenceSession().resolveImmediately(object);
-					
-	                icon = context.getComponentFactory().createObjectIcon(object, item.id, "item");
-	            } else if (item.type == HistoryEntry.COLLECTION) {
-	                final ObjectAdapter object = context.getMappedCollection(item.id);
-	                icon = context.getComponentFactory().createCollectionIcon(object, item.id);
-	            } else {
-	                throw new UnknownTypeException(item);
-	            }
-	            taskBar.add(icon);
-        	} catch (IsisException e){ // Catch resolveImmediately exception when object is deleted.
-        		
-        	}
+            try {
+                final HistoryEntry item = history.get(i);
+                Component icon;
+                if (item.type == HistoryEntry.OBJECT) {
+                    final ObjectAdapter object = context.getMappedObject(item.id);
+
+                    IsisContext.getPersistenceSession().resolveImmediately(object);
+
+                    icon = context.getComponentFactory().createObjectIcon(object, item.id, "item");
+                } else if (item.type == HistoryEntry.COLLECTION) {
+                    final ObjectAdapter object = context.getMappedCollection(item.id);
+                    icon = context.getComponentFactory().createCollectionIcon(object, item.id);
+                } else {
+                    throw new UnknownTypeException(item);
+                }
+                taskBar.add(icon);
+            } catch (final IsisException e) { // Catch resolveImmediately exception when object is deleted.
+
+            }
         }
         navigation.add(taskBar);
     }
@@ -95,14 +93,13 @@ public class ObjectHistory {
         return history.iterator();
     }
 
-    public void remove(String existingId) {
-        for (HistoryEntry entry : history) {
+    public void remove(final String existingId) {
+        for (final HistoryEntry entry : history) {
             if (entry.id.equals(existingId)) {
                 history.remove(entry);
                 break;
             }
         }
-        
+
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java Mon May  2 16:59:09 2011
@@ -17,16 +17,15 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.context;
 
 import org.apache.isis.viewer.html.action.ActionException;
 
-
 public class ObjectLookupException extends ActionException {
     private static final long serialVersionUID = 1L;
 
-    public ObjectLookupException() {}
+    public ObjectLookupException() {
+    }
 
     public ObjectLookupException(final String msg, final Throwable cause) {
         super(msg, cause);
@@ -41,4 +40,3 @@ public class ObjectLookupException exten
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.context;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -25,7 +24,6 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.version.Version;
 
-
 public interface ObjectMapping {
 
     Oid getOid();
@@ -42,4 +40,3 @@ public interface ObjectMapping {
 
     void updateVersion();
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.context;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -30,7 +29,6 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
 
-
 public class PersistentObjectMapping implements ObjectMapping {
     private final Oid oid;
     private final ObjectSpecification specification;
@@ -102,13 +100,11 @@ public class PersistentObjectMapping imp
         final ObjectAdapter adapter = getPersistenceSession().recreateAdapter(oid, specification);
         adapter.setOptimisticLock(getVersion());
     }
-    
-    
-    
-    ///////////////////////////////////////////////////////
+
+    // /////////////////////////////////////////////////////
     // Dependencies (from context)
-    ///////////////////////////////////////////////////////
-    
+    // /////////////////////////////////////////////////////
+
     private static AdapterManager getAdapterManager() {
         return getPersistenceSession().getAdapterManager();
     }
@@ -117,6 +113,4 @@ public class PersistentObjectMapping imp
         return IsisContext.getPersistenceSession();
     }
 
-
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.context;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -30,7 +29,6 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
 
-
 public class TransientObjectMapping implements ObjectMapping {
     private final Oid oid;
     private final Memento memento;
@@ -42,14 +40,17 @@ public class TransientObjectMapping impl
         memento = new Memento(adapter);
     }
 
+    @Override
     public void debug(final DebugBuilder debug) {
         memento.debug(debug);
     }
 
+    @Override
     public Oid getOid() {
         return oid;
     }
 
+    @Override
     public ObjectAdapter getObject() {
         return getAdapterManager().getAdapterFor(oid);
     }
@@ -72,25 +73,28 @@ public class TransientObjectMapping impl
         return "TRANSIENT : " + oid + " : " + memento;
     }
 
+    @Override
     public Version getVersion() {
         return null;
     }
 
-    public void checkVersion(final ObjectAdapter object) {}
+    @Override
+    public void checkVersion(final ObjectAdapter object) {
+    }
 
+    @Override
     public void restoreToLoader() {
         memento.recreateObject();
     }
 
-    public void updateVersion() {}
-
+    @Override
+    public void updateVersion() {
+    }
 
-    
-    //////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////
     // Dependencies (from context)
-    //////////////////////////////////////////////////////////////
-    
-    
+    // ////////////////////////////////////////////////////////////
+
     private AdapterManager getAdapterManager() {
         return getPersistenceSession().getAdapterManager();
     }
@@ -99,6 +103,4 @@ public class TransientObjectMapping impl
         return IsisContext.getPersistenceSession();
     }
 
-
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.crumb;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -26,8 +25,6 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.viewer.html.request.ForwardRequest;
 import org.apache.isis.viewer.html.request.Request;
 
-
-
 public class CollectionCrumb implements Crumb {
     private final String collectionId;
     private final String title;
@@ -37,12 +34,14 @@ public class CollectionCrumb implements 
         title = collection.titleString();
     }
 
+    @Override
     public void debug(final DebugBuilder string) {
         string.appendln("Collection Crumb");
         string.appendln("object", collectionId);
         string.appendln("title", title);
     }
 
+    @Override
     public String title() {
         return title;
     }
@@ -52,8 +51,8 @@ public class CollectionCrumb implements 
         return new ToString(this).append(title()).toString();
     }
 
+    @Override
     public Request changeContext() {
         return ForwardRequest.listCollection(collectionId);
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java Mon May  2 16:59:09 2011
@@ -17,14 +17,11 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.crumb;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
 import org.apache.isis.viewer.html.request.Request;
 
-
-
 public interface Crumb {
     // TODO add icons to crumbs
 
@@ -34,4 +31,3 @@ public interface Crumb {
 
     Request changeContext();
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.crumb;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -26,8 +25,6 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.viewer.html.request.ForwardRequest;
 import org.apache.isis.viewer.html.request.Request;
 
-
-
 public class ObjectCrumb implements Crumb {
     private final String objectId;
     private final boolean isService;
@@ -39,6 +36,7 @@ public class ObjectCrumb implements Crum
         isService = object.getSpecification().isService();
     }
 
+    @Override
     public void debug(final DebugBuilder string) {
         string.appendln("Object Crumb");
         string.appendln("object", objectId);
@@ -46,6 +44,7 @@ public class ObjectCrumb implements Crum
         string.appendln("for service", isService);
     }
 
+    @Override
     public String title() {
         return title;
     }
@@ -55,6 +54,7 @@ public class ObjectCrumb implements Crum
         return new ToString(this).append(title()).toString();
     }
 
+    @Override
     public Request changeContext() {
         if (isService) {
             return ForwardRequest.viewService(objectId);
@@ -64,4 +64,3 @@ public class ObjectCrumb implements Crum
 
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.crumb;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -25,8 +24,6 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.viewer.html.request.Request;
 
-
-
 public class ObjectFieldCrumb implements Crumb {
     private final String fieldName;
 
@@ -34,11 +31,13 @@ public class ObjectFieldCrumb implements
         this.fieldName = fieldName;
     }
 
+    @Override
     public void debug(final DebugBuilder string) {
         string.appendln("Object Field Crumb");
         string.appendln("field name", fieldName);
     }
 
+    @Override
     public String title() {
         return fieldName;
     }
@@ -48,8 +47,8 @@ public class ObjectFieldCrumb implements
         return new ToString(this).append(title()).toString();
     }
 
+    @Override
     public Request changeContext() {
         throw new NotYetImplementedException();
     }
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java Mon May  2 16:59:09 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.crumb;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -26,7 +25,6 @@ import org.apache.isis.viewer.html.reque
 import org.apache.isis.viewer.html.request.Request;
 import org.apache.isis.viewer.html.task.Task;
 
-
 public class TaskCrumb implements Crumb {
     private final Task task;
 
@@ -38,6 +36,7 @@ public class TaskCrumb implements Crumb 
         return task;
     }
 
+    @Override
     public void debug(final DebugBuilder string) {
         string.appendln("Task Crumb");
         string.appendln("task", task);
@@ -45,6 +44,7 @@ public class TaskCrumb implements Crumb 
         task.debug(string);
     }
 
+    @Override
     public String title() {
         return task.getName();
     }
@@ -54,9 +54,9 @@ public class TaskCrumb implements Crumb 
         return new ToString(this).append(title()).toString();
     }
 
+    @Override
     public Request changeContext() {
         return ForwardRequest.task(task);
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java Mon May  2 16:59:09 2011
@@ -17,33 +17,31 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.html.image;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-
 /**
  * ImageLookup provides an efficient way of finding the most suitable image to use.
  * 
  * <p>
- * It ensures that an image is always available, providing a default image if needed. 
- * All requests are cached to improve performance.
+ * It ensures that an image is always available, providing a default image if needed. All requests are cached to improve
+ * performance.
  */
 // TODO allow for multiple extension types
 public class ImageLookup {
-    
+
     private static ImageProvider imageProvider = new ImageProviderResourceBased();
-    
+
     public static ImageProvider getInstance() {
         return imageProvider;
     }
-    
+
     public static void setImageDirectory(final String imageDirectory) {
         if (getInstance() instanceof ImageProviderDirectoryBased) {
-            ImageProviderDirectoryBased imageProviderDirectoryBased = (ImageProviderDirectoryBased) imageProvider;
+            final ImageProviderDirectoryBased imageProviderDirectoryBased = (ImageProviderDirectoryBased) imageProvider;
             imageProviderDirectoryBased.setImageDirectory(imageDirectory);
         }
     }
@@ -65,4 +63,3 @@ public class ImageLookup {
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java?rev=1098662&r1=1098661&r2=1098662&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java Mon May  2 16:59:09 2011
@@ -17,34 +17,31 @@
  *  under the License.
  */
 
+package org.apache.isis.viewer.html.image;
 
-package org.apache.isis.viewer.html.image;
-
 import org.apache.isis.core.commons.debug.DebugBuilder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-/**
- * Factors out the {@link ImageLookup} responsibilities into an interface, with a
- * view to moving towards alternative mechanisms.
- */
-public interface ImageProvider {
-
-    public void debug(final DebugBuilder debug);
-    
-    /**
-     * For an object, the icon name from the object is return if it is not null, otherwise the specification
-     * is used to look up a suitable image name.
-     * 
-     * @see ObjectAdapter#getIconName()
-     * @see #image(ObjectSpecification)
-     */
-    public String image(final ObjectAdapter object);
-
-    public String image(final ObjectSpecification specification);
-
-    public String image(final String name);
-
-}
-
-
+
+/**
+ * Factors out the {@link ImageLookup} responsibilities into an interface, with a view to moving towards alternative
+ * mechanisms.
+ */
+public interface ImageProvider {
+
+    public void debug(final DebugBuilder debug);
+
+    /**
+     * For an object, the icon name from the object is return if it is not null, otherwise the specification is used to
+     * look up a suitable image name.
+     * 
+     * @see ObjectAdapter#getIconName()
+     * @see #image(ObjectSpecification)
+     */
+    public String image(final ObjectAdapter object);
+
+    public String image(final ObjectSpecification specification);
+
+    public String image(final String name);
+
+}



Mime
View raw message