You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2012/01/22 17:00:51 UTC

svn commit: r1234535 - in /incubator/isis/trunk/framework: runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml

Author: rmatthews
Date: Sun Jan 22 16:00:50 2012
New Revision: 1234535

URL: http://svn.apache.org/viewvc?rev=1234535&view=rev
Log:
updating documentation

Modified:
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java
    incubator/isis/trunk/framework/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java?rev=1234535&r1=1234534&r2=1234535&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java Sun Jan 22 16:00:50 2012
@@ -154,11 +154,18 @@ class ObjectReader {
         if (ref == null || ref.equals("null")) {
             fieldObject = null;
         } else {
+            if (ref.equals("")) {
+                throw new NoSqlStoreException("Invalid reference field (an empty string) in data for " + association.getName() + "  in " + object);
+            }
             final Oid oid = keyCreator.oidFromReference(ref);
             final ObjectSpecification specification = keyCreator.specificationFromReference(ref);
             fieldObject = getAdapter(specification, oid);
         }
-        association.initAssociation(object, fieldObject);
+        try {
+            association.initAssociation(object, fieldObject);
+        } catch (IllegalArgumentException e) {
+            throw new NoSqlStoreException("Failed to process field data for " + association.getName() + "  in " + object + ": " + ref);
+        }
     }
 
     private void readCollection(final StateReader reader, final KeyCreator keyCreator, final DataEncryption dataEncrypter, final OneToManyAssociation association, final ObjectAdapter object) {

Modified: incubator/isis/trunk/framework/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml?rev=1234535&r1=1234534&r2=1234535&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml Sun Jan 22 16:00:50 2012
@@ -1837,6 +1837,17 @@ public class CountElements implements El
               </row>
 
               <row>
+                <entry>error</entry>
+
+                <entry>View to be forwarded to if the action causes an error
+                (such as validation failure or missing entry). </entry>
+
+                <entry>no</entry>
+
+                <entry>the current page</entry>
+              </row>
+
+              <row>
                 <entry>result-name</entry>
 
                 <entry>Name of variable to store the resultant object.</entry>
@@ -1847,6 +1858,18 @@ public class CountElements implements El
               </row>
 
               <row>
+                <entry>result-override</entry>
+
+                <entry>value passed into the next page as the result variable
+                (${_result} by default) instead of the returned value or the
+                target.</entry>
+
+                <entry>no</entry>
+
+                <entry></entry>
+              </row>
+
+              <row>
                 <entry>scope</entry>
 
                 <entry>How long the variable should be kept for.</entry>
@@ -1865,6 +1888,17 @@ public class CountElements implements El
 
                 <entry>the action's name</entry>
               </row>
+
+              <row>
+                <entry>show-message</entry>
+
+                <entry>allow validation message to be shown if the action is
+                not shown because it is not available</entry>
+
+                <entry>no</entry>
+
+                <entry>false</entry>
+              </row>
             </tbody>
           </tgroup>
         </table>
@@ -1998,23 +2032,45 @@ public class CountElements implements El
               </row>
 
               <row>
-                <entry>title</entry>
+                <entry>button-title</entry>
 
-                <entry>Title for the submission button.</entry>
+                <entry>Title for the submission button. If blank ("") then
+                "OK" is used.</entry>
 
                 <entry>no</entry>
 
-                <entry>"OK"</entry>
+                <entry>the action's name</entry>
               </row>
 
               <row>
-                <entry>legend</entry>
+                <entry>title</entry>
 
                 <entry>Title for the generated form.</entry>
 
                 <entry>no</entry>
 
-                <entry>the action's name</entry>
+                <entry>the action's name </entry>
+              </row>
+
+              <row>
+                <entry>show-message</entry>
+
+                <entry>allow validation message to be shown if the action is
+                not shown because it is not available</entry>
+
+                <entry>no</entry>
+
+                <entry>false</entry>
+              </row>
+
+              <row>
+                <entry>message</entry>
+
+                <entry>Message to show user on completion of action</entry>
+
+                <entry>no</entry>
+
+                <entry></entry>
               </row>
             </tbody>
           </tgroup>
@@ -2148,6 +2204,16 @@ public class CountElements implements El
 
                 <entry></entry>
               </row>
+
+              <row>
+                <entry>message</entry>
+
+                <entry>Message to show user on completion of action</entry>
+
+                <entry>no</entry>
+
+                <entry></entry>
+              </row>
             </tbody>
           </tgroup>
         </table>
@@ -2306,6 +2372,19 @@ public class CountElements implements El
 
                 <entry>RESULT</entry>
               </row>
+
+              <row>
+                <entry>row-classes</entry>
+
+                <entry>List of classes (separated by a comma (,), slash (/) or
+                bar (|)) to iterate through repeatedly as the rows are
+                created. Sets the variable ${row-class} for each
+                iteration.</entry>
+
+                <entry>no</entry>
+
+                <entry>odd-row|even-row</entry>
+              </row>
             </tbody>
           </tgroup>
         </table>
@@ -2517,7 +2596,7 @@ public class CountElements implements El
               </row>
 
               <row>
-                <entry>title</entry>
+                <entry>button-title</entry>
 
                 <entry>Title for the submission button.</entry>
 
@@ -2527,7 +2606,7 @@ public class CountElements implements El
               </row>
 
               <row>
-                <entry>legend</entry>
+                <entry>title</entry>
 
                 <entry>Title for the generated form.</entry>
 
@@ -2555,6 +2634,28 @@ public class CountElements implements El
 
                 <entry>request</entry>
               </row>
+
+              <row>
+                <entry>class</entry>
+
+                <entry><code><code>class</code></code> attribute given to HTML
+                form element</entry>
+
+                <entry>no</entry>
+
+                <entry>edit full</entry>
+              </row>
+
+              <row>
+                <entry>id</entry>
+
+                <entry><code>id</code> attribute given to HTML form element
+                </entry>
+
+                <entry>no</entry>
+
+                <entry></entry>
+              </row>
             </tbody>
           </tgroup>
         </table>
@@ -3526,6 +3627,58 @@ public class CountElements implements El
         <para>As for <link
         linkend="short-form"><markup>short-form</markup></link>, except that
         collections are displayed (as in-line tables)</para>
+
+        <table>
+          <title><markup>short-form</markup> attributes</title>
+
+          <tgroup cols="4">
+            <colspec colwidth="1*" />
+
+            <colspec colwidth="3*" />
+
+            <colspec colwidth="0.8*" />
+
+            <colspec colwidth="1*" />
+
+            <thead>
+              <row>
+                <entry align="center">Name</entry>
+
+                <entry align="center">Description</entry>
+
+                <entry align="center">Required</entry>
+
+                <entry align="center">Default</entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>table-class</entry>
+
+                <entry>Class attribute given to HTML <code>table</code>
+                element.</entry>
+
+                <entry>no</entry>
+
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>row-classes</entry>
+
+                <entry>List of classes (separated by a comma (,), slash (/) or
+                bar (|)) to iterate through repeatedly as the rows are
+                created. Sets the variable ${row-class} for each
+                iteration.</entry>
+
+                <entry>no</entry>
+
+                <entry>odd-row|even-row</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
       </section>
 
       <section id="messages">