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

delay initialization for upsource

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-04-09 14:38:54 +03:00
parent 3d92be65db
commit 9b17070a0c
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/FileAssociationsManager.java
+4 -2
View File
@@ -27,8 +27,10 @@ import java.util.List;
import java.util.Map;
public abstract class FileAssociationsManager extends SimpleModificationTracker {
public static final FileType[] XML_FILES = new FileType[]{ StdFileTypes.XML, StdFileTypes.XHTML };
public static final List<FileType> XML_FILES_LIST = Arrays.asList(XML_FILES);
public static class Holder {
public static final FileType[] XML_FILES = {StdFileTypes.XML, StdFileTypes.XHTML};
public static final List<FileType> XML_FILES_LIST = Arrays.asList(XML_FILES);
}
public abstract void removeAssociations(PsiFile file);
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AnyXMLDescriptor.java
+3 -4
View File
@@ -15,12 +15,11 @@
*/
package org.intellij.lang.xpath.xslt.associations.impl;
import org.intellij.lang.xpath.xslt.associations.FileAssociationsManager;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.vfs.VirtualFile;
import org.intellij.lang.xpath.xslt.associations.FileAssociationsManager;
public class AnyXMLDescriptor extends FileChooserDescriptor {
final FileTypeManager myFileTypeManager;
@@ -33,6 +32,6 @@ public class AnyXMLDescriptor extends FileChooserDescriptor {
public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
final FileType fileType = file.getFileType();
return file.isDirectory() || (super.isFileVisible(file, showHiddenFiles)
&& FileAssociationsManager.XML_FILES_LIST.contains(fileType));
&& FileAssociationsManager.Holder.XML_FILES_LIST.contains(fileType));
}
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class AssociationsGroup extends ActionGroup {
if (psiFile == null) return AnAction.EMPTY_ARRAY;
final FileAssociationsManager fileAssociationsManager = FileAssociationsManager.getInstance(project);
final PsiFile[] associationsFor = fileAssociationsManager.getAssociationsFor(psiFile, FileAssociationsManager.XML_FILES);
final PsiFile[] associationsFor = fileAssociationsManager.getAssociationsFor(psiFile, FileAssociationsManager.Holder.XML_FILES);
final AnAction[] children;
if (associationsFor.length == 0) {
children = new AnAction[2];
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProviderBase.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* 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.
@@ -326,7 +326,7 @@ public abstract class XsltContextProviderBase extends ContextProvider {
return CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider<ElementNames>() {
public Result<ElementNames> compute() {
final ElementNames names = new ElementNames();
final PsiFile[] associations = myFileAssociationsManager.getAssociationsFor(file, FileAssociationsManager.XML_FILES);
final PsiFile[] associations = myFileAssociationsManager.getAssociationsFor(file, FileAssociationsManager.Holder.XML_FILES);
if (associations.length == 0) {
fillFromSchema(file, names);