summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--webapps/swat/source/class/swat/main/AbstractModule.js24
-rw-r--r--webapps/swat/source/class/swat/main/Gui.js1
-rw-r--r--webapps/swat/source/class/swat/main/Main.js6
-rw-r--r--webapps/swat/source/class/swat/main/Module.js6
4 files changed, 9 insertions, 28 deletions
diff --git a/webapps/swat/source/class/swat/main/AbstractModule.js b/webapps/swat/source/class/swat/main/AbstractModule.js
index 4533f3d8c6..3fd94165ae 100644
--- a/webapps/swat/source/class/swat/main/AbstractModule.js
+++ b/webapps/swat/source/class/swat/main/AbstractModule.js
@@ -84,16 +84,6 @@ qx.Proto.buildInitialFsm = function(module)
"ontransition" :
function(fsm, event)
{
- // Make the "Loading" message go away. (We need to learn how to
- // remove it entirely. Just doing canvas.removeAll() leaves
- // something in the widget queue and we get spurious error
- // messages.)
- var children = module.canvas.getVisibleChildren();
- for (var child in children)
- {
- children[child].hide();
- }
-
// Call the module's initialAppear function to build FSM and GUI.
// That function should *replace* this state, State_Idle, to which
// we'll transition.
@@ -126,8 +116,7 @@ qx.Proto.buildInitialFsm = function(module)
/**
* Build the initial graphical user interface.
*
- * In order to prevent long load times, as minimal as possible of an initial
- * GUI should be created. Generally, this is just a "Loading..." message.
+ * Generally, this is a no-op.
*
* @param module {Object}
* An object containing at least the following properties:
@@ -138,20 +127,13 @@ qx.Proto.buildInitialFsm = function(module)
* The canvas on which to create the gui for this module
* name -
* The name of this module
- * class -
+ * clazz -
* The class for this module
*
*/
qx.Proto.buildInitialGui = function(module)
{
- // For now, just create the "Loading" text
- var o = new qx.ui.basic.Label("Loading module '" + module.name + "'...");
- o.set({
- top: 12,
- left: 20
- });
- o.setFont("bold");
- module.canvas.add(o);
+ // nothing to do
};
qx.Proto.finalize = function(module)
diff --git a/webapps/swat/source/class/swat/main/Gui.js b/webapps/swat/source/class/swat/main/Gui.js
index 2495c31c4d..689edf33d5 100644
--- a/webapps/swat/source/class/swat/main/Gui.js
+++ b/webapps/swat/source/class/swat/main/Gui.js
@@ -175,7 +175,6 @@ qx.Class.buildGui = function(moduleList)
// Set the browser title as well
document.title =
"Swat: " + this.moduleName;
-
}
});
diff --git a/webapps/swat/source/class/swat/main/Main.js b/webapps/swat/source/class/swat/main/Main.js
index fda6ba1115..0ec3fccda2 100644
--- a/webapps/swat/source/class/swat/main/Main.js
+++ b/webapps/swat/source/class/swat/main/Main.js
@@ -60,7 +60,7 @@ qx.Proto.initialize = function()
for (moduleName in moduleList)
{
// ... call the module's buildInitialFsm() function
- var module = moduleList[moduleName]["class"].getInstance();
+ var module = moduleList[moduleName]["clazz"].getInstance();
module.buildInitialFsm(moduleList[moduleName]);
}
};
@@ -77,7 +77,7 @@ qx.Proto.main = function()
for (moduleName in moduleList)
{
// ... call the module's buildInitialGui() function
- var module = moduleList[moduleName]["class"].getInstance();
+ var module = moduleList[moduleName]["clazz"].getInstance();
module.buildInitialGui(moduleList[moduleName]);
}
};
@@ -89,7 +89,7 @@ qx.Proto.finalize = function()
var moduleList = swat.main.Module.getList();
for (moduleName in moduleList)
{
- var module = moduleList[moduleName]["class"].getInstance();
+ var module = moduleList[moduleName]["clazz"].getInstance();
module.finalize(moduleList[moduleName]);
}
};
diff --git a/webapps/swat/source/class/swat/main/Module.js b/webapps/swat/source/class/swat/main/Module.js
index ef71eae625..1e5c6c9daf 100644
--- a/webapps/swat/source/class/swat/main/Module.js
+++ b/webapps/swat/source/class/swat/main/Module.js
@@ -30,7 +30,7 @@
* The name of the module being registered. This is the name that will
* appear in the Modules menu.
*
- * @param class {class}
+ * @param clazz {clazz}
* The class which contains the module implementation. That class must
* extend swat.main.AbstractModule and implement a singleton interface
* that provides a public method called initialAppear() which takes this
@@ -39,7 +39,7 @@
* the module.
*/
qx.OO.defineClass("swat.main.Module", qx.core.Object,
-function(moduleName, class)
+function(moduleName, clazz)
{
qx.core.Object.call(this);
@@ -52,7 +52,7 @@ function(moduleName, class)
this.name = moduleName;
// Save this class name
- this.class = class;
+ this.clazz = clazz;
// Add this new module to the module list.
swat.main.Module._list[moduleName] = this;