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

EA-48902 - PCE: AbstractProgressIndicatorBase.checkCanceled

Browse Source
This commit is contained in:
Sascha Weinreuter
2013-08-19 13:50:40 +02:00
parent 14a363c3c2
commit 726728085d
1 changed files with 8 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/run/XsltRunConfiguration.java
+8 -9
View File
@@ -68,7 +68,6 @@ public final class XsltRunConfiguration extends LocatableConfigurationBase imple
private static final String RELAXED_FILE_PATH_EXPR = "((?:file\\://?)?(?:/?\\p{Alpha}\\:)?(?:/\\p{Alpha}\\:)?[^:]+)";
private static final String LOG_TAG = "(?:\\[[\\w ]+\\]\\:? +)?";
private static final VirtualFilePointerManager FILE_POINTER_MANAGER = VirtualFilePointerManager.getInstance();
public enum OutputType {
CONSOLE, STDOUT, @Deprecated FILE
@@ -173,8 +172,8 @@ public final class XsltRunConfiguration extends LocatableConfigurationBase imple
public final RunConfiguration clone() {
final XsltRunConfiguration configuration = (XsltRunConfiguration)super.clone();
configuration.myParameters = new ArrayList<Pair<String, String>>(myParameters);
if (myXsltFile != null) configuration.myXsltFile = FILE_POINTER_MANAGER.duplicate(myXsltFile, getProject(), null);
if (myXmlInputFile != null) configuration.myXmlInputFile = FILE_POINTER_MANAGER.duplicate(myXmlInputFile, getProject(), null);
if (myXsltFile != null) configuration.myXsltFile = VirtualFilePointerManager.getInstance().duplicate(myXsltFile, getProject(), null);
if (myXmlInputFile != null) configuration.myXmlInputFile = VirtualFilePointerManager.getInstance().duplicate(myXmlInputFile, getProject(), null);
return configuration;
}
@@ -229,14 +228,14 @@ public final class XsltRunConfiguration extends LocatableConfigurationBase imple
if (e != null) {
final String url = e.getAttributeValue("url");
if (url != null) {
myXsltFile = FILE_POINTER_MANAGER.create(url, getProject(), null);
myXsltFile = VirtualFilePointerManager.getInstance().create(url, getProject(), null);
}
}
e = element.getChild("XmlFile");
if (e != null) {
final String url = e.getAttributeValue("url");
if (url != null) {
myXmlInputFile = FILE_POINTER_MANAGER.create(url, getProject(), null);
myXmlInputFile = VirtualFilePointerManager.getInstance().create(url, getProject(), null);
}
}
@@ -349,12 +348,12 @@ public final class XsltRunConfiguration extends LocatableConfigurationBase imple
if (isEmpty(xsltFile)) {
myXsltFile = null;
} else {
myXsltFile = FILE_POINTER_MANAGER.create(VfsUtilCore.pathToUrl(xsltFile).replace(File.separatorChar, '/'), getProject(), null);
myXsltFile = VirtualFilePointerManager.getInstance().create(VfsUtilCore.pathToUrl(xsltFile).replace(File.separatorChar, '/'), getProject(), null);
}
}
private void setXsltFile(VirtualFile virtualFile) {
myXsltFile = FILE_POINTER_MANAGER.create(virtualFile, getProject(), null);
myXsltFile = VirtualFilePointerManager.getInstance().create(virtualFile, getProject(), null);
}
@Nullable
@@ -400,12 +399,12 @@ public final class XsltRunConfiguration extends LocatableConfigurationBase imple
if (isEmpty(xmlInputFile)) {
myXmlInputFile = null;
} else {
myXmlInputFile = FILE_POINTER_MANAGER.create(VfsUtilCore.pathToUrl(xmlInputFile).replace(File.separatorChar, '/'), getProject(), null);
myXmlInputFile = VirtualFilePointerManager.getInstance().create(VfsUtilCore.pathToUrl(xmlInputFile).replace(File.separatorChar, '/'), getProject(), null);
}
}
public void setXmlInputFile(VirtualFile xmlInputFile) {
myXmlInputFile = FILE_POINTER_MANAGER.create(xmlInputFile, getProject(), null);
myXmlInputFile = VirtualFilePointerManager.getInstance().create(xmlInputFile, getProject(), null);
}
public void setModule(Module module) {