diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/description/AbstractDescription.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/description/AbstractDescription.java index 06d990f87..fb5604541 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/description/AbstractDescription.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/description/AbstractDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -11,7 +11,8 @@ package org.eclipse.wb.internal.core.model.description; import org.eclipse.wb.core.model.JavaInfo; -import org.eclipse.wb.internal.core.utils.IAdaptable; + +import org.eclipse.core.runtime.IAdaptable; import java.util.Collections; import java.util.Map; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/menu/MenuObjectInfoUtils.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/menu/MenuObjectInfoUtils.java index 996cf81b4..2e1d1d19f 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/menu/MenuObjectInfoUtils.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/menu/MenuObjectInfoUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -10,11 +10,12 @@ *******************************************************************************/ package org.eclipse.wb.internal.core.model.menu; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.IAdaptableFactory; import org.eclipse.wb.internal.core.utils.external.ExternalFactoriesHelper; import org.eclipse.wb.internal.core.utils.state.GlobalState; +import org.eclipse.core.runtime.IAdaptable; + import java.util.List; /** diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/Property.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/Property.java index 7e8d84c83..5ea70f283 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/Property.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/Property.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -13,7 +13,8 @@ import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.internal.core.model.property.category.PropertyCategory; import org.eclipse.wb.internal.core.model.property.editor.PropertyEditor; -import org.eclipse.wb.internal.core.utils.IAdaptable; + +import org.eclipse.core.runtime.IAdaptable; import java.util.HashMap; import java.util.Map; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/editor/PropertyEditor.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/editor/PropertyEditor.java index 051ce48b1..fb14c79fb 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/editor/PropertyEditor.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/editor/PropertyEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -13,8 +13,8 @@ import org.eclipse.wb.internal.core.model.property.Property; import org.eclipse.wb.internal.core.model.property.editor.presentation.PropertyEditorPresentation; import org.eclipse.wb.internal.core.model.property.table.PropertyTable; -import org.eclipse.wb.internal.core.utils.IAdaptable; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Point; import org.eclipse.swt.SWT; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/table/PropertyTableTooltipHelper.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/table/PropertyTableTooltipHelper.java index 9f941270d..a8d76f5c6 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/table/PropertyTableTooltipHelper.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/table/PropertyTableTooltipHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -12,9 +12,9 @@ import org.eclipse.wb.internal.core.EnvironmentUtils; import org.eclipse.wb.internal.core.model.property.Property; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Control; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/IAdaptable.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/IAdaptable.java deleted file mode 100644 index 8e782a942..000000000 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/IAdaptable.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Google, Inc. - * 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Google, Inc. - initial API and implementation - *******************************************************************************/ -package org.eclipse.wb.internal.core.utils; - -/** - * An generic interface for an adaptable object. - *

- * Adaptable objects can be dynamically extended to provide different interfaces (or "adapters"). - * Adapters are created by adapter factories, which are in turn managed by type by adapter managers. - *

- * For example, - * - * 
- *     IAdaptable a = [some adaptable];
- *     IFoo x = a.getAdapter(IFoo.class);
- *     if (x != null)
- *         [do IFoo things with x]
- *
- * - * @author mitin_aa - * @coverage core.util - */ -public interface IAdaptable { - /** - * @param adapter - * the type of adapter. - * - * @return the adapter of required type. - */ - T getAdapter(Class adapter); -} diff --git a/org.eclipse.wb.layout.group/META-INF/MANIFEST.MF b/org.eclipse.wb.layout.group/META-INF/MANIFEST.MF index c35ebe704..3bc6964c8 100644 --- a/org.eclipse.wb.layout.group/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.layout.group/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wb.layout.group;singleton:=true -Bundle-Version: 1.9.700.qualifier +Bundle-Version: 1.9.800.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/GroupLayoutCodeSupport.java b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/GroupLayoutCodeSupport.java index abc1e6dcc..2906e5aba 100644 --- a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/GroupLayoutCodeSupport.java +++ b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/GroupLayoutCodeSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -16,12 +16,12 @@ import org.eclipse.wb.core.model.broadcast.JavaEventListener; import org.eclipse.wb.internal.core.model.JavaInfoEvaluationHelper; import org.eclipse.wb.internal.core.parser.JavaInfoResolver; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.ast.DomGenerics; import org.eclipse.wb.internal.core.utils.ast.NodeTarget; import org.eclipse.wb.internal.core.utils.ast.StatementTarget; import org.eclipse.wb.internal.core.utils.exception.DesignerException; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.core.dom.ArrayCreation; import org.eclipse.jdt.core.dom.ArrayInitializer; import org.eclipse.jdt.core.dom.Expression; diff --git a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/IGroupLayoutInfo.java b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/IGroupLayoutInfo.java index 718729ddc..cf6d68e61 100644 --- a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/IGroupLayoutInfo.java +++ b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/model/IGroupLayoutInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -13,8 +13,8 @@ import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.internal.core.model.clipboard.JavaInfoMemento; -import org.eclipse.wb.internal.core.utils.IAdaptable; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.geometry.Insets; import org.netbeans.modules.form.layoutdesign.LayoutComponent; diff --git a/org.eclipse.wb.rcp/META-INF/MANIFEST.MF b/org.eclipse.wb.rcp/META-INF/MANIFEST.MF index 799e1c0d8..1328b4ad5 100644 --- a/org.eclipse.wb.rcp/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wb.rcp;singleton:=true -Bundle-Version: 1.9.800.qualifier +Bundle-Version: 1.9.900.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.wb.internal.rcp.Activator Bundle-Vendor: %providerName diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/action/MenuManagerInfo.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/action/MenuManagerInfo.java index e8d014977..c0ab26f73 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/action/MenuManagerInfo.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/action/MenuManagerInfo.java @@ -22,7 +22,6 @@ import org.eclipse.wb.internal.core.model.menu.JavaMenuMenuObject; import org.eclipse.wb.internal.core.model.menu.MenuObjectInfoUtils; import org.eclipse.wb.internal.core.model.menu.MenuVisualData; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.ast.AstEditor; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils; @@ -30,6 +29,7 @@ import org.eclipse.wb.internal.swt.support.ControlSupport; import org.eclipse.wb.internal.swt.support.ToolkitSupport; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.resource.ImageDescriptor; @@ -47,10 +47,7 @@ * @author scheglov_ke * @coverage rcp.model.jface */ -public final class MenuManagerInfo extends ContributionManagerInfo -implements -IContributionItemInfo, -IAdaptable { +public final class MenuManagerInfo extends ContributionManagerInfo implements IContributionItemInfo, IAdaptable { //////////////////////////////////////////////////////////////////////////// // // Constructor diff --git a/org.eclipse.wb.swing.java6/META-INF/MANIFEST.MF b/org.eclipse.wb.swing.java6/META-INF/MANIFEST.MF index 24098b93f..1c8aa3f16 100644 --- a/org.eclipse.wb.swing.java6/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.swing.java6/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wb.swing.java6;singleton:=true -Bundle-Version: 1.9.700.qualifier +Bundle-Version: 1.9.800.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/LayoutEditPolicyFactory2.java b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/LayoutEditPolicyFactory2.java index 07d2e533a..b74dacdf3 100644 --- a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/LayoutEditPolicyFactory2.java +++ b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/LayoutEditPolicyFactory2.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -14,10 +14,11 @@ import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.model.creation.IImplicitCreationSupport; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.layout.group.model.IGroupLayoutInfo; import org.eclipse.wb.internal.swing.java6.model.GroupLayoutInfo2; +import org.eclipse.core.runtime.IAdaptable; + /** * Implementation of {@link ILayoutEditPolicyFactory} for Java6 Swing. "2" is for developers to not * confuse this with main Swing factory. diff --git a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/model/GroupLayoutInfo2.java b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/model/GroupLayoutInfo2.java index 3f57714b9..f252f1277 100644 --- a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/model/GroupLayoutInfo2.java +++ b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/model/GroupLayoutInfo2.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -21,7 +21,6 @@ import org.eclipse.wb.internal.core.model.creation.CreationSupport; import org.eclipse.wb.internal.core.model.description.ComponentDescription; import org.eclipse.wb.internal.core.model.layout.absolute.IImageProvider; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.ast.AstEditor; import org.eclipse.wb.internal.layout.group.model.GroupLayoutClipboardCommand; import org.eclipse.wb.internal.layout.group.model.GroupLayoutCodeSupport; @@ -33,6 +32,7 @@ import org.eclipse.wb.internal.swing.model.layout.LayoutClipboardCommand; import org.eclipse.wb.internal.swing.model.layout.LayoutInfo; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.geometry.Insets; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JMenuBarInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JMenuBarInfo.java index 59f16bbf9..7dd4a6fa2 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JMenuBarInfo.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JMenuBarInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -22,11 +22,11 @@ import org.eclipse.wb.internal.core.model.menu.IMenuPolicy; import org.eclipse.wb.internal.core.model.menu.JavaMenuMenuObject; import org.eclipse.wb.internal.core.model.menu.MenuVisualData; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.ast.AstEditor; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.internal.swing.utils.SwingImageUtils; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JMenuItemInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JMenuItemInfo.java index 2624aa3f3..0530f54bf 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JMenuItemInfo.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JMenuItemInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -16,10 +16,10 @@ import org.eclipse.wb.internal.core.model.menu.IMenuInfo; import org.eclipse.wb.internal.core.model.menu.IMenuItemInfo; import org.eclipse.wb.internal.core.model.menu.IMenuPolicy; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.ast.AstEditor; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JPopupMenuInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JPopupMenuInfo.java index 0a1a81266..190909ebb 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JPopupMenuInfo.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/component/menu/JPopupMenuInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -25,13 +25,13 @@ import org.eclipse.wb.internal.core.model.menu.MenuVisualData; import org.eclipse.wb.internal.core.model.order.ComponentOrder; import org.eclipse.wb.internal.core.model.order.ComponentOrderFirst; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.ast.AstEditor; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.internal.swing.utils.SwingImageUtils; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.ImageData; diff --git a/org.eclipse.wb.swt/META-INF/MANIFEST.MF b/org.eclipse.wb.swt/META-INF/MANIFEST.MF index e5f7ce6b1..fbe68e629 100644 --- a/org.eclipse.wb.swt/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.swt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wb.swt;singleton:=true -Bundle-Version: 1.9.700.qualifier +Bundle-Version: 1.9.800.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.wb.internal.swt.Activator Bundle-Vendor: %providerName diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/menu/MenuInfo.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/menu/MenuInfo.java index e7312e4fe..91cea2637 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/menu/MenuInfo.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/menu/MenuInfo.java @@ -37,7 +37,6 @@ import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation; import org.eclipse.wb.internal.core.model.variable.EmptyPureVariableSupport; import org.eclipse.wb.internal.core.model.variable.VariableSupport; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.ast.AstEditor; import org.eclipse.wb.internal.core.utils.ast.NodeTarget; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; @@ -48,6 +47,7 @@ import org.eclipse.wb.internal.swt.support.SwtSupport; import org.eclipse.wb.internal.swt.support.ToolkitSupport; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jdt.core.dom.ClassInstanceCreation; import org.eclipse.jdt.core.dom.Expression; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/menu/MenuItemInfo.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/menu/MenuItemInfo.java index a58708210..97bee5efd 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/menu/MenuItemInfo.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/menu/MenuItemInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -40,6 +40,7 @@ import org.eclipse.wb.internal.swt.support.MenuSupport; import org.eclipse.wb.internal.swt.support.SwtSupport; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jface.resource.ImageDescriptor; @@ -53,9 +54,7 @@ * @author mitin_aa * @coverage swt.model.widgets.menu */ -public final class MenuItemInfo extends ItemInfo -implements -org.eclipse.wb.internal.core.utils.IAdaptable { +public final class MenuItemInfo extends ItemInfo implements IAdaptable { private final MenuItemInfo m_this = this; //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoRelatedTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoRelatedTest.java index 14412beb4..1bd3d16bd 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoRelatedTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/model/parser/AbstractJavaInfoRelatedTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -38,7 +38,6 @@ import org.eclipse.wb.internal.core.model.variable.VariableSupport; import org.eclipse.wb.internal.core.model.variable.description.LocalUniqueVariableDescription; import org.eclipse.wb.internal.core.preferences.IPreferenceConstants; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.StringUtilities; import org.eclipse.wb.internal.core.utils.ast.AstEditor; import org.eclipse.wb.internal.core.utils.ast.AstNodeUtils; @@ -50,6 +49,7 @@ import org.eclipse.wb.internal.core.utils.state.EditorWarning; import org.eclipse.wb.tests.designer.core.AbstractJavaTest; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.Block; import org.eclipse.jdt.core.dom.MethodDeclaration; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuObjectInfoUtilsTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuObjectInfoUtilsTest.java index 620fa0e42..89b9211be 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuObjectInfoUtilsTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuObjectInfoUtilsTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2024 Google, Inc. 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 @@ -15,11 +15,12 @@ import org.eclipse.wb.internal.core.model.menu.IMenuObjectInfo; import org.eclipse.wb.internal.core.model.menu.IMenuPopupInfo; import org.eclipse.wb.internal.core.model.menu.MenuObjectInfoUtils; -import org.eclipse.wb.internal.core.utils.IAdaptable; import org.eclipse.wb.internal.core.utils.IAdaptableFactory; import org.eclipse.wb.tests.designer.TestUtils; import org.eclipse.wb.tests.designer.tests.DesignerTestCase; +import org.eclipse.core.runtime.IAdaptable; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions;