Bug 461099 - Update PTP to use remote filtering API
Change-Id: I5229d13459dacedc6dab160b435face95757ee27
Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/core/org.eclipse.ptp.launch/.classpath b/core/org.eclipse.ptp.launch/.classpath
index 64c5e31..098194c 100644
--- a/core/org.eclipse.ptp.launch/.classpath
+++ b/core/org.eclipse.ptp.launch/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/org.eclipse.ptp.launch/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.launch/.settings/org.eclipse.jdt.core.prefs
index 416f4fb..7341ab1 100644
--- a/core/org.eclipse.ptp.launch/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.ptp.launch/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/core/org.eclipse.ptp.launch/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.launch/META-INF/MANIFEST.MF
index 54b515e..99f8f8c 100644
--- a/core/org.eclipse.ptp.launch/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.ptp.launch/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@
org.eclipse.ptp.rm.lml.monitor.core,
org.eclipse.ptp.rm.lml.ui
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.ptp.launch;x-friends:="org.eclipse.ptp.etfw.parallel,org.eclipse.ptp.rcp.sysmon",
org.eclipse.ptp.launch.internal;x-internal:=true,
org.eclipse.ptp.launch.internal.messages;x-internal:=true,
diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/tabs/ResourcesTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/tabs/ResourcesTab.java
index 7b40715..6e0a857 100644
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/tabs/ResourcesTab.java
+++ b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/tabs/ResourcesTab.java
@@ -49,6 +49,8 @@
import org.eclipse.ptp.rm.jaxb.control.core.LaunchControllerManager;
import org.eclipse.ptp.rm.jaxb.core.data.MonitorType;
import org.eclipse.remote.core.IRemoteConnection;
+import org.eclipse.remote.core.IRemoteConnectionHostService;
+import org.eclipse.remote.core.IRemoteFileService;
import org.eclipse.remote.core.exception.RemoteConnectionException;
import org.eclipse.remote.ui.widgets.RemoteConnectionWidget;
import org.eclipse.swt.SWT;
@@ -76,6 +78,7 @@
public class ResourcesTab extends LaunchConfigurationTab {
private final class ContentsChangedListener implements IRMLaunchConfigurationContentsChangedListener {
+ @Override
public void handleContentsChanged(IRMLaunchConfigurationDynamicTab rmDynamicTab) {
// The buttons and messages have to be updated based on anything
// that has changed in the dynamic portion of the launch tab.
@@ -177,6 +180,7 @@
NLS.bind(Messages.ResourcesTab_There_is_no_connection, conn.getName()))) {
try {
getLaunchConfigurationDialog().run(false, true, new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
conn.open(monitor);
@@ -201,6 +205,7 @@
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
final int numColumns = 2;
final Composite comp = new Composite(parent, SWT.NONE);
@@ -249,6 +254,7 @@
// adjust selection events per Bug 403704 - for Linux/GTK only
if (Platform.getOS().equals(Platform.OS_LINUX) && Platform.getWS().equals(Platform.WS_GTK)) {
fSystemTypeCombo.addListener(SWT.Traverse, new Listener() {
+ @Override
public void handleEvent(Event event) {
if (event.detail == SWT.TRAVERSE_RETURN) {
event.doit = false;
@@ -259,6 +265,7 @@
fRemoteConnectionWidget = new RemoteConnectionWidget(comp, SWT.NONE, Messages.ResourcesTab_Connection_Type, 0,
getLaunchConfigurationDialog());
+ fRemoteConnectionWidget.filterConnections(IRemoteConnectionHostService.class, IRemoteFileService.class);
fRemoteConnectionWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
fRemoteConnectionWidget.addSelectionListener(new SelectionAdapter() {
@Override
@@ -317,6 +324,7 @@
propAdapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
// avoid double-enter required
propAdapter.addContentProposalListener(new IContentProposalListener() {
+ @Override
public void proposalAccepted(IContentProposal proposal) {
rmTypeSelectionChanged();
updateEnablement();
@@ -366,6 +374,7 @@
try {
getLaunchConfigurationDialog().run(false, true, new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
SubMonitor progress = SubMonitor.convert(monitor, 1);
dynamicTab[0] = getLaunchConfigurationDynamicTab(controller, progress.newChild(1));
@@ -414,6 +423,7 @@
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return Messages.ResourcesTab_Resources;
}
@@ -590,6 +600,7 @@
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse .debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
if (fLaunchControl != null && isTSCselectionValid()) {
LaunchUtils.setTargetConfigurationName(configuration, fSystemTypeCombo.getText());
@@ -645,6 +656,7 @@
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
// Do nothing
}
@@ -708,6 +720,7 @@
try {
getLaunchConfigurationDialog().run(false, true, new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
SubMonitor progress = SubMonitor.convert(monitor, Messages.ResourcesTab_Loading_Resources_tab, 20);
try {
diff --git a/rdt/org.eclipse.ptp.rdt.sync.git.ui/.classpath b/rdt/org.eclipse.ptp.rdt.sync.git.ui/.classpath
index ad32c83..098194c 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.git.ui/.classpath
+++ b/rdt/org.eclipse.ptp.rdt.sync.git.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.git.ui/.settings/org.eclipse.jdt.core.prefs b/rdt/org.eclipse.ptp.rdt.sync.git.ui/.settings/org.eclipse.jdt.core.prefs
index 8000cd6..7341ab1 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.git.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/rdt/org.eclipse.ptp.rdt.sync.git.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/rdt/org.eclipse.ptp.rdt.sync.git.ui/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.sync.git.ui/META-INF/MANIFEST.MF
index c86bf01..96dd179 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.git.ui/META-INF/MANIFEST.MF
+++ b/rdt/org.eclipse.ptp.rdt.sync.git.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@
org.eclipse.remote.core,
org.eclipse.remote.ui
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
Export-Package: org.eclipse.ptp.internal.rdt.sync.git.ui;x-internal:=true,
diff --git a/rdt/org.eclipse.ptp.rdt.sync.git.ui/src/org/eclipse/ptp/internal/rdt/sync/git/ui/GitParticipant.java b/rdt/org.eclipse.ptp.rdt.sync.git.ui/src/org/eclipse/ptp/internal/rdt/sync/git/ui/GitParticipant.java
index 0419fe6..a7172e4 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.git.ui/src/org/eclipse/ptp/internal/rdt/sync/git/ui/GitParticipant.java
+++ b/rdt/org.eclipse.ptp.rdt.sync.git.ui/src/org/eclipse/ptp/internal/rdt/sync/git/ui/GitParticipant.java
@@ -22,6 +22,7 @@
import org.eclipse.ptp.rdt.sync.ui.ISynchronizeParticipant;
import org.eclipse.ptp.rdt.sync.ui.ISynchronizeParticipantDescriptor;
import org.eclipse.remote.core.IRemoteConnection;
+import org.eclipse.remote.core.IRemoteConnectionHostService;
import org.eclipse.remote.core.IRemoteFileService;
import org.eclipse.remote.ui.IRemoteUIConnectionService;
import org.eclipse.remote.ui.IRemoteUIConstants;
@@ -91,9 +92,10 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
configArea.setLayoutData(gd);
- int flags = showProviderCombo ? RemoteConnectionWidget.FLAG_FORCE_PROVIDER_SELECTION : 0;
+ int flags = showProviderCombo ? RemoteConnectionWidget.FLAG_FORCE_CONNECTION_TYPE_SELECTION : 0;
flags |= RemoteConnectionWidget.FLAG_NO_LOCAL_SELECTION;
fRemoteConnectionWidget = new RemoteConnectionWidget(configArea, SWT.NONE, null, flags, context);
+ fRemoteConnectionWidget.filterConnections(IRemoteConnectionHostService.class, IRemoteFileService.class);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 3;
gd.grabExcessHorizontalSpace = true;
