git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update/JAL-3949_jalview_bin_Console_to_cure_sanity_even_more' of https...
[jalview.git]
/
src
/
jalview
/
ext
/
pymol
/
PymolManager.java
diff --git
a/src/jalview/ext/pymol/PymolManager.java
b/src/jalview/ext/pymol/PymolManager.java
index
6a014a5
..
db71269
100644
(file)
--- a/
src/jalview/ext/pymol/PymolManager.java
+++ b/
src/jalview/ext/pymol/PymolManager.java
@@
-14,6
+14,7
@@
import java.util.ArrayList;
import java.util.List;
import jalview.bin.Cache;
import java.util.List;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.gui.Preferences;
import jalview.structure.StructureCommand;
import jalview.structure.StructureCommandI;
import jalview.gui.Preferences;
import jalview.structure.StructureCommand;
import jalview.structure.StructureCommandI;
@@
-140,7
+141,7
@@
public class PymolManager
int rc = conn.getResponseCode();
if (rc != HttpURLConnection.HTTP_OK)
{
int rc = conn.getResponseCode();
if (rc != HttpURLConnection.HTTP_OK)
{
- Cache.error(
+ Console.error(
String.format("Error status from %s: %d", rpcUrl, rc));
return result;
}
String.format("Error status from %s: %d", rpcUrl, rc));
return result;
}
@@
-158,7
+159,7
@@
public class PymolManager
} catch (SocketException e)
{
// thrown when 'quit' command is sent to PyMol
} catch (SocketException e)
{
// thrown when 'quit' command is sent to PyMol
- Cache.warn(String.format("Request to %s returned %s", rpcUrl,
+ Console.warn(String.format("Request to %s returned %s", rpcUrl,
e.toString()));
} catch (Exception e)
{
e.toString()));
} catch (Exception e)
{
@@
-169,12
+170,12
@@
public class PymolManager
{
out.close();
}
{
out.close();
}
- if (Cache.isTraceEnabled())
+ if (Console.isTraceEnabled())
{
{
- Cache.trace("Sent: " + command.toString());
+ Console.trace("Sent: " + command.toString());
if (result != null)
{
if (result != null)
{
- Cache.trace("Received: " + result);
+ Console.trace("Received: " + result);
}
}
}
}
}
}
@@
-251,12
+252,12
@@
public class PymolManager
this.pymolXmlRpcPort = getPortNumber();
if (pymolXmlRpcPort > 0)
{
this.pymolXmlRpcPort = getPortNumber();
if (pymolXmlRpcPort > 0)
{
- Cache.info("PyMOL XMLRPC started on port " + pymolXmlRpcPort);
+ Console.info("PyMOL XMLRPC started on port " + pymolXmlRpcPort);
}
else
{
error += "Failed to read PyMOL XMLRPC port number";
}
else
{
error += "Failed to read PyMOL XMLRPC port number";
- Cache.error(error);
+ Console.error(error);
pymolProcess.destroy();
pymolProcess = null;
}
pymolProcess.destroy();
pymolProcess = null;
}
@@
-300,7
+301,7
@@
public class PymolManager
}
} catch (Exception e)
{
}
} catch (Exception e)
{
- Cache.error("Failed to get REST port number from " + responses
+ Console.error("Failed to get REST port number from " + responses
+ ": " + e.getMessage());
// logger.error("Failed to get REST port number from " + responses + ": "
// + e.getMessage());
+ ": " + e.getMessage());
// logger.error("Failed to get REST port number from " + responses + ": "
// + e.getMessage());
@@
-315,10
+316,10
@@
public class PymolManager
}
if (port == 0)
{
}
if (port == 0)
{
- Cache.error("Failed to start PyMOL with XMLRPC, response was: "
+ Console.error("Failed to start PyMOL with XMLRPC, response was: "
+ responses);
}
+ responses);
}
- Cache.error("PyMOL started with XMLRPC on port " + port);
+ Console.error("PyMOL started with XMLRPC on port " + port);
return port;
}
return port;
}