Update "sample" library as well as assiocated docs to the last changes.

git-svn-id: https://svn.argeo.org/slc/trunk@2144 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.webapp/doc/Argeo-RIA-DeveloperDoc.odt b/org.argeo.slc.webapp/doc/Argeo-RIA-DeveloperDoc.odt
index 2c705ab318e7fedb94415e24b4f82969d7e1a898..224d3f431cf733f2f814ccdb83223cf08b0f95ce 100644 (file)
Binary files a/org.argeo.slc.webapp/doc/Argeo-RIA-DeveloperDoc.odt and b/org.argeo.slc.webapp/doc/Argeo-RIA-DeveloperDoc.odt differ

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Applet.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Applet.js
index 1830d09acfa3b0b292a8241b1d4ca08a485f450a..4baad35a9834e123e50bfab83c7daee96917b669 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Applet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Applet.js
@@ -41,7 +41,14 @@ qx.Class.define("org.argeo.ria.sample.Applet",
                                command         : null
                        }                       
                }
-       }
+       },
+       viewSelection : {
+               nullable:false, 
+               check:"org.argeo.ria.components.ViewSelection"
+       },
+       instanceId : {init:"Hello Applet"},
+       instanceLabel : {init:"Hello"}
+       
   },
 
   members :
@@ -50,17 +57,20 @@ qx.Class.define("org.argeo.ria.sample.Applet",
         * Called at applet creation. Just registers viewPane.
         * @param viewPane {org.argeo.ria.components.ViewPane} The viewPane.
         */
-       init : function(viewPane){
+       init : function(viewPane, data){
                this.setView(viewPane);
+               this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));
+               this.data = data;
+               this.setInstanceId(data[0]);
+               this.setInstanceLabel("Hello applet #"+data[0]);
        },
        
        /**
         * Load a given row : the data passed must be a simple data array.
         * @param data {Element} The text xml description. 
         */
-       load : function(data){
-               this.data = data;
-               this.createHtmlGui("<b>Hello World ! Data ID is : "+data[0]+"</b>");
+       load : function(){              
+               this.createHtmlGui("<b>Hello World ! Data ID is : "+this.getInstanceId()+"</b>");
        },
         
        addScroll : function(){

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/List.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/List.js
index 57d2468e38fd7dfbc7d7dab8b25789eacc2da11d..ad3ef5c9b11d9928fbe538ab52aaa21e131ec14c 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/List.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/List.js
@@ -41,9 +41,9 @@ qx.Class.define("org.argeo.ria.sample.List",
                                callback        : function(e){\r
                                        var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();\r
                                        var classObj = org.argeo.ria.sample.Applet;\r
-                                       var iView = viewsManager.initIViewClass(classObj, "applet");\r
                                        var rowData = viewsManager.getViewPaneSelection("list").getNodes();\r
-                                       iView.load(rowData[0]);\r
+                                       var iView = viewsManager.initIViewClass(classObj, "applet", rowData[0]);\r
+                                       iView.load();\r
                                },\r
                                selectionChange : function(viewId, rowData){\r
                                        if(viewId != "list") return;\r
@@ -54,14 +54,22 @@ qx.Class.define("org.argeo.ria.sample.List",
                                command         : null\r
                        }\r
                }\r
-       }\r
+       },\r
+       viewSelection : {\r
+               nullable:false, \r
+               check:"org.argeo.ria.components.ViewSelection"\r
+       },\r
+       instanceId : {init:"0"},\r
+       instanceLabel : {init:"Sample List"}    \r
   },\r
   \r
   members : {\r
-       init : function(viewPane){\r
+       init : function(viewPane, data){\r
          this.setView(viewPane);\r
+      this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));\r
+         \r
        },\r
-       load : function(data){\r
+       load : function(){\r
          //\r
          // Customize table appearance\r
          //\r
@@ -76,10 +84,9 @@ qx.Class.define("org.argeo.ria.sample.List",
          //      \r
          // Link table selection changes to the standard viewSelection mechanism\r
          //\r
-         var viewPane = this.getView();\r
          var selectionModel = this.table.getSelectionManager().getSelectionModel();\r
          selectionModel.addListener("changeSelection", function(e){\r
-               var viewSelection = viewPane.getViewSelection();\r
+               var viewSelection = this.getViewSelection();\r
                viewSelection.clear();\r
                if(!selectionModel.getSelectedCount()){\r
                        return;\r
@@ -87,7 +94,6 @@ qx.Class.define("org.argeo.ria.sample.List",
                var ranges = selectionModel.getSelectedRanges();\r
                var rowData = this.table.getTableModel().getRowData(ranges[0].minIndex);\r
                viewSelection.addNode(rowData);\r
-               viewPane.setViewSelection(viewSelection);\r
          }, this);             \r
          \r
          //\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Perspective.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Perspective.js
index bd386404675c0cc9c4cf6ddac00d19b7ff0f5eb4..de01afc73e96ed29f7701755e7cf1459e046b54c 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Perspective.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Perspective.js
@@ -14,7 +14,7 @@ qx.Class.define("org.argeo.ria.sample.Perspective",
                \r
        initViewPanes : function(viewsManager){\r
                \r
-      var splitPane = new qx.ui.splitpane.Pane("horizontal");\r
+      this.splitPane = new qx.ui.splitpane.Pane("horizontal");\r
          var topLeft = new org.argeo.ria.components.ViewPane("list", "Sample List", {\r
                orientation : "horizontal",\r
                min : 36\r
@@ -22,18 +22,24 @@ qx.Class.define("org.argeo.ria.sample.Perspective",
          topLeft.set({width:300});\r
          viewsManager.registerViewPane(topLeft);\r
            \r
-         splitPane.add(topLeft, 0);\r
+         this.splitPane.add(topLeft, 0);\r
          var rightPane = new org.argeo.ria.components.ViewPane("applet", "Sample Applet");       \r
          viewsManager.registerViewPane(rightPane);\r
-         splitPane.add(rightPane, 1);\r
+         this.splitPane.add(rightPane, 1);\r
       \r
-      viewsManager.getViewPanesContainer().add(splitPane, {flex:1});\r
+      viewsManager.getViewPanesContainer().add(this.splitPane, {flex:1});\r
                \r
        },\r
        \r
        initViews : function(viewsManager){\r
          var view = viewsManager.initIViewClass(org.argeo.ria.sample.List, "list");\r
          view.load();\r
+       },\r
+       \r
+       remove : function(viewsManager){\r
+               viewsManager.getViewPaneById("list").empty();\r
+               viewsManager.getViewPaneById("applet").empty();\r
+               viewsManager.getViewPanesContainer().remove(this.splitPane);\r
        }\r
        \r
   }\r