Bug 368202 - x-friend JDT debug in platform debug UI

2 files changed, 10 insertions, 10 deletions

diff --git a/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.ui/META-INF/MANIFEST.MF
index fbb62c8ac..6ccbc4261 100644
--- a/org.eclipse.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.debug.ui/META-INF/MANIFEST.MF
@@ -22,17 +22,17 @@ Export-Package: org.eclipse.debug.internal.ui;x-friends:="org.eclipse.jdt.debug.
  org.eclipse.debug.internal.ui.commands.actions;x-internal:=true,
  org.eclipse.debug.internal.ui.contextlaunching;x-internal:=true,
  org.eclipse.debug.internal.ui.contexts;x-internal:=true,
- org.eclipse.debug.internal.ui.elements.adapters;x-internal:=true,
+ org.eclipse.debug.internal.ui.elements.adapters;x-friends:="org.eclipse.jdt.debug.ui",
  org.eclipse.debug.internal.ui.importexport.breakpoints;x-internal:=true,
  org.eclipse.debug.internal.ui.importexport.launchconfigurations;x-internal:=true,
  org.eclipse.debug.internal.ui.launchConfigurations;x-internal:=true,
  org.eclipse.debug.internal.ui.memory;x-internal:=true,
  org.eclipse.debug.internal.ui.memory.provisional;x-internal:=true,
- org.eclipse.debug.internal.ui.model.elements;x-friends:="org.eclipse.debug.examples.ui",
+ org.eclipse.debug.internal.ui.model.elements;x-friends:="org.eclipse.debug.examples.ui,org.eclipse.jdt.debug.ui",
  org.eclipse.debug.internal.ui.preferences;x-internal:=true,
  org.eclipse.debug.internal.ui.sourcelookup;x-internal:=true,
  org.eclipse.debug.internal.ui.sourcelookup.browsers;x-internal:=true,
- org.eclipse.debug.internal.ui.stringsubstitution;x-internal:=true,
+ org.eclipse.debug.internal.ui.stringsubstitution;x-friends:="org.eclipse.jdt.debug.ui",
  org.eclipse.debug.internal.ui.viewers;x-internal:=true,
  org.eclipse.debug.internal.ui.viewers.breadcrumb;x-internal:=true,
  org.eclipse.debug.internal.ui.viewers.model;x-friends:="org.eclipse.debug.tests",
@@ -42,8 +42,8 @@ Export-Package: org.eclipse.debug.internal.ui;x-friends:="org.eclipse.jdt.debug.
    org.eclipse.cdt.dsf.ui,
    org.eclipse.cdt.dsf.gdb.ui,
    org.eclipse.debug.tests",
- org.eclipse.debug.internal.ui.viewers.provisional;x-friends:="org.eclipse.debug.tests",
- org.eclipse.debug.internal.ui.viewers.update;x-friends:="org.eclipse.debug.examples.ui",
+ org.eclipse.debug.internal.ui.viewers.provisional;x-friends:="org.eclipse.debug.tests,org.eclipse.jdt.debug.ui",
+ org.eclipse.debug.internal.ui.viewers.update;x-friends:="org.eclipse.debug.examples.ui,org.eclipse.jdt.debug.ui",
  org.eclipse.debug.internal.ui.views;x-internal:=true,
  org.eclipse.debug.internal.ui.views.breakpoints;x-internal:=true,
  org.eclipse.debug.internal.ui.views.console;x-internal:=true,
@@ -53,8 +53,8 @@ Export-Package: org.eclipse.debug.internal.ui;x-friends:="org.eclipse.jdt.debug.
  org.eclipse.debug.internal.ui.views.memory.renderings;x-internal:=true,
  org.eclipse.debug.internal.ui.views.modules;x-internal:=true,
  org.eclipse.debug.internal.ui.views.registers;x-internal:=true,
- org.eclipse.debug.internal.ui.views.variables;x-internal:=true,
- org.eclipse.debug.internal.ui.views.variables.details;x-internal:=true,
+ org.eclipse.debug.internal.ui.views.variables;x-friends:="org.eclipse.jdt.debug.ui",
+ org.eclipse.debug.internal.ui.views.variables.details;x-friends:="org.eclipse.jdt.debug.ui",
  org.eclipse.debug.ui,
  org.eclipse.debug.ui.actions,
  org.eclipse.debug.ui.console,
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java
index e13b58639..a2c9a9fc9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Wind River Systems and others.
+ * Copyright (c) 2009, 2012 Wind River Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1372,8 +1372,8 @@ public class InternalVirtualTreeModelViewer extends Viewer
      */
     public void autoExpand(TreePath elementPath) {
         int level = getAutoExpandLevel();
-        if (level > 0 || level == ITreeModelViewer.ALL_LEVELS) {
-            if (level == ITreeModelViewer.ALL_LEVELS || level >= elementPath.getSegmentCount()) {
+        if (level > 0 || level == org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer.ALL_LEVELS) {
+            if (level == org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer.ALL_LEVELS || level >= elementPath.getSegmentCount()) {
                 expandToLevel(elementPath, 1);
             }
         }