From 2845d4bc9cd19b154480ecbdde32d5bc8be61375 Mon Sep 17 00:00:00 2001
From: "rginda%netscape.com"
 <rginda%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 21 Apr 2001 00:39:29 +0000
Subject: [PATCH] reverting bogus checkin r=peterv, a=asa

git-svn-id: svn://10.0.0.236/trunk@92857 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/cview/Makefile.in          |  28 +-
 mozilla/extensions/cview/makefile.win         |  34 +-
 .../cview/resources/content/app-handlers.js   |  15 -
 .../cview/resources/content/app-overlay.js    |   6 -
 .../cview/resources/content/app-overlay.xul   |  30 --
 .../cview/resources/content/app-static.js     |  12 -
 .../cview/resources/content/app-ui.xul        |  70 ----
 .../cview/resources/content/app-utils.js      | 386 ------------------
 .../resources/locale/en-US/app-overlay.dtd    |   3 -
 .../cview/resources/locale/en-US/app-ui.dtd   |   8 -
 .../cview/resources/skin/app-ui.css           |   3 -
 11 files changed, 54 insertions(+), 541 deletions(-)
 delete mode 100644 mozilla/extensions/cview/resources/content/app-handlers.js
 delete mode 100644 mozilla/extensions/cview/resources/content/app-overlay.js
 delete mode 100644 mozilla/extensions/cview/resources/content/app-overlay.xul
 delete mode 100644 mozilla/extensions/cview/resources/content/app-static.js
 delete mode 100644 mozilla/extensions/cview/resources/content/app-ui.xul
 delete mode 100644 mozilla/extensions/cview/resources/content/app-utils.js
 delete mode 100644 mozilla/extensions/cview/resources/locale/en-US/app-overlay.dtd
 delete mode 100644 mozilla/extensions/cview/resources/locale/en-US/app-ui.dtd
 delete mode 100644 mozilla/extensions/cview/resources/skin/app-ui.css

diff --git a/mozilla/extensions/cview/Makefile.in b/mozilla/extensions/cview/Makefile.in
index 67df006eacc..8e1d33857b1 100644
--- a/mozilla/extensions/cview/Makefile.in
+++ b/mozilla/extensions/cview/Makefile.in
@@ -1,14 +1,34 @@
-${license_mak}
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/ 
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License. 
+#
+#  The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):
+#  Robert Ginda, rginda@nestcape.com, original author
+#
+#
 
-DEPTH		= ${depth_0_nix}
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS        = resources
+DIRS            = resources
 
 include $(topsrcdir)/config/rules.mk
 
-
diff --git a/mozilla/extensions/cview/makefile.win b/mozilla/extensions/cview/makefile.win
index 5448039b2d5..5c108c50fd0 100644
--- a/mozilla/extensions/cview/makefile.win
+++ b/mozilla/extensions/cview/makefile.win
@@ -1,9 +1,35 @@
-${license_mak}
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/ 
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License. 
+#
+#  The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):
+#  Robert Ginda, rginda@nestcape.com, original author
+#
+#
 
-DEPTH		= ${depth_0_win}
+DEPTH		= ..\..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
-include <$(DEPTH)\config\config.mak>
+include <$(DEPTH)\config\autoconf.mak>
 
 DIRS            = resources
 
-include <$(DEPTH)\config\rules.mak>
+INSTALLROOT = $(DIST)\bin\chrome\packages\cview\cview
+
+include <$(topsrcdir)\config\rules.mak>
diff --git a/mozilla/extensions/cview/resources/content/app-handlers.js b/mozilla/extensions/cview/resources/content/app-handlers.js
deleted file mode 100644
index 351121d29f5..00000000000
--- a/mozilla/extensions/cview/resources/content/app-handlers.js
+++ /dev/null
@@ -1,15 +0,0 @@
-${license_c}
-
-/* Place JavaScript event handlers in this file.
- * Use ${filename:app-static.js} for functons that are not event handlers.
- */
-
-function onLoad()
-{
-    dd ("Application ${app_name_short}, '${app_name_long}' loaded.");
-}
-
-function onUnload()
-{
-    dd ("Application ${app_name_short}, '${app_name_long}' unloaded.");
-}
\ No newline at end of file
diff --git a/mozilla/extensions/cview/resources/content/app-overlay.js b/mozilla/extensions/cview/resources/content/app-overlay.js
deleted file mode 100644
index 1256d8022c1..00000000000
--- a/mozilla/extensions/cview/resources/content/app-overlay.js
+++ /dev/null
@@ -1,6 +0,0 @@
-${license_cpp}
-
-function start_${app_name_short}() 
-{
-    toOpenWindowByType("mozapp:${app_name_short}", "${chrome_main_xul_url}");
-}
diff --git a/mozilla/extensions/cview/resources/content/app-overlay.xul b/mozilla/extensions/cview/resources/content/app-overlay.xul
deleted file mode 100644
index ac5775e47b2..00000000000
--- a/mozilla/extensions/cview/resources/content/app-overlay.xul
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-${license_xml}
-
-
-<!--
-  This file contains the nodes that will be overlayed on top of
-  <${overlay_trigger_url}>.
-  Place JavaScript code that this file needs in ${filename:app-overlay.js}.
-  Declare XMl entites that this file refers to in ${filename:app-overlay.dtd}.
- -->
-
-<!DOCTYPE window SYSTEM "${overlay_dtd_url}" >
-
-<overlay id="${app_name_short}TaskMenuID"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script src="${overlay_js_url}"/>
-
-<!--
-  This is the id that the menuitem will be appended to.  see tasksOverlay.xul
--->
-<menupopup id="${overlay_trigger_node}">
-  <menuitem position="${overlay_trigger_position}"
-   label="&${app_name_short}Cmd.label;"
-     oncommand="start_${app_name_short}()"/>
-</menupopup>
-
-</overlay>
diff --git a/mozilla/extensions/cview/resources/content/app-static.js b/mozilla/extensions/cview/resources/content/app-static.js
deleted file mode 100644
index 6c97ed3f00e..00000000000
--- a/mozilla/extensions/cview/resources/content/app-static.js
+++ /dev/null
@@ -1,12 +0,0 @@
-${license_c}
-
-/* Place JavaScript functions that are *not* event handlers in this file.
- * Use ${filename:app-handlers.js} for JavaScript event handlers.
- */
-
-if (DEBUG)
-    dd = function (msg) { dumpln("-*- ${app_name_short}: " + msg); }
-else
-    dd = function (){};
-
-dd ("sample debug message from ${app_name_long}.");
\ No newline at end of file
diff --git a/mozilla/extensions/cview/resources/content/app-ui.xul b/mozilla/extensions/cview/resources/content/app-ui.xul
deleted file mode 100644
index 9af72051832..00000000000
--- a/mozilla/extensions/cview/resources/content/app-ui.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-
-${license_xml}
-
-<!--
-   This file contains the main UI for your application.  See
-   <http://www.mozilla.org/xpfe> for more information on the contents
-   of this file.
-
-   The following files are used by this file:
-   ${filename:app-ui.dtd} XML entities used by this file.
-   ${filename:app-ui.css} CSS definitions for this file.
-   ${filename:app-utils.js} JavaScript utility functions.
-   ${filename:app-static.js} Non event-handler related JavaScript functions.
-   ${filename:app-handlers.js} JavaScript event handlers.
- -->
-
-<!DOCTYPE window SYSTEM "${chrome_main_dtd_url}" >
-
-<?xml-stylesheet href="${chrome_main_css_url}" type="text/css"?>
-
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-
-<window id="main-window"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="vertical" onload="onLoad();" onunload="onUnload();"
-        persist="width height" title="${app_name_long}"
-        windowtype="mozapp:${app_name_short}">
-
-  <script>
-    <![CDATA[
-    /* set this to false to turn off dd() messages */
-    var DEBUG = true;
-    ]]>
-  </script>
-
-  <script src="${chrome_content_url}${filename:app-utils.js}"/>
-  <script src="${chrome_content_url}${filename:app-static.js}"/>
-  <script src="${chrome_content_url}${filename:app-handlers.js}"/>
-
-  <commandset id="tasksCommands">
-    <command id="cmd_close" oncommand="window.close();"/>
-    <command id="cmd_quit"/>
-  </commandset>
-
-  <keyset id="tasksKeys">
-    <key id="key_close"/>
-    <key id="key_quit"/>
-  </keyset>
-
-  <toolbox>
-    <menubar id="main-menubar" persist="collapsed">
-      <menu id="menu_File">
-        <menupopup id="menu_FilePopup">
-          <menuitem id="menu_close"/>
-        </menupopup>
-      </menu>
-      <menu id="tasksMenu"/>
-    </menubar>
-  </toolbox>
-
-  <titledbox flex="1">
-    <label value="&app.name.short;"/>
-    <button flex="1" onclick="window.close()" label="&${app_name_short}Button.label;"/>
-  </titledbox>
-
-</window>
diff --git a/mozilla/extensions/cview/resources/content/app-utils.js b/mozilla/extensions/cview/resources/content/app-utils.js
deleted file mode 100644
index 8d4a99b2e0b..00000000000
--- a/mozilla/extensions/cview/resources/content/app-utils.js
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code
- *
- * The Initial Developer of the Original Code is New Dimensions Consulting,
- * Inc. Portions created by New Dimensions Consulting, Inc. are
- * Copyright (C) 1999 New Dimensions Consulting, Inc. All Rights Reserved.
- *
- * Contributor(s):
- *  Robert Ginda, rginda@ndcico.com, original author
- *
- *
- * JavaScript utility functions.
- */
-
-var dumpln;
-var dd;
-
-if (typeof document == "undefined") /* in xpcshell */
-    dumpln = print;
-else
-    if (typeof dump == "function")
-        dumpln = function (str) {dump (str + "\n");}
-    else if (jsenv.HAS_RHINO)
-        dumpln = function (str) {var out = java.lang.System.out;
-                                 out.println(str); out.flush(); }
-    else
-        dumpln = function () {} /* no suitable function */
-
-if (DEBUG)
-    dd = dumpln;
-else
-    dd = function (){};
-
-var jsenv = new Object();
-jsenv.HAS_SECURITYMANAGER = ((typeof netscape == "object") &&
-                             (typeof netscape.security == "object"));
-jsenv.HAS_XPCOM = ((typeof Components == "function") &&
-                   (typeof Components.classes == "function"));
-jsenv.HAS_JAVA = (typeof java == "object");
-jsenv.HAS_RHINO = (typeof defineClass == "function");
-jsenv.HAS_DOCUMENT = (typeof document == "object");
-
-/* Dumps an object in tree format, recurse specifiec the the number of objects
- * to recurse, compress is a boolean that can uncompress (true) the output
- * format, and level is the number of levels to intitialy indent (only useful
- * internally.)  A sample dumpObjectTree (o, 1) is shown below.
- *
- * + parent (object)
- * + users (object)
- * | + jsbot (object)
- * | + mrjs (object)
- * | + nakkezzzz (object)
- * | *
- * + bans (object)
- * | *
- * + topic (string) 'ircclient.js:59: nothing is not defined'
- * + getUsersLength (function) 9 lines
- * *
- */
-function dumpObjectTree (o, recurse, compress, level)
-{
-    var s = "";
-    var pfx = "";
-
-    if (typeof recurse == "undefined")
-        recurse = 0;
-    if (typeof level == "undefined")
-        level = 0;
-    if (typeof compress == "undefined")
-        compress = true;
-    
-    for (var i = 0; i < level; i++)
-        pfx += (compress) ? "| " : "|  ";
-
-    var tee = (compress) ? "+ " : "+- ";
-
-    for (i in o)
-    {
-        
-        var t = typeof o[i];
-        switch (t)
-        {
-            case "function":
-                var sfunc = String(o[i]).split("\n");
-                if (sfunc[2] == "    [native code]")
-                    sfunc = "[native code]";
-                else
-                    sfunc = sfunc.length + " lines";
-                s += pfx + tee + i + " (function) " + sfunc + "\n";
-                break;
-
-            case "object":
-                s += pfx + tee + i + " (object)\n";
-                if (!compress)
-                    s += pfx + "|\n";
-                if ((i != "parent") && (recurse))
-                    s += dumpObjectTree (o[i], recurse - 1,
-                                         compress, level + 1);
-                break;
-
-            case "string":
-                if (o[i].length > 200)
-                    s += pfx + tee + i + " (" + t + ") " + 
-                        o[i].length + " chars\n";
-                else
-                    s += pfx + tee + i + " (" + t + ") '" + o[i] + "'\n";
-                break;
-
-            default:
-                s += pfx + tee + i + " (" + t + ") " + o[i] + "\n";
-                
-        }
-
-        if (!compress)
-            s += pfx + "|\n";
-
-    }
-
-    s += pfx + "*\n";
-    
-    return s;
-    
-}
-
-/*
- * Clones an existing object (Only the enumerable properties
- * of course.) use as a function..
- * var c = Clone (obj);
- * or a constructor...
- * var c = new Clone (obj);
- */
-function Clone (obj)
-{
-    robj = new Object();
-
-    for (var p in obj)
-        robj[p] = obj[p];
-
-    return robj;
-    
-}
-
-function renameProperty (obj, oldname, newname)
-{
-
-    if (oldname == newname)
-        return;
-    
-    obj[newname] = obj[oldname];
-    delete obj[oldname];
-    
-}
-
-function newObject(contractID, iface)
-{
-    if (!jsenv.HAS_XPCOM)
-        return null;
-
-    var obj = Components.classes[contractID].createInstance();
-    var rv;
-
-    switch (typeof iface)
-    {
-        case "string":
-            rv = obj.QueryInterface(Components.interfaces[iface]);
-            break;
-
-        case "object":
-            rv = obj.QueryInterface[iface];
-            break;
-
-        default:
-            rv = null;
-            break;
-    }
-
-    return rv;
-    
-}
-
-function keys (o)
-{
-    var rv = new Array();
-    
-    for (var p in o)
-        rv.push(p);
-
-    return rv;
-    
-}
-
-function stringTrim (s)
-{
-    if (!s)
-        return "";
-    s = s.replace (/^\s+/, "");
-    return s.replace (/\s+$/, "");
-    
-}
-
-function formatDateOffset (seconds, format)
-{
-    seconds = parseInt(seconds);
-    var minutes = parseInt(seconds / 60);
-    seconds = seconds % 60;
-    var hours   = parseInt(minutes / 60);
-    minutes = minutes % 60;
-    var days    = parseInt(hours / 24);
-    hours = hours % 24;
-
-    if (!format)
-    {
-        var ary = new Array();
-        if (days > 0)
-            ary.push (days + " days");
-        if (hours > 0)
-            ary.push (hours + " hours");
-        if (minutes > 0)
-            ary.push (minutes + " minutes");
-        if (seconds > 0)
-            ary.push (seconds + " seconds");
-
-        format = ary.join(", ");
-    }
-    else
-    {
-        format = format.replace ("%d", days);
-        format = format.replace ("%h", hours);
-        format = format.replace ("%m", minutes);
-        format = format.replace ("%s", seconds);
-    }
-    
-    return format;
-}
-
-function arraySpeak (ary, single, plural)
-{
-    var rv = "";
-    
-    switch (ary.length)
-    {
-        case 0:
-            break;
-            
-        case 1:
-            rv = ary[0];
-            if (single)
-                rv += " " + single;            
-            break;
-
-        case 2:
-            rv = ary[0] + " and " + ary[1];
-            if (plural)
-                rv += " " + plural;
-            break;
-
-        default:
-            for (var i = 0; i < ary.length - 1; ++i)
-                rv += ary[i] + ", ";
-            rv += "and " + ary[ary.length - 1];
-            if (plural)
-                rv += " " + plural;
-            break;
-    }
-
-    return rv;
-    
-}
-
-
-function arrayContains (ary, elem)
-{
-    return (arrayIndexOf (ary, elem) != -1);
-}
-
-function arrayIndexOf (ary, elem)
-{
-    for (var i in ary)
-        if (ary[i] == elem)
-            return i;
-
-    return -1;
-}
-    
-function arrayInsertAt (ary, i, o)
-{
-
-    ary.splice (i, 0, o);
-
-}
-
-function arrayRemoveAt (ary, i)
-{
-
-    ary.splice (i, 1);
-
-}
-
-function getRandomElement (ary)
-{
-    var i = parseInt (Math.random() * ary.length)
-	if (i == ary.length) i = 0;
-
-    return ary[i];
-
-}
-
-function roundTo (num, prec)
-{
-
-    return parseInt ( Math.round(num * Math.pow (10, prec))) /
-        Math.pow (10, prec);   
-
-}
-
-function randomRange (min, max)
-{
-
-    if (typeof min == "undefined")
-        min = 0;
-
-    if (typeof max == "undefined")
-        max = 1;
-
-    var rv = (parseInt(Math.round((Math.random() * (max - min)) + min )));
-    
-    return rv;
-
-}
-
-function getStackTrace ()
-{
-
-    if (!jsenv.HAS_XPCOM)
-        return "No stack trace available.";
-
-    var frame = Components.stack.caller;
-    var str = "<top>";
-
-    while (frame)
-    {
-        var name = frame.functionName ? frame.functionName : "[anonymous]";
-        str += "\n" + name + "@" + frame.lineNumber;
-        frame = frame.caller;
-    }
-
-    return str;
-    
-}
-
-function getInterfaces (cls)
-{
-    if (!jsenv.HAS_XPCOM)
-        return null;
-
-    var rv = new Object();
-    var e;
-
-    for (var i in Components.interfaces)
-    {
-        try
-        {
-            var ifc = Components.interfaces[i];
-            cls.QueryInterface(ifc);
-            rv[i] = ifc;
-        }
-        catch (e)
-        {
-            /* nada */
-        }
-    }
-
-    return rv;
-    
-}
diff --git a/mozilla/extensions/cview/resources/locale/en-US/app-overlay.dtd b/mozilla/extensions/cview/resources/locale/en-US/app-overlay.dtd
deleted file mode 100644
index ae47d41b6d1..00000000000
--- a/mozilla/extensions/cview/resources/locale/en-US/app-overlay.dtd
+++ /dev/null
@@ -1,3 +0,0 @@
-${license_xml}
-
-<!ENTITY ${app_name_short}Cmd.label				        "${app_name_menu}">
diff --git a/mozilla/extensions/cview/resources/locale/en-US/app-ui.dtd b/mozilla/extensions/cview/resources/locale/en-US/app-ui.dtd
deleted file mode 100644
index 0807a49d81a..00000000000
--- a/mozilla/extensions/cview/resources/locale/en-US/app-ui.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-${license_xml}
-
-<!ENTITY app.name.short "${app_name_short}">
-<!ENTITY app.name.long "${app_name_long}">
-<!ENTITY app.version "${app_version}">
-<!ENTITY app.author "${app_author}">
-
-<!ENTITY ${app_name_short}Button.label "click here to exit ${app_name_long}">
diff --git a/mozilla/extensions/cview/resources/skin/app-ui.css b/mozilla/extensions/cview/resources/skin/app-ui.css
deleted file mode 100644
index 08ee7aaa068..00000000000
--- a/mozilla/extensions/cview/resources/skin/app-ui.css
+++ /dev/null
@@ -1,3 +0,0 @@
-${license_css}
-
-@import url(chrome://communicator/skin/);