Changeset 774108

Timestamp:

Jan 16, 2009, 3:37:41 AM (14 years ago)

Author:

rene <rene@…>

Branches:

lite_0.1, multiEdit, ng_0.6, ng_0.6_help, ng_0.8, ng_0.9

Children:

c09d7b

Parents:

919c17

Message:

completed implementation of containers

Location:

chrome

Files:

• content/v_identity/vI_rdfDataEditor.js (modified) (3 diffs)
• content/v_identity/vI_rdfDataTree.js (modified) (6 diffs)
• content/v_identity/vI_rdfDataTree.xul (modified) (1 diff)
• content/v_identity/vI_rdfDatasource.js (modified) (5 diffs)
• content/v_identity/vI_upgrade.js (modified) (1 diff)
• locale/en-US/v_identity/vI_rdfDataEditor.properties (modified) (1 diff)

chrome/content/v_identity/vI_rdfDataEditor.js

@@ -25 +25 @@
 var vI_rdfDataEditor = {
     __rdfDatasource : null,
+    __type : null,
     
     storageExtras : null,
 
     init : function() {
-        vI_rdfDataEditor.__rdfDatasource = window.arguments[1]
-    
+        vI_rdfDataEditor.__type = window.arguments[1];
+        vI_rdfDataEditor.__rdfDatasource = window.arguments[2];
+
         document.getElementById("recipient").value = window.arguments[0]["recipientCol"];
         
         var typeMenuPopup = document.getElementById("type_menu_popup")
-        for each (typeField in Array("email", "maillist", "newsgroup")) {
+
+        for each (typeField in Array("email", "maillist", "newsgroup", "filter")) {
             var menuitem = document.createElement("menuitem");
             var label = document.getElementById("vI_rdfDataTreeBundle").getString("vI_rdfDataTree.dataType." + typeField)
@@ -40 +43 @@
             menuitem.setAttribute("key", typeField)
             typeMenuPopup.appendChild(menuitem);
-            if (label == window.arguments[0]["typeCol"]) document.getElementById("type_menu").selectedItem = menuitem
+            if (typeField == vI_rdfDataEditor.__type) document.getElementById("type_menu").selectedItem = menuitem
         }
 
@@ -91 +94 @@
             vI_rdfDataEditor.storageExtras)
 
-        vI_rdfDataEditor.__rdfDatasource.updateRDF(
-                document.getElementById("recipient").value,
+        // if current Type and previous Type are different, remove previous resource
+        vI_rdfDataEditor.__rdfDatasource.removeRDF(document.getElementById("recipient").value,
+                vI_rdfDataEditor.__type);
+
+        vI_rdfDataEditor.__rdfDatasource.updateRDF(document.getElementById("recipient").value,
                 document.getElementById("type_menu").selectedItem.getAttribute("key"),
-                localIdentityData, true)
+                localIdentityData, true);
+
+        return document.getElementById("type_menu").selectedItem.getAttribute("key");
     }
 }

chrome/content/v_identity/vI_rdfDataTree.js

@@ -92 +92 @@
     addNewDatum : function(resource, name, localIdentityData, idData) {
         var pref = {    recipientCol : name,
-                typeCol : "type",
                 senderCol : localIdentityData.combinedName,
                 smtpCol : localIdentityData.smtp.value,
@@ -279 +278 @@
                 window.openDialog("chrome://v_identity/content/vI_rdfDataEditor.xul",0,
                     "chrome, dialog, modal, alwaysRaised, resizable=yes",
-                    tree.idTable[v],
+                    tree.idTable[v], treeType,
                     vI_rdfDatasource).focus();
         }
         
-        tree.idData = null; tree.idTable = null;
-        tree.loadTable()
+        // reload all trees (types might have changed)
+        for each (var treeType in vI_rdfDataTree.treeTypes) {
+            vI_rdfDataTree.trees[treeType].idData = null;
+            vI_rdfDataTree.trees[treeType].idTable = null;
+            vI_rdfDataTree.trees[treeType].loadTable()
+        }
         vI_rdfDataTree.hideInfoBox();
     },
@@ -304 +307 @@
             tree.treeElem.view.selection.getRangeAt(t,start,end);
             for (var v=start.value; v<=end.value; v++){
-                vI_rdfDatasource.removeBagForResource(tree.idTable[v]["resource"], tree.idTable[v]["type"])
-                vI_rdfDatasource.removeVIdentityFromRDF(tree.idTable[v]["resource"])
+                vI_rdfDatasource.removeVIdentityFromRDF(tree.idTable[v]["resource"], treeType)
             }
         }
@@ -326 +328 @@
         vI_rdfDataTree.infoBoxHidden = true;
         document.getElementById("vI_rdfDataTreeInfoBox").setAttribute("style", "height:0px");
+        for each (var treeType in vI_rdfDataTree.treeTypes) {
+            vI_rdfDataTree.trees[treeType].treeElem.view.selection.selectNone();
+        }
     },
 
@@ -338 +343 @@
         var newItemPreset = { 
                 recipientCol : "",
-                typeCol : document.getElementById("vI_rdfDataTreeBundle").getString("vI_rdfDataTree.dataType.email"),
                 senderCol : "",
                 smtpKey : "",
@@ -345 +349 @@
         window.openDialog("chrome://v_identity/content/vI_rdfDataEditor.xul",0,
             "chrome, dialog, modal, alwaysRaised, resizable=yes",
-            newItemPreset,
+            newItemPreset, "email",
             vI_rdfDatasource).focus();
         vI_rdfDataTree.__idData = null; vI_rdfDataTree.__idTable = null;

chrome/content/v_identity/vI_rdfDataTree.xul

@@ -120 +120 @@
 </hbox>
 <tabbox id="TreeTabbox" flex="1">
-<tabs>
+<tabs onselect="vI_rdfDataTree.hideInfoBox();" >
 <tab id="emailTab" />
 <tab id="maillistTab" />

chrome/content/v_identity/vI_rdfDatasource.js

@@ -166 +166 @@
             case "newsgroup" : rdfNSRecType = vI_rdfDatasource.rdfNSNewsgroup; break;
             case "maillist" : rdfNSRecType = vI_rdfDatasource.rdfNSMaillist; break;
+            case "filter" : rdfNSRecType = vI_rdfDatasource.rdfNSFilter; break;
         }
         return vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + rdfNSRecType + "/" + recDescription);
     },
     
-    removeBagForResource: function (resource, recType) {
-        var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
-            getService(Components.interfaces.nsIRDFContainerUtils);
-        var rdfNSRecType = null;
-        switch (recType) {
-            case "email": rdfNSRecType = vI_rdfDatasource.rdfNSEmail; break;
-            case "newsgroup" : rdfNSRecType = vI_rdfDatasource.rdfNSNewsgroup; break;
-            case "maillist" : rdfNSRecType = vI_rdfDatasource.rdfNSMaillist; break;
-            case "filter" : rdfNSRecType = vI_rdfDatasource.rdfNSFilter; break;
-        }
-        var storageRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + rdfNSRecType);
-        var container = Components.classes["@mozilla.org/rdf/container;1"]
-            .createInstance(Components.interfaces.nsIRDFContainer);
-        container.Init(vI_rdfDatasource.rdfDataSource, storageRes);
-
-        if (container.IndexOf(emailRes) != -1) container.RemoveElement(resource);
-    },
-    
-    removeVIdentityFromRDF : function (resource) {
+    removeVIdentityFromRDF : function (resource, recType) {
         vI_notificationBar.dump("## vI_rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");
         vI_rdfDatasource.__unsetRDFValue(resource, "email", vI_rdfDatasource.__getRDFValue(resource, "email"))
@@ -199 +181 @@
         var extras = new vI_storageExtras(vI_rdfDatasource.__getRDFValue, resource);
         extras.loopForRDF(vI_rdfDatasource.__unsetRDFValue, resource);
+vI_notificationBar.dump("## vI_rdfDatasource: removeVIdentityFromRDF recType" + recType + " 2.\n");
+        vI_rdfDatasource.getContainer(recType).RemoveElement(resource, true);
+vI_notificationBar.dump("## vI_rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + " 3.\n");
+//      var container = vI_rdfDatasource.getContainer(recType);
+//      if (container.IndexOf(emailRes) != -1) container.RemoveElement(resource);
     },
     
@@ -230 +217 @@
     },
     
+    // only used for upgrade to 0.0.3 - loop through all ressources.
     readAllResourcesFromRDF : function (addNewDatum) {
         vI_notificationBar.dump("## vI_rdfDatasource: readAllResourcesFromRDF.\n");
@@ -268 +256 @@
 
         var email = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "rdf#email");
+        // if no data available try available filters
         if (!vI_rdfDatasource.rdfDataSource.hasArcOut(resource, email))
             resource = vI_rdfDatasource.__findMatchingFilter(recDescription);
+        // if still no data available give up.
         if (!vI_rdfDatasource.rdfDataSource.hasArcOut(resource, email)) {
             vI_notificationBar.dump("## vI_rdfDatasource: readVIdentityFromRDF no data found.\n");
@@ -305 +295 @@
     },
     
-    updateRDF : function (recDescription, recType, localIdentityData, storeBaseID) {
+    removeRDF : function (recDescription, recType) {
+        var resource = vI_rdfDatasource.__getRDFResourceForVIdentity(recDescription, recType);
+        if (!resource) return null;
+        vI_rdfDatasource.removeVIdentityFromRDF(resource, recType);
+        return resource;
+    },
+
+    updateRDF : function (recDescription, recType, localIdentityData, storeBaseID, previousRecType) {
         if (!localIdentityData.email) {
             vI_notificationBar.dump("## vI_rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");
             return;
         }
-        var resource = vI_rdfDatasource.__getRDFResourceForVIdentity(recDescription, recType);
+        var resource = vI_rdfDatasource.removeRDF(recDescription, recType); // just to have a clean base
         if (!resource) return;
-        else vI_rdfDatasource.removeVIdentityFromRDF(resource); // just to have a clean base
 
         vI_notificationBar.dump("## vI_rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");
-        vI_rdfDatasource.__setRDFValue(resource, "email", localIdentityData.email)
-        vI_rdfDatasource.__setRDFValue(resource, "fullName", localIdentityData.fullName)
-        if (storeBaseID) vI_rdfDatasource.__setRDFValue(resource, "id", localIdentityData.id.key)
-        vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp.key)
-        
+        vI_rdfDatasource.__setRDFValue(resource, "email", localIdentityData.email);
+        vI_rdfDatasource.__setRDFValue(resource, "fullName", localIdentityData.fullName);
+        if (storeBaseID) vI_rdfDatasource.__setRDFValue(resource, "id", localIdentityData.id.key);
+        vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp.key);
+        vI_rdfDatasource.__setRDFValue(resource, "name", recDescription);
+
         localIdentityData.extras.loopForRDF(vI_rdfDatasource.__setRDFValue, resource);
+
+        vI_rdfDatasource.getContainer(recType).AppendElement(resource);
     },
 

chrome/content/v_identity/vI_upgrade.js

@@ -104 +104 @@
     
     __createContainersUpgradeElems: function(resource, type, name) {
-        var container;
-        
-        switch (type) {
-            case "email": container = vI_rdfDatasource.emailContainer; break;
-            case "newsgroup" : container = vI_rdfDatasource.newsgroupContainer; break;
-            case "maillist" : container = vI_rdfDatasource.maillistContainer; break;
-        }
+        var container = vI_rdfDatasource.getContainer(type);
         vI_rdfDatasource.__setRDFValue(resource, "name", name);
         if (container.IndexOf(resource) == -1) container.AppendElement(resource);

chrome/locale/en-US/v_identity/vI_rdfDataEditor.properties

@@ -6 +6 @@
 vI_rdfDataTree.dataType.maillist=mailing list
 vI_rdfDataTree.dataType.newsgroup=newsgroup
+vI_rdfDataTree.dataType.filter=filter