From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 6 Jun 2022 15:35:08 +0000 (+0100)
Subject: JAL-4020 class reformatting
X-Git-Tag: Release_2_11_2_6~52^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=14e1f9dbb9c7a4535734fd3be7ddeee2a5ae72dc;p=jalview.git

JAL-4020 class reformatting
---

diff --git a/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java b/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
index 0444895..f7dba79 100644
--- a/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
+++ b/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
@@ -75,8 +75,8 @@ public class StructureManager
       "1.11.2", "1.11.1", "1.11" };
 
   // Missing 1.1 as this has known bug see JAL-2422
-  private static String[] CHIMERAX_VERSIONS = new String[] { "1.3", "1.2.5", "1.0",
-      "0.93", "0.92", "0.91", "0.9" };
+  private static String[] CHIMERAX_VERSIONS = new String[] { "1.3", "1.2.5",
+      "1.0", "0.93", "0.92", "0.91", "0.9" };
 
   static final String[] defaultStructureKeys = { "Structure", "pdb",
       "pdbFileName", "PDB ID", "structure", "biopax.xref.PDB", "pdb_ids",
@@ -1017,7 +1017,8 @@ public class StructureManager
     {
       for (String root : new String[] { "\\Program Files",
           "C:\\Program Files", "\\Program Files (x86)",
-          "C:\\Program Files (x86)", String.format("%s\\AppData\\Local", System.getProperty("user.home"))})
+          "C:\\Program Files (x86)", String.format("%s\\AppData\\Local",
+                  System.getProperty("user.home")) })
       {
         String[] candidates = isChimeraX ? CHIMERAX_VERSIONS
                 : CHIMERA_VERSIONS;
diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java
index d3b8ece..358e360 100644
--- a/src/jalview/ext/pymol/PymolManager.java
+++ b/src/jalview/ext/pymol/PymolManager.java
@@ -36,7 +36,6 @@ import java.util.List;
 import jalview.bin.Cache;
 import jalview.bin.Console;
 import jalview.gui.Preferences;
-import jalview.structure.StructureCommand;
 import jalview.structure.StructureCommandI;
 
 public class PymolManager
@@ -100,22 +99,23 @@ public class PymolManager
     }
     else if (os.startsWith("Windows"))
     {
-    	for (String root : new String[] {
-        String.format("%s\\AppData\\Local", System.getProperty("user.home")), // default user path
-        "\\ProgramData", "C:\\ProgramData", // this is the default install path "for everyone"
-        System.getProperty("user.home"),
-    		"\\Program Files", "C:\\Program Files", "\\Program Files (x86)",
-    		"C:\\Program Files (x86)" })
-    	{
-    	  for (String path : new String [] {
-    	    "Schrodinger\\PyMOL2", "PyMOL" })
+      for (String root : new String[] {
+          String.format("%s\\AppData\\Local",
+                  System.getProperty("user.home")), // default user path
+          "\\ProgramData", "C:\\ProgramData", // this is the default install
+                                              // path "for everyone"
+          System.getProperty("user.home"), "\\Program Files",
+          "C:\\Program Files", "\\Program Files (x86)",
+          "C:\\Program Files (x86)" })
+      {
+        for (String path : new String[] { "Schrodinger\\PyMOL2", "PyMOL" })
         {
-          for (String binary : new String [] {"PyMOLWinWithConsole.bat"})
+          for (String binary : new String[] { "PyMOLWinWithConsole.bat" })
           {
             pathList.add(String.format("%s\\%s\\%s", root, path, binary));
           }
         }
-    	}
+      }
     }
     else if (os.startsWith("Mac"))
     {