Skip to content

Commit

Permalink
Clean up code formatting
Browse files Browse the repository at this point in the history 
Ran Eclipse source cleanup on code.

Change-Id: I1cc0727c7692a8bf31089eea2af9b6df6ae37160
  • Loading branch information
Walter Kolczynski authored and Walter Kolczynski committed Nov 11, 2019
1 parent 2c85285 commit 5fd249b
Show file tree
Hide file tree
Showing 64 changed files with 2,052 additions and 1,917 deletions.
23 changes: 8 additions & 15 deletions src/net/bubbaland/gui/AutoFocusSpinner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,31 @@
/**
* Creates a spinner that automatically selects all of the text when the spinner receives focus. This allows for easier
* data entry when components are being navigated by tabbing.
*
*
* @author Walter Kolczynski
*
*
*/

public class AutoFocusSpinner extends JSpinner {
private static final long serialVersionUID = -7900543713955610434L;

public AutoFocusSpinner(SpinnerModel model) {
public AutoFocusSpinner(final SpinnerModel model) {
super(model);

// Add an anonymous focus listener that will select all of the text when this gets focus
( (JSpinner.DefaultEditor) AutoFocusSpinner.this.getEditor() ).getTextField()
.addFocusListener(new FocusListener() {

@Override
public void focusGained(FocusEvent e) {
SwingUtilities.invokeLater(new Runnable() {

@Override
public void run() {
( (JSpinner.DefaultEditor) AutoFocusSpinner.this.getEditor() ).getTextField()
.selectAll();
}

});
public void focusGained(final FocusEvent e) {
SwingUtilities.invokeLater(() -> ( (JSpinner.DefaultEditor) AutoFocusSpinner.this.getEditor() )
.getTextField().selectAll());
}

@Override
public void focusLost(FocusEvent e) {
public void focusLost(final FocusEvent e) {

}
}

});
}
Expand Down
41 changes: 22 additions & 19 deletions src/net/bubbaland/gui/BubbaDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class BubbaDialog extends JDialog implements WindowListener, PropertyChan
* @param title
* Title for the dialog
*/
public BubbaDialog(BubbaGuiController gui, String title) {
public BubbaDialog(final BubbaGuiController gui, final String title) {
this(gui, title, new JOptionPane());
}

Expand All @@ -54,7 +54,7 @@ public BubbaDialog(BubbaGuiController gui, String title) {
* @param optionPane
* Option pane to use
*/
public BubbaDialog(BubbaGuiController gui, String title, final JOptionPane optionPane) {
public BubbaDialog(final BubbaGuiController gui, final String title, final JOptionPane optionPane) {
super(null, title, JDialog.ModalityType.TOOLKIT_MODAL);
this.optionPane = optionPane;
this.gui = gui;
Expand Down Expand Up @@ -82,7 +82,7 @@ public BubbaDialog(BubbaGuiController gui, String title, final JOptionPane optio
* Panel to display in this dialog
* @see JOptionPane
*/
public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel) {
public BubbaDialog(final BubbaGuiController gui, final String title, final BubbaDialogPanel panel) {
this(gui, title, new JOptionPane(panel));
this.addWindowListener(panel);
}
Expand All @@ -100,7 +100,8 @@ public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel)
* Dialog message type,
* @see JOptionPane
*/
public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel, int messageType) {
public BubbaDialog(final BubbaGuiController gui, final String title, final BubbaDialogPanel panel,
final int messageType) {
this(gui, title, new JOptionPane(panel, messageType));
this.addWindowListener(panel);
}
Expand All @@ -121,7 +122,8 @@ public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel,
* Dialog option type
* @see JOptionPane
*/
public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel, int messageType, int optionType) {
public BubbaDialog(final BubbaGuiController gui, final String title, final BubbaDialogPanel panel,
final int messageType, final int optionType) {
this(gui, title, new JOptionPane(panel, messageType, optionType));
this.addWindowListener(panel);
}
Expand All @@ -145,8 +147,8 @@ public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel,
* Decorative icon to use for this dialog
* @see JOptionPane
*/
public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel, int messageType, int optionType,
Icon icon) {
public BubbaDialog(final BubbaGuiController gui, final String title, final BubbaDialogPanel panel,
final int messageType, final int optionType, final Icon icon) {
this(gui, title, new JOptionPane(panel, messageType, optionType, icon));
this.addWindowListener(panel);
}
Expand All @@ -173,8 +175,8 @@ public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel,
* Array of choices for this dialog
* @see JOptionPane
*/
public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel, int messageType, int optionType,
Icon icon, Object[] options) {
public BubbaDialog(final BubbaGuiController gui, final String title, final BubbaDialogPanel panel,
final int messageType, final int optionType, final Icon icon, final Object[] options) {
this(gui, title, new JOptionPane(panel, messageType, optionType, icon, options));
this.addWindowListener(panel);
}
Expand Down Expand Up @@ -203,8 +205,9 @@ public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel,
* The default option
* @see JOptionPane
*/
public BubbaDialog(BubbaGuiController gui, String title, BubbaDialogPanel panel, int messageType, int optionType,
Icon icon, Object[] options, Object initialValue) {
public BubbaDialog(final BubbaGuiController gui, final String title, final BubbaDialogPanel panel,
final int messageType, final int optionType, final Icon icon, final Object[] options,
final Object initialValue) {
this.optionPane = new JOptionPane(panel, messageType, optionType, icon, options, initialValue);
this.gui = gui;
this.addWindowListener(panel);
Expand Down Expand Up @@ -239,7 +242,7 @@ public Object getValue() {
* Detect when the state of the option pane has changed and close the dialog.
*/
@Override
public void propertyChange(PropertyChangeEvent e) {
public void propertyChange(final PropertyChangeEvent e) {
final String prop = e.getPropertyName();
if (this.isVisible() && ( e.getSource() == this.optionPane )
&& ( JOptionPane.VALUE_PROPERTY.equals(prop) || JOptionPane.INPUT_VALUE_PROPERTY.equals(prop) )) {
Expand All @@ -248,30 +251,30 @@ public void propertyChange(PropertyChangeEvent e) {
}

@Override
public void windowActivated(WindowEvent e) {}
public void windowActivated(final WindowEvent e) {}

@Override
public void windowClosed(WindowEvent e) {}
public void windowClosed(final WindowEvent e) {}

/**
* Set the option pane value if the dialog is closed using the window decoration.
*/
@Override
public void windowClosing(WindowEvent e) {
public void windowClosing(final WindowEvent e) {
this.optionPane.setValue(JOptionPane.CLOSED_OPTION);
}

@Override
public void windowDeactivated(WindowEvent e) {}
public void windowDeactivated(final WindowEvent e) {}

@Override
public void windowDeiconified(WindowEvent e) {}
public void windowDeiconified(final WindowEvent e) {}

@Override
public void windowIconified(WindowEvent e) {}
public void windowIconified(final WindowEvent e) {}

@Override
public void windowOpened(WindowEvent e) {
public void windowOpened(final WindowEvent e) {
this.loadPosition();
}

Expand Down
51 changes: 21 additions & 30 deletions src/net/bubbaland/gui/BubbaDialogPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
* Creates a new panel using the GridBagLayout manager. Also implements an AncestorListener to allow focus on an element
* after the dialog is created.
*
*
* @author Walter Kolczynski
*
*/
Expand All @@ -37,7 +37,7 @@ public abstract class BubbaDialogPanel extends BubbaPanel implements AncestorLis

protected BubbaDialog dialog;

public BubbaDialogPanel(BubbaGuiController controller) {
public BubbaDialogPanel(final BubbaGuiController controller) {
super(controller, new GridBagLayout());
}

Expand All @@ -48,14 +48,14 @@ public BubbaDialogPanel(BubbaGuiController controller) {
* @param component
* The text are whose behavior we want to change
*/
public void addEnterOverride(JComponent component) {
public void addEnterOverride(final JComponent component) {
component.getInputMap().put(KeyStroke.getKeyStroke("ENTER"), "Text Submit");
component.getInputMap().put(KeyStroke.getKeyStroke("shift ENTER"), "insert-break");
component.getActionMap().put("Text Submit", new AbstractAction() {
private static final long serialVersionUID = 1L;

@Override
public void actionPerformed(ActionEvent e) {
public void actionPerformed(final ActionEvent e) {
BubbaDialogPanel.this.submitText();
}
});
Expand All @@ -71,66 +71,57 @@ public void ancestorAdded(final AncestorEvent event) {
try {
Thread.sleep(10);
} catch (final InterruptedException e) {}
SwingUtilities.invokeLater(new Runnable() {

@Override
public void run() {
final JComponent component = event.getComponent();
component.requestFocusInWindow();
component.removeAncestorListener(al);
}
SwingUtilities.invokeLater(() -> {
final JComponent component = event.getComponent();
component.requestFocusInWindow();
component.removeAncestorListener(al);
});

}

@Override
public void ancestorMoved(AncestorEvent event) {}
public void ancestorMoved(final AncestorEvent event) {}

@Override
public void ancestorRemoved(AncestorEvent event) {}
public void ancestorRemoved(final AncestorEvent event) {}

@Override
public void focusGained(FocusEvent event) {
public void focusGained(final FocusEvent event) {
final JComponent source = (JComponent) event.getSource();
if (source instanceof JTextField) {
// try {
// Thread.sleep(10);
// } catch (InterruptedException e) { }
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
( (JTextField) source ).selectAll();
}
});
SwingUtilities.invokeLater(() -> ( (JTextField) source ).selectAll());

}
}

@Override
public void focusLost(FocusEvent e) {}
public void focusLost(final FocusEvent e) {}

@Override
public void windowOpened(WindowEvent event) {}
public void windowOpened(final WindowEvent event) {}

@Override
public void windowClosing(WindowEvent event) {}
public void windowClosing(final WindowEvent event) {}

@Override
public void windowClosed(WindowEvent event) {
public void windowClosed(final WindowEvent event) {
this.dialog.removeWindowListener(this);
}

@Override
public void windowIconified(WindowEvent event) {}
public void windowIconified(final WindowEvent event) {}

@Override
public void windowDeiconified(WindowEvent event) {}
public void windowDeiconified(final WindowEvent event) {}

@Override
public void windowActivated(WindowEvent event) {}
public void windowActivated(final WindowEvent event) {}

@Override
public void windowDeactivated(WindowEvent event) {}
public void windowDeactivated(final WindowEvent event) {}

/**
* Tell the dialog to click the OK button on the option pane.
Expand All @@ -139,7 +130,7 @@ public void submitText() {
this.dialog.clickOK();
}

public static void loadProperties(Properties properties) {
public static void loadProperties(final Properties properties) {
/**
* Warning Color
*/
Expand Down
Loading

0 comments on commit 5fd249b

Please sign in to comment.