Changeset c4e569

Timestamp:

Sep 21, 2010, 12:29:45 AM (12 years ago)

Author:

rene <just@…>

Branches:

ng_0.6, ng_0.8, ng_0.9

Children:

c65ba0

Parents:

2e8903

Message:

changed vI_rdfDatasource into class to allow multiple instances

Location:

chrome

Files:

• content/v_identity/vI_context.xul (modified) (2 diffs)
• content/v_identity/vI_prefDialog.xul (modified) (2 diffs)
• content/v_identity/vI_rdfDataTree.js (modified) (12 diffs)
• content/v_identity/vI_rdfDataTree.xul (modified) (4 diffs)
• content/v_identity/vI_rdfDatasource.js (modified) (21 diffs)
• content/v_identity/vI_storage.js (modified) (7 diffs)
• content/v_identity/vI_storageExtras.js (modified) (2 diffs)
• content/v_identity/vI_upgrade.js (modified) (7 diffs)
• content/v_identity/vI_upgrade.xul (modified) (1 diff)
• content/v_identity/vI_upgradeOverlay.js (modified) (2 diffs)
• locale/en-US/v_identity/vI_prefDialog.dtd (modified) (1 diff)
• locale/en-US/v_identity/v_identity.dtd (modified) (1 diff)

chrome/content/v_identity/vI_context.xul

@@ -29 +29 @@
 <!ENTITY % vIdentDTD SYSTEM "chrome://v_identity/locale/v_identity.dtd">
 %vIdentDTD;
+<!ENTITY % abMainWindowDTD SYSTEM "chrome://messenger/locale/addressbook/abMainWindow.dtd" >
+%abMainWindowDTD;
 ]>
 
@@ -59 +61 @@
                 <menuitem label="&vident.vI_Menu.Settings.label;"
                       oncommand="window.open('chrome://v_identity/content/vI_prefDialogOpener.xul', '', 'chrome, dialog, resizable=yes');" />
-                <menuitem label="&vident.vI_Menu.DataEditor.label;"
-                      oncommand="window.open('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome, dialog, resizable=yes');" />
+                <menu label="&vident.vI_Menu.DataStorage.label;">
+                    <menupopup>                        
+                        <menuitem label="&vident.vI_Menu.DataEditor.label;"
+                            oncommand="window.open('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome, dialog, resizable=yes');" />
+                        <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="vI_rdfDatasource = new vI_rdfDatasource(); vI_rdfDatasource.import('virtualIdentity.rdf')"/>
+                        <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="vI_rdfDatasource = new vI_rdfDatasource(); vI_rdfDatasource.export('virtualIdentity.rdf')"/>
+                    </menupopup>
+                </menu>
             </menupopup>
         </menu>

chrome/content/v_identity/vI_prefDialog.xul

@@ -58 +58 @@
 <script type="application/x-javascript"
             src="chrome://v_identity/content/vI_helper.js" />
+<script type="application/x-javascript"
+            src="chrome://v_identity/content/vI_rdfDatasource.js" />
+<script type="application/x-javascript"
+            src="chrome://v_identity/content/vI_notificationBar.js" />
 
 <stringbundleset id="stringbundleset">
@@ -570 +574 @@
                 <spacer class="paragraph"/>
                 <button id="VIdent_identity.storage.openEditor" label="&vI_prefDialog.storage.openEditor;" oncommand="openDialog('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome, dialog, resizable=yes');" />
+                <button id="VIdent_identity.storage.import" label="&vI_prefDialog.storage.import;" oncommand="vI_rdfDatasource = new vI_rdfDatasource(); vI_rdfDatasource.import('virtualIdentity.rdf')" />
+                <button id="VIdent_identity.storage.export" label="&vI_prefDialog.storage.export;" oncommand="vI_rdfDatasource = new vI_rdfDatasource(); vI_rdfDatasource.export('virtualIdentity.rdf')" />
                 </groupbox>
             </tabpanel>

chrome/content/v_identity/vI_rdfDataTree.js

@@ -38 +38 @@
 
 
-function rdfDataTree(treeType) {
+function rdfDataTree(treeType, vI_rdfDatasource) {
     this.treeType = treeType;
+    this._vI_rdfDatasource = vI_rdfDatasource;
     this.filterText = "";
     this.loadTable();
@@ -48 +49 @@
     filterText : null,
     treeType : null,
-
-    get treeElem() { return document.getElementById("rdfDataTree_" + this.treeType); },
+    _vI_rdfDatasource : null,
+
+    get treeElem() { return document.getElementById("rdfDataTree_" + this.treeType); },
     get tabElem() { return document.getElementById(this.treeType + "Tab"); },
     
     //this function is called every time the tree is sorted, filtered, or reloaded
     loadTable : function() {
+//         if (vI_notificationBar) vI_notificationBar.dump("## rdfDataTree: loadTable.\n");
         //remember scroll position. this is useful if this is an editable table
         //to prevent the user from losing the row they edited
@@ -60 +63 @@
         if (this.idData == null) {
             this.idData = [];
-            vI_rdfDatasource.readAllEntriesFromRDF(this.addNewDatum, this.treeType, this.idData);
+            this._vI_rdfDatasource.readAllEntriesFromRDF(this.addNewDatum, this.treeType, this.idData);
         }
         if (this.filterText == "") {
@@ -89 +92 @@
         // set Tab label
         this.tabElem.setAttribute("label", this.treeType + " (" + this.idTable.length + ")");
+//         if (vI_notificationBar) vI_notificationBar.dump("## rdfDataTree: loadTable done.\n");
     },
 
@@ -106 +110 @@
     },
     sort : function(columnName) {
-        vI_notificationBar.dump("## sort: " + columnName + ".\n");
+//      vI_notificationBar.dump("## sort: " + columnName + ".\n");
         var order = this.treeElem.getAttribute("sortDirection") == "ascending" ? 1 : -1;
         //if the column is passed and it's already sorted by that column, reverse sort
@@ -148 +152 @@
     
     _strings : null,
+    _vI_rdfDatasource : null,
     
     onselect : function () {
@@ -180 +185 @@
         vI_rdfDataTree._strings = document.getElementById("vI_rdfDataTreeBundle");
 
-        vI_rdfDatasource.init();
+        vI_rdfDataTree._vI_rdfDatasource = new vI_rdfDatasource("virtualIdentity.rdf");
         
         for each (var treeType in vI_rdfDataTree.treeTypes)
-            vI_rdfDataTree.trees[treeType] = new rdfDataTree(treeType);
-    },
-    
-    get _braille() {
+            vI_rdfDataTree.trees[treeType] = new rdfDataTree(treeType, vI_rdfDataTree._vI_rdfDatasource);
+    },
+    
+    clean : function() {
+        if (vI_rdfDataTree._vI_rdfDatasource) vI_rdfDataTree._vI_rdfDatasource.clean();
+    },
+
+    get _braille() {
         var prefRoot = Components.classes["@mozilla.org/preferences-service;1"]
             .getService(Components.interfaces.nsIPrefService).getBranch(null);
@@ -303 +312 @@
                     "chrome, dialog, modal, alwaysRaised, resizable=yes",
                     tree.idTable[v], treeType,
-                    vI_rdfDatasource, retVar).focus();
+                    vI_rdfDataTree._vI_rdfDatasource, retVar).focus();
         }
         
@@ -332 +341 @@
             tree.treeElem.view.selection.getRangeAt(t,start,end);
             for (var v=start.value; v<=end.value; v++){
-                vI_rdfDatasource.removeVIdentityFromRDF(tree.idTable[v]["resource"], treeType)
+                vI_rdfDataTree._vI_rdfDatasource.removeVIdentityFromRDF(tree.idTable[v]["resource"], treeType)
             }
         }
@@ -378 +387 @@
         tree.treeElem.view.selection.getRangeAt(0,start,end);
         for (var v=start.value; v<=end.value; v++){
-            var resource = vI_rdfDatasource.filterContainer.RemoveElementAt(v+1, true);
-            vI_rdfDatasource.filterContainer.InsertElementAt(resource,v,true); 
+            var resource = vI_rdfDataTree._vI_rdfDatasource.filterContainer.RemoveElementAt(v+1, true);
+            vI_rdfDataTree._vI_rdfDatasource.filterContainer.InsertElementAt(resource,v,true); 
         }
         tree.idData = null; tree.idTable = null;
@@ -398 +407 @@
         tree.treeElem.view.selection.getRangeAt(0,start,end);
         for (var v=end.value; v>=start.value; v--){
-            var resource = vI_rdfDatasource.filterContainer.RemoveElementAt(v+1, true);
-            vI_rdfDatasource.filterContainer.InsertElementAt(resource,v+2,true); 
+            var resource = vI_rdfDataTree._vI_rdfDatasource.filterContainer.RemoveElementAt(v+1, true);
+            vI_rdfDataTree._vI_rdfDatasource.filterContainer.InsertElementAt(resource,v+2,true); 
         }
         tree.idData = null; tree.idTable = null;
@@ -437 +446 @@
             "chrome, dialog, modal, alwaysRaised, resizable=yes",
             newItemPreset, treeType,
-            vI_rdfDatasource, retVar).focus();
+            vI_rdfDataTree._vI_rdfDatasource, retVar).focus();
 
         // reload all trees (multiple types might have changed)

chrome/content/v_identity/vI_rdfDataTree.xul

@@ -38 +38 @@
 %messengercomposeDTD;
 <!ENTITY % filtersDTD SYSTEM "chrome://messenger/locale/FilterListDialog.dtd">%filtersDTD;
+<!ENTITY % abMainWindowDTD SYSTEM "chrome://messenger/locale/addressbook/abMainWindow.dtd" >
+%abMainWindowDTD;
 ]>
 
@@ -44 +46 @@
         width="750"
         height="500"
-    persist="width,height,screenX,screenY"
+        persist="width,height,screenX,screenY"
         onload="vI_rdfDataTree.init();"
-    title="&vI_rdfDataTree.dlgTitle.label;">
+        onunload="vI_rdfDataTree.clean();"
+        title="&vI_rdfDataTree.dlgTitle.label;">
 
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataTree.js" />
@@ -52 +55 @@
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDatasource.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_storageExtras.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
-
 
 <stringbundleset id="stringbundleset">
@@ -96 +96 @@
     <vbox><spacer flex="1"/>
     <menubar>
-        <menu id="editMenu" label="&vI_rdfDataTree.editMenu.label;" 
-            accesskey="&vI_rdfDataTree.editMenu.accesskey;">
-        <menupopup onpopupshowing="if (event.target == this) vI_rdfDataTree.updateMenu();">
-            <menuitem id="menu_modifySelected" label="&vI_rdfDataTree.modifySelected.label;"
-                accesskey="&vI_rdfDataTree.modifySelected.accesskey;"
-                oncommand="vI_rdfDataTree.modifySelected();"/>
-            <menuitem id="menu_removeSelected" label="&vI_rdfDataTree.removeSelected.label;"
-                accesskey="&vI_rdfDataTree.removeSelected.accesskey;"
-                oncommand="vI_rdfDataTree.removeSelected();"/>
-            <menuitem id="menu_newItem" label="&vI_rdfDataTree.newItem.label;"
-                accesskey="&vI_rdfDataTree.newItem.accesskey;"
-                oncommand="vI_rdfDataTree.newItem();"/>
-            <menuseparator />
-            <menuitem id="menu_menu_selectAll" label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
-                oncommand="vI_rdfDataTree.selectAll();"/>
+        <menu id="editMenu" label="&vI_rdfDataTree.editMenu.label;" 
+            accesskey="&vI_rdfDataTree.editMenu.accesskey;">
+        <menupopup onpopupshowing="if (event.target == this) vI_rdfDataTree.updateMenu();">
+            <menuitem id="menu_modifySelected" label="&vI_rdfDataTree.modifySelected.label;"
+                accesskey="&vI_rdfDataTree.modifySelected.accesskey;"
+                oncommand="vI_rdfDataTree.modifySelected();"/>
+            <menuitem id="menu_removeSelected" label="&vI_rdfDataTree.removeSelected.label;"
+                accesskey="&vI_rdfDataTree.removeSelected.accesskey;"
+                oncommand="vI_rdfDataTree.removeSelected();"/>
+            <menuitem id="menu_newItem" label="&vI_rdfDataTree.newItem.label;"
+                accesskey="&vI_rdfDataTree.newItem.accesskey;"
+                oncommand="vI_rdfDataTree.newItem();"/>
+            <menuseparator />
+            <menuitem id="menu_menu_selectAll" label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
+                oncommand="vI_rdfDataTree.selectAll();"/>
+        </menupopup>
+        </menu>
+        <menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
+        <menupopup>
+            <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="vI_rdfDatasource = new vI_rdfDatasource(); vI_rdfDatasource.import('virtualIdentity.rdf')"/>
+            <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="vI_rdfDatasource = new vI_rdfDatasource(); vI_rdfDatasource.export('virtualIdentity.rdf')"/>
         </menupopup>
         </menu>

chrome/content/v_identity/vI_rdfDatasource.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-
-var vI_rdfDatasource = {            
-    rdfService : Components.classes["@mozilla.org/rdf/rdf-service;1"]
-            .getService(Components.interfaces.nsIRDFService),
-    
-    rdfDataSource : null,
-    rdfFileName : "virtualIdentity.rdf",
-    rdfNS : "http://virtual-id.absorb.it/",
-    rdfNSStorage : "vIStorage",
-    rdfNSEmail : "vIStorage/email",
-    rdfNSMaillist : "vIStorage/maillist",
-    rdfNSNewsgroup : "vIStorage/newsgroup",
-    rdfNSFilter : "vIStorage/filter",
-    rdfNSAccounts : "vIAccounts",
-    rdfNSIdentities : "vIAccounts/id",
-    rdfNSSMTPservers : "vIAccounts/smtp",
-
-    
-    // seamonkey doesn't have a extensionmanager, so read version of extension from hidden version-label
-    // extensionManager : Components.classes["@mozilla.org/extensions/manager;1"]
-    //      .getService(Components.interfaces.nsIExtensionManager),
-    
-    rdfVersion : "0.0.5",   // version of current implemented RDF-schema, internal only to trigger updates
-    
-    virtualIdentityID : "{dddd428e-5ac8-4a81-9f78-276c734f75b8}",
-    
-    unicodeConverter : Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
-        .createInstance(Components.interfaces.nsIScriptableUnicodeConverter),
-    
-    emailContainer : Components.classes["@mozilla.org/rdf/container;1"]
+function vI_rdfDatasource(rdfFileName, dontRegisterObserver) {
+    this._rdfFileName = rdfFileName;
+    if (this._rdfFileName) this.init();
+    if (!dontRegisterObserver) this.AccountManagerObserver.register();
+}
+
+vI_rdfDatasource.prototype = {          
+    _rdfService :       Components.classes["@mozilla.org/rdf/rdf-service;1"]
+                            .getService(Components.interfaces.nsIRDFService),
+    _rdfDataSource :    null,
+    _rdfFileName :      null,
+    _rdfNS :            "http://virtual-id.absorb.it/",
+    _rdfNSStorage :     "vIStorage",
+    _rdfNSEmail :       "vIStorage/email",
+    _rdfNSMaillist :    "vIStorage/maillist",
+    _rdfNSNewsgroup :   "vIStorage/newsgroup",
+    _rdfNSFilter :      "vIStorage/filter",
+    _rdfNSAccounts :    "vIAccounts",
+    _rdfNSIdentities :  "vIAccounts/id",
+    _rdfNSSMTPservers : "vIAccounts/smtp",
+
+    _virtualIdentityID : "{dddd428e-5ac8-4a81-9f78-276c734f75b8}",
+    
+    _emailContainer : Components.classes["@mozilla.org/rdf/container;1"]
             .createInstance(Components.interfaces.nsIRDFContainer),
 
-    maillistContainer : Components.classes["@mozilla.org/rdf/container;1"]
+    _maillistContainer : Components.classes["@mozilla.org/rdf/container;1"]
             .createInstance(Components.interfaces.nsIRDFContainer),
 
-    newsgroupContainer : Components.classes["@mozilla.org/rdf/container;1"]
+    _newsgroupContainer : Components.classes["@mozilla.org/rdf/container;1"]
             .createInstance(Components.interfaces.nsIRDFContainer),
 
-    filterContainer : Components.classes["@mozilla.org/rdf/container;1"]
+    _filterContainer : Components.classes["@mozilla.org/rdf/container;1"]
             .createInstance(Components.interfaces.nsIRDFContainer),
 
-    identityContainer : Components.classes["@mozilla.org/rdf/container;1"]
+    _identityContainer : Components.classes["@mozilla.org/rdf/container;1"]
             .createInstance(Components.interfaces.nsIRDFContainer),
 
-    smtpContainer : Components.classes["@mozilla.org/rdf/container;1"]
+    _smtpContainer : Components.classes["@mozilla.org/rdf/container;1"]
             .createInstance(Components.interfaces.nsIRDFContainer),
     
     getContainer : function (type) {
         switch (type) {
-            case "email": return vI_rdfDatasource.emailContainer;
-            case "maillist": return vI_rdfDatasource.maillistContainer;
-            case "newsgroup": return vI_rdfDatasource.newsgroupContainer;
-            case "filter": return vI_rdfDatasource.filterContainer;
-            case "identity": return vI_rdfDatasource.identityContainer;
-            case "smtp": return vI_rdfDatasource.smtpContainer;
+            case "email": return this._emailContainer;
+            case "maillist": return this._maillistContainer;
+            case "newsgroup": return this._newsgroupContainer;
+            case "filter": return this._filterContainer;
+            case "identity": return this._identityContainer;
+            case "smtp": return this._smtpContainer;
         }
         return null;
@@ -83 +77 @@
 
     init: function() {
-        if (vI_rdfDatasource.rdfDataSource) return;     
-        var protoHandler = Components.classes["@mozilla.org/network/protocol;1?name=file"]
-            .getService(Components.interfaces.nsIFileProtocolHandler)
-        var newFile = Components.classes["@mozilla.org/file/local;1"]
-                    .createInstance(Components.interfaces.nsILocalFile);
-        
-        var file = Components.classes["@mozilla.org/file/directory_service;1"]
-            .getService(Components.interfaces.nsIProperties)
-            .get("ProfD", Components.interfaces.nsIFile);
-        var delimiter = (file.path.match(/\\/))?"\\":"/";
-
-        newFile.initWithPath(file.path + delimiter + vI_rdfDatasource.rdfFileName);
-        var fileURI = protoHandler.newFileURI(newFile);
-
-        vI_notificationBar.dump("## vI_rdfDatasource read rdf from '" + fileURI.spec + "'\n");
-
-        vI_rdfDatasource.rdfDataSource =
-            vI_rdfDatasource.rdfService.GetDataSourceBlocking(fileURI.spec);
-        vI_rdfDatasource.__initContainers();
-        vI_rdfDatasource.refreshAccountInfo();
-        
-        vI_rdfDatasource.AccountManagerObserver.register();
-    },
-    
-    __initContainers: function() {
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource init.\n");
+
+        this._openRdfDataSource();
+        if (!this._rdfDataSource) return;
+        this._initContainers();
+        if (this.rdfUpgradeRequired()) this.rdfUpgrade();
+        
+        // store version everytime to recognize downgrades later
+        this.storeRDFVersion();
+            
+        this.refreshAccountInfo();
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource init done.\n");
+    },
+    
+    _openRdfDataSource: function() {
+        if (!this._rdfFileName || this._rdfDataSource);
+        var protoHandler = Components.classes["@mozilla.org/network/protocol;1?name=file"]
+            .getService(Components.interfaces.nsIFileProtocolHandler)
+        var newFile = Components.classes["@mozilla.org/file/local;1"]
+                    .createInstance(Components.interfaces.nsILocalFile);
+        
+        var file = Components.classes["@mozilla.org/file/directory_service;1"]
+            .getService(Components.interfaces.nsIProperties)
+            .get("ProfD", Components.interfaces.nsIFile);
+        var delimiter = (file.path.match(/\\/))?"\\":"/";
+
+        newFile.initWithPath(file.path + delimiter + this._rdfFileName);
+        var fileURI = protoHandler.newFileURI(newFile);
+
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource read rdf from '" + fileURI.spec + "'\n");
+
+        this._rdfDataSource =
+            this._rdfService.GetDataSourceBlocking(fileURI.spec);
+            
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource read rdf from '" + fileURI.spec + "' done." + this._rdfService + "\n");
+    },
+    
+    _initContainers: function() {
         try {   // will possibly fail before upgrade
-            var storageRes = vI_rdfDatasource.rdfService
-                .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSEmail);
-            vI_rdfDatasource.emailContainer.Init(vI_rdfDatasource.rdfDataSource, storageRes);
-            storageRes = vI_rdfDatasource.rdfService
-                .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSMaillist);
-            vI_rdfDatasource.maillistContainer.Init(vI_rdfDatasource.rdfDataSource, storageRes);
-            storageRes = vI_rdfDatasource.rdfService
-                .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSNewsgroup);
-            vI_rdfDatasource.newsgroupContainer.Init(vI_rdfDatasource.rdfDataSource, storageRes);
-            storageRes = vI_rdfDatasource.rdfService
-                .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSFilter);
-            vI_rdfDatasource.filterContainer.Init(vI_rdfDatasource.rdfDataSource, storageRes);
-            storageRes = vI_rdfDatasource.rdfService
-                .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSIdentities);
-            vI_rdfDatasource.identityContainer.Init(vI_rdfDatasource.rdfDataSource, storageRes);
-            storageRes = vI_rdfDatasource.rdfService
-                .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSSMTPservers);
-            vI_rdfDatasource.smtpContainer.Init(vI_rdfDatasource.rdfDataSource, storageRes);
+            var storageRes = this._rdfService
+                .GetResource(this._rdfNS + this._rdfNSEmail);
+            this._emailContainer.Init(this._rdfDataSource, storageRes);
+            storageRes = this._rdfService
+                .GetResource(this._rdfNS + this._rdfNSMaillist);
+            this._maillistContainer.Init(this._rdfDataSource, storageRes);
+            storageRes = this._rdfService
+                .GetResource(this._rdfNS + this._rdfNSNewsgroup);
+            this._newsgroupContainer.Init(this._rdfDataSource, storageRes);
+            storageRes = this._rdfService
+                .GetResource(this._rdfNS + this._rdfNSFilter);
+            this._filterContainer.Init(this._rdfDataSource, storageRes);
+            storageRes = this._rdfService
+                .GetResource(this._rdfNS + this._rdfNSIdentities);
+            this._identityContainer.Init(this._rdfDataSource, storageRes);
+            storageRes = this._rdfService
+                .GetResource(this._rdfNS + this._rdfNSSMTPservers);
+            this._smtpContainer.Init(this._rdfDataSource, storageRes);
         } catch (e) { };
     },
 
+    // ******************************************************************************************
+    // **************    BEGIN RDF UPGRADE CODE    **********************************************
     rdfUpgradeRequired: function() {
-        var oldRdfVersion = vI_rdfDatasource.getCurrentRDFFileVersion();
+        var oldRdfVersion = this.getCurrentRDFFileVersion();
         var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
             .getService(Components.interfaces.nsIVersionComparator);
-        return (!oldRdfVersion || versionChecker.compare(oldRdfVersion, vI_rdfDatasource.rdfVersion) < 0)
-    },
-    
+        return (!oldRdfVersion || versionChecker.compare(oldRdfVersion, this.rdfVersion) < 0)
+    },
+    // **************    RDF UPGRADE CODE    ****************************************************
     extUpgradeRequired: function() {
-        var oldExtVersion = vI_rdfDatasource.getCurrentExtFileVersion()
+        var oldExtVersion = this.getCurrentExtFileVersion()
         var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
             .getService(Components.interfaces.nsIVersionComparator);
         // seamonkey doesn't have a extensionmanager, so read version of extension from hidden version-label
-        // var extVersion = vI_rdfDatasource.extensionManager.getItemForID(vI_rdfDatasource.virtualIdentityID).version
+        // var extVersion = this.extensionManager.getItemForID(this._virtualIdentityID).version
         var extVersion = document.getElementById("extVersion").getAttribute("value");
         return (!oldExtVersion || versionChecker.compare(oldExtVersion, extVersion) < 0)    
     },
-    
-    getCurrentRDFFileVersion: function() {
-        return vI_rdfDatasource.__getRDFValue(
-            vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "virtualIdentity"), "rdfVersion");
-    },
-    
-    getCurrentExtFileVersion: function() {
-        return vI_rdfDatasource.__getRDFValue(
-            vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "virtualIdentity"), "version");
-    },
-    
-    storeRDFVersion: function() {
-        vI_rdfDatasource.__setRDFValue(
-            vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "virtualIdentity"), "rdfVersion",
-            vI_rdfDatasource.rdfVersion);
-        vI_rdfDatasource.flush();
-    },
-    
-    storeExtVersion: function() {
-        // seamonkey doesn't have a extensionmanager, so read version of extension from hidden version-label
-        // var extVersion = vI_rdfDatasource.extensionManager.getItemForID(vI_rdfDatasource.virtualIdentityID).version
-        var extVersion = document.getElementById("extVersion").getAttribute("value");
-        vI_rdfDatasource.__setRDFValue(
-            vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "virtualIdentity"), "version", extVersion)
-        vI_rdfDatasource.flush();
-    },
-
-    clean : function() {
-        vI_rdfDatasource.AccountManagerObserver.unregister();
-        vI_rdfDatasource.flush();
-    },
-
-    flush : function() {
-        vI_rdfDatasource.rdfDataSource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-        vI_rdfDatasource.rdfDataSource.Flush();
-    },
-    
-    refreshAccountInfo : function() {
-        try {   // will possibly fail before upgrade
-            vI_rdfDatasource.cleanAccountInfo();
-            vI_rdfDatasource.storeAccountInfo();
-        } catch (e) {};
-    },
-    
-    cleanAccountInfo : function() {
-        vI_notificationBar.dump("## vI_rdfDatasource: cleanAccountInfo\n");
-        
-        var enumerator = vI_rdfDatasource.identityContainer.GetElements();
+    // **************    RDF UPGRADE CODE    ****************************************************
+    rdfUpgrade : function() {
+        var currentVersion = this.getCurrentRDFFileVersion();
+        if (vI_notificationBar) vI_notificationBar.dump("checking for previous version of rdf, found " + 
+            currentVersion + "\nrdf-upgrade required.\n")
+        switch (currentVersion) {
+            case null:
+            case "0.0.1":
+            case "0.0.2":
+                this._createRDFContainers(); // no break
+            case "0.0.3":
+                this._tagDefaultSMTP();
+            case "0.0.4":
+            default:
+                this._createAccountInfoContainersTP();
+        }
+        this.storeRDFVersion();
+        if (vI_notificationBar) vI_notificationBar.dump("rdf-upgrade to " + this.getCurrentRDFFileVersion() + " done.\n\n");
+    },
+    // **************    RDF UPGRADE CODE    ****************************************************
+    // only used for upgrade to 0.0.3 - loop through all ressources.
+    _transferAllResources : function () {
+        if (vI_notificationBar) vI_notificationBar.dump("upgrade: transferAllResources ");
+        var enumerator = this.rdfDataSource.GetAllResources();
         while (enumerator && enumerator.hasMoreElements()) {
             var resource = enumerator.getNext();
             resource.QueryInterface(Components.interfaces.nsIRDFResource);
-            vI_rdfDatasource.__unsetRDFValue(resource, "identityName", vI_rdfDatasource.__getRDFValue(resource, "identityName"))
-            vI_rdfDatasource.__unsetRDFValue(resource, "fullName", vI_rdfDatasource.__getRDFValue(resource, "fullName"))
-            vI_rdfDatasource.__unsetRDFValue(resource, "email", vI_rdfDatasource.__getRDFValue(resource, "email"))
-            vI_rdfDatasource.identityContainer.RemoveElement(resource, true);
-        }
-
-        enumerator = vI_rdfDatasource.smtpContainer.GetElements();
+            
+            var type; var name;
+            if (resource.ValueUTF8.match(new RegExp(this.rdfNS + this.rdfNSEmail + "/", "i")))
+                { type = "email"; name = RegExp.rightContext }
+            else if (resource.ValueUTF8.match(new RegExp(this.rdfNS + this.rdfNSNewsgroup + "/", "i")))
+                { type = "newsgroup"; name = RegExp.rightContext }
+            else if (resource.ValueUTF8.match(new RegExp(this.rdfNS + this.rdfNSMaillist + "/", "i")))
+                { type = "maillist"; name = RegExp.rightContext }
+            else continue;
+            
+            var container = this.getContainer(type);
+            this._setRDFValue(resource, "name", name);
+            
+            if (container.IndexOf(resource) == -1) container.AppendElement(resource);
+        
+            if (vI_notificationBar) vI_notificationBar.dump(".");
+        }
+        if (vI_notificationBar) vI_notificationBar.dump("\n");
+    },
+    // **************    RDF UPGRADE CODE    ****************************************************
+    _tagDefaultSMTP: function() {
+        if (vI_notificationBar) vI_notificationBar.dump("upgrade: tagDefaultSMTP ");
+        for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
+            var enumerator = this.getContainer(treeType).GetElements();
+            while (enumerator && enumerator.hasMoreElements()) {
+                var resource = enumerator.getNext();
+                resource.QueryInterface(Components.interfaces.nsIRDFResource);
+                var smtp = this._getRDFValue(resource, "smtp")
+                if (!smtp || smtp == "") this._setRDFValue(resource, "smtp", DEFAULT_SMTP_TAG);
+                if (vI_notificationBar) vI_notificationBar.dump(".");
+            }
+        }
+        if (vI_notificationBar) vI_notificationBar.dump("\n");
+    },
+    // **************    RDF UPGRADE CODE    ****************************************************
+    _createAccountInfoContainersTP: function() {
+        if (vI_notificationBar) vI_notificationBar.dump("upgrade: createAccountInfoContainers \n");
+        var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
+            getService(Components.interfaces.nsIRDFContainerUtils);
+        
+        var accountRes = this.rdfService
+            .GetResource(this.rdfNS + this.rdfNSAccounts);
+        var identityRes = this.rdfService
+            .GetResource(this.rdfNS + this.rdfNSIdentities);
+        var smtpRes = this.rdfService
+            .GetResource(this.rdfNS + this.rdfNSSMTPservers);
+        this._setRDFValue(accountRes, "name", "Accounts");
+        this._setRDFValue(identityRes, "name", "Identities");
+        this._setRDFValue(smtpRes, "name", "SMTP-Server");
+        
+        rdfContainerUtils.MakeBag(this.rdfDataSource, accountRes);
+        rdfContainerUtils.MakeBag(this.rdfDataSource, identityRes);
+        rdfContainerUtils.MakeBag(this.rdfDataSource, smtpRes);
+
+        var accountContainer = Components.classes["@mozilla.org/rdf/container;1"].
+            createInstance(Components.interfaces.nsIRDFContainer);
+        
+        // initialize container with accountRes
+        accountContainer.Init(this.rdfDataSource, accountRes);
+        // append all new containers to accountRes
+        if (accountContainer.IndexOf(identityRes) == -1) accountContainer.AppendElement(identityRes);
+        if (accountContainer.IndexOf(smtpRes) == -1) accountContainer.AppendElement(smtpRes);
+        
+        this._initContainers();
+        this.refreshAccountInfo();
+    },
+    // **************    RDF UPGRADE CODE    ****************************************************
+    _createRDFContainers: function() {
+        if (vI_notificationBar) vI_notificationBar.dump("upgrade: createRDFContainers ");
+        var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
+            getService(Components.interfaces.nsIRDFContainerUtils);
+
+        var storageRes = this.rdfService
+            .GetResource(this.rdfNS + this.rdfNSStorage);
+        var emailRes = this.rdfService
+            .GetResource(this.rdfNS + this.rdfNSEmail);
+        var maillistRes = this.rdfService
+            .GetResource(this.rdfNS + this.rdfNSMaillist);
+        var newsgroupRes = this.rdfService
+            .GetResource(this.rdfNS + this.rdfNSNewsgroup);
+        var filterRes = this.rdfService
+            .GetResource(this.rdfNS + this.rdfNSFilter);
+        this._setRDFValue(emailRes, "name", "E-Mail");
+        this._setRDFValue(maillistRes, "name", "Mailing-List");
+        this._setRDFValue(newsgroupRes, "name", "Newsgroup");
+        this._setRDFValue(filterRes, "name", "Filter");
+
+        rdfContainerUtils.MakeBag(this.rdfDataSource, storageRes);
+        rdfContainerUtils.MakeBag(this.rdfDataSource, emailRes);
+        rdfContainerUtils.MakeBag(this.rdfDataSource, maillistRes);
+        rdfContainerUtils.MakeBag(this.rdfDataSource, newsgroupRes);
+        // use a sequence for the filters, order does matter
+        rdfContainerUtils.MakeSeq(this.rdfDataSource, filterRes);
+        
+        var container = Components.classes["@mozilla.org/rdf/container;1"].
+            createInstance(Components.interfaces.nsIRDFContainer);
+        
+        // initialize container with storageRes
+        container.Init(this.rdfDataSource, storageRes);
+        // append all new containers to storageRes
+        if (container.IndexOf(emailRes) == -1) container.AppendElement(emailRes);
+        if (container.IndexOf(maillistRes) == -1) container.AppendElement(maillistRes);
+        if (container.IndexOf(newsgroupRes) == -1) container.AppendElement(newsgroupRes);
+        if (container.IndexOf(filterRes) == -1) container.AppendElement(filterRes);
+        
+        this._initContainers();
+        
+        this._transferAllResources();
+    },
+    // **************    END RDF UPGRADE CODE    ************************************************
+    // ******************************************************************************************
+        
+    getCurrentRDFFileVersion: function() {
+        return this._getRDFValue(
+            this._rdfService.GetResource(this._rdfNS + "virtualIdentity"), "rdfVersion");
+    },
+    
+    getCurrentExtFileVersion: function() {
+        return this._getRDFValue(
+            this._rdfService.GetResource(this._rdfNS + "virtualIdentity"), "version");
+    },
+    
+    storeRDFVersion: function() {
+        this._setRDFValue(
+            this._rdfService.GetResource(this._rdfNS + "virtualIdentity"), "rdfVersion",
+            this.rdfVersion);
+        this._flush();
+    },
+    
+    storeExtVersion: function() {
+        // seamonkey doesn't have a extensionmanager, so read version of extension from hidden version-label
+        // var extVersion = this.extensionManager.getItemForID(this._virtualIdentityID).version
+        var extVersion = document.getElementById("extVersion").getAttribute("value");
+        this._setRDFValue(
+            this._rdfService.GetResource(this._rdfNS + "virtualIdentity"), "version", extVersion)
+        this._flush();
+    },
+
+    clean : function() {
+        this.AccountManagerObserver.unregister();
+        this._flush();
+    },
+
+    _flush : function() {
+        this._rdfDataSource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+        this._rdfDataSource.Flush();
+    },
+    
+    refreshAccountInfo : function() {
+        try {   // will possibly fail before upgrade
+            this.cleanAccountInfo(); this.storeAccountInfo();
+        } catch (e) {};
+    },
+    
+    cleanAccountInfo : function() {
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: cleanAccountInfo\n");
+        
+        var enumerator = this._identityContainer.GetElements();
         while (enumerator && enumerator.hasMoreElements()) {
             var resource = enumerator.getNext();
             resource.QueryInterface(Components.interfaces.nsIRDFResource);
-            vI_rdfDatasource.__unsetRDFValue(resource, "label", vI_rdfDatasource.__getRDFValue(resource, "label"))
-            vI_rdfDatasource.__unsetRDFValue(resource, "hostname", vI_rdfDatasource.__getRDFValue(resource, "hostname"))
-            vI_rdfDatasource.__unsetRDFValue(resource, "username", vI_rdfDatasource.__getRDFValue(resource, "username"))
-            vI_rdfDatasource.smtpContainer.RemoveElement(resource, true);
+            this._unsetRDFValue(resource, "identityName", this._getRDFValue(resource, "identityName"))
+            this._unsetRDFValue(resource, "fullName", this._getRDFValue(resource, "fullName"))
+            this._unsetRDFValue(resource, "email", this._getRDFValue(resource, "email"))
+            this._identityContainer.RemoveElement(resource, true);
+        }
+
+        enumerator = this._smtpContainer.GetElements();
+        while (enumerator && enumerator.hasMoreElements()) {
+            var resource = enumerator.getNext();
+            resource.QueryInterface(Components.interfaces.nsIRDFResource);
+            this._unsetRDFValue(resource, "label", this._getRDFValue(resource, "label"))
+            this._unsetRDFValue(resource, "hostname", this._getRDFValue(resource, "hostname"))
+            this._unsetRDFValue(resource, "username", this._getRDFValue(resource, "username"))
+            this._smtpContainer.RemoveElement(resource, true);
         }    
     },
     
     searchIdentityMismatch : function() {
-        vI_notificationBar.dump("## vI_rdfDatasource: searchIdentityMismatch\n");
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: searchIdentityMismatch\n");
 
         var relevantIDs = new Object();
@@ -222 +368 @@
         // search relevant Identities
         for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
-            var enumerator = vI_rdfDatasource.getContainer(treeType).GetElements();
+            var enumerator = this.getContainer(treeType).GetElements();
             while (enumerator && enumerator.hasMoreElements()) {
                 var resource = enumerator.getNext();
                 resource.QueryInterface(Components.interfaces.nsIRDFResource);
-                var id = vI_rdfDatasource.__getRDFValue(resource, "id")
+                var id = this._getRDFValue(resource, "id")
                 if (id) {
                     if (!relevantIDs[id]) relevantIDs[id] = 1; else relevantIDs[id] += 1;
@@ -237 +383 @@
         for (var id in relevantIDs) {
             var identity = AccountManager.getIdentity(id)
-            var resource = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSIdentities + "/" + id);
-            var rdfIdentityName = vI_rdfDatasource.__getRDFValue(resource, "identityName");
-            var rdfEmail = vI_rdfDatasource.__getRDFValue(resource, "email");
-            var rdfFullName = vI_rdfDatasource.__getRDFValue(resource, "fullName")
+            var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSIdentities + "/" + id);
+            var rdfIdentityName = this._getRDFValue(resource, "identityName");
+            var rdfEmail = this._getRDFValue(resource, "email");
+            var rdfFullName = this._getRDFValue(resource, "fullName")
             if ( !identity || rdfIdentityName != identity.identityName && rdfEmail != identity.email)
                     mismatchIDs.push( { oldkey: id, label : rdfIdentityName, ext1: rdfEmail, ext2: rdfFullName, count: relevantIDs[id], key: "" } )
         }
         if (mismatchIDs.length > 0) {
-            vI_notificationBar.dump("## vI_rdfDatasource: searchIdentityMismatch found mismatches on id(s).\n");
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: searchIdentityMismatch found mismatches on id(s).\n");
             
             window.openDialog("chrome://v_identity/content/vI_rdfAccountMismatchDialog.xul",0,
                     "chrome, dialog, modal, alwaysRaised, resizable=yes", "identity", mismatchIDs,
-                    /* callback: */ vI_rdfDatasource.repairAccountMismatch).focus();
+                    /* callback: */ this.repairAccountMismatch).focus();
             return true;
         }
         else {
-            vI_notificationBar.dump("## vI_rdfDatasource: searchIdentityMismatch found no mismatch\n");
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: searchIdentityMismatch found no mismatch\n");
             return false;
         }
@@ -259 +405 @@
     
     repairAccountMismatch : function(type, mismatchItems) {
-        vI_notificationBar.dump("## vI_rdfDatasource: repairAccountMismatch\n");
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: repairAccountMismatch\n");
         var keyField = (type == "identity")?"id":"smtp" // field to change is 'id' or 'smtp' dependent on type
         for (var i = 0; i < mismatchItems.length; i++) {
-            vI_notificationBar.dump("## vI_rdfDatasource: repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": ");
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": ");
             // search relevant Identities
             for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
-                var enumerator = vI_rdfDatasource.getContainer(treeType).GetElements();
+                var enumerator = this.getContainer(treeType).GetElements();
                 while (enumerator && enumerator.hasMoreElements()) {
                     var resource = enumerator.getNext();
                     resource.QueryInterface(Components.interfaces.nsIRDFResource);
-                    if (vI_rdfDatasource.__getRDFValue(resource, keyField) == mismatchItems[i].oldkey) {
-                        if (mismatchItems[i].key == "") vI_rdfDatasource.__unsetRDFValue(resource, keyField, mismatchItems[i].oldkey)
-                        else vI_rdfDatasource.__setRDFValue(resource, keyField, mismatchItems[i].key)
-                        vI_notificationBar.dump(".");
+                    if (this._getRDFValue(resource, keyField) == mismatchItems[i].oldkey) {
+                        if (mismatchItems[i].key == "") this._unsetRDFValue(resource, keyField, mismatchItems[i].oldkey)
+                        else this._setRDFValue(resource, keyField, mismatchItems[i].key)
+                        if (vI_notificationBar) vI_notificationBar.dump(".");
                     }
                 }
             }
-            vI_notificationBar.dump("\n");
+            if (vI_notificationBar) vI_notificationBar.dump("\n");
         }
     },
     
     searchSmtpMismatch : function() {
-        vI_notificationBar.dump("## vI_rdfDatasource: searchSmtpMismatch\n");
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: searchSmtpMismatch\n");
 
         var relevantSMTPs = new Object();
@@ -288 +434 @@
         // search relevant SMTPs
         for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
-            var enumerator = vI_rdfDatasource.getContainer(treeType).GetElements();
+            var enumerator = this.getContainer(treeType).GetElements();
             while (enumerator && enumerator.hasMoreElements()) {
                 var resource = enumerator.getNext();
                 resource.QueryInterface(Components.interfaces.nsIRDFResource);
-                var smtp = vI_rdfDatasource.__getRDFValue(resource, "smtp")
+                var smtp = this._getRDFValue(resource, "smtp")
                 if (smtp && smtp != DEFAULT_SMTP_TAG) {
                     if (!relevantSMTPs[smtp]) relevantSMTPs[smtp] = 1; else relevantSMTPs[smtp] += 1;
@@ -303 +449 @@
         for (var smtp in relevantSMTPs) {
             var server = SmtpService.getServerByKey(smtp)
-            var resource = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSSMTPservers + "/" + smtp);
-            var rdfSMTPlabel = vI_rdfDatasource.__getRDFValue(resource, "label");
-            var rdfHostname = vI_rdfDatasource.__getRDFValue(resource, "hostname");
-            var rdfUsername = vI_rdfDatasource.__getRDFValue(resource, "username")
+            var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSSMTPservers + "/" + smtp);
+            var rdfSMTPlabel = this._getRDFValue(resource, "label");
+            var rdfHostname = this._getRDFValue(resource, "hostname");
+            var rdfUsername = this._getRDFValue(resource, "username")
             if (!server || rdfSMTPlabel != (server.description?server.description:server.hostname) && rdfHostname != server.hostname)
                     mismatchSMTPs.push( { oldkey: smtp, label : rdfSMTPlabel, ext1: rdfHostname, ext2: rdfUsername, count: relevantSMTPs[smtp], key: "" } )
         }
         if (mismatchSMTPs.length > 0) {
-            vI_notificationBar.dump("## vI_rdfDatasource: searchSmtpMismatch found mismatches on smtp(s).\n");
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: searchSmtpMismatch found mismatches on smtp(s).\n");
             window.openDialog("chrome://v_identity/content/vI_rdfAccountMismatchDialog.xul",0,
                     "chrome, dialog, modal, alwaysRaised, resizable=yes", "smtp", mismatchSMTPs,
-                    /* callback: */ vI_rdfDatasource.repairAccountMismatch).focus();
+                    /* callback: */ this.repairAccountMismatch).focus();
             return true;
         }
         else {
-            vI_notificationBar.dump("## vI_rdfDatasource: searchSmtpMismatch found no mismatch\n");
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: searchSmtpMismatch found no mismatch\n");
             return false;
         }
@@ -324 +470 @@
 
     storeAccountInfo : function() {
-        vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts\n");
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts\n");
 
         var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
@@ -332 +478 @@
             for (let j = 0; j < account.identities.Count(); j++) {
                 var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity);
-//                 vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts identity store id " + identity.key + "\n");
-
-                var resource = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSIdentities + "/" + identity.key);
-                vI_rdfDatasource.__setRDFValue(resource, "identityName", identity.identityName);
-                vI_rdfDatasource.__setRDFValue(resource, "fullName", identity.fullName);
-                vI_rdfDatasource.__setRDFValue(resource, "email", identity.email);
+//                 if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts identity store id " + identity.key + "\n");
+
+                var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSIdentities + "/" + identity.key);
+                this._setRDFValue(resource, "identityName", identity.identityName);
+                this._setRDFValue(resource, "fullName", identity.fullName);
+                this._setRDFValue(resource, "email", identity.email);
                 
-                var position = vI_rdfDatasource.identityContainer.IndexOf(resource); // check for index in new recType
-                if (position != -1) vI_rdfDatasource.identityContainer.InsertElementAt(resource, position, false);
-                else vI_rdfDatasource.identityContainer.AppendElement(resource);
+                var position = this._identityContainer.IndexOf(resource); // check for index in new recType
+                if (position != -1) this._identityContainer.InsertElementAt(resource, position, false);
+                else this._identityContainer.AppendElement(resource);
             }
         }
         
-        function storeSmtp(server) {
-//             vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts smtp store id " + server.key + "\n");
-            var resource = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSSMTPservers + "/" + server.key);
-            vI_rdfDatasource.__setRDFValue(resource, "label", (server.description?server.description:server.hostname));
-            vI_rdfDatasource.__setRDFValue(resource, "hostname", server.hostname);
-            vI_rdfDatasource.__setRDFValue(resource, "username", server.username);
-            var position = vI_rdfDatasource.smtpContainer.IndexOf(resource); // check for index in new recType
-            if (position != -1) vI_rdfDatasource.smtpContainer.InsertElementAt(resource, position, false);
-            else vI_rdfDatasource.smtpContainer.AppendElement(resource);
+        function storeSmtp(server, parent) {
+//             if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts smtp store id " + server.key + "\n");
+            var resource = parent._rdfService.GetResource(this._rdfNS + this._rdfNSSMTPservers + "/" + server.key);
+            parent._setRDFValue(resource, "label", (server.description?server.description:server.hostname));
+            parent._setRDFValue(resource, "hostname", server.hostname);
+            parent._setRDFValue(resource, "username", server.username);
+            var position = parent._smtpContainer.IndexOf(resource); // check for index in new recType
+            if (position != -1) parent._smtpContainer.InsertElementAt(resource, position, false);
+            else parent._smtpContainer.AppendElement(resource);
         }
         
@@ -361 +507 @@
             while (servers && servers.hasMoreElements()) {
                 var server = servers.getNext(); 
-                if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) storeSmtp(server);
+                if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) storeSmtp(server, this);
             }
         else                            // TB 2.x
-            for (var i=0 ; i<servers.Count(); i++) storeSmtp(servers.QueryElementAt(i, Components.interfaces.nsISmtpServer));
-
-//         vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts done\n");
-    },
-
-    __getRDFResourceForVIdentity : function (recDescription, recType) {
-        if (!vI_rdfDatasource.rdfDataSource) return null;
+            for (var i=0 ; i<servers.Count(); i++) storeSmtp(servers.QueryElementAt(i, Components.interfaces.nsISmtpServer), this);
+
+//         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts done\n");
+    },
+
+    export : function(rdfFileName) {
+        var filePicker = Components.classes["@mozilla.org/filepicker;1"]
+            .createInstance(Components.interfaces.nsIFilePicker);
+        filePicker.init(window, "", Components.interfaces.nsIFilePicker.modeSave);
+        filePicker.appendFilters(Components.interfaces.nsIFilePicker.filterAll | Components.interfaces.nsIFilePicker.filterText );
+        filePicker.appendFilter("RDF Files","*.rdf");
+        
+        if (filePicker.show() == Components.interfaces.nsIFilePicker.returnOK) {
+            var rdfDataFile = Components.classes["@mozilla.org/file/local;1"]
+                .createInstance(Components.interfaces.nsILocalFile);
+            var file = Components.classes["@mozilla.org/file/directory_service;1"]
+                .getService(Components.interfaces.nsIProperties).get("ProfD", Components.interfaces.nsIFile);
+            var delimiter = (file.path.match(/\\/))?"\\":"/";
+            rdfDataFile.initWithPath(file.path + delimiter + rdfFileName);
+
+            rdfDataFile.copyTo(filePicker.file.parent,filePicker.file.leafName);
+        }
+    },
+    
+    import : function(rdfFileName) {
+        var filePicker = Components.classes["@mozilla.org/filepicker;1"]
+            .createInstance(Components.interfaces.nsIFilePicker);
+
+        filePicker.init(window, "", Components.interfaces.nsIFilePicker.modeOpen);
+        filePicker.appendFilter("RDF Files","*.rdf");
+        filePicker.appendFilters(Components.interfaces.nsIFilePicker.filterText | Components.interfaces.nsIFilePicker.filterAll );
+        
+        if (filePicker.show() == Components.interfaces.nsIFilePicker.returnOK) {
+            // init local Datasource
+            this._rdfFileName = rdfFileName; this.init();
+            
+            var importRdfDataFile = Components.classes["@mozilla.org/file/local;1"]
+                .createInstance(Components.interfaces.nsILocalFile);
+            var file = Components.classes["@mozilla.org/file/directory_service;1"]
+                .getService(Components.interfaces.nsIProperties).get("ProfD", Components.interfaces.nsIFile);
+            var delimiter = (file.path.match(/\\/))?"\\":"/";
+            rdfDataFile.initWithPath(file.path + delimiter + this._rdfFileName + "_import");
+            
+            filePicker.file.copyTo(importRdfDataFile.parent,importRdfDataFile.leafName);
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource import: copied file from " + filePicker.path + " to " + importRdfDataFile.path + "'\n");
+            
+            import_rdfDatasource = new vI_rdfDatasource(importRdfDataFile.leafName);
+            // --- do something with the file here ---
+        }  
+    },
+
+    _getRDFResourceForVIdentity : function (recDescription, recType) {
+        if (!this._rdfDataSource) return null;
         if (!recDescription) {
-            vI_notificationBar.dump("## vI_rdfDatasource: __getRDFResourceForVIdentity: no Recipient given.\n");
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: _getRDFResourceForVIdentity: no Recipient given.\n");
             return null;
         }
-        var rdfNSRecType = null
+        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;
+            case "email": _rdfNSRecType = this._rdfNSEmail; break;
+            case "newsgroup" : _rdfNSRecType = this._rdfNSNewsgroup; break;
+            case "maillist" : _rdfNSRecType = this._rdfNSMaillist; break;
+            case "filter" : _rdfNSRecType = this._rdfNSFilter; break;
         }
-        return vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + rdfNSRecType + "/" + recDescription);
+        return this._rdfService.GetResource(this._rdfNS + _rdfNSRecType + "/" + recDescription);
     },
     
     removeVIdentityFromRDF : function (resource, recType) {
-        vI_notificationBar.dump("## vI_rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");
-        vI_rdfDatasource.__unsetRDFValue(resource, "email", vI_rdfDatasource.__getRDFValue(resource, "email"))
-        vI_rdfDatasource.__unsetRDFValue(resource, "fullName", vI_rdfDatasource.__getRDFValue(resource, "fullName"))
-        vI_rdfDatasource.__unsetRDFValue(resource, "id", vI_rdfDatasource.__getRDFValue(resource, "id"))
-        vI_rdfDatasource.__unsetRDFValue(resource, "smtp", vI_rdfDatasource.__getRDFValue(resource, "smtp"))
-        vI_rdfDatasource.__unsetRDFValue(resource, "name", vI_rdfDatasource.__getRDFValue(resource, "name"))
-        
-        var extras = new vI_storageExtras(vI_rdfDatasource.__getRDFValue, resource);
-        extras.loopForRDF(vI_rdfDatasource.__unsetRDFValue, resource);
-        vI_rdfDatasource.getContainer(recType).RemoveElement(resource, true);
-    },
-    
-    __unsetRDFValue : function (resource, field, value) {
-        var predicate = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "rdf#" + field);
-        var name = vI_rdfDatasource.rdfService.GetLiteral(value?value:"");
-        var target = vI_rdfDatasource.rdfDataSource.GetTarget(resource, predicate, true);
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");
+        this._unsetRDFValue(resource, "email", this._getRDFValue(resource, "email"))
+        this._unsetRDFValue(resource, "fullName", this._getRDFValue(resource, "fullName"))
+        this._unsetRDFValue(resource, "id", this._getRDFValue(resource, "id"))
+        this._unsetRDFValue(resource, "smtp", this._getRDFValue(resource, "smtp"))
+        this._unsetRDFValue(resource, "name", this._getRDFValue(resource, "name"))
+        
+        var extras = new vI_storageExtras(this, resource);
+        extras.loopForRDF(this._unsetRDFValue, resource);
+        this.getContainer(recType).RemoveElement(resource, true);
+    },
+    
+    _unsetRDFValue : function (resource, field, value) {
+//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource _unsetRDFValue " + this._rdfService  + " " + this._rdfDataSource + "\n");
+        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
+        var name = this._rdfService.GetLiteral(value?value:"");
+        var target = this._rdfDataSource.GetTarget(resource, predicate, true);
         if (target instanceof Components.interfaces.nsIRDFLiteral)
-            vI_rdfDatasource.rdfDataSource.Unassert(resource, predicate, name, true);
+            this._rdfDataSource.Unassert(resource, predicate, name, true);
     },
     
     // this will be used from rdfDataTree to get all RDF values, callFunction is vI_rdfDataTree.__addNewDatum
     readAllEntriesFromRDF : function (addNewDatum, treeType, idData) {
-//      vI_notificationBar.dump("## vI_rdfDatasource: readAllEntriesFromRDF.\n");
-        var enumerator = vI_rdfDatasource.getContainer(treeType).GetElements();
+//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: readAllEntriesFromRDF " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
+        var enumerator = this.getContainer(treeType).GetElements();
         while (enumerator && enumerator.hasMoreElements()) {
             var resource = enumerator.getNext();
             resource.QueryInterface(Components.interfaces.nsIRDFResource);
-            var name = vI_rdfDatasource.__getRDFValue(resource, "name")
-            var email = vI_rdfDatasource.__getRDFValue(resource, "email")
-            var fullName = vI_rdfDatasource.__getRDFValue(resource, "fullName")
-            var id = vI_rdfDatasource.__getRDFValue(resource, "id")
-            var smtp = vI_rdfDatasource.__getRDFValue(resource, "smtp")
+            var name = this._getRDFValue(resource, "name")
+            var email = this._getRDFValue(resource, "email")
+            var fullName = this._getRDFValue(resource, "fullName")
+            var id = this._getRDFValue(resource, "id")
+            var smtp = this._getRDFValue(resource, "smtp")
             if (!smtp) smtp = NO_SMTP_TAG;
-            var extras = new vI_storageExtras(vI_rdfDatasource.__getRDFValue, resource);
+            var extras = new vI_storageExtras(this, resource);
             
             var localIdentityData = new vI_identityData(email, fullName, id, smtp, extras)
@@ -427 +620 @@
     
     findMatchingFilter : function (recDescription) {
-        vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter for " + recDescription + ".\n");
-        var enumerator = vI_rdfDatasource.filterContainer.GetElements();
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter for " + recDescription + ".\n");
+        var enumerator = this._filterContainer.GetElements();
         while (enumerator && enumerator.hasMoreElements()) {
             var resource = enumerator.getNext();
             resource.QueryInterface(Components.interfaces.nsIRDFResource);
-            var filter = vI_rdfDatasource.__getRDFValue(resource, "name");
+            var filter = this._getRDFValue(resource, "name");
             
             const filterType = { None : 0, RegExp : 1, StrCmp : 2 }
@@ -439 +632 @@
             if (filter == "") continue;
             if (/^\/(.*)\/$/.exec(filter))
-                { vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter with RegExp '"
+                { if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter with RegExp '"
                     + filter.replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; }
-            else    { vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter, compare with '"
+            else    { if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter, compare with '"
                     + filter + "'\n"); recentfilterType = filterType.StrCmp; }
             
@@ -448 +641 @@
                     try {   /^\/(.*)\/$/.exec(filter);
                         if (recDescription.match(new RegExp(RegExp.$1,"i"))) {
-                            vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter found stored data.\n");
-                            return vI_rdfDatasource.__readVIdentityFromRDF(resource);
+                            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter found stored data.\n");
+                            return this._readVIdentityFromRDF(resource);
                         }
                     }
@@ -455 +648 @@
                 case filterType.StrCmp:
                     if (recDescription.toLowerCase().indexOf(filter.toLowerCase()) != -1) {
-                        vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter found stored data.\n");
-                        return vI_rdfDatasource.__readVIdentityFromRDF(resource);
+                        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter found stored data.\n");
+                        return this._readVIdentityFromRDF(resource);
                     }
                     break;
             }
         }
-        vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter no match found.\n");
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter no match found.\n");
         return null;
     },
     
     readVIdentityFromRDF : function (recDescription, recType) {
-        var email = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "rdf#email");
-        var resource = vI_rdfDatasource.__getRDFResourceForVIdentity(recDescription, recType);
+        var email = this._rdfService.GetResource(this._rdfNS + "rdf#email");
+        var resource = this._getRDFResourceForVIdentity(recDescription, recType);
         if (!resource) return null;
-        if (!vI_rdfDatasource.rdfDataSource.hasArcOut(resource, email)) {
+        if (!this._rdfDataSource.hasArcOut(resource, email)) {
             // no data available --> give up.
-            vI_notificationBar.dump("## vI_rdfDatasource: readVIdentityFromRDF no data found.\n");
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: readVIdentityFromRDF no data found.\n");
             return null;
         }
-        vI_notificationBar.dump("## vI_rdfDatasource: readVIdentityFromRDF found stored data.\n");
-        
-        return vI_rdfDatasource.__readVIdentityFromRDF(resource);
-    },
-    
-    __readVIdentityFromRDF : function (resource) {
-        var email = vI_rdfDatasource.__getRDFValue(resource, "email")
-        var fullName = vI_rdfDatasource.__getRDFValue(resource, "fullName")
-        var id = vI_rdfDatasource.__getRDFValue(resource, "id")
-        var smtp = vI_rdfDatasource.__getRDFValue(resource, "smtp")
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: readVIdentityFromRDF found stored data.\n");
+        
+        return this._readVIdentityFromRDF(resource);
+    },
+    
+    _readVIdentityFromRDF : function (resource) {
+        var email = this._getRDFValue(resource, "email")
+        var fullName = this._getRDFValue(resource, "fullName")
+        var id = this._getRDFValue(resource, "id")
+        var smtp = this._getRDFValue(resource, "smtp")
         if (!smtp) smtp = NO_SMTP_TAG;
         
-        vI_notificationBar.dump("## vI_rdfDatasource: email='" + email + 
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: email='" + email + 
             "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n");
         
-        var extras = new vI_storageExtras(vI_rdfDatasource.__getRDFValue, resource);
-        vI_notificationBar.dump("## vI_rdfDatasource: extras:" + extras.status() + "\n");
+        var extras = new vI_storageExtras(this, resource);
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: extras:" + extras.status() + "\n");
         
         var localIdentityData = new vI_identityData(email, fullName, id, smtp, extras)
@@ -496 +689 @@
     },
 
-    __getRDFValue : function (resource, field) {
-        var predicate = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "rdf#" + field);
-        var target = vI_rdfDatasource.rdfDataSource.GetTarget(resource, predicate, true);
+    _getRDFValue : function (resource, field) {
+//         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource _getRDFValue " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
+        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
+        var target = this._rdfDataSource.GetTarget(resource, predicate, true);
         if (target instanceof Components.interfaces.nsIRDFLiteral) return target.Value
         else return null;
@@ -504 +698 @@
     
     updateRDFFromVIdentity : function(recDescription, recType) {
-        vI_rdfDatasource.updateRDF(recDescription, recType,
+        this.updateRDF(recDescription, recType,
             document.getElementById("msgIdentity_clone").identityData,
             (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true"),
@@ -512 +706 @@
     
     removeRDF : function (recDescription, recType) {
-        var resource = vI_rdfDatasource.__getRDFResourceForVIdentity(recDescription, recType);
+        var resource = this._getRDFResourceForVIdentity(recDescription, recType);
         if (!resource) return null;
-        vI_rdfDatasource.removeVIdentityFromRDF(resource, recType);
+        this.removeVIdentityFromRDF(resource, recType);
         return resource;
     },
@@ -520 +714 @@
     updateRDF : function (recDescription, recType, localIdentityData, storeBaseID, storeSMTP, prevRecDescription, prevRecType) {
 //      if (!localIdentityData.email) {
-//          vI_notificationBar.dump("## vI_rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");
+//          if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");
 //          return;
 //      }
@@ -528 +722 @@
         if (!prevRecType) prevRecType = recType;
 
-        var resource = vI_rdfDatasource.__getRDFResourceForVIdentity(prevRecDescription, prevRecType);
+        var resource = this._getRDFResourceForVIdentity(prevRecDescription, prevRecType);
         if (!resource) return;
-        vI_notificationBar.dump("## vI_rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");
-        
-        var position = vI_rdfDatasource.getContainer(recType).IndexOf(resource); // check for index in new recType
-        vI_rdfDatasource.removeVIdentityFromRDF(resource, prevRecType);
-        
-        resource = vI_rdfDatasource.__getRDFResourceForVIdentity(recDescription, recType);
-
-        vI_rdfDatasource.__setRDFValue(resource, "email", localIdentityData.email);
-        vI_rdfDatasource.__setRDFValue(resource, "fullName", localIdentityData.fullName);
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");
+        
+        var position = this.getContainer(recType).IndexOf(resource); // check for index in new recType
+        this.removeVIdentityFromRDF(resource, prevRecType);
+        
+        resource = this._getRDFResourceForVIdentity(recDescription, recType);
+
+        this._setRDFValue(resource, "email", localIdentityData.email);
+        this._setRDFValue(resource, "fullName", localIdentityData.fullName);
         if (storeBaseID)
-            vI_rdfDatasource.__setRDFValue(resource, "id", localIdentityData.id.key);
-        else    vI_rdfDatasource.__unsetRDFValue(resource, "id", vI_rdfDatasource.__getRDFValue(resource, "id"))
+            this._setRDFValue(resource, "id", localIdentityData.id.key);
+        else    this._unsetRDFValue(resource, "id", this._getRDFValue(resource, "id"))
         if (storeSMTP && localIdentityData.smtp.key != NO_SMTP_TAG)
-            vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp.key);
-        else    vI_rdfDatasource.__unsetRDFValue(resource, "smtp", vI_rdfDatasource.__getRDFValue(resource, "smtp"))
-        vI_rdfDatasource.__setRDFValue(resource, "name", recDescription);
-
-        localIdentityData.extras.loopForRDF(vI_rdfDatasource.__setRDFValue, resource);
-        
-        vI_notificationBar.dump("## vI_rdfDatasource: updateRDF " + resource.ValueUTF8  + " added.\n");
-        if (position != -1) vI_rdfDatasource.getContainer(recType).InsertElementAt(resource, position, false);
-        else vI_rdfDatasource.getContainer(recType).AppendElement(resource);
-    },
-
-    __setRDFValue : function (resource, field, value) {
-//      vI_notificationBar.dump("## vI_rdfDatasource: __setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n");
+            this._setRDFValue(resource, "smtp", localIdentityData.smtp.key);
+        else    this._unsetRDFValue(resource, "smtp", this._getRDFValue(resource, "smtp"))
+        this._setRDFValue(resource, "name", recDescription);
+
+        localIdentityData.extras.loopForRDF(this._setRDFValue, resource);
+        
+        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: updateRDF " + resource.ValueUTF8  + " added.\n");
+        if (position != -1) this.getContainer(recType).InsertElementAt(resource, position, false);
+        else this.getContainer(recType).AppendElement(resource);
+    },
+
+    _setRDFValue : function (resource, field, value) {
+//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: _setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n");
         if (!value) return; // return if some value was not set.
-        var predicate = vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + "rdf#" + field);
-        var name = vI_rdfDatasource.rdfService.GetLiteral(value);
-        var target = vI_rdfDatasource.rdfDataSource.GetTarget(resource, predicate, true);
+//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource _setRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n");
+        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
+        var name = this._rdfService.GetLiteral(value);
+        var target = this._rdfDataSource.GetTarget(resource, predicate, true);
         
         if (target instanceof Components.interfaces.nsIRDFLiteral)
-            vI_rdfDatasource.rdfDataSource.Change(resource, predicate, target, name);
-        else    vI_rdfDatasource.rdfDataSource.Assert(resource, predicate, name, true);
+            this._rdfDataSource.Change(resource, predicate, target, name);
+        else    this._rdfDataSource.Assert(resource, predicate, name, true);
     },
     
@@ -571 +766 @@
         observe : function(subject, topic, data) {
             if (topic == "am-smtpChanges" || topic == "am-acceptChanges") {
-                vI_notificationBar.dump("## vI_rdfDatasource: account/smtp changes observed\n");
-                if (vI_rdfDatasource.searchIdentityMismatch()) {
-                    vI_notificationBar.dump("## vI_rdfDatasource: identity mismatch detected\n");
-                }
-                if (vI_rdfDatasource.searchSmtpMismatch()) {
-                    vI_notificationBar.dump("## vI_rdfDatasource: smtp mismatch detected\n");
-                }
-                vI_rdfDatasource.refreshAccountInfo();
+                if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: account/smtp changes observed\n");
+                this.searchIdentityMismatch();
+                this.searchSmtpMismatch();
+                this.refreshAccountInfo();
             }
         },
         register : function() {
+            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: register AccountManagerObserver\n");
             var obsService = Components.classes["@mozilla.org/observer-service;1"].
                 getService(Components.interfaces.nsIObserverService)
@@ -590 +782 @@
             var obsService = Components.classes["@mozilla.org/observer-service;1"].
                 getService(Components.interfaces.nsIObserverService)
-            obsService.removeObserver(this, "am-smtpChanges");
-            obsService.removeObserver(this, "am-acceptChanges");
+            try {
+                obsService.removeObserver(this, "am-smtpChanges");
+                obsService.removeObserver(this, "am-acceptChanges");
+            } catch(e) { };
         }
     }
 }
-window.addEventListener("load", vI_rdfDatasource.init, false);
-window.addEventListener("unload", vI_rdfDatasource.clean, false);

chrome/content/v_identity/vI_storage.js

@@ -42 +42 @@
             .getBranch(null).QueryInterface(Components.interfaces.nsIPrefBranch2),
     
+    vI_rdfDatasource : null,    // local storage
+
     clean: function() {
         vI_notificationBar.dump("## vI_storage: clean.\n");
@@ -48 +50 @@
         vI_storage.firstUsedInputElement = null;
         awSetInputAndPopupValue = vI_storage.original_functions.awSetInputAndPopupValue;
+        if (vI_storage.vI_rdfDatasource) vI_storage.vI_rdfDatasource.clean();
     },
     
@@ -83 +86 @@
     },
     
-    initialized : null,
+    initialized : null,
     init: function() {
         if (!vI_storage.initialized) {
+            vI_storage.vI_rdfDatasource = new vI_rdfDatasource("virtualIdentity.rdf");
+
             // better approach would be to use te onchange event, but this one is not fired in any change case
             // see https://bugzilla.mozilla.org/show_bug.cgi?id=355367
@@ -152 +157 @@
 
         var matchResults = { storageData : {}, menuItem : {} };
-        matchResults.storageData[0] = vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
-        matchResults.storageData[1] = vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
+        matchResults.storageData[0] = vI_storage.vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
+        matchResults.storageData[1] = vI_storage.vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
 
         vI_notificationBar.dump("## vI_storage: updateVIdentityFromStorage add found Identities to CloneMenu.\n");
@@ -287 +292 @@
         recipient = vI_storage.__getDescriptionAndType(recipient, recipientType);
 
-        var storageDataByType = vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
-        var storageDataByFilter = vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
+        var storageDataByType = vI_storage.vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
+        var storageDataByFilter = vI_storage.vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
         
         // update (storing) of data by type is required if there is
@@ -312 +317 @@
             }
         }
-        if (doUpdate == "accept") vI_rdfDatasource.updateRDFFromVIdentity(recipient.recDesc, recipient.recType);
+        if (doUpdate == "accept") vI_storage.vI_rdfDatasource.updateRDFFromVIdentity(recipient.recDesc, recipient.recType);
         return true;
     },
@@ -409 +414 @@
             vI_storage.lastCheckedEmail[row] = awGetInputElement(row).value;
             var recipient = vI_storage.__getDescriptionAndType(awGetInputElement(row).value, recipientType);
-            var storageData = vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
+            var storageData = vI_storage.vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
             if (storageData) allIdentities.addWithoutDuplicates(storageData);
-            storageData = vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
+            storageData = vI_storage.vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
             if (storageData) allIdentities.addWithoutDuplicates(storageData);
         }

chrome/content/v_identity/vI_storageExtras.js

@@ -60 +60 @@
 }
 
-function vI_storageExtras(callFunction, resource) {
+function vI_storageExtras(rdfDatasource, resource) {
 // function vI_storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
     this.extras = [
@@ -93 +93 @@
         this.extras[4] = new vI_storageExtras_sMime_messageEncryption()
 
-    if (callFunction) this.loopForRDF(callFunction, resource)
+    if (rdfDatasource) this.loopForRDF(rdfDatasource, resource)
 }
 
 vI_storageExtras.prototype = {
-    loopForRDF : function(callFunction, resource) {
-        for( var i = 0; i < this.extras.length; i++ ) {
-            // only if pref set and feature(element available) or for dataEditor
+    loopForRDF : function(rdfDatasource, resource) {
+        for( var i = 0; i < this.extras.length; i++ ) {
+//          if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: loopForRDF " + rdfDatasource + "\n");
+            // only if pref set and feature(element available) or for dataEditor
             if (typeof(gMsgCompose) == "undefined" || !gMsgCompose || this.extras[i].active)
-                this.extras[i].value = callFunction(resource, this.extras[i].field, this.extras[i].value)
+                this.extras[i].value = rdfDatasource._getRDFValue(resource, this.extras[i].field, this.extras[i].value)
         }
     },

chrome/content/v_identity/vI_upgrade.js

@@ -30 +30 @@
     versionChecker : Components.classes["@mozilla.org/xpcom/version-comparator;1"]
             .getService(Components.interfaces.nsIVersionComparator),
+    
+    vI_rdfDatasource : null,
 
     init : function() {
@@ -36 +38 @@
     },
 
-    __initRequirements : function() {
+    clean : function() {
+        if (vI_upgrade.vI_rdfDatasource) vI_upgrade.vI_rdfDatasource.clean();
+    },
+
+    __initRequirements : function() {
         vI_notificationBar.dump("") // this initialises the debug-area
-        vI_rdfDatasource.init(); // just to be sure that Datasource is initialised
+        vI_upgrade.vI_rdfDatasource = new vI_rdfDatasource("virtualIdentity.rdf", true);
     },
     
@@ -44 +50 @@
     // if so, perform the upgrade and return true
     // by default the wizard is not shown if it is a one-version-forward upgrade
-    quick_upgrade : function() {
+    quick_upgrade : function(currentVersion) {
         // seamonkey doesn't have a extensionmanager, so read version of extension from hidden version-label
-        var currentVersion = vI_rdfDatasource.getCurrentExtFileVersion()
         if (!currentVersion) return false;
         currentVersion = currentVersion.split(/\./);
@@ -76 +81 @@
     
     __upgrade : function() {
-        if (vI_rdfDatasource.extUpgradeRequired()) vI_upgrade.extUpgrade();
-        if (vI_rdfDatasource.rdfUpgradeRequired()) vI_upgrade.rdfUpgrade();
+        if (vI_upgrade.vI_rdfDatasource.extUpgradeRequired()) vI_upgrade.extUpgrade();
         
         vI_account.cleanupSystem();
@@ -95 +99 @@
     },
     
-    rdfUpgrade : function() {
-        var currentVersion = vI_rdfDatasource.getCurrentRDFFileVersion();
-        vI_notificationBar.dump("checking for previous version of rdf, found " + 
-            currentVersion + "\nrdf-upgrade required.\n")
-        switch (currentVersion) {
-            case null:
-            case "0.0.1":
-            case "0.0.2":
-                vI_upgrade.__createRDFContainers(); // no break
-            case "0.0.3":
-                vI_upgrade.__tagDefaultSMTP();
-            case "0.0.4":
-            default:
-                vI_upgrade.__createAccountInfoContainers();
-        }
-        vI_rdfDatasource.storeRDFVersion();
-        vI_notificationBar.dump("rdf-upgrade to " + vI_rdfDatasource.getCurrentRDFFileVersion() + " done.\n\n");
-    },
-    
-    // only used for upgrade to 0.0.3 - loop through all ressources.
-    __transferAllResources : function () {
-        vI_notificationBar.dump("upgrade: transferAllResources ");
-        var enumerator = vI_rdfDatasource.rdfDataSource.GetAllResources();
-        while (enumerator && enumerator.hasMoreElements()) {
-            var resource = enumerator.getNext();
-            resource.QueryInterface(Components.interfaces.nsIRDFResource);
-            
-            var type; var name;
-            if (resource.ValueUTF8.match(new RegExp(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSEmail + "/", "i")))
-                { type = "email"; name = RegExp.rightContext }
-            else if (resource.ValueUTF8.match(new RegExp(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSNewsgroup + "/", "i")))
-                { type = "newsgroup"; name = RegExp.rightContext }
-            else if (resource.ValueUTF8.match(new RegExp(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSMaillist + "/", "i")))
-                { type = "maillist"; name = RegExp.rightContext }
-            else continue;
-            
-            var container = vI_rdfDatasource.getContainer(type);
-            vI_rdfDatasource.__setRDFValue(resource, "name", name);
-            
-            if (container.IndexOf(resource) == -1) container.AppendElement(resource);
-        
-            vI_notificationBar.dump(".");
-        }
-        vI_notificationBar.dump("\n");
-    },
-
-    __tagDefaultSMTP: function() {
-        vI_notificationBar.dump("upgrade: tagDefaultSMTP ");
-        for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
-            var enumerator = vI_rdfDatasource.getContainer(treeType).GetElements();
-            while (enumerator && enumerator.hasMoreElements()) {
-                var resource = enumerator.getNext();
-                resource.QueryInterface(Components.interfaces.nsIRDFResource);
-                var smtp = vI_rdfDatasource.__getRDFValue(resource, "smtp")
-                if (!smtp || smtp == "") vI_rdfDatasource.__setRDFValue(resource, "smtp", DEFAULT_SMTP_TAG);
-                vI_notificationBar.dump(".");
-            }
-        }
-        vI_notificationBar.dump("\n");
-    },
-
-    __createAccountInfoContainers: function() {
-        vI_notificationBar.dump("upgrade: createAccountInfoContainers \n");
-        var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
-            getService(Components.interfaces.nsIRDFContainerUtils);
-        
-        var accountRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSAccounts);
-        var identityRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSIdentities);
-        var smtpRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSSMTPservers);
-        vI_rdfDatasource.__setRDFValue(accountRes, "name", "Accounts");
-        vI_rdfDatasource.__setRDFValue(identityRes, "name", "Identities");
-        vI_rdfDatasource.__setRDFValue(smtpRes, "name", "SMTP-Server");
-        
-        rdfContainerUtils.MakeBag(vI_rdfDatasource.rdfDataSource, accountRes);
-        rdfContainerUtils.MakeBag(vI_rdfDatasource.rdfDataSource, identityRes);
-        rdfContainerUtils.MakeBag(vI_rdfDatasource.rdfDataSource, smtpRes);
-
-        var accountContainer = Components.classes["@mozilla.org/rdf/container;1"].
-            createInstance(Components.interfaces.nsIRDFContainer);
-        
-        // initialize container with accountRes
-        accountContainer.Init(vI_rdfDatasource.rdfDataSource, accountRes);
-        // append all new containers to accountRes
-        if (accountContainer.IndexOf(identityRes) == -1) accountContainer.AppendElement(identityRes);
-        if (accountContainer.IndexOf(smtpRes) == -1) accountContainer.AppendElement(smtpRes);
-        
-        vI_rdfDatasource.__initContainers();
-        vI_rdfDatasource.refreshAccountInfo();
-    },
-
-    __createRDFContainers: function() {
-        vI_notificationBar.dump("upgrade: createRDFContainers ");
-        var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
-            getService(Components.interfaces.nsIRDFContainerUtils);
-
-        var storageRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSStorage);
-        var emailRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSEmail);
-        var maillistRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSMaillist);
-        var newsgroupRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSNewsgroup);
-        var filterRes = vI_rdfDatasource.rdfService
-            .GetResource(vI_rdfDatasource.rdfNS + vI_rdfDatasource.rdfNSFilter);
-        vI_rdfDatasource.__setRDFValue(emailRes, "name", "E-Mail");
-        vI_rdfDatasource.__setRDFValue(maillistRes, "name", "Mailing-List");
-        vI_rdfDatasource.__setRDFValue(newsgroupRes, "name", "Newsgroup");
-        vI_rdfDatasource.__setRDFValue(filterRes, "name", "Filter");
-
-        rdfContainerUtils.MakeBag(vI_rdfDatasource.rdfDataSource, storageRes);
-        rdfContainerUtils.MakeBag(vI_rdfDatasource.rdfDataSource, emailRes);
-        rdfContainerUtils.MakeBag(vI_rdfDatasource.rdfDataSource, maillistRes);
-        rdfContainerUtils.MakeBag(vI_rdfDatasource.rdfDataSource, newsgroupRes);
-        // use a sequence for the filters, order does matter
-        rdfContainerUtils.MakeSeq(vI_rdfDatasource.rdfDataSource, filterRes);
-        
-        var container = Components.classes["@mozilla.org/rdf/container;1"].
-            createInstance(Components.interfaces.nsIRDFContainer);
-        
-        // initialize container with storageRes
-        container.Init(vI_rdfDatasource.rdfDataSource, storageRes);
-        // append all new containers to storageRes
-        if (container.IndexOf(emailRes) == -1) container.AppendElement(emailRes);
-        if (container.IndexOf(maillistRes) == -1) container.AppendElement(maillistRes);
-        if (container.IndexOf(newsgroupRes) == -1) container.AppendElement(newsgroupRes);
-        if (container.IndexOf(filterRes) == -1) container.AppendElement(filterRes);
-        
-        vI_rdfDatasource.__initContainers();
-        
-        vI_upgrade.__transferAllResources();
-    },
-    
     extUpgrade : function() {
-        var currentVersion = vI_rdfDatasource.getCurrentExtFileVersion();
+        var currentVersion = vI_upgrade.vI_rdfDatasource.getCurrentExtFileVersion();
         vI_notificationBar.dump("checking for previous version, found " + 
             currentVersion + "\nextension-upgrade required.\n")
@@ -243 +111 @@
                 vI_upgrade.__removeExtraAddedHeaders(currentVersion);
         }
-        vI_rdfDatasource.storeExtVersion();
-        vI_notificationBar.dump("extension-upgrade to " + vI_rdfDatasource.getCurrentExtFileVersion() + " done.\n\n");
+        vI_upgrade.vI_rdfDatasource.storeExtVersion();
+        vI_notificationBar.dump("extension-upgrade to " + vI_upgrade.vI_rdfDatasource.getCurrentExtFileVersion() + " done.\n\n");
     },
     
@@ -342 +210 @@
         var localIdentityData = new vI_identityData(newFullEmail, null, id, smtp, null)
         
-        vI_rdfDatasource.updateRDF(localIdentityData.combinedName,
+        vI_upgrade.vI_rdfDatasource.updateRDF(localIdentityData.combinedName,
                         "email", localIdentityData, true, true, null, null)
         if (Card.secondEmail.replace(/^\s+|\s+$/g,""))
-            vI_rdfDatasource.updateRDF(localIdentityData.combinedName,
+            vI_upgrade.vI_rdfDatasource.updateRDF(localIdentityData.combinedName,
                     "email", localIdentityData, true, true, null, null)
         

chrome/content/v_identity/vI_upgrade.xul

@@ -38 +38 @@
 <wizard id="upgradeWizard" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&vident.upgrade.dlgTitle.label;"
-    zlevel="6" onload="vI_upgrade.init(); vI_upgrade.prepare(document.getElementById('introPage'));" >
+    zlevel="6" onload="vI_upgrade.init(); vI_upgrade.prepare(document.getElementById('introPage'));" onunload="vI_upgrade.clean();" >
 
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgrade.js" />

chrome/content/v_identity/vI_upgradeOverlay.js

@@ -25 +25 @@
 var vI_upgradeOverlay = {
     init: function() {
-        vI_rdfDatasource.init() // just to be sure that Datasource is available
-        if (vI_rdfDatasource.rdfUpgradeRequired() || vI_rdfDatasource.extUpgradeRequired()) {
-            if (!vI_upgrade.quick_upgrade())
+        var rdfDatasource = new vI_rdfDatasource("virtualIdentity.rdf", true);
+        if (rdfDatasource.extUpgradeRequired()) {
+            if (!vI_upgrade.quick_upgrade(rdfDatasource.getCurrentExtFileVersion()))
                 window.open("chrome://v_identity/content/vI_upgrade.xul",0,
                     "chrome, dialog, modal, alwaysRaised, resizable=yes").focus();
@@ -33 +33 @@
         else {
             vI_account.cleanupSystem(); // always clean leftover accounts and directories
-            
-            // just to recognize downgrades later
-            vI_rdfDatasource.storeRDFVersion();
-            vI_rdfDatasource.storeExtVersion();
+            rdfDatasource.storeExtVersion();
         }
+        rdfDatasource.clean();
+        
         // show error-Console if required
         var prefroot = Components.classes["@mozilla.org/preferences-service;1"]

chrome/locale/en-US/v_identity/vI_prefDialog.dtd

@@ -133 +133 @@
 <!ENTITY vI_prefDialog.storage.tooltiptext "Used Identities might be stored related to the recipients of your email. If you write again to the same recipient, the same virtual or non-virtual Identity will be used">
 <!ENTITY vI_prefDialog.storage.openEditor "edit stored data">
+<!ENTITY vI_prefDialog.storage.export "export stored data">
+<!ENTITY vI_prefDialog.storage.import "import data">
 
 <!ENTITY vI_prefDialog.storageTab.reading.header "Identity Reading">

chrome/locale/en-US/v_identity/v_identity.dtd

@@ -11 +11 @@
 <!ENTITY vident.vI_Menu.label "Virtual Identity">
 <!ENTITY vident.vI_Menu.Settings.label "Settings">
-<!ENTITY vident.vI_Menu.DataEditor.label "Data-Storage Editor">
+<!ENTITY vident.vI_Menu.DataStorage.label "Data-Storage">
+<!ENTITY vident.vI_Menu.DataEditor.label "Editor">
 <!ENTITY vident.vI_Menu.storageSave.label "save Identity while sending">
 <!ENTITY vident.vI_Menu.saveBaseID.label "store underlying base Identity">