editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/SearchResultPage_NEW.java - Issue 542323003: Search domain implementation in the Remote java server, using generated types.

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/SearchResultPage_NEW.java

Issue 542323003: Search domain implementation in the Remote java server, using generated types. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: nit merge issue fixed Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/FindReferencesAction_NEW.java ('k') | editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/typehierarchy/TypeHierarchyContentProvider_NEW.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/SearchResultPage_NEW.java

diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/SearchResultPage_NEW.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/SearchResultPage_NEW.java

index 1d07111f99b97e6340b58cb087d94222453765fe..ca25709c0213540acc9f3839a4e5162a8ad3add3 100644

--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/SearchResultPage_NEW.java

+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/SearchResultPage_NEW.java

@@ -23,11 +23,11 @@ import com.google.common.collect.Sets;

import com.google.common.io.Files;

import com.google.dart.engine.search.SearchMatch;

import com.google.dart.engine.utilities.source.SourceRange;

-import com.google.dart.server.SearchResult;

-import com.google.dart.server.SearchResultKind;

import com.google.dart.server.generated.types.Element;

import com.google.dart.server.generated.types.ElementKind;

import com.google.dart.server.generated.types.Location;

+import com.google.dart.server.generated.types.SearchResult;

+import com.google.dart.server.generated.types.SearchResultKind;

import com.google.dart.tools.core.internal.util.ResourceUtil;

import com.google.dart.tools.internal.corext.refactoring.util.ExecutionUtils;

import com.google.dart.tools.internal.corext.refactoring.util.RunnableEx;

@@ -434,12 +434,13 @@ public abstract class SearchResultPage_NEW extends SearchPage {

REFERENCE,

READ,

WRITE;

- public static ReferenceKind of(SearchResultKind kind) {

- if (kind == SearchResultKind.READ) {

+ public static ReferenceKind of(String searchResultKind) {

+ if (searchResultKind.equals(SearchResultKind.READ)) {

return READ;

}

- if (kind == SearchResultKind.DECLARATION || kind == SearchResultKind.READ_WRITE

- || kind == SearchResultKind.WRITE) {

+ if (searchResultKind.equals(SearchResultKind.DECLARATION)

+ || searchResultKind.equals(SearchResultKind.READ_WRITE)

+ || searchResultKind.equals(SearchResultKind.WRITE)) {

return WRITE;

}

return REFERENCE;