diff --git a/.consulo/runConfigurations/consulo_run_desktop_awt.xml b/.consulo/runConfigurations/consulo_run_desktop_awt.xml
new file mode 100644
index 0000000..4399b4f
--- /dev/null
+++ b/.consulo/runConfigurations/consulo_run_desktop_awt.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a85c338..d18dc8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
.consulo/
+!/.consulo/codeStyleSettings.xml
+!/.consulo/runConfigurations
target/
plugin/sandbox/
diff --git a/javaee-impl/src/main/java/consulo/gwt/jakartaee/run/GwtRunConfigurationProducer.java b/javaee-impl/src/main/java/consulo/gwt/jakartaee/run/GwtRunConfigurationProducer.java
index 13757b8..acbb04b 100644
--- a/javaee-impl/src/main/java/consulo/gwt/jakartaee/run/GwtRunConfigurationProducer.java
+++ b/javaee-impl/src/main/java/consulo/gwt/jakartaee/run/GwtRunConfigurationProducer.java
@@ -16,11 +16,11 @@
package consulo.gwt.jakartaee.run;
-import com.intellij.gwt.module.GwtModulesManager;
-import com.intellij.gwt.module.model.GwtModule;
import com.intellij.gwt.jakartaee.run.GwtRunConfiguration;
import com.intellij.gwt.jakartaee.run.GwtRunConfigurationEditor;
import com.intellij.gwt.jakartaee.run.GwtRunConfigurationType;
+import com.intellij.gwt.module.GwtModulesManager;
+import com.intellij.gwt.module.model.GwtModule;
import com.intellij.java.language.psi.PsiClass;
import com.intellij.java.language.psi.PsiJavaFile;
import consulo.annotation.component.ExtensionImpl;
@@ -33,111 +33,97 @@
import consulo.module.Module;
import consulo.util.lang.Comparing;
import consulo.util.lang.Pair;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
import consulo.virtualFileSystem.VirtualFile;
import consulo.xml.psi.xml.XmlFile;
-
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
/**
* @author VISTALL
- * @since 02-Jun-16
+ * @since 2016-06-02
*/
@ExtensionImpl
-public class GwtRunConfigurationProducer extends RunConfigurationProducer
-{
- public GwtRunConfigurationProducer()
- {
- super(GwtRunConfigurationType.getInstance());
- }
+public class GwtRunConfigurationProducer extends RunConfigurationProducer {
+ public GwtRunConfigurationProducer() {
+ super(GwtRunConfigurationType.getInstance());
+ }
- @Override
- protected boolean setupConfigurationFromContext(GwtRunConfiguration runConfiguration, ConfigurationContext configurationContext, Ref ref)
- {
- Pair pair = findGwtModule(configurationContext.getLocation());
- if(pair != null)
- {
- GwtModule gwtModule = pair.getFirst();
- String path = GwtRunConfigurationEditor.getPath(gwtModule, pair.getSecond());
- runConfiguration.setModule(gwtModule.getModule());
- runConfiguration.setPage(path);
- return true;
- }
- return false;
- }
+ @Override
+ protected boolean setupConfigurationFromContext(
+ GwtRunConfiguration runConfiguration,
+ ConfigurationContext configurationContext,
+ SimpleReference ref
+ ) {
+ Pair pair = findGwtModule(configurationContext.getLocation());
+ if (pair != null) {
+ GwtModule gwtModule = pair.getFirst();
+ String path = GwtRunConfigurationEditor.getPath(gwtModule, pair.getSecond());
+ runConfiguration.setModule(gwtModule.getModule());
+ runConfiguration.setPage(path);
+ return true;
+ }
+ return false;
+ }
- @Override
- public boolean isConfigurationFromContext(GwtRunConfiguration runConfiguration, ConfigurationContext configurationContext)
- {
- Pair pair = findGwtModule(configurationContext.getLocation());
- if(pair != null)
- {
- String pagePath1 = runConfiguration.getPage();
- Module module1 = runConfiguration.getModule();
+ @Override
+ public boolean isConfigurationFromContext(GwtRunConfiguration runConfiguration, ConfigurationContext configurationContext) {
+ Pair pair = findGwtModule(configurationContext.getLocation());
+ if (pair != null) {
+ String pagePath1 = runConfiguration.getPage();
+ Module module1 = runConfiguration.getModule();
- GwtModule gwtModule = pair.getFirst();
- String pagePath2 = GwtRunConfigurationEditor.getPath(gwtModule, pair.getSecond());
- Module module2 = gwtModule.getModule();
- return pagePath2.equals(pagePath1) && Comparing.equal(module1, module2);
- }
- return false;
- }
+ GwtModule gwtModule = pair.getFirst();
+ String pagePath2 = GwtRunConfigurationEditor.getPath(gwtModule, pair.getSecond());
+ Module module2 = gwtModule.getModule();
+ return pagePath2.equals(pagePath1) && Comparing.equal(module1, module2);
+ }
+ return false;
+ }
- @Nullable
- private static Pair findGwtModule(Location location)
- {
- PsiFile psiFile = location.getPsiElement().getContainingFile();
- if(psiFile == null)
- {
- return null;
- }
+ @Nullable
+ private static Pair findGwtModule(Location location) {
+ PsiFile psiFile = location.getPsiElement().getContainingFile();
+ if (psiFile == null) {
+ return null;
+ }
- VirtualFile file = psiFile.getVirtualFile();
- if(file == null || !GwtModuleExtensionUtil.hasModuleExtension(location.getProject(), file))
- {
- return null;
- }
+ VirtualFile file = psiFile.getVirtualFile();
+ if (file == null || !GwtModuleExtensionUtil.hasModuleExtension(location.getProject(), file)) {
+ return null;
+ }
- GwtModulesManager gwtModulesManager = GwtModulesManager.getInstance(location.getProject());
- GwtModule gwtModule = gwtModulesManager.getGwtModuleByXmlFile(psiFile);
- if(gwtModule != null)
- {
- return getModuleWithFile(gwtModulesManager, gwtModule);
- }
+ GwtModulesManager gwtModulesManager = GwtModulesManager.getInstance(location.getProject());
+ GwtModule gwtModule = gwtModulesManager.getGwtModuleByXmlFile(psiFile);
+ if (gwtModule != null) {
+ return getModuleWithFile(gwtModulesManager, gwtModule);
+ }
- if(psiFile instanceof PsiJavaFile)
- {
- PsiClass[] classes = ((PsiJavaFile) psiFile).getClasses();
- if(classes.length == 1)
- {
- PsiClass psiClass = classes[0];
- GwtModule module = gwtModulesManager.findGwtModuleByEntryPoint(psiClass);
- if(module != null)
- {
- return getModuleWithFile(gwtModulesManager, module);
- }
- }
- }
- return null;
- }
+ if (psiFile instanceof PsiJavaFile javaFile) {
+ PsiClass[] classes = javaFile.getClasses();
+ if (classes.length == 1) {
+ PsiClass psiClass = classes[0];
+ GwtModule module = gwtModulesManager.findGwtModuleByEntryPoint(psiClass);
+ if (module != null) {
+ return getModuleWithFile(gwtModulesManager, module);
+ }
+ }
+ }
+ return null;
+ }
- @Nullable
- private static Pair getModuleWithFile(@Nonnull GwtModulesManager gwtModulesManager, @Nonnull GwtModule gwtModule)
- {
- XmlFile psiHtmlFile = gwtModulesManager.findHtmlFileByModule(gwtModule);
- if(psiHtmlFile != null)
- {
- VirtualFile htmlFile = psiHtmlFile.getVirtualFile();
- if(htmlFile != null)
- {
- String path = gwtModulesManager.getPathFromPublicRoot(gwtModule, htmlFile);
- if(path != null)
- {
- return Pair.create(gwtModule, path);
- }
- }
- }
- return null;
- }
+ @Nullable
+ private static Pair getModuleWithFile(@Nonnull GwtModulesManager gwtModulesManager, @Nonnull GwtModule gwtModule) {
+ XmlFile psiHtmlFile = gwtModulesManager.findHtmlFileByModule(gwtModule);
+ if (psiHtmlFile != null) {
+ VirtualFile htmlFile = psiHtmlFile.getVirtualFile();
+ if (htmlFile != null) {
+ String path = gwtModulesManager.getPathFromPublicRoot(gwtModule, htmlFile);
+ if (path != null) {
+ return Pair.create(gwtModule, path);
+ }
+ }
+ }
+ return null;
+ }
}