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 'develop' into releases/Release_2_11_Branch
[jalview.git]
/
src
/
MCview
/
AppletPDBCanvas.java
diff --git
a/src/MCview/AppletPDBCanvas.java
b/src/MCview/AppletPDBCanvas.java
index
f94faba
..
c6553f8
100644
(file)
--- a/
src/MCview/AppletPDBCanvas.java
+++ b/
src/MCview/AppletPDBCanvas.java
@@
-37,8
+37,7
@@
import jalview.util.MessageManager;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Event;
-import java.awt.Font;
+import java.awt.event.InputEvent;import java.awt.Font;
import java.awt.Graphics;
import java.awt.Image;
// JBPNote TODO: This class is quite noisy - needs proper log.info/log.debug
import java.awt.Graphics;
import java.awt.Image;
// JBPNote TODO: This class is quite noisy - needs proper log.info/log.debug
@@
-159,7
+158,7
@@
public class AppletPDBCanvas extends Panel
try
{
try
{
- pdb = ssm.setMapping(seq, chains, pdbentry.getFile(), protocol);
+ pdb = ssm.setMapping(seq, chains, pdbentry.getFile(), protocol, null);
if (protocol == DataSourceType.PASTE)
{
if (protocol == DataSourceType.PASTE)
{
@@
-893,7
+892,7
@@
public class AppletPDBCanvas extends Panel
MCMatrix objmat = new MCMatrix(3, 3);
objmat.setIdentity();
MCMatrix objmat = new MCMatrix(3, 3);
objmat.setIdentity();
- if ((evt.getModifiers() & Event.META_MASK) != 0)
+ if ((evt.getModifiersEx() & InputEvent.META_DOWN_MASK) != 0)
{
objmat.rotatez(((mx - omx)));
}
{
objmat.rotatez(((mx - omx)));
}