mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEA-101831 Add opportunity create new project from VCSs. When user create new project and has op...
This commit is contained in:
@@ -13,6 +13,6 @@
|
||||
<orderEntry type="module" module-name="java-impl" />
|
||||
<orderEntry type="library" name="XmlRPC" level="project" />
|
||||
<orderEntry type="library" name="OroMatcher" level="project" />
|
||||
<orderEntry type="module" module-name="vcs-impl" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
</module>
|
||||
@@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright 2000-2015 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.openapi.vcs.checkout;
|
||||
|
||||
import com.intellij.openapi.actionSystem.AnAction;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.vcs.CheckoutProvider;
|
||||
import com.intellij.openapi.vcs.VcsKey;
|
||||
import com.intellij.openapi.vfs.LocalFileSystem;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.platform.PlatformProjectOpenProcessor;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
public class NewProjectFromVCSGroup extends CheckoutActionGroup {
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
protected AnAction createAction(CheckoutProvider provider) {
|
||||
return new CheckoutAction(provider) {
|
||||
@Override
|
||||
protected CheckoutProvider.Listener getListener(Project project) {
|
||||
return new CheckoutProvider.Listener() {
|
||||
@Override
|
||||
public void directoryCheckedOut(File directory, VcsKey vcs) {
|
||||
final VirtualFile dir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(directory);
|
||||
if (dir != null) {
|
||||
PlatformProjectOpenProcessor.getInstance().doOpenProject(dir, null, false);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkoutCompleted() {
|
||||
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -32,6 +32,10 @@ import java.io.FilenameFilter;
|
||||
* @author yole
|
||||
*/
|
||||
public class ProjectCheckoutListener implements CheckoutListener {
|
||||
|
||||
public ProjectCheckoutListener() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean processCheckedOutDirectory(Project project, File directory) {
|
||||
File[] files = directory.listFiles((FilenameFilter) new GlobFilenameFilter("*" + ProjectFileType.DOT_DEFAULT_EXTENSION));
|
||||
|
||||
@@ -18,10 +18,9 @@ package com.intellij.openapi.vcs.checkout;
|
||||
import com.intellij.openapi.actionSystem.AnAction;
|
||||
import com.intellij.openapi.actionSystem.AnActionEvent;
|
||||
import com.intellij.openapi.actionSystem.CommonDataKeys;
|
||||
import com.intellij.openapi.actionSystem.PlatformDataKeys;
|
||||
import com.intellij.openapi.project.DumbAware;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.project.ProjectManager;
|
||||
import com.intellij.openapi.project.DumbAware;
|
||||
import com.intellij.openapi.vcs.CheckoutProvider;
|
||||
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
|
||||
|
||||
@@ -35,7 +34,11 @@ public class CheckoutAction extends AnAction implements DumbAware {
|
||||
public void actionPerformed(AnActionEvent e) {
|
||||
Project project = e.getData(CommonDataKeys.PROJECT);
|
||||
project = (project == null) ? ProjectManager.getInstance().getDefaultProject() : project;
|
||||
myProvider.doCheckout(project, ProjectLevelVcsManager.getInstance(project).getCompositeCheckoutListener());
|
||||
myProvider.doCheckout(project, getListener(project));
|
||||
}
|
||||
|
||||
protected CheckoutProvider.Listener getListener(Project project) {
|
||||
return ProjectLevelVcsManager.getInstance(project).getCompositeCheckoutListener();
|
||||
}
|
||||
|
||||
public void update(AnActionEvent e) {
|
||||
|
||||
@@ -35,8 +35,14 @@ public class CheckoutActionGroup extends ComputableActionGroup.Simple {
|
||||
Arrays.sort(providers, new CheckoutProvider.CheckoutProviderComparator());
|
||||
AnAction[] children = new AnAction[providers.length];
|
||||
for (int i = 0; i < providers.length; i++) {
|
||||
children[i] = new CheckoutAction(providers[i]);
|
||||
CheckoutProvider provider = providers[i];
|
||||
children[i] = createAction(provider);
|
||||
}
|
||||
return children;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
protected AnAction createAction(CheckoutProvider provider) {
|
||||
return new CheckoutAction(provider);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
<group id="NewProjectOrModuleGroup">
|
||||
<action id="NewProject" class="com.intellij.ide.actions.NewProjectAction" text="Project..."/>
|
||||
<action id="ImportProject" class="com.intellij.ide.actions.ImportProjectAction" text="Project from Existing Sources..."/>
|
||||
<group id="NewProjectFromVCS" class="com.intellij.openapi.vcs.checkout.NewProjectFromVCSGroup" text="Project from Version Control" popup="true"/>
|
||||
<separator/>
|
||||
<action id="NewModule" class="com.intellij.openapi.roots.ui.configuration.actions.NewModuleAction" text="Module..."/>
|
||||
<action id="ImportModule" class="com.intellij.ide.actions.ImportModuleAction" text="Module from Existing Sources..."/>
|
||||
|
||||
Reference in New Issue
Block a user