Backed out changeset f12ee1e34504 - brakes JSON messages.
authorTomas Zezula <tzezula@netbeans.org>
Wed, 05 Feb 2014 10:00:39 +0100
changeset 181562bae1cfd9912
parent 18155 f12ee1e34504
child 18157 415ab418a46b
Backed out changeset f12ee1e34504 - brakes JSON messages.
dew4nb/src/org/netbeans/modules/dew4nb/api/Server.java
dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPoint.java
     1.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/api/Server.java	Tue Feb 04 18:26:59 2014 +0100
     1.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/api/Server.java	Wed Feb 05 10:00:39 2014 +0100
     1.3 @@ -222,11 +222,10 @@
     1.4          public void onMessage(WebSocket socket, byte[] bytes) {            
     1.5              final ByteBuffer bb = ByteBuffer.wrap(bytes);
     1.6              final CharBuffer cb = UTF8.decode(bb);
     1.7 -            String message=cb.toString();
     1.8 -            if (measuringEnabled && message.startsWith("javac|{\"type\":\"autocomplete\",\"java\":")) {
     1.9 +            if (measuringEnabled) {
    1.10                  Utilities.insertStartTime(System.currentTimeMillis(), socket.hashCode());
    1.11              }
    1.12 -            onMessage(socket, message);
    1.13 +            onMessage(socket, cb.toString());
    1.14          }
    1.15      }
    1.16  }
     2.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPoint.java	Tue Feb 04 18:26:59 2014 +0100
     2.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPoint.java	Wed Feb 05 10:00:39 2014 +0100
     2.3 @@ -232,13 +232,12 @@
     2.4              if (closed) {
     2.5                  throw new IllegalStateException("Env already closed");  //NOI18N
     2.6              }
     2.7 -            if (measuringEnabled && message!=null && message.startsWith("{\"status\":\"done\",\"type\":\"autocomplete\"")) {  //NOI18N
     2.8 +            if (measuringEnabled) {
     2.9                  long timeinside=Utilities.getMeasuredTime(System.currentTimeMillis(), ws.hashCode());
    2.10 -                String newMsg = message.replace("}]}", "},{\"text\":\"Duration: @#$ms Browser->Tomcat: @#$ms\",\"displayName\":null,\"extraText\":\"Tomcat->IDE: @#$ms\",\"rightText\":\"IDE: @#$"+timeinside+"@#$ms\",\"className\":\"MTV\"}]}");  //NOI18N                 
    2.11 -                ws.send(newMsg);
    2.12 +                ws.send(message == null ? "null" :( (timeinside<0)? message : (message +"@"+timeinside) ) );    //NOI18N
    2.13              } else {
    2.14                  ws.send(message == null ? "null" : ( message) );    //NOI18N
    2.15 -            }            
    2.16 +            }
    2.17          }
    2.18  
    2.19          public void setProperty(