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

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-12-01 12:48:21 +03:00
parent ac50287e6e
commit 47c44aa713
3 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
+8 -11
View File
@@ -50,9 +50,9 @@ import java.awt.*;
* Date: 5/7/12
*/
public abstract class DockablePopupManager<T extends JComponent & Disposable> {
protected ToolWindow myToolWindow = null;
protected boolean myAutoUpdateDocumentation = PropertiesComponent.getInstance().isTrueValue(getAutoUpdateEnabledProperty());
protected Runnable myAutoUpdateRequest;
protected ToolWindow myToolWindow;
private boolean myAutoUpdateDocumentation = PropertiesComponent.getInstance().isTrueValue(getAutoUpdateEnabledProperty());
private Runnable myAutoUpdateRequest;
@NotNull protected final Project myProject;
public DockablePopupManager(@NotNull Project project) {
@@ -171,10 +171,10 @@ public abstract class DockablePopupManager<T extends JComponent & Disposable> {
};
}
protected void restartAutoUpdate(final boolean state) {
void restartAutoUpdate(final boolean state) {
if (state && myToolWindow != null) {
if (myAutoUpdateRequest == null) {
myAutoUpdateRequest = () -> updateComponent();
myAutoUpdateRequest = this::updateComponent;
UIUtil.invokeLaterIfNeeded(() -> IdeEventQueue.getInstance().addIdleListener(myAutoUpdateRequest, 500));
}
@@ -190,12 +190,9 @@ public abstract class DockablePopupManager<T extends JComponent & Disposable> {
public void updateComponent() {
if (myProject.isDisposed()) return;
DataManager.getInstance().getDataContextFromFocus().doWhenDone(new Consumer<DataContext>() {
@Override
public void consume(@NotNull DataContext dataContext) {
if (!myProject.isOpen()) return;
updateComponentInner(dataContext);
}
DataManager.getInstance().getDataContextFromFocus().doWhenDone((Consumer<DataContext>)dataContext -> {
if (!myProject.isOpen()) return;
updateComponentInner(dataContext);
});
}
platform/platform-api/src/com/intellij/ide/GeneralSettings.java
+6 -8
View File
@@ -51,9 +51,9 @@ public class GeneralSettings implements PersistentStateComponent<GeneralSettings
private boolean mySyncOnFrameActivation = true;
private boolean mySaveOnFrameDeactivation = true;
private boolean myAutoSaveIfInactive = false; // If true the IDEA automatically saves files if it is inactive for some seconds
private int myInactiveTimeout; // Number of seconds of inactivity after which IDEA automatically saves all files
private int myInactiveTimeout = 15; // Number of seconds of inactivity after which IDEA automatically saves all files
private boolean myUseSafeWrite = true;
private final PropertyChangeSupport myPropertyChangeSupport;
private final PropertyChangeSupport myPropertyChangeSupport = new PropertyChangeSupport(this);
private boolean myUseDefaultBrowser = true;
private boolean mySearchInBackground;
private boolean myConfirmExit = true;
@@ -65,8 +65,6 @@ public class GeneralSettings implements PersistentStateComponent<GeneralSettings
}
public GeneralSettings() {
myInactiveTimeout = 15;
myPropertyChangeSupport = new PropertyChangeSupport(this);
}
public void addPropertyChangeListener(PropertyChangeListener listener){
@@ -169,7 +167,7 @@ public class GeneralSettings implements PersistentStateComponent<GeneralSettings
}
/**
* @return <code>true</code> if IDEA saves all files after "idle" timeout.
* @return {@code true} if IDEA saves all files after "idle" timeout.
*/
public boolean isAutoSaveIfInactive(){
return myAutoSaveIfInactive;
@@ -187,12 +185,12 @@ public class GeneralSettings implements PersistentStateComponent<GeneralSettings
return myInactiveTimeout;
}
public void setInactiveTimeout(int inactiveTimeout) {
public void setInactiveTimeout(int inactiveTimeoutSeconds) {
int oldInactiveTimeout = myInactiveTimeout;
myInactiveTimeout = inactiveTimeout;
myInactiveTimeout = inactiveTimeoutSeconds;
myPropertyChangeSupport.firePropertyChange(
PROP_INACTIVE_TIMEOUT, Integer.valueOf(oldInactiveTimeout), Integer.valueOf(inactiveTimeout)
PROP_INACTIVE_TIMEOUT, Integer.valueOf(oldInactiveTimeout), Integer.valueOf(inactiveTimeoutSeconds)
);
}
platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorManager.java
+11 -11
View File
@@ -49,7 +49,7 @@ public abstract class FileEditorManager {
*
*
* @param file file to open
* @param focusEditor <code>true</code> if need to focus
* @param focusEditor {@code true} if need to focus
* @return array of opened editors
*/
@NotNull
@@ -68,20 +68,20 @@ public abstract class FileEditorManager {
* Works as {@link #openFile(VirtualFile, boolean)} but forces opening of text editor.
* This method ignores {@link FileEditorPolicy#HIDE_DEFAULT_EDITOR} policy.
*
* @return opened text editor. The method returns <code>null</code> in case if text editor wasn't opened.
* @return opened text editor. The method returns {@code null} in case if text editor wasn't opened.
*/
@Nullable
public abstract Editor openTextEditor(@NotNull OpenFileDescriptor descriptor, boolean focusEditor);
/**
* @return currently selected text editor. The method returns <code>null</code> in case
* @return currently selected text editor. The method returns {@code null} in case
* there is no selected editor at all or selected editor is not a text one.
*/
@Nullable
public abstract Editor getSelectedTextEditor();
/**
* @return <code>true</code> if <code>file</code> is opened, <code>false</code> otherwise
* @return {@code true} if {@code file} is opened, {@code false} otherwise
*/
public abstract boolean isFileOpen(@NotNull VirtualFile file);
@@ -108,7 +108,7 @@ public abstract class FileEditorManager {
* @param file cannot be null
*
* @return editor which is currently selected in the currently selected file.
* The method returns <code>null</code> if <code>file</code> is not opened.
* The method returns {@code null} if {@code file} is not opened.
*/
@Nullable
public abstract FileEditor getSelectedEditor(@NotNull VirtualFile file);
@@ -116,7 +116,7 @@ public abstract class FileEditorManager {
/**
* @param file cannot be null
*
* @return current editors for the specified <code>file</code>
* @return current editors for the specified {@code file}
*/
@NotNull
public abstract FileEditor[] getEditors(@NotNull VirtualFile file);
@@ -124,7 +124,7 @@ public abstract class FileEditorManager {
/**
* @param file cannot be null
*
* @return all editors for the specified <code>file</code>
* @return all editors for the specified {@code file}
*/
@NotNull
public abstract FileEditor[] getAllEditors(@NotNull VirtualFile file);
@@ -151,7 +151,7 @@ public abstract class FileEditorManager {
/**
* Adds specified <code>listener</code>
* Adds specified {@code listener}
* @param listener listener to be added
* @deprecated Use MessageBus instead: see {@link FileEditorManagerListener#FILE_EDITOR_MANAGER}
*/
@@ -163,7 +163,7 @@ public abstract class FileEditorManager {
public abstract void addFileEditorManagerListener(@NotNull FileEditorManagerListener listener, @NotNull Disposable parentDisposable);
/**
* Removes specified <code>listener</code>
* Removes specified {@code listener}
*
* @param listener listener to be removed
* @deprecated Use {@link FileEditorManagerListener#FILE_EDITOR_MANAGER} instead
@@ -186,7 +186,7 @@ public abstract class FileEditorManager {
/**
* Returns data associated with given editor/caret context. Data providers are registered via
* {@link #registerExtraEditorDataProvider(EditorDataProvider, com.intellij.openapi.Disposable)} method.
* {@link #registerExtraEditorDataProvider(EditorDataProvider, Disposable)} method.
*/
@Nullable
public abstract Object getData(@NotNull String dataId, @NotNull Editor editor, @NotNull Caret caret);
@@ -195,7 +195,7 @@ public abstract class FileEditorManager {
* Selects a specified file editor tab for the specified editor.
* @param file a file to switch the file editor tab for. The function does nothing if the file is not currently open in the editor.
* @param fileEditorProviderId the ID of the file editor to open; matches the return value of
* {@link com.intellij.openapi.fileEditor.FileEditorProvider#getEditorTypeId()}
* {@link FileEditorProvider#getEditorTypeId()}
*/
public abstract void setSelectedEditor(@NotNull VirtualFile file, @NotNull String fileEditorProviderId);
}