Deliver error messages and error code back to Java
authorJaroslav Tulach <jtulach@netbeans.org>
Wed, 25 Jun 2014 10:49:24 +0200
changeset 724627ef86d9273
parent 707 9b1c84366336
child 725 31ff0f826084
Deliver error messages and error code back to Java
geo/src/main/java/net/java/html/geo/Position.java
geo/src/main/java/org/netbeans/html/geo/impl/JsG.java
     1.1 --- a/geo/src/main/java/net/java/html/geo/Position.java	Mon Jun 09 15:37:22 2014 +0200
     1.2 +++ b/geo/src/main/java/net/java/html/geo/Position.java	Wed Jun 25 10:49:24 2014 +0200
     1.3 @@ -248,7 +248,7 @@
     1.4              }
     1.5  
     1.6              @Override
     1.7 -            public void onError(Object error) {
     1.8 +            public void onError(final String message, int code) {
     1.9                  if (handle != this) {
    1.10                      return;
    1.11                  }
    1.12 @@ -256,7 +256,13 @@
    1.13                      stop();
    1.14                  }
    1.15                  try {
    1.16 -                    Handle.this.onError(new Exception());
    1.17 +                    final Exception err = new Exception(message + " errno: " + code) {
    1.18 +                        @Override
    1.19 +                        public String getLocalizedMessage() {
    1.20 +                            return message;
    1.21 +                        }
    1.22 +                    };
    1.23 +                    Handle.this.onError(err);
    1.24                  } catch (Throwable ex) {
    1.25                      LOG.log(Level.SEVERE, null, ex);
    1.26                  }
     2.1 --- a/geo/src/main/java/org/netbeans/html/geo/impl/JsG.java	Mon Jun 09 15:37:22 2014 +0200
     2.2 +++ b/geo/src/main/java/org/netbeans/html/geo/impl/JsG.java	Wed Jun 25 10:49:24 2014 +0200
     2.3 @@ -57,7 +57,7 @@
     2.4      }
     2.5      
     2.6      public abstract void onLocation(Object position);
     2.7 -    public abstract void onError(Object error);
     2.8 +    public abstract void onError(String message, int code);
     2.9      
    2.10      @JavaScriptBody(args = {}, body = "return !!navigator.geolocation;")
    2.11      public static boolean hasGeolocation() {
    2.12 @@ -73,7 +73,7 @@
    2.13          "  self.@org.netbeans.html.geo.impl.JsG::onLocation(Ljava/lang/Object;)(position);\n" +
    2.14          "};\n" +
    2.15          "var fail = function (error) {\n" +
    2.16 -        "  self.@org.netbeans.html.geo.impl.JsG::onError(Ljava/lang/Object;)(error);\n" +
    2.17 +        "  self.@org.netbeans.html.geo.impl.JsG::onError(Ljava/lang/String;I)(error.message, error.code);\n" +
    2.18          "};\n" +
    2.19          "var options = {};\n" +
    2.20          "options.enableHighAccuracy = enableHighAccuracy;\n" +