JAL-3438 spotless for 2.11.2.0

[jalview.git] / src / jalview / gui / JvOptionPane.java

diff --git a/src/jalview/gui/JvOptionPane.java b/src/jalview/gui/JvOptionPane.java
index bf15b86..22396fb 100644 (file)
--- a/src/jalview/gui/JvOptionPane.java
+++ b/src/jalview/gui/JvOptionPane.java
@@ -37,8 +37,8 @@ import javax.swing.Icon;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
-public class JvOptionPane extends JOptionPane implements DialogRunnerI,
-    PropertyChangeListener
+public class JvOptionPane extends JOptionPane
+        implements DialogRunnerI, PropertyChangeListener
 {
   private static final long serialVersionUID = -3019167117756785229L;
 
@@ -55,7 +55,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
    * option (text); this list allows conversion to index (int)
    */
   List<Object> ourOptions;
-  
+
   public JvOptionPane(final Component parent)
   {
     this.parentComponent = Platform.isJS() ? this : parent;
@@ -91,7 +91,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
     switch (optionType)
     {
     case JvOptionPane.YES_NO_CANCEL_OPTION:
-      // FeatureRenderer amendFeatures  ?? TODO ??
+      // FeatureRenderer amendFeatures ?? TODO ??
       // Chimera close
       // PromptUserConfig
       // $FALL-THROUGH$
@@ -164,8 +164,10 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
           Object message)
   {
     // JvOptionPaneTest only;
-    return isInteractiveMode() ? JOptionPane.showInternalConfirmDialog(
-            parentComponent, message) : (int) getMockResponse();
+    return isInteractiveMode()
+            ? JOptionPane.showInternalConfirmDialog(parentComponent,
+                    message)
+            : (int) getMockResponse();
   }
 
   /**
@@ -399,7 +401,6 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
     JOptionPane.showMessageDialog(parentComponent, message);
   }
 
-
   /**
    * Adds title and messageType
    * 
@@ -506,6 +507,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
 
     return JOptionPane.showInputDialog(message, initialSelectionValue);
   }
+
   /**
    * centered on parent
    * 
@@ -535,15 +537,14 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
   public static String showInputDialog(Component parentComponent,
           String message, String initialSelectionValue)
   {
-    
+
     // AnnotationPanel
-    
+
     return isInteractiveMode()
             ? JOptionPane.showInputDialog(parentComponent, message,
                     initialSelectionValue)
             : getMockResponse().toString();
   }
-  
 
   /**
    * input with initial selection
@@ -556,9 +557,9 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
   public static String showInputDialog(Component parentComponent,
           Object message, Object initialSelectionValue)
   {
-    
+
     // AnnotationPanel
-    
+
     return isInteractiveMode()
             ? JOptionPane.showInputDialog(parentComponent, message,
                     initialSelectionValue)
@@ -581,13 +582,14 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
 
     // test only
 
-    return isInteractiveMode() ? JOptionPane
-            .showInputDialog(parentComponent, message, title, messageType)
+    return isInteractiveMode()
+            ? JOptionPane.showInputDialog(parentComponent, message, title,
+                    messageType)
             : getMockResponse().toString();
   }
 
   /**
-   * Customized input option 
+   * Customized input option
    * 
    * @param parentComponent
    * @param message
@@ -604,9 +606,9 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
           Object[] selectionValues, Object initialSelectionValue)
           throws HeadlessException
   {
-    
+
     // test only
-    
+
     return isInteractiveMode()
             ? JOptionPane.showInputDialog(parentComponent, message, title,
                     messageType, icon, selectionValues,
@@ -614,8 +616,6 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
             : getMockResponse().toString();
   }
 
-  
-  
   /**
    * internal version
    * 
@@ -627,13 +627,12 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
           String message)
   {
     // test only
-    
+
     return isInteractiveMode()
             ? JOptionPane.showInternalInputDialog(parentComponent, message)
             : getMockResponse().toString();
   }
 
-  
   /**
    * internal with title and messageType
    * 
@@ -646,9 +645,9 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
   public static String showInternalInputDialog(Component parentComponent,
           String message, String title, int messageType)
   {
-    
+
     // AlignFrame tabbedPane_mousePressed
-    
+
     return isInteractiveMode()
             ? JOptionPane.showInternalInputDialog(parentComponent,
                     getPrefix(messageType) + message, title, messageType)
@@ -672,7 +671,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
           Object[] selectionValues, Object initialSelectionValue)
   {
     // test only
-    
+
     return isInteractiveMode()
             ? JOptionPane.showInternalInputDialog(parentComponent, message,
                     title, messageType, icon, selectionValues,
@@ -680,10 +679,8 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
             : getMockResponse().toString();
   }
 
-  
   ///////////// end of options ///////////////
-  
-  
+
   private static void outputMessage(Object message)
   {
     System.out.println(">>> JOption Message : " + message.toString());
@@ -717,8 +714,8 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
 
   private static String getPrefix(int messageType)
   {
-    String prefix = ""; 
-    
+    String prefix = "";
+
     // JavaScript only
     if (Platform.isJS())
     {
@@ -756,9 +753,8 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
     return new JvOptionPane(parentComponent);
   }
 
-  public void showDialog(
-          String message, String title, int optionType, int messageType,
-          Icon icon, Object[] options, Object initialValue)
+  public void showDialog(String message, String title, int optionType,
+          int messageType, Icon icon, Object[] options, Object initialValue)
   {
 
     if (!isInteractiveMode())
@@ -779,12 +775,12 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
     //
     // 2) UserDefinedColors warning about saving over a name already defined
     //
-    
+
     ourOptions = Arrays.asList(options);
-    
-    int response = JOptionPane.showOptionDialog(parentComponent, message, title,
-            optionType, messageType, icon, options, initialValue);
-    
+
+    int response = JOptionPane.showOptionDialog(parentComponent, message,
+            title, optionType, messageType, icon, options, initialValue);
+
     /*
      * In Java, the response is returned to this thread and handled here;
      * (for Javascript, see propertyChange)
@@ -808,19 +804,19 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
     {
       handleResponse(getMockResponse());
     }
-    
+
     ourOptions = Arrays.asList(options);
     int response;
-    if (parentComponent != this) 
+    if (parentComponent != this)
     {
-      response = JOptionPane.showInternalOptionDialog(parentComponent, mainPanel,
-              title, yesNoCancelOption, questionMessage, icon, options,
-              initresponse);
+      response = JOptionPane.showInternalOptionDialog(parentComponent,
+              mainPanel, title, yesNoCancelOption, questionMessage, icon,
+              options, initresponse);
     }
     else
     {
-      response = JOptionPane.showOptionDialog(parentComponent, mainPanel, title,
-              yesNoCancelOption, questionMessage, icon, options,
+      response = JOptionPane.showOptionDialog(parentComponent, mainPanel,
+              title, yesNoCancelOption, questionMessage, icon, options,
               initresponse);
     }
     if (!Platform.isJS())
@@ -833,18 +829,18 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
       handleResponse(response);
     }
   }
-    
+
   @Override
   public JvOptionPane setResponseHandler(Object response, Runnable action)
   {
-       callbacks.put(response,  action);
+    callbacks.put(response, action);
     return this;
   }
 
   /**
-   * JalviewJS signals option selection by a property change event
-   * for the option e.g. "OK".  This methods responds to that by
-   * running the response action that corresponds to that option.
+   * JalviewJS signals option selection by a property change event for the
+   * option e.g. "OK". This methods responds to that by running the response
+   * action that corresponds to that option.
    * 
    * @param evt
    */
@@ -852,7 +848,7 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
   public void propertyChange(PropertyChangeEvent evt)
   {
     Object newValue = evt.getNewValue();
-       int ourOption = ourOptions.indexOf(newValue);
+    int ourOption = ourOptions.indexOf(newValue);
     if (ourOption >= 0)
     {
       handleResponse(ourOption);
@@ -868,8 +864,8 @@ public class JvOptionPane extends JOptionPane implements DialogRunnerI,
   public void handleResponse(Object response)
   {
     /*
-        * this test is for NaN in Chrome
-        */
+    * this test is for NaN in Chrome
+    */
     if (response != null && !response.equals(response))
     {
       return;