convert to new capabilities in scooj
diff --git a/weinre.build/build.xml b/weinre.build/build.xml
index 9c5e59e..357df8e 100644
--- a/weinre.build/build.xml
+++ b/weinre.build/build.xml
@@ -154,7 +154,6 @@
<echo message="compiling scoop modules"/>
<exec executable="python" failonerror="true" failifexecutionfails="true">
<arg file="vendor/scooj/scoopc.py"/>
- <arg value="--quiet"/>
<arg value="--out"/>
<arg file="${TMP}/modules"/>
<arg file="../${PROJECT_WEB}/modules"/>
diff --git a/weinre.web/modules/weinre/client/Client.scoop b/weinre.web/modules/weinre/client/Client.scoop
index d6a388f..3c2c3b0 100644
--- a/weinre.web/modules/weinre/client/Client.scoop
+++ b/weinre.web/modules/weinre/client/Client.scoop
@@ -6,23 +6,23 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/IDLTools
-require ../common/Callback
-require ../common/Weinre
-require ../common/Socket
-require ../common/Binding
+requireClass ../common/IDLTools
+requireClass ../common/Callback
+requireClass ../common/Weinre
+requireClass ../common/Socket
+requireClass ../common/Binding
-require ./InspectorBackendImpl
-require ./InspectorFrontendHostImpl
-require ./WeinreClientEventsImpl
-require ./RemotePanel
+requireClass ./InspectorBackendImpl
+requireClass ./InspectorFrontendHostImpl
+requireClass ./WeinreClientEventsImpl
+requireClass ./RemotePanel
//-----------------------------------------------------------------------------
class Client
this.initialize()
//-----------------------------------------------------------------------------
-static
+init
var AutoConnect = true
Weinre.showNotImplemented()
diff --git a/weinre.web/modules/weinre/client/ConnectorList.scoop b/weinre.web/modules/weinre/client/ConnectorList.scoop
index 1f6dddd..47e20f2 100644
--- a/weinre.web/modules/weinre/client/ConnectorList.scoop
+++ b/weinre.web/modules/weinre/client/ConnectorList.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./DOMTemplates as dt
+requireClass ./DOMTemplates as dt
//-----------------------------------------------------------------------------
class ConnectorList(title)
diff --git a/weinre.web/modules/weinre/client/DOMTemplates.scoop b/weinre.web/modules/weinre/client/DOMTemplates.scoop
index 937e548..837a0c8 100644
--- a/weinre.web/modules/weinre/client/DOMTemplates.scoop
+++ b/weinre.web/modules/weinre/client/DOMTemplates.scoop
@@ -19,12 +19,12 @@
// (the resulting property name doesn't include "$")
//-----------------------------------------------------------------------------
-require ../common/Ex
+requireClass ../common/Ex
//-----------------------------------------------------------------------------
class DOMTemplates
-static
+init
var ElementNames = "H1 H2 H3 H4 H5 H6 UL OL DL LI DT DD SPAN DIV A B I TT P HR BR PRE IMG CANVAS TABLE TR TD FORM INPUT BUTTON SELECT OPTGROUP OPTION TEXTAREA"
ElementNames = ElementNames.split(" ")
@@ -69,7 +69,7 @@
}
//-----------------------------------------------------------------------------
-static
+init
ElementNames.forEach(function(elementName) {
DOMTemplates[elementName] = getElementFunction(elementName)
})
diff --git a/weinre.web/modules/weinre/client/InspectorBackendImpl.scoop b/weinre.web/modules/weinre/client/InspectorBackendImpl.scoop
index 4bcd8fe..472fb52 100644
--- a/weinre.web/modules/weinre/client/InspectorBackendImpl.scoop
+++ b/weinre.web/modules/weinre/client/InspectorBackendImpl.scoop
@@ -6,10 +6,10 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/Ex
-require ../common/IDLTools
-require ../common/Socket
-require ../common/Weinre
+requireClass ../common/Ex
+requireClass ../common/IDLTools
+requireClass ../common/Socket
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class InspectorBackendImpl
diff --git a/weinre.web/modules/weinre/client/InspectorFrontendHostImpl.scoop b/weinre.web/modules/weinre/client/InspectorFrontendHostImpl.scoop
index 6552093..76d5d92 100644
--- a/weinre.web/modules/weinre/client/InspectorFrontendHostImpl.scoop
+++ b/weinre.web/modules/weinre/client/InspectorFrontendHostImpl.scoop
@@ -6,8 +6,8 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/Weinre
-require ../common/IDLTools
+requireClass ../common/Weinre
+requireClass ../common/IDLTools
//-----------------------------------------------------------------------------
class InspectorFrontendHostImpl
diff --git a/weinre.web/modules/weinre/client/RemotePanel.scoop b/weinre.web/modules/weinre/client/RemotePanel.scoop
index 1cd0d22..909da5e 100644
--- a/weinre.web/modules/weinre/client/RemotePanel.scoop
+++ b/weinre.web/modules/weinre/client/RemotePanel.scoop
@@ -6,11 +6,11 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/Binding
-require ../common/Weinre
+requireClass ../common/Binding
+requireClass ../common/Weinre
-require ./ConnectorList
-require ./DOMTemplates as dt
+requireClass ./ConnectorList
+requireClass ./DOMTemplates as dt
//-----------------------------------------------------------------------------
class RemotePanel < WebInspector.Panel
diff --git a/weinre.web/modules/weinre/client/WeinreClientEventsImpl.scoop b/weinre.web/modules/weinre/client/WeinreClientEventsImpl.scoop
index 73df852..c8057d6 100644
--- a/weinre.web/modules/weinre/client/WeinreClientEventsImpl.scoop
+++ b/weinre.web/modules/weinre/client/WeinreClientEventsImpl.scoop
@@ -6,8 +6,8 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/Callback
-require ../common/Weinre
+requireClass ../common/Callback
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WeinreClientEventsImpl(client)
diff --git a/weinre.web/modules/weinre/common/Binding.scoop b/weinre.web/modules/weinre/common/Binding.scoop
index cc46b97..9db156b 100644
--- a/weinre.web/modules/weinre/common/Binding.scoop
+++ b/weinre.web/modules/weinre/common/Binding.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./Ex
+requireClass ./Ex
//-----------------------------------------------------------------------------
class Binding(receiver, method)
diff --git a/weinre.web/modules/weinre/common/Callback.scoop b/weinre.web/modules/weinre/common/Callback.scoop
index ed0756a..2728a90 100644
--- a/weinre.web/modules/weinre/common/Callback.scoop
+++ b/weinre.web/modules/weinre/common/Callback.scoop
@@ -6,14 +6,14 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./Ex
+requireClass ./Ex
//-----------------------------------------------------------------------------
class Callback
throw new Ex(arguments, "this class is not intended to be instantiated")
//-----------------------------------------------------------------------------
-static
+init
var CallbackTable = {}
var CallbackIndex = 1
var ConnectorId = "???"
diff --git a/weinre.web/modules/weinre/common/EventListeners.scoop b/weinre.web/modules/weinre/common/EventListeners.scoop
index d40bafe..ffad30c 100644
--- a/weinre.web/modules/weinre/common/EventListeners.scoop
+++ b/weinre.web/modules/weinre/common/EventListeners.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./Ex
+requireClass ./Ex
//-----------------------------------------------------------------------------
class EventListeners
diff --git a/weinre.web/modules/weinre/common/Ex.scoop b/weinre.web/modules/weinre/common/Ex.scoop
index f392b2c..e6d0bf7 100644
--- a/weinre.web/modules/weinre/common/Ex.scoop
+++ b/weinre.web/modules/weinre/common/Ex.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./StackTrace
+requireClass ./StackTrace
//-----------------------------------------------------------------------------
class Ex(args, message)
diff --git a/weinre.web/modules/weinre/common/IDLTools.scoop b/weinre.web/modules/weinre/common/IDLTools.scoop
index b86d6b6..2bd2ca3 100644
--- a/weinre.web/modules/weinre/common/IDLTools.scoop
+++ b/weinre.web/modules/weinre/common/IDLTools.scoop
@@ -6,15 +6,15 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./Ex
-require ./Callback
+requireClass ./Ex
+requireClass ./Callback
//-----------------------------------------------------------------------------
class IDLTools
throw new Ex(arguments, "this class is not intended to be instantiated")
//-----------------------------------------------------------------------------
-static
+init
var IDLs = {}
IDLTools._idls = IDLs
diff --git a/weinre.web/modules/weinre/common/Socket.scoop b/weinre.web/modules/weinre/common/Socket.scoop
index 153b857..873f640 100644
--- a/weinre.web/modules/weinre/common/Socket.scoop
+++ b/weinre.web/modules/weinre/common/Socket.scoop
@@ -6,11 +6,11 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./Weinre
-require ./WebSocketXhr
-require ./IDLTools
-require ./Binding
-require ./Ex
+requireClass ./Weinre
+requireClass ./WebSocketXhr
+requireClass ./IDLTools
+requireClass ./Binding
+requireClass ./Ex
//-----------------------------------------------------------------------------
class Socket(url)
@@ -25,7 +25,7 @@
this._open()
//-----------------------------------------------------------------------------
-static
+init
var Verbose = false
var InspectorBackend
diff --git a/weinre.web/modules/weinre/common/WebSocketXhr.scoop b/weinre.web/modules/weinre/common/WebSocketXhr.scoop
index f717a34..b270ffd 100644
--- a/weinre.web/modules/weinre/common/WebSocketXhr.scoop
+++ b/weinre.web/modules/weinre/common/WebSocketXhr.scoop
@@ -6,16 +6,16 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./Ex
-require ./Weinre
-require ./EventListeners
+requireClass ./Ex
+requireClass ./Weinre
+requireClass ./EventListeners
//-----------------------------------------------------------------------------
class WebSocketXhr(url)
this.initialize(url)
//-----------------------------------------------------------------------------
-static
+init
WebSocketXhr.CONNECTING = 0
WebSocketXhr.OPEN = 1
WebSocketXhr.CLOSING = 2
diff --git a/weinre.web/modules/weinre/common/Weinre.scoop b/weinre.web/modules/weinre/common/Weinre.scoop
index 5e32f0e..69f58f1 100644
--- a/weinre.web/modules/weinre/common/Weinre.scoop
+++ b/weinre.web/modules/weinre/common/Weinre.scoop
@@ -6,16 +6,16 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ./Ex
-require ./IDLTools
-require ./StackTrace
+requireClass ./Ex
+requireClass ./IDLTools
+requireClass ./StackTrace
//-----------------------------------------------------------------------------
class Weinre
throw new Ex(arguments, "this class is not intended to be instantiated")
//-----------------------------------------------------------------------------
-static
+init
var _notImplemented = {}
var _showNotImplemented = false
var CSSProperties = []
diff --git a/weinre.web/modules/weinre/target/CSSStore.scoop b/weinre.web/modules/weinre/target/CSSStore.scoop
index a3c4478..3f1edf7 100644
--- a/weinre.web/modules/weinre/target/CSSStore.scoop
+++ b/weinre.web/modules/weinre/target/CSSStore.scoop
@@ -12,7 +12,7 @@
this.__nextId = 0
//-----------------------------------------------------------------------------
-static
+init
var Properties = []
//-----------------------------------------------------------------------------
@@ -165,7 +165,7 @@
return false
//-----------------------------------------------------------------------------
-static
+init
var elementMatchesSelector
if (Element.prototype.webkitMatchesSelector) elementMatchesSelector = webkitMatchesSelector
diff --git a/weinre.web/modules/weinre/target/Console.scoop b/weinre.web/modules/weinre/target/Console.scoop
index 940b695..54e85ae 100644
--- a/weinre.web/modules/weinre/target/Console.scoop
+++ b/weinre.web/modules/weinre/target/Console.scoop
@@ -6,13 +6,13 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class Console
//-----------------------------------------------------------------------------
-static
+init
var UsingRemote = false
var RemoteConsole = new Console()
diff --git a/weinre.web/modules/weinre/target/ElementHighlighter.scoop b/weinre.web/modules/weinre/target/ElementHighlighter.scoop
index d9c3b60..d74cb4f 100644
--- a/weinre.web/modules/weinre/target/ElementHighlighter.scoop
+++ b/weinre.web/modules/weinre/target/ElementHighlighter.scoop
@@ -6,8 +6,8 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Binding
-require ../common/Weinre
+requireClass ../common/Binding
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class ElementHighlighter
diff --git a/weinre.web/modules/weinre/target/InjectedScriptHostImpl.scoop b/weinre.web/modules/weinre/target/InjectedScriptHostImpl.scoop
index a03a360..a28667a 100644
--- a/weinre.web/modules/weinre/target/InjectedScriptHostImpl.scoop
+++ b/weinre.web/modules/weinre/target/InjectedScriptHostImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class InjectedScriptHostImpl
diff --git a/weinre.web/modules/weinre/target/Target.scoop b/weinre.web/modules/weinre/target/Target.scoop
index a2e45eb..d5a1408 100644
--- a/weinre.web/modules/weinre/target/Target.scoop
+++ b/weinre.web/modules/weinre/target/Target.scoop
@@ -6,18 +6,18 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/Ex
-require ../common/Binding
-require ../common/Callback
-require ../common/Socket
-require ../common/Weinre
+requireClass ../common/Ex
+requireClass ../common/Binding
+requireClass ../common/Callback
+requireClass ../common/Socket
+requireClass ../common/Weinre
-require ./NodeStore
-require ./CSSStore
-require ./ElementHighlighter
-require ./InjectedScriptHostImpl
+requireClass ./NodeStore
+requireClass ./CSSStore
+requireClass ./ElementHighlighter
+requireClass ./InjectedScriptHostImpl
-require ./WeinreTargetEventsImpl
+requireClass ./WeinreTargetEventsImpl
// require ./WebInspectorApplicationCacheHandlerImpl
// require ./WebInspectorBackendHandlerImpl
@@ -27,19 +27,19 @@
// require ./WebInspectorProfilerHandlerImpl
// require ./WebInspectorResourceHandlerImpl
-require ./WiApplicationCacheImpl
-require ./WiBrowserDebuggerImpl
-require ./WiCSSImpl
-require ./WiConsoleImpl
-require ./WiDOMImpl
-require ./WiDOMStorageImpl
-require ./WiDatabaseImpl
-require ./WiDebuggerImpl
-require ./WiInjectedScriptImpl
-require ./WiInspectorImpl
-require ./WiNetworkImpl
-require ./WiProfilerImpl
-require ./WiRuntimeImpl
+requireClass ./WiApplicationCacheImpl
+requireClass ./WiBrowserDebuggerImpl
+requireClass ./WiCSSImpl
+requireClass ./WiConsoleImpl
+requireClass ./WiDOMImpl
+requireClass ./WiDOMStorageImpl
+requireClass ./WiDatabaseImpl
+requireClass ./WiDebuggerImpl
+requireClass ./WiInjectedScriptImpl
+requireClass ./WiInspectorImpl
+requireClass ./WiNetworkImpl
+requireClass ./WiProfilerImpl
+requireClass ./WiRuntimeImpl
//-----------------------------------------------------------------------------
class Target
diff --git a/weinre.web/modules/weinre/target/WeinreTargetEventsImpl.scoop b/weinre.web/modules/weinre/target/WeinreTargetEventsImpl.scoop
index 1147e80..65098f1 100644
--- a/weinre.web/modules/weinre/target/WeinreTargetEventsImpl.scoop
+++ b/weinre.web/modules/weinre/target/WeinreTargetEventsImpl.scoop
@@ -6,10 +6,10 @@
* Copyright (c) 2010, 2011 IBM Corporation
*/
-require ../common/Weinre
-require ../common/Callback
+requireClass ../common/Weinre
+requireClass ../common/Callback
-require ./Console
+requireClass ./Console
//-----------------------------------------------------------------------------
class WeinreTargetEventsImpl
diff --git a/weinre.web/modules/weinre/target/WiApplicationCacheImpl.scoop b/weinre.web/modules/weinre/target/WiApplicationCacheImpl.scoop
index 3f72891..02c0077 100644
--- a/weinre.web/modules/weinre/target/WiApplicationCacheImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiApplicationCacheImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiApplicationCacheImpl
diff --git a/weinre.web/modules/weinre/target/WiBrowserDebuggerImpl.scoop b/weinre.web/modules/weinre/target/WiBrowserDebuggerImpl.scoop
index 7b4de5c..ae2c877 100644
--- a/weinre.web/modules/weinre/target/WiBrowserDebuggerImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiBrowserDebuggerImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiBrowserDebuggerImpl
diff --git a/weinre.web/modules/weinre/target/WiCSSImpl.scoop b/weinre.web/modules/weinre/target/WiCSSImpl.scoop
index aa1834b..9a04b78 100644
--- a/weinre.web/modules/weinre/target/WiCSSImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiCSSImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiCSSImpl
diff --git a/weinre.web/modules/weinre/target/WiConsoleImpl.scoop b/weinre.web/modules/weinre/target/WiConsoleImpl.scoop
index 9964c5a..8b8e6a4 100644
--- a/weinre.web/modules/weinre/target/WiConsoleImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiConsoleImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiConsoleImpl
diff --git a/weinre.web/modules/weinre/target/WiDOMImpl.scoop b/weinre.web/modules/weinre/target/WiDOMImpl.scoop
index f52af3c..4c895d9 100644
--- a/weinre.web/modules/weinre/target/WiDOMImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiDOMImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiDOMImpl
diff --git a/weinre.web/modules/weinre/target/WiDOMStorageImpl.scoop b/weinre.web/modules/weinre/target/WiDOMStorageImpl.scoop
index b3cd513..cd42790 100644
--- a/weinre.web/modules/weinre/target/WiDOMStorageImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiDOMStorageImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiDOMStorageImpl
diff --git a/weinre.web/modules/weinre/target/WiDatabaseImpl.scoop b/weinre.web/modules/weinre/target/WiDatabaseImpl.scoop
index 5ad1d29..7b71765 100644
--- a/weinre.web/modules/weinre/target/WiDatabaseImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiDatabaseImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiDatabaseImpl
diff --git a/weinre.web/modules/weinre/target/WiDebuggerImpl.scoop b/weinre.web/modules/weinre/target/WiDebuggerImpl.scoop
index 76a4c4b..b7c2bdc 100644
--- a/weinre.web/modules/weinre/target/WiDebuggerImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiDebuggerImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiDebuggerImpl
diff --git a/weinre.web/modules/weinre/target/WiFileSystemImpl.scoop b/weinre.web/modules/weinre/target/WiFileSystemImpl.scoop
index 7060a53..19cb006 100644
--- a/weinre.web/modules/weinre/target/WiFileSystemImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiFileSystemImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiFileSystemImpl
diff --git a/weinre.web/modules/weinre/target/WiInjectedScriptImpl.scoop b/weinre.web/modules/weinre/target/WiInjectedScriptImpl.scoop
index 3afb1d5..c2830bd 100644
--- a/weinre.web/modules/weinre/target/WiInjectedScriptImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiInjectedScriptImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiInjectedScriptImpl
diff --git a/weinre.web/modules/weinre/target/WiInspectorImpl.scoop b/weinre.web/modules/weinre/target/WiInspectorImpl.scoop
index f0f2934..34b6de4 100644
--- a/weinre.web/modules/weinre/target/WiInspectorImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiInspectorImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiInspectorImpl
diff --git a/weinre.web/modules/weinre/target/WiNetworkImpl.scoop b/weinre.web/modules/weinre/target/WiNetworkImpl.scoop
index d9815c0..522e2d2 100644
--- a/weinre.web/modules/weinre/target/WiNetworkImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiNetworkImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiNetworkImpl
diff --git a/weinre.web/modules/weinre/target/WiProfilerImpl.scoop b/weinre.web/modules/weinre/target/WiProfilerImpl.scoop
index 33cbac7..4655d9c 100644
--- a/weinre.web/modules/weinre/target/WiProfilerImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiProfilerImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiProfilerImpl
diff --git a/weinre.web/modules/weinre/target/WiRuntimeImpl.scoop b/weinre.web/modules/weinre/target/WiRuntimeImpl.scoop
index cf7c4b5..44cd0e9 100644
--- a/weinre.web/modules/weinre/target/WiRuntimeImpl.scoop
+++ b/weinre.web/modules/weinre/target/WiRuntimeImpl.scoop
@@ -6,7 +6,7 @@
* Copyright (c) 2011 IBM Corporation
*/
-require ../common/Weinre
+requireClass ../common/Weinre
//-----------------------------------------------------------------------------
class WiRuntimeImpl
