Skip to content
Snippets Groups Projects
Commit 53aa40cd authored by Tobias Pietzsch's avatar Tobias Pietzsch
Browse files

Rename MemoryFixedDialog to DelayedPackDialog, don't mess with defaultCloseOperation

parent 851f1dab
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
*/ */
package bdv.tools; package bdv.tools;
import bdv.util.MemoryFixedDialog; import bdv.util.DelayedPackDialog;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
...@@ -48,9 +48,8 @@ import javax.swing.JEditorPane; ...@@ -48,9 +48,8 @@ import javax.swing.JEditorPane;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.ScrollPaneConstants; import javax.swing.ScrollPaneConstants;
import javax.swing.WindowConstants;
public class HelpDialog extends MemoryFixedDialog public class HelpDialog extends DelayedPackDialog
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -30,7 +30,7 @@ package bdv.tools; ...@@ -30,7 +30,7 @@ package bdv.tools;
import bdv.cache.CacheControl; import bdv.cache.CacheControl;
import bdv.export.ProgressWriter; import bdv.export.ProgressWriter;
import bdv.util.MemoryFixedDialog; import bdv.util.DelayedPackDialog;
import bdv.util.Prefs; import bdv.util.Prefs;
import bdv.viewer.BasicViewerState; import bdv.viewer.BasicViewerState;
import bdv.viewer.ViewerPanel; import bdv.viewer.ViewerPanel;
...@@ -64,7 +64,6 @@ import javax.swing.JSpinner; ...@@ -64,7 +64,6 @@ import javax.swing.JSpinner;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import net.imglib2.Cursor; import net.imglib2.Cursor;
...@@ -77,7 +76,7 @@ import bdv.viewer.OverlayRenderer; ...@@ -77,7 +76,7 @@ import bdv.viewer.OverlayRenderer;
import bdv.viewer.render.RenderTarget; import bdv.viewer.render.RenderTarget;
import net.imglib2.util.LinAlgHelpers; import net.imglib2.util.LinAlgHelpers;
public class RecordMaxProjectionDialog extends MemoryFixedDialog implements OverlayRenderer public class RecordMaxProjectionDialog extends DelayedPackDialog implements OverlayRenderer
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -30,7 +30,7 @@ package bdv.tools; ...@@ -30,7 +30,7 @@ package bdv.tools;
import bdv.cache.CacheControl; import bdv.cache.CacheControl;
import bdv.export.ProgressWriter; import bdv.export.ProgressWriter;
import bdv.util.MemoryFixedDialog; import bdv.util.DelayedPackDialog;
import bdv.util.Prefs; import bdv.util.Prefs;
import bdv.viewer.BasicViewerState; import bdv.viewer.BasicViewerState;
import bdv.viewer.ViewerPanel; import bdv.viewer.ViewerPanel;
...@@ -63,14 +63,13 @@ import javax.swing.JSpinner; ...@@ -63,14 +63,13 @@ import javax.swing.JSpinner;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import net.imglib2.realtransform.AffineTransform3D; import net.imglib2.realtransform.AffineTransform3D;
import bdv.viewer.OverlayRenderer; import bdv.viewer.OverlayRenderer;
import bdv.viewer.render.RenderTarget; import bdv.viewer.render.RenderTarget;
public class RecordMovieDialog extends MemoryFixedDialog implements OverlayRenderer public class RecordMovieDialog extends DelayedPackDialog implements OverlayRenderer
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
*/ */
package bdv.tools; package bdv.tools;
import bdv.util.MemoryFixedDialog; import bdv.util.DelayedPackDialog;
import bdv.viewer.SourceAndConverter; import bdv.viewer.SourceAndConverter;
import bdv.viewer.ViewerState; import bdv.viewer.ViewerState;
import bdv.viewer.VisibilityAndGrouping; import bdv.viewer.VisibilityAndGrouping;
...@@ -68,12 +68,11 @@ import javax.swing.JRadioButton; ...@@ -68,12 +68,11 @@ import javax.swing.JRadioButton;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.WindowConstants;
import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
@Deprecated @Deprecated
public class VisibilityAndGroupingDialog extends MemoryFixedDialog public class VisibilityAndGroupingDialog extends DelayedPackDialog
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -60,12 +60,11 @@ import javax.swing.JSpinner; ...@@ -60,12 +60,11 @@ import javax.swing.JSpinner;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import bdv.util.InvokeOnEDT; import bdv.util.InvokeOnEDT;
import bdv.util.MemoryFixedDialog; import bdv.util.DelayedPackDialog;
import mpicbg.spim.data.generic.sequence.BasicViewSetup; import mpicbg.spim.data.generic.sequence.BasicViewSetup;
import net.imglib2.type.numeric.ARGBType; import net.imglib2.type.numeric.ARGBType;
...@@ -76,7 +75,7 @@ import net.imglib2.type.numeric.ARGBType; ...@@ -76,7 +75,7 @@ import net.imglib2.type.numeric.ARGBType;
* @author Tobias Pietzsch <tobias.pietzsch@gmail.com> * @author Tobias Pietzsch <tobias.pietzsch@gmail.com>
*/ */
@Deprecated @Deprecated
public class BrightnessDialog extends MemoryFixedDialog public class BrightnessDialog extends DelayedPackDialog
{ {
public BrightnessDialog( final Frame owner, final SetupAssignments setupAssignments ) public BrightnessDialog( final Frame owner, final SetupAssignments setupAssignments )
{ {
......
...@@ -3,17 +3,14 @@ package bdv.util; ...@@ -3,17 +3,14 @@ package bdv.util;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class MemoryFixedDialog extends JDialog /**
* A {@code JDialog} that delays {@code pack()} calls until the dialog is made visible.
*/
public class DelayedPackDialog extends JDialog
{ {
private boolean packIsPending = false; private volatile boolean packIsPending = false;
public MemoryFixedDialog() public DelayedPackDialog( Frame owner, String title, boolean modal )
{
super();
super.setDefaultCloseOperation( WindowConstants.DISPOSE_ON_CLOSE );
}
public MemoryFixedDialog( Frame owner, String title, boolean modal )
{ {
super( owner, title, modal ); super( owner, title, modal );
} }
...@@ -40,10 +37,4 @@ public class MemoryFixedDialog extends JDialog ...@@ -40,10 +37,4 @@ public class MemoryFixedDialog extends JDialog
} }
super.setVisible( visible ); super.setVisible( visible );
} }
@Override
public void setDefaultCloseOperation( int operation )
{
// do nothing
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment