diff --git a/platform/remote-servers/impl/resources/resources/cloud.properties b/platform/remote-servers/impl/resources/resources/cloud.properties index 24aae89b33a7..3427d98f0d97 100644 --- a/platform/remote-servers/impl/resources/resources/cloud.properties +++ b/platform/remote-servers/impl/resources/resources/cloud.properties @@ -6,3 +6,4 @@ failed.reset.remote=Failed to set {0} repository as remote cloning.existing.application=Cloning existing {0} application fetching.application=Fetching {0} application run.configuration.name={0} - {1} +choose.account.title=Choose {0} account\: diff --git a/plugins/git4idea/remote-servers-git/remote-servers-git.iml b/plugins/git4idea/remote-servers-git/remote-servers-git.iml index b9f613800a04..154f59125497 100644 --- a/plugins/git4idea/remote-servers-git/remote-servers-git.iml +++ b/plugins/git4idea/remote-servers-git/remote-servers-git.iml @@ -15,6 +15,8 @@ + + diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.form b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.form new file mode 100644 index 000000000000..08bd5c10fa89 --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.form @@ -0,0 +1,34 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.java new file mode 100644 index 000000000000..1b433931683f --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.java @@ -0,0 +1,127 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.remoteServer.util.importProject; + +import com.intellij.ide.util.importProject.ModuleDescriptor; +import com.intellij.ide.util.importProject.ProjectDescriptor; +import com.intellij.ide.util.projectWizard.ModuleBuilder; +import com.intellij.ide.util.projectWizard.ModuleWizardStep; +import com.intellij.ide.util.projectWizard.importSources.DetectedProjectRoot; +import com.intellij.ide.util.projectWizard.importSources.DetectedSourceRoot; +import com.intellij.ide.util.projectWizard.importSources.ProjectFromSourcesBuilder; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.StdModuleTypes; +import com.intellij.openapi.options.ConfigurationException; +import com.intellij.openapi.roots.ModifiableRootModel; +import com.intellij.remoteServer.util.CloudAccountSelectionEditor; +import com.intellij.remoteServer.util.CloudBundle; +import com.intellij.remoteServer.util.CloudDeploymentNameConfiguration; +import com.intellij.util.containers.MultiMap; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * @author michael.golubev + */ +public class CloudGitChooseAccountStep extends ModuleWizardStep { + + private JPanel myAccountSelectionPanelPlaceHolder; + private JPanel myMainPanel; + private JLabel myTitleLabel; + + private final CloudGitProjectStructureDetectorBase myDetector; + private final ProjectFromSourcesBuilder myBuilder; + private final ProjectDescriptor myProjectDescriptor; + + private CloudAccountSelectionEditor myEditor; + + public CloudGitChooseAccountStep(CloudGitProjectStructureDetectorBase detector, + ProjectFromSourcesBuilder builder, + ProjectDescriptor projectDescriptor) { + myDetector = detector; + myBuilder = builder; + myProjectDescriptor = projectDescriptor; + + myTitleLabel.setText(CloudBundle.getText("choose.account.title", detector.getDetectorId())); + + myEditor = detector.createAccountSelectionEditor(); + myAccountSelectionPanelPlaceHolder.add(myEditor.getMainPanel()); + myEditor.initUI(); + } + + @Override + public JComponent getComponent() { + return myMainPanel; + } + + @Override + public void updateDataModel() { + Collection roots = myBuilder.getProjectRoots(myDetector); + + CloudGitProjectRoot lastProjectRoot = null; + MultiMap project2sourceRoots = new MultiMap(); + + for (DetectedProjectRoot root : roots) { + if (root instanceof CloudGitProjectRoot) { + lastProjectRoot = (CloudGitProjectRoot)root; + project2sourceRoots.put(lastProjectRoot, new ArrayList()); + } + else if (root instanceof DetectedSourceRoot) { + project2sourceRoots.putValue(lastProjectRoot, (DetectedSourceRoot)root); + } + } + + List modules = new ArrayList(); + for (Map.Entry> project2sourceRootsEntry : project2sourceRoots.entrySet()) { + CloudGitProjectRoot projectRoot = project2sourceRootsEntry.getKey(); + ModuleDescriptor moduleDescriptor + = new ModuleDescriptor(projectRoot.getDirectory(), StdModuleTypes.JAVA, project2sourceRootsEntry.getValue()); + final String applicationName = projectRoot.getApplicationName(); + moduleDescriptor.addConfigurationUpdater(new ModuleBuilder.ModuleConfigurationUpdater() { + + @Override + public void update(@NotNull Module module, @NotNull ModifiableRootModel rootModel) { + createRunConfiguration(module, applicationName); + } + }); + modules.add(moduleDescriptor); + } + myProjectDescriptor.setModules(modules); + } + + @Override + public boolean validate() throws ConfigurationException { + myEditor.validate(); + return super.validate(); + } + + private void createRunConfiguration(Module module, String applicationName) { + DC deploymentConfiguration = myDetector.createDeploymentConfiguration(); + + boolean defaultName = module.getName().equals(applicationName); + deploymentConfiguration.setDefaultDeploymentName(defaultName); + if (!defaultName) { + deploymentConfiguration.setDeploymentName(applicationName); + } + + myEditor.createRunConfiguration(module, deploymentConfiguration); + } +} diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java new file mode 100644 index 000000000000..0d1267128775 --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java @@ -0,0 +1,39 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.remoteServer.util.importProject; + +import com.intellij.ide.util.projectWizard.importSources.DetectedSourceRoot; +import com.intellij.ide.util.projectWizard.importSources.JavaModuleSourceRoot; +import org.jetbrains.annotations.NotNull; + +/** + * @author michael.golubev + */ +public class CloudGitJavaSourceRoot extends DetectedSourceRoot { + + private final String myRootTypeName; + + public CloudGitJavaSourceRoot(String rootTypeName, JavaModuleSourceRoot javaSourceRoot) { + super(javaSourceRoot.getDirectory(), javaSourceRoot.getPackagePrefix()); + myRootTypeName = rootTypeName; + } + + @NotNull + @Override + public String getRootTypeName() { + return myRootTypeName; + } +} diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java new file mode 100644 index 000000000000..b78f8b9ab4ff --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java @@ -0,0 +1,53 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.remoteServer.util.importProject; + +import com.intellij.ide.util.projectWizard.importSources.DetectedProjectRoot; +import org.jetbrains.annotations.NotNull; + +import java.io.File; + +/** + * @author michael.golubev + */ +public class CloudGitProjectRoot extends DetectedProjectRoot { + + private final String myRootTypeName; + private final String myJavaSourceRootTypeName; + private final String myApplicationName; + + public CloudGitProjectRoot(String rootTypeName, String javaSourceRootTypeName, @NotNull File directory, String applicationName) { + super(directory); + myRootTypeName = rootTypeName; + myJavaSourceRootTypeName = javaSourceRootTypeName; + myApplicationName = applicationName; + } + + @NotNull + @Override + public String getRootTypeName() { + return myRootTypeName; + } + + @Override + public boolean canContainRoot(@NotNull DetectedProjectRoot root) { + return myJavaSourceRootTypeName.equals(root.getRootTypeName()); + } + + public String getApplicationName() { + return myApplicationName; + } +} diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetectorBase.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetectorBase.java new file mode 100644 index 000000000000..00be96eb5ae4 --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetectorBase.java @@ -0,0 +1,134 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.remoteServer.util.importProject; + +import com.intellij.ide.util.importProject.ProjectDescriptor; +import com.intellij.ide.util.projectWizard.ModuleWizardStep; +import com.intellij.ide.util.projectWizard.importSources.DetectedProjectRoot; +import com.intellij.ide.util.projectWizard.importSources.JavaModuleSourceRoot; +import com.intellij.ide.util.projectWizard.importSources.ProjectFromSourcesBuilder; +import com.intellij.ide.util.projectWizard.importSources.ProjectStructureDetector; +import com.intellij.ide.util.projectWizard.importSources.impl.JavaProjectStructureDetector; +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectManager; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.remoteServer.ServerType; +import com.intellij.remoteServer.util.CloudAccountSelectionEditor; +import com.intellij.remoteServer.util.CloudDeploymentNameConfiguration; +import com.intellij.remoteServer.util.CloudGitDeploymentDetector; +import git4idea.GitPlatformFacade; +import git4idea.GitUtil; +import git4idea.repo.GitRepository; +import git4idea.repo.GitRepositoryImpl; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * @author michael.golubev + */ +public abstract class CloudGitProjectStructureDetectorBase extends ProjectStructureDetector { + + private final JavaProjectStructureDetector myJavaDetector = new JavaProjectStructureDetector(); + + private final String myId; + private final String myJavaSourceRootTypeName; + private final CloudGitDeploymentDetector myDeploymentDetector; + + protected CloudGitProjectStructureDetectorBase(ServerType serverType, CloudGitDeploymentDetector deploymentDetector) { + myId = serverType.getPresentableName(); + myJavaSourceRootTypeName = "Java/" + myId; + myDeploymentDetector = deploymentDetector; + } + + @NotNull + @Override + public DirectoryProcessingResult detectRoots(@NotNull File dir, + @NotNull File[] children, + @NotNull File base, + @NotNull List result) { + detectApplicationRoot(dir, result); + + for (DetectedProjectRoot projectRoot : result) { + if ((projectRoot instanceof CloudGitProjectRoot) && FileUtil.isAncestor(projectRoot.getDirectory(), dir, true)) { + return detectJavaRoots(dir, children, base, result); + } + } + + return DirectoryProcessingResult.PROCESS_CHILDREN; + } + + private void detectApplicationRoot(@NotNull File dir, @NotNull List result) { + VirtualFile contentRoot = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(dir); + if (contentRoot == null) { + return; + } + + final File gitDir = new File(dir, GitUtil.DOT_GIT); + if (!gitDir.exists()) { + return; + } + + Project project = ProjectManager.getInstance().getDefaultProject(); + GitRepository repository + = GitRepositoryImpl.getLightInstance(contentRoot, project, ServiceManager.getService(project, GitPlatformFacade.class), project); + repository.update(); + + List applicationNames = myDeploymentDetector.collectApplicationNames(repository); + if (applicationNames.isEmpty()) { + return; + } + + result.add(new CloudGitProjectRoot(myId, myJavaSourceRootTypeName, dir, applicationNames.get(0))); + } + + private DirectoryProcessingResult detectJavaRoots(@NotNull File dir, + @NotNull File[] children, + @NotNull File base, + @NotNull List result) { + List detectedJavaRoots = new ArrayList(); + DirectoryProcessingResult processingResult = myJavaDetector.detectRoots(dir, children, base, detectedJavaRoots); + for (DetectedProjectRoot detectedJavaRoot : detectedJavaRoots) { + if (detectedJavaRoot instanceof JavaModuleSourceRoot) { + result.add(new CloudGitJavaSourceRoot(myJavaSourceRootTypeName, (JavaModuleSourceRoot)detectedJavaRoot)); + } + } + return processingResult; + } + + @Override + public String getDetectorId() { + return myId; + } + + @Override + public List createWizardSteps(ProjectFromSourcesBuilder builder, + ProjectDescriptor projectDescriptor, + Icon stepIcon) { + return Collections.singletonList(new CloudGitChooseAccountStep(this, builder, projectDescriptor)); + } + + public abstract CloudAccountSelectionEditor createAccountSelectionEditor(); + + public abstract DC createDeploymentConfiguration(); +}