JAL-1645 source formatting and organise imports

[jalview.git] / src / ext / edu / ucsf / rbvi / strucviz2 / ChimeraManager.java

diff --git a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
index d53d498..2de2829 100644 (file)
--- a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
+++ b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
@@ -302,13 +302,12 @@ public class ChimeraManager
     // TODO: [Optional] Convert path to name in a better way
     if (modelPath.lastIndexOf(File.separator) > 0)
     {
-      modelName = modelPath.substring(modelPath
-              .lastIndexOf(File.separator) + 1);
+      modelName = modelPath
+              .substring(modelPath.lastIndexOf(File.separator) + 1);
     }
     else if (modelPath.lastIndexOf("/") > 0)
     {
-      modelName = modelPath
-              .substring(modelPath.lastIndexOf("/") + 1);
+      modelName = modelPath.substring(modelPath.lastIndexOf("/") + 1);
     }
     return modelName;
   }
@@ -355,7 +354,8 @@ public class ChimeraManager
   public void startListening(String uri)
   {
     sendChimeraCommand("listen start models url " + uri
-    + ";listen start select prefix SelectionChanged url " + uri, false);
+            + ";listen start select prefix SelectionChanged url " + uri,
+            false);
   }
 
   /**
@@ -379,7 +379,7 @@ public class ChimeraManager
   {
     chimera = null;
     currentModelsMap.clear();
-      this.chimeraRestPort = 0;
+    this.chimeraRestPort = 0;
     structureManager.clearOnChimeraExit();
   }
 
@@ -630,8 +630,7 @@ public class ChimeraManager
     } catch (Exception e)
     {
       logger.error("Failed to get REST port number from " + responses
-              + ": "
-              + e.getMessage());
+              + ": " + e.getMessage());
     } finally
     {
       try
@@ -776,7 +775,7 @@ public class ChimeraManager
    */
   public List<String> sendChimeraCommand(String command, boolean reply)
   {
-//    System.out.println("chimeradebug>> " + command);
+    // System.out.println("chimeradebug>> " + command);
     if (!isChimeraLaunched() || command == null
             || "".equals(command.trim()))
     {
@@ -827,11 +826,13 @@ public class ChimeraManager
 
     List<String> reply = new ArrayList<String>();
     BufferedReader response = null;
-    try {
+    try
+    {
       response = HttpClientUtils
               .doHttpUrlPost(restUrl, commands, 100, 5000);
       String line = "";
-      while ((line = response.readLine()) != null) {
+      while ((line = response.readLine()) != null)
+      {
         reply.add(line);
       }
     } catch (Exception e)