mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-18 09:34:34 +07:00
get rid of LoactableConfigurationTYpe (I)
This commit is contained in:
anna
+121
@@ -0,0 +1,121 @@
|
||||
/*
|
||||
* Copyright 2000-2010 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* User: anna
|
||||
* Date: 13-May-2010
|
||||
*/
|
||||
package com.intellij.execution.applet;
|
||||
|
||||
import com.intellij.execution.JavaExecutionUtil;
|
||||
import com.intellij.execution.Location;
|
||||
import com.intellij.execution.RunManagerEx;
|
||||
import com.intellij.execution.RunnerAndConfigurationSettings;
|
||||
import com.intellij.execution.actions.ConfigurationContext;
|
||||
import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
|
||||
import com.intellij.execution.junit.JUnitUtil;
|
||||
import com.intellij.execution.junit.JavaRuntimeConfigurationProducerBase;
|
||||
import com.intellij.openapi.module.Module;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Comparing;
|
||||
import com.intellij.psi.JavaPsiFacade;
|
||||
import com.intellij.psi.PsiClass;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiManager;
|
||||
import com.intellij.psi.search.GlobalSearchScope;
|
||||
import com.intellij.psi.util.PsiClassUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class AppletConfigurationProducer extends JavaRuntimeConfigurationProducerBase {
|
||||
private PsiClass myPsiClass;
|
||||
|
||||
protected AppletConfigurationProducer() {
|
||||
super(AppletConfigurationType.getInstance());
|
||||
}
|
||||
|
||||
@Override
|
||||
public PsiElement getSourceElement() {
|
||||
return myPsiClass;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) {
|
||||
location = JavaExecutionUtil.stepIntoSingleClass(location);
|
||||
final Project project = location.getProject();
|
||||
final PsiElement element = location.getPsiElement();
|
||||
myPsiClass = getAppletClass(element, PsiManager.getInstance(project));
|
||||
if (myPsiClass == null) return null;
|
||||
RunnerAndConfigurationSettings settings = RunManagerEx.getInstanceEx(project).createConfiguration("", getConfigurationFactory());
|
||||
final AppletConfiguration configuration = (AppletConfiguration)settings.getConfiguration();
|
||||
configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(myPsiClass);
|
||||
configuration.setModule(new JUnitUtil.ModuleOfClass().convert(myPsiClass));
|
||||
configuration.setName(configuration.getGeneratedName());
|
||||
return (RunnerAndConfigurationSettingsImpl)settings;
|
||||
}
|
||||
|
||||
public int compareTo(Object o) {
|
||||
return PREFERED;
|
||||
}
|
||||
|
||||
|
||||
private static PsiClass getAppletClass(PsiElement element, final PsiManager manager) {
|
||||
while (element != null) {
|
||||
if (element instanceof PsiClass) {
|
||||
final PsiClass aClass = (PsiClass)element;
|
||||
if (isAppletClass(aClass, manager)){
|
||||
return aClass;
|
||||
}
|
||||
}
|
||||
element = element.getParent();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
private static boolean isAppletClass(final PsiClass aClass, final PsiManager manager) {
|
||||
if (!PsiClassUtil.isRunnableClass(aClass, true)) return false;
|
||||
|
||||
final Module module = JavaExecutionUtil.findModule(aClass);
|
||||
final GlobalSearchScope scope = module != null
|
||||
? GlobalSearchScope.moduleWithLibrariesScope(module)
|
||||
: GlobalSearchScope.projectScope(manager.getProject());
|
||||
PsiClass appletClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.applet.Applet", scope);
|
||||
if (appletClass != null) {
|
||||
if (aClass.isInheritor(appletClass, true)) return true;
|
||||
}
|
||||
appletClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("javax.swing.JApplet", scope);
|
||||
if (appletClass != null) {
|
||||
if (aClass.isInheritor(appletClass, true)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location,
|
||||
@NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations
|
||||
) {
|
||||
final PsiClass aClass = getAppletClass(location.getPsiElement(), PsiManager.getInstance(location.getProject()));
|
||||
if (aClass != null) {
|
||||
for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) {
|
||||
if (Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(aClass),
|
||||
((AppletConfiguration)existingConfiguration.getConfiguration()).MAIN_CLASS_NAME)) {
|
||||
return existingConfiguration;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -15,28 +15,19 @@
|
||||
*/
|
||||
package com.intellij.execution.applet;
|
||||
|
||||
import com.intellij.execution.*;
|
||||
import com.intellij.execution.ExecutionBundle;
|
||||
import com.intellij.execution.configurations.ConfigurationFactory;
|
||||
import com.intellij.execution.configurations.ConfigurationType;
|
||||
import com.intellij.execution.configurations.RunConfiguration;
|
||||
import com.intellij.execution.junit.JUnitUtil;
|
||||
import com.intellij.openapi.extensions.Extensions;
|
||||
import com.intellij.openapi.module.Module;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Comparing;
|
||||
import com.intellij.openapi.util.IconLoader;
|
||||
import com.intellij.psi.JavaPsiFacade;
|
||||
import com.intellij.psi.PsiClass;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiManager;
|
||||
import com.intellij.psi.search.GlobalSearchScope;
|
||||
import com.intellij.psi.util.PsiClassUtil;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
public class AppletConfigurationType implements LocatableConfigurationType {
|
||||
public class AppletConfigurationType implements ConfigurationType {
|
||||
private final ConfigurationFactory myFactory;
|
||||
private static final Icon ICON = IconLoader.getIcon("/runConfigurations/applet.png");
|
||||
|
||||
@@ -65,56 +56,8 @@ public class AppletConfigurationType implements LocatableConfigurationType {
|
||||
return new ConfigurationFactory[]{myFactory};
|
||||
}
|
||||
|
||||
public RunnerAndConfigurationSettings createConfigurationByLocation(Location location) {
|
||||
location = JavaExecutionUtil.stepIntoSingleClass(location);
|
||||
final Project project = location.getProject();
|
||||
final PsiElement element = location.getPsiElement();
|
||||
final PsiClass aClass = getAppletClass(element, PsiManager.getInstance(project));
|
||||
if (aClass == null) return null;
|
||||
RunnerAndConfigurationSettings settings = RunManagerEx.getInstanceEx(project).createConfiguration("", getConfigurationFactories()[0]);
|
||||
final AppletConfiguration configuration = (AppletConfiguration)settings.getConfiguration();
|
||||
configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(aClass);
|
||||
configuration.setModule(new JUnitUtil.ModuleOfClass().convert(aClass));
|
||||
configuration.setName(configuration.getGeneratedName());
|
||||
return settings;
|
||||
}
|
||||
|
||||
public boolean isConfigurationByLocation(final RunConfiguration configuration, Location location) {
|
||||
final PsiClass aClass = getAppletClass(location.getPsiElement(), PsiManager.getInstance(location.getProject()));
|
||||
return aClass != null &&
|
||||
Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(aClass), ((AppletConfiguration)configuration).MAIN_CLASS_NAME);
|
||||
}
|
||||
|
||||
private static PsiClass getAppletClass(PsiElement element, final PsiManager manager) {
|
||||
while (element != null) {
|
||||
if (element instanceof PsiClass) {
|
||||
final PsiClass aClass = (PsiClass)element;
|
||||
if (isAppletClass(aClass, manager)){
|
||||
return aClass;
|
||||
}
|
||||
}
|
||||
element = element.getParent();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean isAppletClass(final PsiClass aClass, final PsiManager manager) {
|
||||
if (!PsiClassUtil.isRunnableClass(aClass, true)) return false;
|
||||
|
||||
final Module module = JavaExecutionUtil.findModule(aClass);
|
||||
final GlobalSearchScope scope = module != null
|
||||
? GlobalSearchScope.moduleWithLibrariesScope(module)
|
||||
: GlobalSearchScope.projectScope(manager.getProject());
|
||||
PsiClass appletClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.applet.Applet", scope);
|
||||
if (appletClass != null) {
|
||||
if (aClass.isInheritor(appletClass, true)) return true;
|
||||
}
|
||||
appletClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("javax.swing.JApplet", scope);
|
||||
if (appletClass != null) {
|
||||
if (aClass.isInheritor(appletClass, true)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@NotNull
|
||||
@@ -125,4 +68,4 @@ public class AppletConfigurationType implements LocatableConfigurationType {
|
||||
public static AppletConfigurationType getInstance() {
|
||||
return ContainerUtil.findInstance(Extensions.getExtensions(CONFIGURATION_TYPE_EP), AppletConfigurationType.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+33
@@ -18,16 +18,21 @@ package com.intellij.execution.application;
|
||||
import com.intellij.execution.JavaExecutionUtil;
|
||||
import com.intellij.execution.Location;
|
||||
import com.intellij.execution.RunConfigurationExtension;
|
||||
import com.intellij.execution.RunManagerEx;
|
||||
import com.intellij.execution.actions.ConfigurationContext;
|
||||
import com.intellij.execution.configurations.ConfigurationUtil;
|
||||
import com.intellij.execution.impl.RunManagerImpl;
|
||||
import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
|
||||
import com.intellij.execution.junit.JavaRuntimeConfigurationProducerBase;
|
||||
import com.intellij.execution.junit.RuntimeConfigurationProducer;
|
||||
import com.intellij.openapi.module.Module;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Comparing;
|
||||
import com.intellij.psi.PsiClass;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiMethod;
|
||||
import com.intellij.psi.util.PsiMethodUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class ApplicationConfigurationProducer extends JavaRuntimeConfigurationProducerBase implements Cloneable {
|
||||
@@ -86,4 +91,32 @@ public class ApplicationConfigurationProducer extends JavaRuntimeConfigurationPr
|
||||
public int compareTo(final Object o) {
|
||||
return PREFERED;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location,
|
||||
@NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations
|
||||
) {
|
||||
final PsiClass aClass = ApplicationConfigurationType.getMainClass(location.getPsiElement());
|
||||
if (aClass == null) {
|
||||
return null;
|
||||
}
|
||||
final Module predefinedModule =
|
||||
((ApplicationConfiguration)((RunManagerImpl)RunManagerEx.getInstanceEx(location.getProject()))
|
||||
.getConfigurationTemplate(getConfigurationFactory())
|
||||
.getConfiguration()).getConfigurationModule().getModule();
|
||||
for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) {
|
||||
final ApplicationConfiguration appConfiguration = (ApplicationConfiguration)existingConfiguration.getConfiguration();
|
||||
if (Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(aClass), appConfiguration.MAIN_CLASS_NAME)) {
|
||||
if (Comparing.equal(location.getModule(), appConfiguration.getConfigurationModule().getModule())) {
|
||||
return existingConfiguration;
|
||||
}
|
||||
final Module configurationModule = appConfiguration.getConfigurationModule().getModule();
|
||||
if (Comparing.equal(location.getModule(), configurationModule)) return existingConfiguration;
|
||||
if (Comparing.equal(predefinedModule, configurationModule)) {
|
||||
return existingConfiguration;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
+4
-29
@@ -15,14 +15,13 @@
|
||||
*/
|
||||
package com.intellij.execution.application;
|
||||
|
||||
import com.intellij.execution.*;
|
||||
import com.intellij.execution.ExecutionBundle;
|
||||
import com.intellij.execution.RunConfigurationExtension;
|
||||
import com.intellij.execution.configurations.ConfigurationFactory;
|
||||
import com.intellij.execution.configurations.ConfigurationType;
|
||||
import com.intellij.execution.configurations.RunConfiguration;
|
||||
import com.intellij.execution.impl.RunManagerImpl;
|
||||
import com.intellij.openapi.extensions.Extensions;
|
||||
import com.intellij.openapi.module.Module;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Comparing;
|
||||
import com.intellij.openapi.util.IconLoader;
|
||||
import com.intellij.psi.PsiClass;
|
||||
import com.intellij.psi.PsiElement;
|
||||
@@ -35,7 +34,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
public class ApplicationConfigurationType implements LocatableConfigurationType {
|
||||
public class ApplicationConfigurationType implements ConfigurationType {
|
||||
private final ConfigurationFactory myFactory;
|
||||
private static final Icon ICON = IconLoader.getIcon("/runConfigurations/application.png");
|
||||
|
||||
@@ -70,30 +69,6 @@ public class ApplicationConfigurationType implements LocatableConfigurationType
|
||||
return new ConfigurationFactory[]{myFactory};
|
||||
}
|
||||
|
||||
public RunnerAndConfigurationSettings createConfigurationByLocation(final Location location) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean isConfigurationByLocation(final RunConfiguration configuration, final Location location) {
|
||||
final PsiClass aClass = getMainClass(location.getPsiElement());
|
||||
if (aClass == null) {
|
||||
return false;
|
||||
}
|
||||
if (Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(aClass), ((ApplicationConfiguration)configuration).MAIN_CLASS_NAME)) {
|
||||
if (Comparing.equal(location.getModule(), ((ApplicationConfiguration)configuration).getConfigurationModule().getModule())) {
|
||||
return true;
|
||||
}
|
||||
final Module configurationModule = ((ApplicationConfiguration)configuration).getConfigurationModule().getModule();
|
||||
if (Comparing.equal(location.getModule(), configurationModule)) return true;
|
||||
|
||||
final Module predefinedModule =
|
||||
((ApplicationConfiguration)((RunManagerImpl)RunManagerEx.getInstanceEx(location.getProject())).getConfigurationTemplate(myFactory)
|
||||
.getConfiguration()).getConfigurationModule().getModule();
|
||||
return Comparing.equal(predefinedModule, configurationModule);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static PsiClass getMainClass(PsiElement element) {
|
||||
while (element != null) {
|
||||
if (element instanceof PsiClass) {
|
||||
|
||||
Reference in New Issue
Block a user