svn commit: r1092776 - in /incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher: context/RequestContext.java view/display/TableView.java

[rm...@apache.org]

Author: rmatthews
Date: Fri Apr 15 17:44:11 2011
New Revision: 1092776

URL: http://svn.apache.org/viewvc?rev=1092776&view=rev
Log:
Title attribute now only affects the overall form and not it contained table (for long form element)

Modified:
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java?rev=1092776&r1=1092775&r2=1092776&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java Fri Apr 15 17:44:11 2011
@@ -775,8 +775,8 @@ public abstract class RequestContext {
     }
 
     public boolean showDebugData() {
-        String variable = (String) getVariable("debug");
-        return variable != null && "on".equalsIgnoreCase(variable);
+        Boolean variable = (Boolean) getVariable("debug");
+        return variable != null && variable.booleanValue();
     }
 
     

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java?rev=1092776&r1=1092775&r2=1092776&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java Fri Apr 15 17:44:11 2011
@@ -203,12 +203,14 @@ public class TableView extends AbstractT
             final String parent,
             final List<ObjectAssociation> allFields, ObjectAdapter collection) {
         final String fieldName = request.getOptionalProperty(FIELD);
-        return rowBuilder(request, context, parent, fieldName, allFields);
+        final String title = request.getOptionalProperty(FORM_TITLE);
+        return rowBuilder(request, context, title, parent, fieldName, allFields);
     }
 
     private static TableContentWriter rowBuilder(
             final Request request,
             RequestContext context,
+            String title,
             final String object,
             String fieldName, 
             List<ObjectAssociation> allFields) {
@@ -219,7 +221,6 @@ public class TableView extends AbstractT
                 context.fullUriPath(linkRowView));
         final boolean includeHeading = request.isRequested(HEADING, true);
         final boolean includeFooting = request.isRequested(FOOTING, false);
-        final String title = request.getOptionalProperty(FORM_TITLE);
         
         boolean linkFields = request.isRequested("link-fields", true);
         final boolean showIcons = request.isRequested(SHOW_ICON, true);
@@ -271,7 +272,7 @@ public class TableView extends AbstractT
             }
         }
         RequestContext context = request.getContext();
-        TableContentWriter rowBuilder = rowBuilder(request, context, context.mapObject(object, Scope.REQUEST), field.getId(), fields);
+        TableContentWriter rowBuilder = rowBuilder(request, context, null, context.mapObject(object, Scope.REQUEST), field.getId(), fields);
         write(request, collection, summary, rowBuilder, null, null);
     }