MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

removed remaining dependencies from App Engine plugin to ultimate

Browse Source
This commit is contained in:
nik
2013-04-10 21:18:26 +04:00
parent 38032904ba
commit 9ea79ff2df
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/google-app-engine/google-app-engine.iml
-2
View File
@@ -15,7 +15,6 @@
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="lang-api" />
<orderEntry type="module" module-name="openapi" />
<orderEntry type="module" module-name="idea" />
<orderEntry type="module" module-name="debugger-openapi" />
<orderEntry type="module" module-name="codeInsight-tests" scope="TEST" />
<orderEntry type="module" module-name="testFramework-java" scope="TEST" />
@@ -23,7 +22,6 @@
<orderEntry type="module" module-name="xml" scope="TEST" />
<orderEntry type="module" module-name="appEngine-runtime" />
<orderEntry type="module" module-name="google-app-engine-jps-plugin" />
<orderEntry type="module" module-name="jam-support-openapi" />
<orderEntry type="module" module-name="compiler-impl" />
<orderEntry type="module" module-name="dom-openapi" />
</component>
plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacet.java
+19 -2
View File
@@ -19,7 +19,6 @@ import com.intellij.appengine.descriptor.dom.AppEngineWebApp;
import com.intellij.appengine.sdk.AppEngineSdk;
import com.intellij.appengine.sdk.AppEngineSdkManager;
import com.intellij.facet.*;
import com.intellij.javaee.util.JamCommonUtil;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
@@ -28,6 +27,11 @@ import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.xml.XmlFile;
import com.intellij.util.ReflectionCache;
import com.intellij.util.xml.DomElement;
import com.intellij.util.xml.DomFileElement;
import com.intellij.util.xml.DomManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -69,9 +73,22 @@ public class AppEngineFacet extends Facet<AppEngineFacetConfiguration> {
PsiFile psiFile = PsiManager.getInstance(project).findFile(descriptorFile);
if (psiFile == null) return null;
return JamCommonUtil.getRootElement(psiFile, AppEngineWebApp.class, module);
return getRootElement(psiFile, AppEngineWebApp.class, module);
}
//todo[nik] copied from JamCommonUtil
@Nullable
private static <T> T getRootElement(final PsiFile file, final Class<T> domClass, final Module module) {
if (!(file instanceof XmlFile)) return null;
final DomManager domManager = DomManager.getDomManager(file.getProject());
final DomFileElement<DomElement> element = domManager.getFileElement((XmlFile)file, DomElement.class);
if (element == null) return null;
final DomElement root = element.getRootElement();
if (!ReflectionCache.isAssignable(domClass, root.getClass())) return null;
return (T)root;
}
public boolean shouldRunEnhancerFor(@NotNull VirtualFile file) {
for (String path : getConfiguration().getFilesToEnhance()) {
final VirtualFile toEnhance = LocalFileSystem.getInstance().findFileByPath(path);