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

[r=Peter.Gromov] use weak reference for Window key to avoid memory leak, as we do not get some window closed events

Browse Source
This commit is contained in:
Maxim.Mossienko
2013-01-17 15:52:38 +01:00
parent 0b66179309
commit 04e38d8abf
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java
+9 -10
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.wm.FocusWatcher;
import com.intellij.openapi.wm.ex.WindowManagerEx;
import com.intellij.util.containers.HashMap;
import com.intellij.util.containers.WeakHashMap;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -37,6 +38,7 @@ import java.beans.PropertyChangeListener;
import java.lang.ref.WeakReference;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
/**
* @author Anton Katilin
@@ -44,8 +46,8 @@ import java.util.Iterator;
*/
public final class WindowWatcher implements PropertyChangeListener{
private static final Logger LOG=Logger.getInstance("#com.intellij.openapi.wm.impl.WindowWatcher");
private final Object myLock;
private final HashMap<Window, WindowInfo> myWindow2Info;
private final Object myLock = new Object();
private final Map<Window, WindowInfo> myWindow2Info = new WeakHashMap<Window, WindowInfo>();
/**
* Currenly focused window (window which has focused component). Can be <code>null</code> if there is no focused
* window at all.
@@ -54,14 +56,10 @@ public final class WindowWatcher implements PropertyChangeListener{
/**
* Contains last focused window for each project.
*/
private final HashSet myFocusedWindows;
private final HashSet myFocusedWindows = new HashSet();
@NonNls protected static final String FOCUSED_WINDOW_PROPERTY = "focusedWindow";
WindowWatcher(){
myLock=new Object();
myWindow2Info=new HashMap<Window, WindowInfo>();
myFocusedWindows=new HashSet();
}
WindowWatcher() {}
/**
* This method should get notifications abount changes of focused window.
@@ -111,7 +109,8 @@ public final class WindowWatcher implements PropertyChangeListener{
final void dispatchComponentEvent(final ComponentEvent e){
final int id=e.getID();
if(WindowEvent.WINDOW_CLOSED==id||(ComponentEvent.COMPONENT_HIDDEN==id&&e.getSource() instanceof Window)){
if(WindowEvent.WINDOW_CLOSED == id ||
(ComponentEvent.COMPONENT_HIDDEN == id && e.getSource() instanceof Window)){
dispatchHiddenOrClosed((Window)e.getSource());
}
// Clear obsolete reference on root frame
@@ -268,7 +267,7 @@ public final class WindowWatcher implements PropertyChangeListener{
}
}
public final void doNotSuggestAsParent(final Window window){
public final void doNotSuggestAsParent(final Window window) {
if(LOG.isDebugEnabled()){
LOG.debug("enter: doNotSuggestAsParent("+window+")");
}