| Index: pkg/analysis_server/lib/src/server/http_server.dart
|
| diff --git a/pkg/analysis_server/lib/src/server/http_server.dart b/pkg/analysis_server/lib/src/server/http_server.dart
|
| index c047d1fac836065f87b13c3211cd7f05daa99f35..9afabdab375eef0cb8c88c5884394ae9499df672 100644
|
| --- a/pkg/analysis_server/lib/src/server/http_server.dart
|
| +++ b/pkg/analysis_server/lib/src/server/http_server.dart
|
| @@ -2,16 +2,14 @@
|
| // for details. All rights reserved. Use of this source code is governed by a
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| -library http.server;
|
| +library analysis_server.src.server.http_server;
|
|
|
| import 'dart:async';
|
| import 'dart:io';
|
|
|
| import 'package:analysis_server/src/channel/web_socket_channel.dart';
|
| -import 'package:analysis_server/src/get_handler.dart';
|
| import 'package:analysis_server/src/socket_server.dart';
|
| -import 'package:analysis_server/src/status/get_handler.dart' as newHandler;
|
| -import 'package:analyzer/src/generated/engine.dart';
|
| +import 'package:analysis_server/src/status/get_handler.dart';
|
|
|
| /**
|
| * Instances of the class [HttpServer] implement a simple HTTP server. The
|
| @@ -36,11 +34,6 @@ class HttpAnalysisServer {
|
| GetHandler getHandler;
|
|
|
| /**
|
| - * An object that can handle GET requests when the new task model is in use.
|
| - */
|
| - newHandler.GetHandler newGetHandler;
|
| -
|
| - /**
|
| * Future that is completed with the HTTP server once it is running.
|
| */
|
| Future<HttpServer> _server;
|
| @@ -89,17 +82,10 @@ class HttpAnalysisServer {
|
| * Handle a GET request received by the HTTP server.
|
| */
|
| void _handleGetRequest(HttpRequest request) {
|
| - if (AnalysisEngine.instance.useTaskModel) {
|
| - if (newGetHandler == null) {
|
| - newGetHandler = new newHandler.GetHandler(socketServer, _printBuffer);
|
| - }
|
| - newGetHandler.handleGetRequest(request);
|
| - } else {
|
| - if (getHandler == null) {
|
| - getHandler = new GetHandler(socketServer, _printBuffer);
|
| - }
|
| - getHandler.handleGetRequest(request);
|
| + if (getHandler == null) {
|
| + getHandler = new GetHandler(socketServer, _printBuffer);
|
| }
|
| + getHandler.handleGetRequest(request);
|
| }
|
|
|
| /**
|
|
|