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

ant: get rid of circular dependency between services

Browse Source 
AntWorkspaceConfiguration accesses AntConfigurationImpl in its 'writeExternal' method so if AntConfigurationImpl's constructor depends on AntWorkspaceConfiguration it may lead to circular dependency (EA-95431).
This commit is contained in:
nik
2017-06-30 12:21:16 +02:00
parent e5a1ed1b66
commit f21f5d8061
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
+9 -7
View File
@@ -118,16 +118,14 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
private final Map<AntBuildFile, AntBuildModelBase> myModelToBuildFileMap = new HashMap<>();
private final Map<VirtualFile, VirtualFile> myAntFileToContextFileMap = new java.util.HashMap<>();
private final EventDispatcher<AntConfigurationListener> myEventDispatcher = EventDispatcher.create(AntConfigurationListener.class);
private final AntWorkspaceConfiguration myAntWorkspaceConfiguration;
private final StartupManager myStartupManager;
public AntConfigurationImpl(final Project project, final AntWorkspaceConfiguration antWorkspaceConfiguration, final DaemonCodeAnalyzer daemon) {
public AntConfigurationImpl(final Project project, final DaemonCodeAnalyzer daemon) {
super(project);
getProperties().registerProperty(DEFAULT_ANT, AntReference.EXTERNALIZER);
getProperties().rememberKey(INSTANCE);
getProperties().rememberKey(DEFAULT_JDK_NAME);
INSTANCE.set(getProperties(), this);
myAntWorkspaceConfiguration = antWorkspaceConfiguration;
myPsiManager = PsiManager.getInstance(project);
myStartupManager = StartupManager.getInstance(project);
addAntConfigurationListener(new AntConfigurationListener() {
@@ -441,12 +439,12 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
@Override
public boolean isFilterTargets() {
return myAntWorkspaceConfiguration.FILTER_TARGETS;
return getAntWorkspaceConfiguration().FILTER_TARGETS;
}
@Override
public void setFilterTargets(final boolean value) {
myAntWorkspaceConfiguration.FILTER_TARGETS = value;
getAntWorkspaceConfiguration().FILTER_TARGETS = value;
}
@Override
@@ -530,12 +528,12 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
@Override
public boolean isAutoScrollToSource() {
return myAntWorkspaceConfiguration.IS_AUTOSCROLL_TO_SOURCE;
return getAntWorkspaceConfiguration().IS_AUTOSCROLL_TO_SOURCE;
}
@Override
public void setAutoScrollToSource(final boolean value) {
myAntWorkspaceConfiguration.IS_AUTOSCROLL_TO_SOURCE = value;
getAntWorkspaceConfiguration().IS_AUTOSCROLL_TO_SOURCE = value;
}
@Override
@@ -677,6 +675,10 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
}
}
private AntWorkspaceConfiguration getAntWorkspaceConfiguration() {
return AntWorkspaceConfiguration.getInstance(getProject());
}
private static void collectTargetActions(final AntBuildTarget[] targets,
final List<Pair<String, AnAction>> actionList,
final AntBuildFile buildFile) {