summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2007-01-05 21:42:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:37:04 -0500
commit33009ef6ad77597f326f72e4c678c7032ea968a2 (patch)
treea3a85a19548ebea9719b53d31eb33285351c8457
parent40b71722e184e82de6c030d56af6943854599e19 (diff)
downloadsamba-33009ef6ad77597f326f72e4c678c7032ea968a2.tar.gz
samba-33009ef6ad77597f326f72e4c678c7032ea968a2.tar.bz2
samba-33009ef6ad77597f326f72e4c678c7032ea968a2.zip
r20574: reorganization of common modules
(This used to be commit 5075e008941177d5be1d9471387c9d27aba65f81)
-rw-r--r--webapps/swat/source/class/swat/main/AbstractModule.js (renamed from webapps/swat/source/class/swat/module/AbstractModule.js)12
-rw-r--r--webapps/swat/source/class/swat/main/AbstractModuleFsm.js (renamed from webapps/swat/source/class/swat/module/AbstractModuleFsm.js)46
-rw-r--r--webapps/swat/source/class/swat/main/Gui.js2
-rw-r--r--webapps/swat/source/class/swat/main/Main.js16
-rw-r--r--webapps/swat/source/class/swat/main/Module.js (renamed from webapps/swat/source/class/swat/module/Module.js)8
-rw-r--r--webapps/swat/source/class/swat/module/documentation/Documentation.js6
-rw-r--r--webapps/swat/source/class/swat/module/documentation/Fsm.js6
-rw-r--r--webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js10
-rw-r--r--webapps/swat/source/class/swat/module/ldbbrowse/Gui.js4
-rw-r--r--webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js6
-rw-r--r--webapps/swat/source/class/swat/module/statistics/Fsm.js8
-rw-r--r--webapps/swat/source/class/swat/module/statistics/Gui.js2
-rw-r--r--webapps/swat/source/class/swat/module/statistics/Statistics.js6
13 files changed, 66 insertions, 66 deletions
diff --git a/webapps/swat/source/class/swat/module/AbstractModule.js b/webapps/swat/source/class/swat/main/AbstractModule.js
index 19bcc88a13..4533f3d8c6 100644
--- a/webapps/swat/source/class/swat/module/AbstractModule.js
+++ b/webapps/swat/source/class/swat/main/AbstractModule.js
@@ -10,7 +10,7 @@
/**
* Abstract Module class. All modules should extend this class.
*/
-qx.OO.defineClass("swat.module.AbstractModule", qx.core.Object,
+qx.OO.defineClass("swat.main.AbstractModule", qx.core.Object,
function()
{
qx.core.Object.call(this);
@@ -26,7 +26,7 @@ function()
* module is first selected (and each subsequent time), and the FSM can use
* that event to build the complete FSM.
*
- * @param module {swat.module.Module}
+ * @param module {swat.main.Module}
* The module descriptor for the module.
*/
qx.Proto.buildInitialFsm = function(module)
@@ -47,7 +47,7 @@ qx.Proto.buildInitialFsm = function(module)
* State: Idle
*
* Transition on:
- * "appear" on swat.module.canvas
+ * "appear" on swat.main.canvas
*/
var state = new qx.util.fsm.State(
"State_Idle",
@@ -59,7 +59,7 @@ qx.Proto.buildInitialFsm = function(module)
// user interface.
"appear" :
{
- "swat.module.canvas" :
+ "swat.main.canvas" :
"Transition_Idle_to_Idle_Load_Gui"
}
}
@@ -106,7 +106,7 @@ qx.Proto.buildInitialFsm = function(module)
module.fsm = fsm;
// Save the module descriptor in the finite state machine
- fsm.addObject("swat.module.module", module);
+ fsm.addObject("swat.main.module", module);
// Create an RPC object for use by this module
module.rpc = new qx.io.remote.Rpc();
@@ -117,7 +117,7 @@ qx.Proto.buildInitialFsm = function(module)
module.rpc.addEventListener("failed", fsm.eventListener, fsm);
module.rpc.addEventListener("timeout", fsm.eventListener, fsm);
module.rpc.addEventListener("aborted", fsm.eventListener, fsm);
- fsm.addObject("swat.module.rpc", module.rpc);
+ fsm.addObject("swat.main.rpc", module.rpc);
// Start the finite state machine
fsm.start();
diff --git a/webapps/swat/source/class/swat/module/AbstractModuleFsm.js b/webapps/swat/source/class/swat/main/AbstractModuleFsm.js
index 2b54b4fab4..49222d90d4 100644
--- a/webapps/swat/source/class/swat/module/AbstractModuleFsm.js
+++ b/webapps/swat/source/class/swat/main/AbstractModuleFsm.js
@@ -11,7 +11,7 @@
* Common facilities for modules' finite state machines. Each module's FSM
* should extend this class.
*/
-qx.OO.defineClass("swat.module.AbstractModuleFsm", qx.core.Object, function()
+qx.OO.defineClass("swat.main.AbstractModuleFsm", qx.core.Object, function()
{
qx.core.Object.call(this);
@@ -35,17 +35,17 @@ qx.Proto.addAwaitRpcResultState = function(module)
* State: AwaitRpcResult
*
* Actions upon entry:
- * - enable any objects in group "swat.module.fsmUtils.enable_during_rpc"
- * - disable any objects in group "swat.module.fsmUtils.disable_during_rpc"
+ * - enable any objects in group "swat.main.fsmUtils.enable_during_rpc"
+ * - disable any objects in group "swat.main.fsmUtils.disable_during_rpc"
*
* Actions upon exit:
- * - disable any objects in group "swat.module.fsmUtils.enable_during_rpc"
- * - enable any objects in group "swat.module.fsmUtils.disable_during_rpc"
+ * - disable any objects in group "swat.main.fsmUtils.enable_during_rpc"
+ * - enable any objects in group "swat.main.fsmUtils.disable_during_rpc"
*
* Transition on:
* "completed" (on RPC)
* "failed" (on RPC)
- * "execute" on swat.module.fsmUtils.abort_rpc
+ * "execute" on swat.main.fsmUtils.abort_rpc
*/
var state = new qx.util.fsm.State(
"State_AwaitRpcResult",
@@ -57,24 +57,24 @@ qx.Proto.addAwaitRpcResultState = function(module)
[
{
// We want to enable objects in the group
- // swat.module.fsmUtils.enable_during_rpc
+ // swat.main.fsmUtils.enable_during_rpc
"parameters" : [ true ],
// Call this.getObject(<object>).setEnabled(true) on
// state entry, for each <object> in the group called
- // "swat.module.fsmUtils.enable_during_rpc".
- "groups" : [ "swat.module.fsmUtils.enable_during_rpc" ]
+ // "swat.main.fsmUtils.enable_during_rpc".
+ "groups" : [ "swat.main.fsmUtils.enable_during_rpc" ]
},
{
// We want to disable objects in the group
- // swat.module.fsmUtils.disable_during_rpc
+ // swat.main.fsmUtils.disable_during_rpc
"parameters" : [ false ],
// Call this.getObject(<object>).setEnabled(false) on
// state entry, for each <object> in the group called
- // "swat.module.fsmUtils.disable_during_rpc".
- "groups" : [ "swat.module.fsmUtils.disable_during_rpc" ]
+ // "swat.main.fsmUtils.disable_during_rpc".
+ "groups" : [ "swat.main.fsmUtils.disable_during_rpc" ]
}
]
},
@@ -86,24 +86,24 @@ qx.Proto.addAwaitRpcResultState = function(module)
[
{
// We want to re-disable objects we had enabled, in the group
- // swat.module.fsmUtils.enable_during_rpc
+ // swat.main.fsmUtils.enable_during_rpc
"parameters" : [ false ],
// Call this.getObject(<object>).setEnabled(false) on
// state entry, for each <object> in the group called
- // "swat.module.fsmUtils.enable_during_rpc".
- "groups" : [ "swat.module.fsmUtils.enable_during_rpc" ]
+ // "swat.main.fsmUtils.enable_during_rpc".
+ "groups" : [ "swat.main.fsmUtils.enable_during_rpc" ]
},
{
// We want to re-enable objects we had disabled, in the group
- // swat.module.fsmUtils.disable_during_rpc
+ // swat.main.fsmUtils.disable_during_rpc
"parameters" : [ true ],
// Call this.getObject(<object>).setEnabled(true) on
// state entry, for each <object> in the group called
- // "swat.module.fsmUtils.disable_during_rpc".
- "groups" : [ "swat.module.fsmUtils.disable_during_rpc" ]
+ // "swat.main.fsmUtils.disable_during_rpc".
+ "groups" : [ "swat.main.fsmUtils.disable_during_rpc" ]
}
]
},
@@ -123,7 +123,7 @@ qx.Proto.addAwaitRpcResultState = function(module)
{
"execute" :
{
- "swat.module.fsmUtils.abort_rpc" :
+ "swat.main.fsmUtils.abort_rpc" :
"Transition_AwaitRpcResult_to_AwaitRpcResult_via_button_abort"
},
@@ -155,8 +155,8 @@ qx.Proto.addAwaitRpcResultState = function(module)
var error = event.getData(); // retrieve the JSON-RPC error
// Did we get get origin=Server, code=PermissionDenied ?
- var origins = swat.module.AbstractModuleFsm.JsonRpc_Origin;
- var serverErrors = swat.module.AbstractModuleFsm.JsonRpc_ServerError;
+ var origins = swat.main.AbstractModuleFsm.JsonRpc_Origin;
+ var serverErrors = swat.main.AbstractModuleFsm.JsonRpc_ServerError;
if (error.origin == origins.Server &&
error.code == serverErrors.PermissionDenied)
{
@@ -201,7 +201,7 @@ qx.Proto.addAwaitRpcResultState = function(module)
/*
* Transition: AwaitRpcResult to AwaitRpcResult
*
- * Cause: "execute" on swat.module.fsmUtils.abort_rpc
+ * Cause: "execute" on swat.main.fsmUtils.abort_rpc
*/
var trans = new qx.util.fsm.Transition(
"Transition_AwaitRpcResult_to_AwaitRpcResult_via_button_abort",
@@ -287,7 +287,7 @@ qx.Proto.callRpc = function(fsm, service, method, params)
rpcRequest.params.unshift(true);
// Retrieve the RPC object */
- var rpc = fsm.getObject("swat.module.rpc");
+ var rpc = fsm.getObject("swat.main.rpc");
// Set the service name
rpc.setServiceName(rpcRequest.service);
diff --git a/webapps/swat/source/class/swat/main/Gui.js b/webapps/swat/source/class/swat/main/Gui.js
index 8d18f5f38a..2495c31c4d 100644
--- a/webapps/swat/source/class/swat/main/Gui.js
+++ b/webapps/swat/source/class/swat/main/Gui.js
@@ -125,7 +125,7 @@ qx.Class.buildGui = function(moduleList)
canvas.setDisplay(false); // initially not displayed
var fsm = moduleList[moduleName].fsm;
- fsm.addObject("swat.module.canvas", canvas);
+ fsm.addObject("swat.main.canvas", canvas);
canvas.addEventListener("appear", fsm.eventListener, fsm);
canvas.addEventListener("disappear", fsm.eventListener, fsm);
diff --git a/webapps/swat/source/class/swat/main/Main.js b/webapps/swat/source/class/swat/main/Main.js
index d8cfaac139..7cc6b01736 100644
--- a/webapps/swat/source/class/swat/main/Main.js
+++ b/webapps/swat/source/class/swat/main/Main.js
@@ -8,8 +8,8 @@
*/
/*
-#require(swat.module.Module)
-#require(swat.module.AbstractModule)
+#require(swat.main.Module)
+#require(swat.main.AbstractModule)
*/
/**
@@ -26,16 +26,16 @@ function()
*/
//#require(swat.module.statistics.Statistics)
-new swat.module.Module("Status and Statistics",
+new swat.main.Module("Status and Statistics",
swat.module.statistics.Statistics);
//#require(swat.module.ldbbrowse.LdbBrowse)
-new swat.module.Module("LDB Browser",
+new swat.main.Module("LDB Browser",
swat.module.ldbbrowse.LdbBrowse);
//#require(swat.module.documentation.Documentation)
//#require(api.Viewer)
-new swat.module.Module("API Documentation",
+new swat.main.Module("API Documentation",
swat.module.documentation.Documentation);
@@ -54,7 +54,7 @@ qx.Proto.initialize = function()
qx.Settings.setCustomOfClass("qx.io.Json", "enableDebug", true);
// For each module...
- var moduleList = swat.module.Module.getList();
+ var moduleList = swat.main.Module.getList();
for (moduleName in moduleList)
{
// ... call the module's buildInitialFsm() function
@@ -66,7 +66,7 @@ qx.Proto.initialize = function()
qx.Proto.main = function()
{
- var moduleList = swat.module.Module.getList();
+ var moduleList = swat.main.Module.getList();
// Initialize the gui for the main menu
swat.main.Gui.buildGui(moduleList);
@@ -84,7 +84,7 @@ qx.Proto.main = function()
qx.Proto.finalize = function()
{
// Call each module's finalization function
- var moduleList = swat.module.Module.getList();
+ var moduleList = swat.main.Module.getList();
for (moduleName in moduleList)
{
var module = moduleList[moduleName]["class"].getInstance();
diff --git a/webapps/swat/source/class/swat/module/Module.js b/webapps/swat/source/class/swat/main/Module.js
index e7180d2895..ef71eae625 100644
--- a/webapps/swat/source/class/swat/module/Module.js
+++ b/webapps/swat/source/class/swat/main/Module.js
@@ -32,13 +32,13 @@
*
* @param class {class}
* The class which contains the module implementation. That class must
- * extend swat.module.AbstractModule and implement a singleton interface
+ * extend swat.main.AbstractModule and implement a singleton interface
* that provides a public method called initialAppear() which takes this
* Module object as a parameter, and creates the finite state machine for
* the module (if applicable) and builds the graphical user interface for
* the module.
*/
-qx.OO.defineClass("swat.module.Module", qx.core.Object,
+qx.OO.defineClass("swat.main.Module", qx.core.Object,
function(moduleName, class)
{
qx.core.Object.call(this);
@@ -55,7 +55,7 @@ function(moduleName, class)
this.class = class;
// Add this new module to the module list.
- swat.module.Module._list[moduleName] = this;
+ swat.main.Module._list[moduleName] = this;
});
@@ -64,7 +64,7 @@ function(moduleName, class)
*/
qx.Class.getList = function()
{
- return swat.module.Module._list;
+ return swat.main.Module._list;
};
diff --git a/webapps/swat/source/class/swat/module/documentation/Documentation.js b/webapps/swat/source/class/swat/module/documentation/Documentation.js
index 03191cacc2..acd7e90400 100644
--- a/webapps/swat/source/class/swat/module/documentation/Documentation.js
+++ b/webapps/swat/source/class/swat/module/documentation/Documentation.js
@@ -11,10 +11,10 @@
* Swat statistics class
*/
qx.OO.defineClass("swat.module.documentation.Documentation",
- swat.module.AbstractModule,
+ swat.main.AbstractModule,
function()
{
- swat.module.AbstractModule.call(this);
+ swat.main.AbstractModule.call(this);
});
@@ -25,7 +25,7 @@ function()
* appear. Creation of the module's GUI has been deferred until it was
* actually needed (now), so we need to create it.
*
- * @param module {swat.module.Module}
+ * @param module {swat.main.Module}
* The module descriptor for the module.
*/
qx.Proto.initialAppear = function(module)
diff --git a/webapps/swat/source/class/swat/module/documentation/Fsm.js b/webapps/swat/source/class/swat/module/documentation/Fsm.js
index 9df878b4f1..184b438520 100644
--- a/webapps/swat/source/class/swat/module/documentation/Fsm.js
+++ b/webapps/swat/source/class/swat/module/documentation/Fsm.js
@@ -11,10 +11,10 @@
* Swat statistics class finite state machine
*/
qx.OO.defineClass("swat.module.documentation.Fsm",
- swat.module.AbstractModuleFsm,
+ swat.main.AbstractModuleFsm,
function()
{
- swat.module.AbstractModuleFsm.call(this);
+ swat.main.AbstractModuleFsm.call(this);
});
@@ -36,7 +36,7 @@ qx.Proto.buildFsm = function(module)
// We need at least one event listed due to FSM requirements
"appear" :
{
- "swat.module.canvas" :
+ "swat.main.canvas" :
"Transition_Idle_to_Idle_via_appear"
}
}
diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js b/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js
index 6b5ae695bf..0abb3454c8 100644
--- a/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js
+++ b/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js
@@ -10,10 +10,10 @@
/**
* Swat LDB Browser class finite state machine
*/
-qx.OO.defineClass("swat.module.ldbbrowse.Fsm", swat.module.AbstractModuleFsm,
+qx.OO.defineClass("swat.module.ldbbrowse.Fsm", swat.main.AbstractModuleFsm,
function()
{
- swat.module.AbstractModuleFsm.call(this);
+ swat.main.AbstractModuleFsm.call(this);
});
@@ -106,7 +106,7 @@ qx.Proto.buildFsm = function(module)
function(fsm, event)
{
// Get our module descriptor
- var module = fsm.getObject("swat.module.module");
+ var module = fsm.getObject("swat.main.module");
// Retrieve the database handle
var dbHandle = module.dbHandle;
@@ -203,7 +203,7 @@ qx.Proto.buildFsm = function(module)
var searchExpr = "(objectclass=*)";
// Get our module descriptor
- var module = fsm.getObject("swat.module.module");
+ var module = fsm.getObject("swat.main.module");
// Retrieve the database handle
var dbHandle = module.dbHandle;
@@ -299,7 +299,7 @@ qx.Proto.buildFsm = function(module)
var searchExpr = "(objectclass=*)";
// Get our module descriptor
- var module = fsm.getObject("swat.module.module");
+ var module = fsm.getObject("swat.main.module");
// Retrieve the database handle
var dbHandle = module.dbHandle;
diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js b/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
index 52db8fdd88..38d10768ee 100644
--- a/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
+++ b/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
@@ -107,7 +107,7 @@ qx.Proto.buildGui = function(module)
/**
* Populate the graphical user interface with the specified data
*
- * @param module {swat.module.Module}
+ * @param module {swat.main.Module}
* The module descriptor for the module.
*
* @result {Object}
@@ -296,7 +296,7 @@ qx.Proto._buildPageSearch = function(module, page)
find.addEventListener("execute", fsm.eventListener, fsm);
// We'll be receiving events on the find object, so save its friendly name
- fsm.addObject("find", find, "swat.module.fsmUtils.disable_during_rpc");
+ fsm.addObject("find", find, "swat.main.fsmUtils.disable_during_rpc");
hlayout.add(find);
diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js b/webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js
index 45a4c48930..abccbff2d0 100644
--- a/webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js
+++ b/webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js
@@ -11,10 +11,10 @@
* Swat LDB Browser class
*/
qx.OO.defineClass("swat.module.ldbbrowse.LdbBrowse",
- swat.module.AbstractModule,
+ swat.main.AbstractModule,
function()
{
- swat.module.AbstractModule.call(this);
+ swat.main.AbstractModule.call(this);
});
@@ -25,7 +25,7 @@ function()
* appear. Creation of the module's actual FSM and GUI have been deferred
* until they were actually needed (now) so we need to create them.
*
- * @param module {swat.module.Module}
+ * @param module {swat.main.Module}
* The module descriptor for the module.
*/
qx.Proto.initialAppear = function(module)
diff --git a/webapps/swat/source/class/swat/module/statistics/Fsm.js b/webapps/swat/source/class/swat/module/statistics/Fsm.js
index 5e4843691c..3083fed42a 100644
--- a/webapps/swat/source/class/swat/module/statistics/Fsm.js
+++ b/webapps/swat/source/class/swat/module/statistics/Fsm.js
@@ -10,10 +10,10 @@
/**
* Swat statistics class finite state machine
*/
-qx.OO.defineClass("swat.module.statistics.Fsm", swat.module.AbstractModuleFsm,
+qx.OO.defineClass("swat.module.statistics.Fsm", swat.main.AbstractModuleFsm,
function()
{
- swat.module.AbstractModuleFsm.call(this);
+ swat.main.AbstractModuleFsm.call(this);
});
@@ -105,14 +105,14 @@ qx.Proto.buildFsm = function(module)
// When we get an appear event, start our timer
"appear" :
{
- "swat.module.canvas" :
+ "swat.main.canvas" :
"Transition_Idle_to_Idle_via_appear"
},
// When we get a disappear event, stop our timer
"disappear" :
{
- "swat.module.canvas" :
+ "swat.main.canvas" :
"Transition_Idle_to_Idle_via_disappear"
}
}
diff --git a/webapps/swat/source/class/swat/module/statistics/Gui.js b/webapps/swat/source/class/swat/module/statistics/Gui.js
index 28b21aa46d..5968785e07 100644
--- a/webapps/swat/source/class/swat/module/statistics/Gui.js
+++ b/webapps/swat/source/class/swat/module/statistics/Gui.js
@@ -303,7 +303,7 @@ qx.Proto.buildGui = function(module)
/**
* Populate the graphical user interface with the specified data
*
- * @param module {swat.module.Module}
+ * @param module {swat.main.Module}
* The module descriptor for the module.
*
* @result {Object}
diff --git a/webapps/swat/source/class/swat/module/statistics/Statistics.js b/webapps/swat/source/class/swat/module/statistics/Statistics.js
index 1618ab73c5..f15e180cba 100644
--- a/webapps/swat/source/class/swat/module/statistics/Statistics.js
+++ b/webapps/swat/source/class/swat/module/statistics/Statistics.js
@@ -11,10 +11,10 @@
* Swat statistics class
*/
qx.OO.defineClass("swat.module.statistics.Statistics",
- swat.module.AbstractModule,
+ swat.main.AbstractModule,
function()
{
- swat.module.AbstractModule.call(this);
+ swat.main.AbstractModule.call(this);
});
@@ -25,7 +25,7 @@ function()
* appear. Creation of the module's actual FSM and GUI have been deferred
* until they were actually needed (now) so we need to create them.
*
- * @param module {swat.module.Module}
+ * @param module {swat.main.Module}
* The module descriptor for the module.
*/
qx.Proto.initialAppear = function(module)