/*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import com.intellij.util.xmlb.annotations.OptionTag;
import com.intellij.util.xmlb.annotations.Transient;
import org.intellij.lang.annotations.MagicConstant;
-import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
import java.beans.PropertyChangeListener;
public static final int OPEN_PROJECT_NEW_WINDOW = 0;
public static final int OPEN_PROJECT_SAME_WINDOW = 1;
- @NonNls public static final String PROP_INACTIVE_TIMEOUT = "inactiveTimeout";
+ public static final String PROP_INACTIVE_TIMEOUT = "inactiveTimeout";
private String myBrowserPath = BrowserUtil.getDefaultAlternativeBrowserPath();
private boolean myShowTipsOnStartup = true;
/*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
myDispatcher.getMulticaster().writeActionFinished(action);
}
- // public for testing purposes
- public void _saveSettings() {
+ @Override
+ public void saveSettings() {
+ if (myDoNotSave) return;
+
if (mySaveSettingsIsInProgress.compareAndSet(false, true)) {
try {
StoreUtil.save(getStateStore(), null);
}
}
- @Override
- public void saveSettings() {
- if (myDoNotSave) return;
- _saveSettings();
- }
-
@Override
public void saveAll() {
if (myDoNotSave) return;