From 119f49c94f8fab33ec0278644fba9ea02b9d1380 Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Wed, 4 Mar 2009 16:57:33 +0000 Subject: [PATCH] [265882] - Moved VM update scopes interface to a provisional package. --- dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF | 6 +++++- .../ui/viewmodel/actions/UpdateScopesContribution.java | 4 ++-- .../viewmodel/actions/UpdateScopesPropertyTester.java | 4 ++-- .../viewmodel/update/provisional}/AllUpdateScope.java | 4 +++- .../provisional}/ICachingVMProviderExtension.java | 4 +++- .../viewmodel/update/provisional}/IVMUpdateScope.java | 4 ++-- .../update/provisional}/VisibleUpdateScope.java | 4 +++- .../ui/viewmodel/update/AbstractCachingVMProvider.java | 10 ++++++++++ 8 files changed, 30 insertions(+), 10 deletions(-) rename dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/{ui/viewmodel/update => debug/internal/ui/viewmodel/update/provisional}/AllUpdateScope.java (88%) rename dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/{ui/viewmodel/update => debug/internal/ui/viewmodel/update/provisional}/ICachingVMProviderExtension.java (88%) rename dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/{ui/viewmodel/update => debug/internal/ui/viewmodel/update/provisional}/IVMUpdateScope.java (89%) rename dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/{ui/viewmodel/update => debug/internal/ui/viewmodel/update/provisional}/VisibleUpdateScope.java (88%) diff --git a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF index 6c2a1e9d0f2..68aaab0f012 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF @@ -22,15 +22,19 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.expressions;bundle-version="3.4.0", org.eclipse.core.filesystem;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.cdt.dsf.debug.ui, +Export-Package: org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional;x-internal:=true, + org.eclipse.cdt.dsf.debug.ui, org.eclipse.cdt.dsf.debug.ui.actions, org.eclipse.cdt.dsf.debug.ui.contexts, + org.eclipse.cdt.dsf.debug.ui.memory, org.eclipse.cdt.dsf.debug.ui.sourcelookup, org.eclipse.cdt.dsf.debug.ui.viewmodel, org.eclipse.cdt.dsf.debug.ui.viewmodel.actions, org.eclipse.cdt.dsf.debug.ui.viewmodel.expression;x-internal:=true, org.eclipse.cdt.dsf.debug.ui.viewmodel.launch;x-internal:=true, + org.eclipse.cdt.dsf.debug.ui.viewmodel.launch.actions, org.eclipse.cdt.dsf.debug.ui.viewmodel.modules;x-internal:=true, + org.eclipse.cdt.dsf.debug.ui.viewmodel.modules.detail, org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat, org.eclipse.cdt.dsf.debug.ui.viewmodel.register;x-internal:=true, org.eclipse.cdt.dsf.debug.ui.viewmodel.update, diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdateScopesContribution.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdateScopesContribution.java index a4770e0ff34..09b461bfdff 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdateScopesContribution.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdateScopesContribution.java @@ -13,10 +13,10 @@ package org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.actions; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional.ICachingVMProviderExtension; +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional.IVMUpdateScope; import org.eclipse.cdt.dsf.debug.ui.viewmodel.actions.VMHandlerUtils; import org.eclipse.cdt.dsf.ui.viewmodel.IVMProvider; -import org.eclipse.cdt.dsf.ui.viewmodel.update.ICachingVMProviderExtension; -import org.eclipse.cdt.dsf.ui.viewmodel.update.IVMUpdateScope; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.ContributionItem; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdateScopesPropertyTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdateScopesPropertyTester.java index 752c71ce86d..04e8c987120 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdateScopesPropertyTester.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdateScopesPropertyTester.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.actions; +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional.ICachingVMProviderExtension; +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional.IVMUpdateScope; import org.eclipse.cdt.dsf.debug.ui.viewmodel.actions.VMHandlerUtils; import org.eclipse.cdt.dsf.ui.viewmodel.IVMContext; import org.eclipse.cdt.dsf.ui.viewmodel.IVMProvider; -import org.eclipse.cdt.dsf.ui.viewmodel.update.ICachingVMProviderExtension; -import org.eclipse.cdt.dsf.ui.viewmodel.update.IVMUpdateScope; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.debug.ui.IDebugView; import org.eclipse.ui.IWorkbenchPart; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AllUpdateScope.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/AllUpdateScope.java similarity index 88% rename from dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AllUpdateScope.java rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/AllUpdateScope.java index 6d0410643ac..d11e6401cab 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AllUpdateScope.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/AllUpdateScope.java @@ -8,7 +8,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.dsf.ui.viewmodel.update; +package org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional; + +import org.eclipse.cdt.dsf.ui.viewmodel.update.ViewModelUpdateMessages; /** diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ICachingVMProviderExtension.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/ICachingVMProviderExtension.java similarity index 88% rename from dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ICachingVMProviderExtension.java rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/ICachingVMProviderExtension.java index ba770ccc28e..9c2cf344a76 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ICachingVMProviderExtension.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/ICachingVMProviderExtension.java @@ -8,7 +8,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.dsf.ui.viewmodel.update; +package org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional; + +import org.eclipse.cdt.dsf.ui.viewmodel.update.ICachingVMProvider; /** diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/IVMUpdateScope.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/IVMUpdateScope.java similarity index 89% rename from dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/IVMUpdateScope.java rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/IVMUpdateScope.java index ab0158a2b95..4805f9b62f6 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/IVMUpdateScope.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/IVMUpdateScope.java @@ -8,11 +8,11 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.dsf.ui.viewmodel.update; +package org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional; /** - * @since 1.1 + * @since 1.1 */ public interface IVMUpdateScope { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/VisibleUpdateScope.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/VisibleUpdateScope.java similarity index 88% rename from dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/VisibleUpdateScope.java rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/VisibleUpdateScope.java index 1df004c443a..206d9448065 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/VisibleUpdateScope.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/update/provisional/VisibleUpdateScope.java @@ -8,7 +8,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.dsf.ui.viewmodel.update; +package org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional; + +import org.eclipse.cdt.dsf.ui.viewmodel.update.ViewModelUpdateMessages; /** diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java index eca0b263642..8bc2957780a 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java @@ -29,6 +29,10 @@ import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.datamodel.IDMData; import org.eclipse.cdt.dsf.datamodel.IDMService; +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional.AllUpdateScope; +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional.ICachingVMProviderExtension; +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional.IVMUpdateScope; +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provisional.VisibleUpdateScope; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; import org.eclipse.cdt.dsf.ui.concurrent.SimpleDisplayExecutor; import org.eclipse.cdt.dsf.ui.concurrent.ViewerCountingRequestMonitor; @@ -1044,6 +1048,8 @@ public class AbstractCachingVMProvider extends AbstractVMProvider implements ICa } /** + * @noreference This method is an implementation of a provisional interface and + * not intended to be referenced by clients. * @since 1.1 */ public IVMUpdateScope[] getAvailableUpdateScopes() { @@ -1051,6 +1057,8 @@ public class AbstractCachingVMProvider extends AbstractVMProvider implements ICa } /** + * @noreference This method is an implementation of a provisional interface and + * not intended to be referenced by clients. * @since 1.1 */ public IVMUpdateScope getActiveUpdateScope() { @@ -1068,6 +1076,8 @@ public class AbstractCachingVMProvider extends AbstractVMProvider implements ICa } /** + * @noreference This method is an implementation of a provisional interface and + * not intended to be referenced by clients. * @since 1.1 */ public void setActiveUpdateScope(IVMUpdateScope updateScope) {