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

fixing SOE during offline inspections (IDEA-152435)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2016-03-12 20:17:43 +01:00
parent efcef1ed92
commit 22b837be69
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java
+3 -2
View File
@@ -175,8 +175,9 @@ public class AntBuildFileImpl implements AntBuildFileBase {
myProjectOptions.registerProperty(ADDITIONAL_CLASSPATH, "entry", SinglePathEntry.EXTERNALIZER);
myProjectOptions.registerProperty(ANT_REFERENCE, AntReference.EXTERNALIZER);
myAllOptions = new CompositePropertyContainer(new AbstractProperty.AbstractPropertyContainer[]{myWorkspaceOptions, myProjectOptions,
GlobalAntConfiguration.getInstance().getProperties(getProject())});
myAllOptions = new CompositePropertyContainer(new AbstractProperty.AbstractPropertyContainer[]{
myWorkspaceOptions, myProjectOptions, GlobalAntConfiguration.getInstance().getProperties(), configuration.getProperties()
});
myClassloaderHolder = new AntBuildFileClassLoaderHolder(myAllOptions);
}
plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
+1
View File
@@ -640,6 +640,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
final Semaphore targetDone = new Semaphore();
targetDone.down();
final Ref<Boolean> result = Ref.create(Boolean.FALSE);
//noinspection SSBasedInspection
SwingUtilities.invokeLater(new Runnable() {
public void run() {
try {
plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java
-6
View File
@@ -20,7 +20,6 @@ import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.config.AntBuildFile;
import com.intellij.lang.ant.config.AntBuildTarget;
import com.intellij.lang.ant.config.AntConfiguration;
import com.intellij.lang.ant.config.AntConfigurationBase;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.ServiceManager;
@@ -125,11 +124,6 @@ public class GlobalAntConfiguration implements PersistentStateComponent<Element>
return myProperties;
}
public AbstractProperty.AbstractPropertyContainer getProperties(Project project) {
return new CompositePropertyContainer(new AbstractProperty.AbstractPropertyContainer[]{
myProperties, AntConfigurationBase.getInstance(project).getProperties()});
}
public void addConfiguration(final AntInstallation ant) {
if (getConfiguredAnts().containsKey(ant.getReference())) {
LOG.error("Duplicate name: " + ant.getName());