[581758] Handle removal of ResourceNavigator and friends Change-Id: I6b26e1d1e50d732c1cbbcf963b3f2ec94d6e5db7
diff --git a/features/org.eclipse.wst.server_sdk.feature/feature.xml b/features/org.eclipse.wst.server_sdk.feature/feature.xml index 4929902..d4f902d 100644 --- a/features/org.eclipse.wst.server_sdk.feature/feature.xml +++ b/features/org.eclipse.wst.server_sdk.feature/feature.xml
@@ -14,7 +14,7 @@ <feature id="org.eclipse.wst.server_sdk.feature" label="%featureName" - version="3.4.100.qualifier" + version="3.4.200.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.server_sdk.feature/pom.xml b/features/org.eclipse.wst.server_sdk.feature/pom.xml index db583ee..a72c292 100644 --- a/features/org.eclipse.wst.server_sdk.feature/pom.xml +++ b/features/org.eclipse.wst.server_sdk.feature/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server_sdk.feature</artifactId> - <version>3.4.100-SNAPSHOT</version> + <version>3.4.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.xml b/features/org.eclipse.wst.server_ui.feature/feature.xml index 8f3530f..09becc4 100644 --- a/features/org.eclipse.wst.server_ui.feature/feature.xml +++ b/features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -14,7 +14,7 @@ <feature id="org.eclipse.wst.server_ui.feature" label="%featureName" - version="3.3.1500.qualifier" + version="3.3.1600.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.server_ui.feature/pom.xml b/features/org.eclipse.wst.server_ui.feature/pom.xml index 7b5f31b..b3f185a 100644 --- a/features/org.eclipse.wst.server_ui.feature/pom.xml +++ b/features/org.eclipse.wst.server_ui.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server_ui.feature</artifactId> - <version>3.3.1500-SNAPSHOT</version> + <version>3.3.1600-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF index 9642253..f8a915c 100644 --- a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.wst.server.ui Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.server.ui; singleton:=true -Bundle-Version: 1.6.0.qualifier +Bundle-Version: 1.6.100.qualifier Bundle-Activator: org.eclipse.wst.server.ui.internal.ServerUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.server.ui/pom.xml b/plugins/org.eclipse.wst.server.ui/pom.xml index 6fa0346..f0de9e9 100644 --- a/plugins/org.eclipse.wst.server.ui/pom.xml +++ b/plugins/org.eclipse.wst.server.ui/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server.ui</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.6.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java index e481242..07b3746 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2011 IBM Corporation and others. + * Copyright (c) 2003, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -21,6 +21,7 @@ import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jface.action.*; import org.eclipse.jface.bindings.TriggerSequence; +import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.*; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; @@ -38,7 +39,6 @@ import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.part.ViewPart; -import org.eclipse.ui.views.navigator.LocalSelectionTransfer; import org.eclipse.wst.server.core.*; import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.core.model.ServerDelegate; @@ -118,7 +118,7 @@ column3.setWidth(cols[2]); column3.addSelectionListener(getHeaderListener(2)); - IContextService contextSupport = (IContextService)getSite().getService(IContextService.class); + IContextService contextSupport = getSite().getService(IContextService.class); contextSupport.activateContext(SERVERS_VIEW_CONTEXT); deferInitialization(); @@ -285,7 +285,7 @@ // create copy, paste, and delete actions pasteAction = new PasteAction(shell, provider, tableViewer.clipboard); copyAction = new CopyAction(provider, tableViewer.clipboard, pasteAction); - deleteAction = new DeleteAction(shell, provider); + deleteAction = new GlobalDeleteAction(shell, provider); // Create a second delete action that can act in modules, when the delete key is pressed // the old DeleteAction only works for servers see bug# 286960 globalDeleteAction = new GlobalDeleteAction(shell, provider); @@ -452,7 +452,7 @@ */ protected void initDragAndDrop() { int ops = DND.DROP_COPY; - Transfer[] transfers = new Transfer[] { LocalSelectionTransfer.getInstance(), + Transfer[] transfers = new Transfer[] { LocalSelectionTransfer.getTransfer(), ResourceTransfer.getInstance(), FileTransfer.getInstance() }; //tableViewer.addDragSupport(ops, transfers, new ServersViewDragAdapter(viewer)); tableViewer.addDropSupport(ops | DND.DROP_DEFAULT, transfers, new ServersViewDropAdapter(tableViewer));
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersViewDropAdapter.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersViewDropAdapter.java index 3ebf622..2cc8f4d 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersViewDropAdapter.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersViewDropAdapter.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.action.Action; +import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; @@ -30,7 +31,6 @@ import org.eclipse.swt.dnd.TransferData; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.ui.views.navigator.LocalSelectionTransfer; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IModuleArtifact; import org.eclipse.wst.server.core.IServer; @@ -84,7 +84,7 @@ protected boolean doSel(IServer server, Object data) { // check if the selection is a project (module) that we can add to the server - IProject project = (IProject) Platform.getAdapterManager().getAdapter(data, IProject.class); + IProject project = Platform.getAdapterManager().getAdapter(data, IProject.class); if (project != null) { IModule[] modules = ServerUtil.getModules(project); if (modules != null && modules.length == 1) { @@ -164,7 +164,7 @@ return true; if (ResourceTransfer.getInstance().isSupportedType(transferType)) return true; - if (LocalSelectionTransfer.getInstance().isSupportedType(transferType)) + if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType)) return true; return false;