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

inject ProgressManager as dependency instead of using getInstance() (EA-23313 - NPE: SaveAndSyncHandler.canSyncOrSave)

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-11-11 13:36:52 +03:00
parent 4e9a900577
commit 841e59a147
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/SaveAndSyncHandler.java
+7 -4
View File
@@ -43,10 +43,13 @@ public class SaveAndSyncHandler implements ApplicationComponent {
private static final Logger LOG = Logger.getInstance("#com.intellij.ide.SaveAndSyncHandler");
private final Runnable myIdleListener;
private final PropertyChangeListener myGeneralSettingsListener;
private final ProgressManager myProgressManager;
public SaveAndSyncHandler(final FrameStateManager frameStateManager,
final FileDocumentManager fileDocumentManager,
final GeneralSettings generalSettings) {
final GeneralSettings generalSettings,
final ProgressManager progressManager) {
myProgressManager = progressManager;
myIdleListener = new Runnable() {
public void run() {
@@ -101,8 +104,8 @@ public class SaveAndSyncHandler implements ApplicationComponent {
IdeEventQueue.getInstance().removeIdleListener(myIdleListener);
}
private static boolean canSyncOrSave() {
return !LaterInvocator.isInModalContext() && !ProgressManager.getInstance().hasModalProgressIndicator();
private boolean canSyncOrSave() {
return !LaterInvocator.isInModalContext() && !myProgressManager.hasModalProgressIndicator();
}
// made public for tests
@@ -132,7 +135,7 @@ public class SaveAndSyncHandler implements ApplicationComponent {
}
}
private static void refreshFiles() {
private void refreshFiles() {
if (ApplicationManager.getApplication().isDisposed()) return;
if (LOG.isDebugEnabled()) {
LOG.debug("enter: synchronize()");