From c39d229f46868132c9ef25df29d95ea2777773c1 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Wed, 31 Aug 2016 12:29:30 -0400 Subject: [PATCH] Allow setting of target attributes for remote targets. This is used, for example, by ESP8266 to set the OS and ARCH attributes on new launch targets created by the remote launch target provider. Change-Id: If0e5f2c20debfa17dcab3608584b54638679bb63 --- .../META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.launchbar.remote.core/pom.xml | 2 +- .../remote/core/RemoteLaunchTargetProvider.java | 11 +++++++---- features/org.eclipse.launchbar.remote/feature.xml | 2 +- features/org.eclipse.launchbar.remote/pom.xml | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bundles/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF index 6ad3819382f..9c14a8ee348 100644 --- a/bundles/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.launchbar.remote.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: LaunchBar Remote Core Bundle-SymbolicName: org.eclipse.launchbar.remote.core;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-Activator: org.eclipse.launchbar.remote.core.internal.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/bundles/org.eclipse.launchbar.remote.core/pom.xml b/bundles/org.eclipse.launchbar.remote.core/pom.xml index a02aca3e5f3..300eb79704d 100644 --- a/bundles/org.eclipse.launchbar.remote.core/pom.xml +++ b/bundles/org.eclipse.launchbar.remote.core/pom.xml @@ -12,7 +12,7 @@ org.eclipse.launchbar.remote.core - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT eclipse-plugin diff --git a/bundles/org.eclipse.launchbar.remote.core/src/org/eclipse/launchbar/remote/core/RemoteLaunchTargetProvider.java b/bundles/org.eclipse.launchbar.remote.core/src/org/eclipse/launchbar/remote/core/RemoteLaunchTargetProvider.java index eb32493d936..2761670ce6d 100644 --- a/bundles/org.eclipse.launchbar.remote.core/src/org/eclipse/launchbar/remote/core/RemoteLaunchTargetProvider.java +++ b/bundles/org.eclipse.launchbar.remote.core/src/org/eclipse/launchbar/remote/core/RemoteLaunchTargetProvider.java @@ -29,6 +29,10 @@ public abstract class RemoteLaunchTargetProvider implements ILaunchTargetProvide protected abstract String getTypeId(); + protected void initLaunchTarget(ILaunchTarget target) { + // default nothing + } + @Override public void init(ILaunchTargetManager targetManager) { this.targetManager = targetManager; @@ -49,7 +53,7 @@ public abstract class RemoteLaunchTargetProvider implements ILaunchTargetProvide for (IRemoteConnection remote : remoteType.getConnections()) { String id = remote.getName(); if (targetManager.getLaunchTarget(typeId, id) == null) { - targetManager.addLaunchTarget(typeId, id); + initLaunchTarget(targetManager.addLaunchTarget(typeId, id)); } } @@ -75,7 +79,7 @@ public abstract class RemoteLaunchTargetProvider implements ILaunchTargetProvide if (connection.getConnectionType().getId().equals(getTypeId())) { switch (event.getType()) { case RemoteConnectionChangeEvent.CONNECTION_ADDED: - targetManager.addLaunchTarget(getTypeId(), connection.getName()); + initLaunchTarget(targetManager.addLaunchTarget(getTypeId(), connection.getName())); break; case RemoteConnectionChangeEvent.CONNECTION_REMOVED: ILaunchTarget target = targetManager.getLaunchTarget(getTypeId(), connection.getName()); @@ -91,11 +95,10 @@ public abstract class RemoteLaunchTargetProvider implements ILaunchTargetProvide if (target != null ) { targetManager.removeLaunchTarget(target); } - targetManager.addLaunchTarget(getTypeId(), wc.getName()); + initLaunchTarget(targetManager.addLaunchTarget(getTypeId(), wc.getName())); } break; } - } } diff --git a/features/org.eclipse.launchbar.remote/feature.xml b/features/org.eclipse.launchbar.remote/feature.xml index e22b58b1cca..9467061f58c 100644 --- a/features/org.eclipse.launchbar.remote/feature.xml +++ b/features/org.eclipse.launchbar.remote/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.launchbar.remote/pom.xml b/features/org.eclipse.launchbar.remote/pom.xml index e2879f4a5fd..7d5a47c5c8a 100644 --- a/features/org.eclipse.launchbar.remote/pom.xml +++ b/features/org.eclipse.launchbar.remote/pom.xml @@ -13,7 +13,7 @@ org.eclipse.launchbar.features org.eclipse.launchbar.remote - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT eclipse-feature