skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Just dispose on close and scope executors to a window, clean up on window hide.

Browse Source
This commit is contained in:
Maarten Billemont
2015-01-03 14:25:20 -05:00
parent 80f507b4cc
commit d1649f3c33
6 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/GUI.java
View File

@@ -116,9 +116,6 @@ public class GUI implements UnlockFrame.SignInCallback {
}
protected PasswordFrame newPasswordFrame(final User user) {
PasswordFrame frame = new PasswordFrame( user );
frame.setDefaultCloseOperation( WindowConstants.EXIT_ON_CLOSE );
return frame;
return new PasswordFrame( user );
}
}

2
MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/ModelUser.java
View File

@@ -68,6 +68,8 @@ public class ModelUser extends User {
@Override
public void reset() {
super.reset();
masterPassword = null;
}

2
MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/PasswordFrame.java
View File

@@ -217,7 +217,7 @@ public class PasswordFrame extends JFrame implements DocumentListener {
site.setSiteCounter( siteCounter );
}
ListenableFuture<String> passwordFuture = Res.execute( new Callable<String>() {
ListenableFuture<String> passwordFuture = Res.execute( this, new Callable<String>() {
@Override
public String call()
throws Exception {

32
MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/Res.java
View File

@@ -8,9 +8,11 @@ import com.google.common.io.Resources;
import com.google.common.util.concurrent.*;
import com.lyndir.lhunath.opal.system.logging.Logger;
import java.awt.*;
import java.awt.event.*;
import java.awt.image.ImageObserver;
import java.io.IOException;
import java.net.URL;
import java.util.WeakHashMap;
import java.util.concurrent.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -22,8 +24,8 @@ import javax.swing.*;
*/
public abstract class Res {
private static final ExecutorService executor = Executors.newSingleThreadExecutor();
private static final Logger logger = Logger.get( Res.class );
private static final WeakHashMap<Window, ExecutorService> executorByWindow = new WeakHashMap<>();
private static final Logger logger = Logger.get( Res.class );
private static Font sourceCodeProRegular;
private static Font sourceCodeProBlack;
@@ -32,8 +34,8 @@ public abstract class Res {
private static Font exoRegular;
private static Font exoThin;
public static Future<?> execute(final Runnable job) {
return executor.submit( new Runnable() {
public static Future<?> execute(final Window host, final Runnable job) {
return getExecutor( host ).submit( new Runnable() {
@Override
public void run() {
try {
@@ -46,7 +48,8 @@ public abstract class Res {
} );
}
public static <V> ListenableFuture<V> execute(final Callable<V> job) {
public static <V> ListenableFuture<V> execute(final Window host, final Callable<V> job) {
ExecutorService executor = getExecutor( host );
return JdkFutureAdapters.listenInPoolThread( executor.submit( new Callable<V>() {
@Override
public V call()
@@ -62,6 +65,25 @@ public abstract class Res {
} ), executor );
}
private static ExecutorService getExecutor(final Window host) {
ExecutorService executor = executorByWindow.get( host );
if (executor == null) {
executorByWindow.put( host, executor = Executors.newSingleThreadExecutor() );
host.addWindowListener( new WindowAdapter() {
@Override
public void windowClosing(final WindowEvent e) {
ExecutorService executor = executorByWindow.remove( host );
if (executor != null)
executor.shutdownNow();
}
} );
}
return executor;
}
public static Icon iconAdd() {
return new RetinaIcon( Resources.getResource( "media/icon_add@2x.png" ) );
}

2
MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/UnlockFrame.java
View File

@@ -134,7 +134,7 @@ public class UnlockFrame extends JFrame {
signInButton.setEnabled( false );
signInButton.setText( "Signing In..." );
Res.execute( new Runnable() {
Res.execute( this, new Runnable() {
@Override
public void run() {
final boolean success = signInCallback.signedIn( user );