diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-06-14 15:29:50 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-06-14 15:29:50 -0700 |
| commit | 9a718963c1d41c5bcd3a1bdd5e518d497964ccdf (patch) | |
| tree | f93674d5a9ca36b5bd830dcb62b2b0b76cd94ba5 /platform/external-system-api | |
| parent | d9e4c285fa2c3c38c5b92cf30e77f27e243566a8 (diff) | |
| download | idea-9a718963c1d41c5bcd3a1bdd5e518d497964ccdf.tar.gz | |
Snapshot 9b8f3d0a06c4e85d80b213966bbd66f4ac18a18d from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: Ided6f0fe5547342e95ceb77b0464b8e1187b97e4
Diffstat (limited to 'platform/external-system-api')
4 files changed, 18 insertions, 4 deletions
diff --git a/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties b/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties index 58e2981cdff9..acd0ee23cdb0 100644 --- a/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties +++ b/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties @@ -1,6 +1,6 @@ # Import. import.title=Import {0} Projects -orphan.modules.text=<html>The modules below have been removed from {0} structure.<br/>Check those to be removed from the project too: +orphan.modules.text=<html>The modules below are not backed by {0} anymore.<br/>Check those to be removed from the ide project too: # Settings. setting.type.location.deduced={0} location is deduced @@ -21,6 +21,7 @@ progress.update.text={0}: {1} # Errors. error.project.undefined=No external project config file is defined +error.project.already.registered=The project is already registered error.cannot.parse.project=Can not parse {0} project error.resolve.with.reason={0}\n\nConsult IDE log for more details (Help | Show Log) error.resolve.generic=Resolve error @@ -31,6 +32,8 @@ tool.window.title.tasks=tasks # Action. action.refresh.all.projects.text=Refresh all {0} projects action.refresh.all.projects.description=Force refresh all linked {0} projects +action.attach.external.project.text=Attach +action.attach.external.project.description=Attach external project to the current ide project action.detach.external.project.text=Detach action.detach.external.project.description=Detach selected external project diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemManager.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemManager.java index 3d8294e8fb61..df67190d2285 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemManager.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemManager.java @@ -10,6 +10,7 @@ import com.intellij.openapi.externalSystem.settings.AbstractExternalSystemLocalS import com.intellij.openapi.externalSystem.settings.AbstractExternalSystemSettings; import com.intellij.openapi.externalSystem.settings.ExternalProjectSettings; import com.intellij.openapi.externalSystem.settings.ExternalSystemSettingsListener; +import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.util.Function; @@ -79,4 +80,10 @@ public interface ExternalSystemManager< * @see #getProjectResolverClass() */ Class<? extends ExternalSystemTaskManager<ExecutionSettings>> getTaskManagerClass(); + + /** + * @return file chooser descriptor to use when adding new external project + */ + @NotNull + FileChooserDescriptor getExternalProjectDescriptor(); } diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java index aff17a8e8aa7..d947a51f2abd 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java @@ -54,7 +54,7 @@ public abstract class AbstractExternalSystemSettings<S extends ExternalProjectSe public S getLinkedProjectSettings(@NotNull String linkedProjectPath) { return myLinkedProjectsSettings.get(linkedProjectPath); } - + /** * Un-links given external project from the current ide project. * @@ -111,6 +111,11 @@ public abstract class AbstractExternalSystemSettings<S extends ExternalProjectSe protected abstract void checkSettings(@NotNull S old, @NotNull S current); @NotNull + public Topic<L> getChangesTopic() { + return myChangesTopic; + } + + @NotNull public L getPublisher() { return myProject.getMessageBus().syncPublisher(myChangesTopic); } diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java index 3e41f1e290bf..fd354030c7c9 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java @@ -55,8 +55,7 @@ import java.util.regex.Pattern; */ public class ExternalSystemApiUtil { - private static final Logger LOG = - Logger.getInstance("#" + ExternalSystemApiUtil.class.getName()); + private static final Logger LOG = Logger.getInstance("#" + ExternalSystemApiUtil.class.getName()); private static final String LAST_USED_PROJECT_PATH_PREFIX = "LAST_EXTERNAL_PROJECT_PATH_"; @NotNull public static final String PATH_SEPARATOR = "/"; |