From af814a34846908fffd854e1275b7a953a2a01bfe Mon Sep 17 00:00:00 2001 From: "rginda%netscape.com" Date: Sat, 17 Feb 2001 05:55:01 +0000 Subject: [PATCH] -- NOT PART OF THE BUILD -- clean out some bitrot in cview, add an install.js file. xpi will be located at www.hacksrus.com/~ginda/cview shortly. --- .../cview/resources/content/cview-handlers.js | 26 +++++++++- .../cview/resources/content/cview-rdf.js | 13 ++++- .../cview/resources/content/cview-static.js | 11 ++--- extensions/cview/resources/content/cview.xul | 49 ++++++++++++------- extensions/cview/resources/install.js | 46 +++++++++++++++++ 5 files changed, 116 insertions(+), 29 deletions(-) create mode 100644 extensions/cview/resources/install.js diff --git a/extensions/cview/resources/content/cview-handlers.js b/extensions/cview/resources/content/cview-handlers.js index c33aabd194d9..d56cabdf91ac 100644 --- a/extensions/cview/resources/content/cview-handlers.js +++ b/extensions/cview/resources/content/cview-handlers.js @@ -162,8 +162,30 @@ function onChangeDisplayMode (e) dd ("** UNKNOWN ID '" + id + "' in onChangeDisplayMode **"); return; } - - var typeDesc = (ary[1] == "cmp") ? "Components" : "Interfaces"; + + var typeDesc; + var el; + if (ary[1] == "cmp") { + typeDesc = "Components"; + el = document.getElementById("menu-cmp-show-all"); + el.setAttribute("checked", false); + el = document.getElementById("menu-cmp-show-contains"); + el.setAttribute("checked", false); + el = document.getElementById("menu-cmp-show-starts-with"); + el.setAttribute("checked", false); + } else { + typeDesc = "Interfaces"; + el = document.getElementById("menu-ifc-show-all"); + el.setAttribute("checked", false); + el = document.getElementById("menu-ifc-show-contains"); + el.setAttribute("checked", false); + el = document.getElementById("menu-ifc-show-starts-with"); + el.setAttribute("checked", false); + el = document.getElementById("menu-ifc-show-implemented-by"); + el.setAttribute("checked", false); + } + + e.target.setAttribute ("checked", true); var filter = ""; if (ary[2] == "contains") diff --git a/extensions/cview/resources/content/cview-rdf.js b/extensions/cview/resources/content/cview-rdf.js index 7ffdaf2ccd27..c842d378e47a 100644 --- a/extensions/cview/resources/content/cview-rdf.js +++ b/extensions/cview/resources/content/cview-rdf.js @@ -83,6 +83,14 @@ function rdf_getr (s) RDFHelper.prototype.GetLiteral = function rdf_getl (s) { + if (!s) + { + dd ("rdf_getl: no argument provided!"); + dd (getStackTrace()); + + return ""; + } + return this.svc.GetLiteral(s); } @@ -92,7 +100,7 @@ function rdf_assert (n1, a, n2, f) if (typeof f == "undefined") f = true; - /*return this.dAssert (n1, a, n2, f);*/ +// return this.dAssert (n1, a, n2, f); return this.ds.Assert (n1, a, n2, f); } @@ -111,7 +119,10 @@ function rdf_dassert (n1, a, n2, f) var n2v = n2 ? n2.Value : "!!!"; if (!n1 || !a || !n2) + { + dd ("n1 " + n1v + " a " + av + " n2 " + n2v); dd(getStackTrace()); + } this.ds.Assert (n1, a, n2, f) } diff --git a/extensions/cview/resources/content/cview-static.js b/extensions/cview/resources/content/cview-static.js index b9ff601a31a2..f47a60d9f8b3 100644 --- a/extensions/cview/resources/content/cview-static.js +++ b/extensions/cview/resources/content/cview-static.js @@ -31,10 +31,7 @@ var cview = new Object(); /* * instead of creating a slew of global variables, all app-wide values are - * stored on this cview object. Doing this instead of global variable is - * somewhat religious; it avoids any "m" prefix for module vars, makes - * it trivial to track down all globals, and in theory makes it possible - * to embed the code in another app without colliding globals. + * stored on this cview object. */ /* number of items to process per refresh step */ @@ -77,7 +74,7 @@ function refreshComponentsStep() cview.rdf.Assert (res, cview.rdf.resContractID, cview.rdf.GetLiteral(cls.name)); cview.rdf.Assert (res, cview.rdf.resCLSID, - cview.rdf.GetLiteral(cls.id)); + cview.rdf.GetLiteral(cls.number)); cview.rdf.Assert (res, cview.rdf.resShow, cview.rdf.litTrue); cview.rdf.Assert (cview.rdf.resRoot, cview.rdf.resCmp, res); @@ -142,12 +139,12 @@ function refreshInterfacesStep() if (!ifc) break; - + var res = cview.rdf.GetResource ("interface:" + (++cview.interfaceID)); cview.rdf.Assert (res, cview.rdf.resIName, cview.rdf.GetLiteral(ifc.name)); cview.rdf.Assert (res, cview.rdf.resIID, - cview.rdf.GetLiteral(ifc.id)); + cview.rdf.GetLiteral(ifc.number)); cview.rdf.Assert (res, cview.rdf.resShow, cview.rdf.litTrue); cview.rdf.Assert (cview.rdf.resRoot, cview.rdf.resIfc, res); diff --git a/extensions/cview/resources/content/cview.xul b/extensions/cview/resources/content/cview.xul index 3f9e44ba6ef4..282357d7ed9c 100644 --- a/extensions/cview/resources/content/cview.xul +++ b/extensions/cview/resources/content/cview.xul @@ -24,7 +24,8 @@ - + + @@ -120,8 +121,9 @@ - - + + - - + - + - + @@ -166,19 +170,20 @@ - - + - - @@ -187,10 +192,13 @@ - + + + - - + + @@ -199,14 +207,16 @@ - - + - + @@ -215,9 +225,10 @@ - - + diff --git a/extensions/cview/resources/install.js b/extensions/cview/resources/install.js new file mode 100644 index 000000000000..85902d2db809 --- /dev/null +++ b/extensions/cview/resources/install.js @@ -0,0 +1,46 @@ +// this function verifies disk space in kilobytes +function verifyDiskSpace(dirPath, spaceRequired) +{ + var spaceAvailable; + + // Get the available disk space on the given path + spaceAvailable = fileGetDiskSpaceAvailable(dirPath); + + // Convert the available disk space into kilobytes + spaceAvailable = parseInt(spaceAvailable / 1024); + + // do the verification + if(spaceAvailable < spaceRequired) + { + logComment("Insufficient disk space: " + dirPath); + logComment(" required : " + spaceRequired + " K"); + logComment(" available: " + spaceAvailable + " K"); + return(false); + } + + return(true); +} +var srDest = 111; + +var err = initInstall("Component Viewer v0.5", "CView", "5.0.0.2001021601"); +logComment("initInstall: " + err); + +if (verifyDiskSpace(getFolder("Program"), srDest)) +{ + addFile("CView Chrome", + "bin/chrome/cview.jar", // jar source folder + getFolder("Chrome"), // target folder + ""); // target subdir + + registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","cview.jar"), + "content/cview/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome","cview.jar"), + "locale/en-US/cview/"); + + if (err==SUCCESS) + performInstall(); + else + cancelInstall(err); +} +else + cancelInstall(INSUFFICIENT_DISK_SPACE);