Revision: 20349
http://sourceforge.net/p/jmol/code/20349
Author: hansonr
Date: 2015-03-01 15:58:44 +0000 (Sun, 01 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/console/GenericConsole.java
Modified: trunk/Jmol/src/org/jmol/console/GenericConsole.java
===================================================================
--- trunk/Jmol/src/org/jmol/console/GenericConsole.java 2015-03-01 13:13:24 UTC
(rev 20348)
+++ trunk/Jmol/src/org/jmol/console/GenericConsole.java 2015-03-01 15:58:44 UTC
(rev 20349)
@@ -297,37 +297,29 @@
@Override
public boolean notifyEnabled(CBK type) {
// See org.jmol.viewer.JmolConstants.java for a complete list
- // ignore in JavaScript
- /**
- * @j2sNative
- *
- *
- */
- {
- switch (type) {
- case ECHO:
- case MEASURE:
- case MESSAGE:
- case PICK:
- return true;
- case ANIMFRAME:
- case APPLETREADY:
- case ATOMMOVED:
- case CLICK:
- case DRAGDROP:
- case ERROR:
- case EVAL:
- case HOVER:
- case IMAGE:
- case LOADSTRUCT:
- case MINIMIZATION:
- case SERVICE:
- case RESIZE:
- case SCRIPT:
- case SYNC:
- case STRUCTUREMODIFIED:
- break;
- }
+ switch (type) {
+ case ECHO:
+ case MEASURE:
+ case MESSAGE:
+ case PICK:
+ return true;
+ case ANIMFRAME:
+ case APPLETREADY:
+ case ATOMMOVED:
+ case CLICK:
+ case DRAGDROP:
+ case ERROR:
+ case EVAL:
+ case HOVER:
+ case IMAGE:
+ case LOADSTRUCT:
+ case MINIMIZATION:
+ case SERVICE:
+ case RESIZE:
+ case SCRIPT:
+ case SYNC:
+ case STRUCTUREMODIFIED:
+ break;
}
return false;
}
@@ -335,35 +327,26 @@
@Override
@SuppressWarnings("incomplete-switch")
public void notifyCallback(CBK type, Object[] data) {
- // ignore in JavaScript
- /**
- * @j2sNative
- *
- *
- */
- {
- String strInfo = (data == null || data[1] == null ? null : data[1]
- .toString());
- switch (type) {
- case ECHO:
- sendConsoleEcho(strInfo);
- break;
- case MEASURE:
- String mystatus = (String) data[3];
- if (mystatus.indexOf("Picked") >= 0
- || mystatus.indexOf("Sequence") >= 0) // picking mode
- sendConsoleMessage(strInfo);
- else if (mystatus.indexOf("Completed") >= 0)
- sendConsoleEcho(strInfo.substring(strInfo.lastIndexOf(",") + 2,
- strInfo.length() - 1));
- break;
- case MESSAGE:
- sendConsoleMessage(data == null ? null : strInfo);
- break;
- case PICK:
+ String strInfo = (data == null || data[1] == null ? null : data[1]
+ .toString());
+ switch (type) {
+ case ECHO:
+ sendConsoleEcho(strInfo);
+ break;
+ case MEASURE:
+ String mystatus = (String) data[3];
+ if (mystatus.indexOf("Picked") >= 0 || mystatus.indexOf("Sequence") >=
0) // picking mode
sendConsoleMessage(strInfo);
- break;
- }
+ else if (mystatus.indexOf("Completed") >= 0)
+ sendConsoleEcho(strInfo.substring(strInfo.lastIndexOf(",") + 2,
+ strInfo.length() - 1));
+ break;
+ case MESSAGE:
+ sendConsoleMessage(data == null ? null : strInfo);
+ break;
+ case PICK:
+ sendConsoleMessage(strInfo);
+ break;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
