Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(997)

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartOutlinePage_NEW.java

Issue 517043002: Re-implementation of the analysis.outline in the java layer, this uses the generated types, and rem… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: rebase with bleeding_edge Created 6 years, 4 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
Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartOutlinePage_NEW.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartOutlinePage_NEW.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartOutlinePage_NEW.java
index 2f6ea6c3a9d57a7da6a2304eb622325bfc4addec..33e480e82f74ed684b69b4a17a4815df38ba229c 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartOutlinePage_NEW.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartOutlinePage_NEW.java
@@ -14,8 +14,8 @@
package com.google.dart.tools.ui.internal.text.editor;
import com.google.common.base.Objects;
-import com.google.dart.server.Outline;
import com.google.dart.server.generated.types.Element;
+import com.google.dart.server.generated.types.Outline;
import com.google.dart.tools.core.DartCore;
import com.google.dart.tools.internal.search.ui.DartSearchActionGroup;
import com.google.dart.tools.ui.DartPluginImages;
@@ -73,6 +73,8 @@ import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.part.Page;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import java.util.List;
+
/**
* {@link IContentOutlinePage} for {@link DartEditor}.
*/
@@ -130,12 +132,14 @@ public class DartOutlinePage_NEW extends Page implements IContentOutlinePage {
@Override
public Object[] getChildren(Object parentElement) {
- return ((Outline) parentElement).getChildren();
+ List<Outline> outlineList = ((Outline) parentElement).getChildren();
+ return outlineList.toArray(new Outline[outlineList.size()]);
}
@Override
public Object[] getElements(Object inputElement) {
- return ((Outline) inputElement).getChildren();
+ List<Outline> outlineList = ((Outline) inputElement).getChildren();
+ return outlineList.toArray(new Outline[outlineList.size()]);
}
@Override

Powered by Google App Engine
This is Rietveld 408576698