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

read ant workspace setting from workspace data only, affects IDEA-169055

Browse Source
This commit is contained in:
Eugene Zhuravlev
2017-05-29 18:36:21 +02:00
parent 1279ab20d8
commit 8e37dce717
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
-7
View File
@@ -216,13 +216,6 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
@Override
public void loadState(Element state) {
myIsInitialized = Boolean.FALSE;
try {
myAntWorkspaceConfiguration.loadFromProjectSettings(state);
}
catch (InvalidDataException e) {
LOG.error(e);
return;
}
List<Pair<Element, String>> files = new ArrayList<>();
for (Iterator<Element> iterator = state.getChildren(BUILD_FILE).iterator(); iterator.hasNext(); ) {
plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java
+1 -9
View File
@@ -69,7 +69,7 @@ public class AntWorkspaceConfiguration implements PersistentStateComponent<Eleme
}
public void readExternal(Element parentNode) throws InvalidDataException {
loadGlobalSettings(parentNode);
DefaultJDOMExternalizer.readExternal(this, parentNode);
myProperties.set(parentNode);
}
@@ -101,14 +101,6 @@ public class AntWorkspaceConfiguration implements PersistentStateComponent<Eleme
}
}
public void loadFromProjectSettings(Element parentNode) throws InvalidDataException {
loadGlobalSettings(parentNode);
}
private void loadGlobalSettings(Element parentNode) throws InvalidDataException {
DefaultJDOMExternalizer.readExternal(this, parentNode);
}
@Nullable
private static Element findChildByUrl(Element parentNode, String url) {
for (Element element : parentNode.getChildren(BUILD_FILE)) {