incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmue...@apache.org
Subject [13/27] git commit: fixes for #40
Date Tue, 03 Jan 2012 18:39:31 GMT
fixes for #40


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/commit/d5a266df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/tree/d5a266df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/diff/d5a266df

Branch: refs/heads/master
Commit: d5a266df2011d22bd8f123188bafd20f92eff1e5
Parents: f85a7e2
Author: Patrick Mueller <pmuellr@yahoo.com>
Authored: Thu Oct 13 14:12:39 2011 -0400
Committer: Patrick Mueller <pmuellr@yahoo.com>
Committed: Thu Oct 13 14:12:39 2011 -0400

----------------------------------------------------------------------
 weinre.build/scripts/build-target-scripts.py       |    1 +
 weinre.server/src/weinre/server/Channel.java       |    4 +-
 weinre.web/demo/weinre-demo-min.html               |   26 +++++++--------
 weinre.web/demo/weinre-demo.html                   |   26 +++++++--------
 .../modules/weinre/common/MessageDispatcher.coffee |    2 +-
 5 files changed, 28 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/d5a266df/weinre.build/scripts/build-target-scripts.py
----------------------------------------------------------------------
diff --git a/weinre.build/scripts/build-target-scripts.py b/weinre.build/scripts/build-target-scripts.py
index b82e6fa..367450f 100644
--- a/weinre.build/scripts/build-target-scripts.py
+++ b/weinre.build/scripts/build-target-scripts.py
@@ -82,6 +82,7 @@ def writeMergedFile(oFileName, scripts, scriptNames, srcs):
         lines.append(";")
         lines.append("")
 
+    lines.append("// require('weinre/common/Weinre').showNotImplemented()")
     lines.append("require('weinre/target/Target').main()")
     lines.append("})();")
     targetScript = "\n".join(lines)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/d5a266df/weinre.server/src/weinre/server/Channel.java
----------------------------------------------------------------------
diff --git a/weinre.server/src/weinre/server/Channel.java b/weinre.server/src/weinre/server/Channel.java
index dbf073b..0e19b12 100644
--- a/weinre.server/src/weinre/server/Channel.java
+++ b/weinre.server/src/weinre/server/Channel.java
@@ -134,14 +134,14 @@ public class Channel {
             klass = Class.forName(klassName);
         }
         catch (ClassNotFoundException e) {
-            Main.debug("service class not found: " + klassName);
+            // Main.debug("service class not found: " + klassName);
             serviceMap.put(name, null);
             return null;
         }
 
         Object result = klass.newInstance();
         serviceMap.put(name, result);
-        Main.debug("loaded service class: " + klassName);
+        // Main.debug("loaded service class: " + klassName);
         return result;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/d5a266df/weinre.web/demo/weinre-demo-min.html
----------------------------------------------------------------------
diff --git a/weinre.web/demo/weinre-demo-min.html b/weinre.web/demo/weinre-demo-min.html
index ef2554a..61e5070 100644
--- a/weinre.web/demo/weinre-demo-min.html
+++ b/weinre.web/demo/weinre-demo-min.html
@@ -13,30 +13,28 @@
 <script>try {window.WeinreServerId = location.hash.split("#")[1]} catch(e) {window.WeinreServerId
= "anonymous"}</script>
 <script src="/target/target-script-min.js"></script>
 <script src="weinre-demo.js"></script>
-
-<script type="text/javascript">
-    require("weinre/common/Weinre").showNotImplemented()
-</script>
 </head>
 
 <body onload="onLoad()">
 <input id="button-start-stuff" type="button" value="start stuff">
 
-<p>exceptions in callbacks<p>
-<input id="button-error-DOM-event"    type="button" value="DOM addEventHandler">
-<input id="button-error-window-event" type="button" value="window addEventHandler">
-<input id="button-error-XHR-event"    type="button" value="XHR addEventHandler">
-<input id="button-error-setTimeout"   type="button" value="setTimeout()">
-<input id="button-error-setInterval"  type="button" value="setInterval()">
-
 <h1>this is a green h1</h1>
 <h1 class="blue">this is a blue h1</h1>
 <h1 style="color:red">this is a red h1</h1>
 <p>Some text, <i>some italic text</i>, and <b>some bold text</b>.
 
-<div id="metrics">a div</div>
-
-<input id="button-clear-output" type="button" value="clear output">
+<hr>
+<p>test exceptions in callbacks:
+<div style="margin-left:1em">
+    <input id="button-error-DOM-event"    type="button" value="DOM addEventHandler">
+<br><input id="button-error-window-event" type="button" value="window addEventHandler">
+<br><input id="button-error-XHR-event"    type="button" value="XHR addEventHandler">
+<br><input id="button-error-setTimeout"   type="button" value="setTimeout()">
+<br><input id="button-error-setInterval"  type="button" value="setInterval()">
+</div>
+
+<hr>
+<p><input id="button-clear-output" type="button" value="clear output">
 <div id="output"></div>
 </body>
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/d5a266df/weinre.web/demo/weinre-demo.html
----------------------------------------------------------------------
diff --git a/weinre.web/demo/weinre-demo.html b/weinre.web/demo/weinre-demo.html
index a499331..58e003b 100644
--- a/weinre.web/demo/weinre-demo.html
+++ b/weinre.web/demo/weinre-demo.html
@@ -13,30 +13,28 @@
 <script>try {window.WeinreServerId = location.hash.split("#")[1]} catch(e) {window.WeinreServerId
= "anonymous"}</script>
 <script src="/target/target-script.js"></script>
 <script src="weinre-demo.js"></script>
-
-<script type="text/javascript">
-    require("weinre/common/Weinre").showNotImplemented()
-</script>
 </head>
 
 <body onload="onLoad()">
 <input id="button-start-stuff" type="button" value="start stuff">
 
-<p>exceptions in callbacks<p>
-<input id="button-error-DOM-event"    type="button" value="DOM addEventHandler">
-<input id="button-error-window-event" type="button" value="window addEventHandler">
-<input id="button-error-XHR-event"    type="button" value="XHR addEventHandler">
-<input id="button-error-setTimeout"   type="button" value="setTimeout()">
-<input id="button-error-setInterval"  type="button" value="setInterval()">
-
 <h1>this is a green h1</h1>
 <h1 class="blue">this is a blue h1</h1>
 <h1 style="color:red">this is a red h1</h1>
 <p>Some text, <i>some italic text</i>, and <b>some bold text</b>.
 
-<div id="metrics">a div</div>
-
-<input id="button-clear-output" type="button" value="clear output">
+<hr>
+<p>test exceptions in callbacks:
+<div style="margin-left:1em">
+    <input id="button-error-DOM-event"    type="button" value="DOM addEventHandler">
+<br><input id="button-error-window-event" type="button" value="window addEventHandler">
+<br><input id="button-error-XHR-event"    type="button" value="XHR addEventHandler">
+<br><input id="button-error-setTimeout"   type="button" value="setTimeout()">
+<br><input id="button-error-setInterval"  type="button" value="setInterval()">
+</div>
+
+<hr>
+<p><input id="button-clear-output" type="button" value="clear output">
 <div id="output"></div>
 </body>
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/d5a266df/weinre.web/modules/weinre/common/MessageDispatcher.coffee
----------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/common/MessageDispatcher.coffee b/weinre.web/modules/weinre/common/MessageDispatcher.coffee
index 5f1a4be..a732cad 100644
--- a/weinre.web/modules/weinre/common/MessageDispatcher.coffee
+++ b/weinre.web/modules/weinre/common/MessageDispatcher.coffee
@@ -152,7 +152,7 @@ module.exports = class MessageDispatcher
             intf = InspectorBackend.getRegisteredDomainDispatcher(intfName.substr(0, intfName.length
- 6))
 
         unless intf
-            Weinre.logWarning "weinre: request for non-registered interface:" + methodSignature
+            Weinre.notImplemented "weinre: request for non-registered interface: #{methodSignature}"
             return
 
         methodSignature = intf.constructor.name + ".#{methodName}()"


Mime
View raw message