X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;fp=src%2Fjalview%2Fgui%2FDesktop.java;h=874c619564c20df26788d2ea46047b5060ad35e3;hb=dcdf54b52932630bbc230a6e553db0a7482a2cb4;hp=9e8624a8159225572308184e4b58917a3141685b;hpb=37e53fb916ef469eda6fd042701e116d56ff3c0b;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 9e8624a..874c619 100644
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -381,83 +381,84 @@ public class Desktop extends jalview.jbgui.GDesktop
       try
       {
 
-	if (Platform.isAMac())
-	{
-		if (desktopClass.getDeclaredMethod("setAboutHandler",
-			new Class[]
-			{ AboutHandler.class }) != null)
-		{
-
-		  hdesktop.setAboutHandler(new AboutHandler()
-		  {
-		    @Override
-		    public void handleAbout(AboutEvent e)
-		    {
-		      aboutMenuItem_actionPerformed(null);
-		    }
-		  });
-
-		}
-
-		if (desktopClass.getDeclaredMethod("setPreferencesHandler",
-			new Class[]
-			{ PreferencesHandler.class }) != null)
-		{
-
-		  hdesktop.setPreferencesHandler(new PreferencesHandler()
-		  {
-		    @Override
-		    public void handlePreferences(PreferencesEvent e)
-		    {
-		      preferences_actionPerformed(null);
-		    }
-		  });
-
-		}
-
-		if (desktopClass.getDeclaredMethod("setQuitHandler",
-			new Class[]
-			{ QuitHandler.class }) != null)
-		{
-
-		  hdesktop.setQuitHandler(new QuitHandler()
-		  {
-		    @Override
-		    public void handleQuitRequestWith(QuitEvent e, QuitResponse r)
-		    {
-		      boolean confirmQuit = jalview.bin.Cache
-			      .getDefault(CONFIRM_KEYBOARD_QUIT, true);
-		      int n;
-		      if (confirmQuit)
-		      {
-			n = JOptionPane.showConfirmDialog(null,
-				MessageManager.getString("label.quit_jalview"),
-				MessageManager.getString("action.quit"),
-				JOptionPane.OK_CANCEL_OPTION,
-				JOptionPane.PLAIN_MESSAGE, null);
-		      }
-		      else
-		      {
-			n = JOptionPane.OK_OPTION;
-		      }
-		      if (n == JOptionPane.OK_OPTION)
-		      {
-			System.out.println("Shortcut Quit confirmed by user");
-			quit();
-			r.performQuit(); // probably won't reach this line, but just in
-					 // case
-		      }
-		      else
-		      {
-			r.cancelQuit();
-			System.out.println("Shortcut Quit cancelled by user");
-		      }
-		    }
-		  });
-		  hdesktop.setQuitStrategy(QuitStrategy.CLOSE_ALL_WINDOWS);
-
-		}
-	}
+        if (Platform.isAMac())
+        {
+          if (desktopClass.getDeclaredMethod("setAboutHandler",
+                  new Class[]
+                  { AboutHandler.class }) != null)
+          {
+
+            hdesktop.setAboutHandler(new AboutHandler()
+            {
+              @Override
+              public void handleAbout(AboutEvent e)
+              {
+                aboutMenuItem_actionPerformed(null);
+              }
+            });
+
+          }
+
+          if (desktopClass.getDeclaredMethod("setPreferencesHandler",
+                  new Class[]
+                  { PreferencesHandler.class }) != null)
+          {
+
+            hdesktop.setPreferencesHandler(new PreferencesHandler()
+            {
+              @Override
+              public void handlePreferences(PreferencesEvent e)
+              {
+                preferences_actionPerformed(null);
+              }
+            });
+
+          }
+
+          if (desktopClass.getDeclaredMethod("setQuitHandler",
+                  new Class[]
+                  { QuitHandler.class }) != null)
+          {
+
+            hdesktop.setQuitHandler(new QuitHandler()
+            {
+              @Override
+              public void handleQuitRequestWith(QuitEvent e, QuitResponse r)
+              {
+                boolean confirmQuit = jalview.bin.Cache
+                        .getDefault(CONFIRM_KEYBOARD_QUIT, true);
+                int n;
+                if (confirmQuit)
+                {
+                  n = JOptionPane.showConfirmDialog(null,
+                          MessageManager.getString("label.quit_jalview"),
+                          MessageManager.getString("action.quit"),
+                          JOptionPane.OK_CANCEL_OPTION,
+                          JOptionPane.PLAIN_MESSAGE, null);
+                }
+                else
+                {
+                  n = JOptionPane.OK_OPTION;
+                }
+                if (n == JOptionPane.OK_OPTION)
+                {
+                  System.out.println("Shortcut Quit confirmed by user");
+                  quit();
+                  r.performQuit(); // probably won't reach this line, but just
+                                   // in
+                                   // case
+                }
+                else
+                {
+                  r.cancelQuit();
+                  System.out.println("Shortcut Quit cancelled by user");
+                }
+              }
+            });
+            hdesktop.setQuitStrategy(QuitStrategy.CLOSE_ALL_WINDOWS);
+
+          }
+        }
 
       } catch (NoSuchMethodException e)
       {
@@ -1816,8 +1817,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     final String[] desc = new String[] { "Jalview Project",
         "Jalview Project (old)" };
     JalviewFileChooser chooser = new JalviewFileChooser(
-            Cache.getProperty("LAST_DIRECTORY"), suffix,
-            desc,
+            Cache.getProperty("LAST_DIRECTORY"), suffix, desc,
             "Jalview Project");
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager.getString("label.restore_state"));