X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FVamsasApplication.java;h=9defed4b8dd6220ce224255c54510e4e322e1d59;hb=cb8e52fbbc5f725e3f7f48c672cdddb0690bd978;hp=3671b39d2678a36fddcef6a2c0e929d076641028;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/gui/VamsasApplication.java b/src/jalview/gui/VamsasApplication.java index 3671b39..9defed4 100644 --- a/src/jalview/gui/VamsasApplication.java +++ b/src/jalview/gui/VamsasApplication.java @@ -21,8 +21,10 @@ package jalview.gui; import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.AlignmentI; import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.io.VamsasAppDatastore; @@ -32,18 +34,17 @@ import jalview.structure.StructureSelectionManager; import jalview.structure.VamsasListener; import jalview.structure.VamsasSource; import jalview.util.MessageManager; +import jalview.viewmodel.AlignmentViewport; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; -import java.util.Enumeration; import java.util.Hashtable; import java.util.IdentityHashMap; import java.util.Iterator; import javax.swing.JInternalFrame; -import javax.swing.JOptionPane; import uk.ac.vamsas.client.ClientHandle; import uk.ac.vamsas.client.IClient; @@ -156,7 +157,8 @@ public class VamsasApplication implements SelectionSource, VamsasSource { if (sess != null) { - throw new Error(MessageManager.getString("error.implementation_error_cannot_import_vamsas_doc")); + throw new Error(MessageManager.getString( + "error.implementation_error_cannot_import_vamsas_doc")); } try { @@ -172,13 +174,13 @@ public class VamsasApplication implements SelectionSource, VamsasSource } } catch (InvalidSessionDocumentException e) { - JOptionPane - .showInternalMessageDialog( - Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.desktop, - MessageManager.getString("label.vamsas_doc_couldnt_be_opened_as_new_session"), - MessageManager.getString("label.vamsas_document_import_failed"), - JOptionPane.ERROR_MESSAGE); + MessageManager.getString( + "label.vamsas_doc_couldnt_be_opened_as_new_session"), + MessageManager + .getString("label.vamsas_document_import_failed"), + JvOptionPane.ERROR_MESSAGE); } } @@ -200,8 +202,8 @@ public class VamsasApplication implements SelectionSource, VamsasSource } catch (Exception e) { - jalview.bin.Cache.log - .error("Couldn't instantiate vamsas client !", e); + Console.error("Couldn't instantiate vamsas client !", + e); return false; } return true; @@ -224,14 +226,14 @@ public class VamsasApplication implements SelectionSource, VamsasSource } } catch (Error e) { - Cache.log - .warn("Probable SERIOUS VAMSAS client incompatibility - carrying on regardless", - e); + Console.warn( + "Probable SERIOUS VAMSAS client incompatibility - carrying on regardless", + e); } catch (Exception e) { - Cache.log - .warn("Probable VAMSAS client incompatibility - carrying on regardless", - e); + Console.warn( + "Probable VAMSAS client incompatibility - carrying on regardless", + e); } } @@ -243,7 +245,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource private ClientHandle getJalviewHandle() { return new ClientHandle("jalview.bin.Jalview", - jalview.bin.Cache.getProperty("VERSION")); + Cache.getProperty("VERSION")); } /** @@ -263,18 +265,19 @@ public class VamsasApplication implements SelectionSource, VamsasSource { if (!inSession()) { - throw new Error(MessageManager.getString("error.implementation_error_vamsas_operation_not_init")); + throw new Error( + "Implementation error! Vamsas Operations when client not initialised and connected"); } addDocumentUpdateHandler(); addStoreDocumentHandler(); startSession(); inInitialUpdate = true; - Cache.log - .debug("Jalview loading the Vamsas Session for the first time."); + Console.debug( + "Jalview loading the Vamsas Session for the first time."); dealWithDocumentUpdate(false); // we don't push an update out to the inInitialUpdate = false; // document yet. - Cache.log.debug("... finished update for the first time."); + Console.debug("... finished update for the first time."); } /** @@ -304,9 +307,9 @@ public class VamsasApplication implements SelectionSource, VamsasSource } } catch (Exception e) { - Cache.log - .warn("Exception whilst refreshing jalview windows after a vamsas document update.", - e); + Console.warn( + "Exception whilst refreshing jalview windows after a vamsas document update.", + e); } } @@ -315,12 +318,13 @@ public class VamsasApplication implements SelectionSource, VamsasSource Thread udthread = new Thread(new Runnable() { + @Override public void run() { - Cache.log.info("Jalview updating to the Vamsas Session."); + Console.info("Jalview updating to the Vamsas Session."); dealWithDocumentUpdate(true); - Cache.log.info("Jalview finished updating to the Vamsas Session."); + Console.info("Jalview finished updating to the Vamsas Session."); } }); @@ -347,8 +351,10 @@ public class VamsasApplication implements SelectionSource, VamsasSource public void end_session(boolean promptUser) { if (!inSession()) - throw new Error(MessageManager.getString("error.jalview_no_connected_vamsas_session")); - Cache.log.info("Jalview disconnecting from the Vamsas Session."); + { + throw new Error("Jalview not connected to Vamsas session"); + } + Console.info("Jalview disconnecting from the Vamsas Session."); try { if (joinedSession) @@ -356,13 +362,13 @@ public class VamsasApplication implements SelectionSource, VamsasSource boolean ourprompt = this.promptUser; this.promptUser = promptUser; vclient.finalizeClient(); - Cache.log.info("Jalview has left the session."); + Console.info("Jalview has left the session."); this.promptUser = ourprompt; // restore default value } else { - Cache.log - .warn("JV Client leaving a session that's its not joined yet."); + Console.warn( + "JV Client leaving a session that's its not joined yet."); } joinedSession = false; vclient = null; @@ -372,13 +378,13 @@ public class VamsasApplication implements SelectionSource, VamsasSource vobj2jv = null; } catch (Exception e) { - Cache.log.error("Vamsas Session finalization threw exceptions!", e); + Console.error("Vamsas Session finalization threw exceptions!", e); } } public void updateJalview(IClientDocument cdoc) { - Cache.log.debug("Jalview updating from sesion document .."); + Console.debug("Jalview updating from sesion document .."); ensureJvVamsas(); VamsasAppDatastore vds = new VamsasAppDatastore(cdoc, vobj2jv, jv2vobj, baseProvEntry(), alRedoState); @@ -387,7 +393,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource vds.updateToJalview(); } catch (Exception e) { - Cache.log.error("Failed to update Jalview from vamsas document.", e); + Console.error("Failed to update Jalview from vamsas document.", e); } try { @@ -399,10 +405,10 @@ public class VamsasApplication implements SelectionSource, VamsasSource } } catch (Exception e) { - Cache.log.error( + Console.error( "Exception when updating Jalview settings from Appdata.", e); } - Cache.log.debug(".. finished updating from sesion document."); + Console.debug(".. finished updating from sesion document."); } @@ -476,11 +482,10 @@ public class VamsasApplication implements SelectionSource, VamsasSource } catch (Exception e) { errorsDuringUpdate = true; - Cache.log.error("Exception synchronizing " - + af.getTitle() + Console.error("Exception synchronizing " + af.getTitle() + " " - + (af.getViewport().viewName == null ? "" : " view " - + af.getViewport().viewName) + + (af.getViewport().getViewName() == null ? "" + : " view " + af.getViewport().getViewName()) + " to document.", e); stored = false; } @@ -515,7 +520,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource } } catch (Exception e) { - Cache.log.error("Exception synchronizing Views to Document :", e); + Console.error("Exception synchronizing Views to Document :", e); errorsDuringUpdate = true; } @@ -532,7 +537,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource } } catch (Exception e) { - Cache.log.error("Client Appdata Write exception", e); + Console.error("Client Appdata Write exception", e); errorsDuringAppUpdate = true; } vds.clearSkipList(); @@ -560,32 +565,32 @@ public class VamsasApplication implements SelectionSource, VamsasSource { int storedviews = 0; // called by update handler for document update. - Cache.log.debug("Updating jalview from changed vamsas document."); + Console.debug("Updating jalview from changed vamsas document."); disableGui(true); try { long time = System.currentTimeMillis(); IClientDocument cdoc = vclient.getClientDocument(); - if (Cache.log.isDebugEnabled()) + if (Console.isDebugEnabled()) { - Cache.log.debug("Time taken to get ClientDocument = " + Console.debug("Time taken to get ClientDocument = " + (System.currentTimeMillis() - time)); time = System.currentTimeMillis(); } if (fromJalview) { storedviews += updateVamsasDocument(cdoc); - if (Cache.log.isDebugEnabled()) + if (Console.isDebugEnabled()) { - Cache.log - .debug("Time taken to update Vamsas Document from jalview\t= " + Console.debug( + "Time taken to update Vamsas Document from jalview\t= " + (System.currentTimeMillis() - time)); time = System.currentTimeMillis(); } cdoc.setVamsasRoots(cdoc.getVamsasRoots()); - if (Cache.log.isDebugEnabled()) + if (Console.isDebugEnabled()) { - Cache.log.debug("Time taken to set Document Roots\t\t= " + Console.debug("Time taken to set Document Roots\t\t= " + (System.currentTimeMillis() - time)); time = System.currentTimeMillis(); } @@ -593,19 +598,19 @@ public class VamsasApplication implements SelectionSource, VamsasSource else { updateJalview(cdoc); - if (Cache.log.isDebugEnabled()) + if (Console.isDebugEnabled()) { - Cache.log - .debug("Time taken to update Jalview from vamsas document Roots\t= " + Console.debug( + "Time taken to update Jalview from vamsas document Roots\t= " + (System.currentTimeMillis() - time)); time = System.currentTimeMillis(); } } vclient.updateDocument(cdoc); - if (Cache.log.isDebugEnabled()) + if (Console.isDebugEnabled()) { - Cache.log.debug("Time taken to update Session Document\t= " + Console.debug("Time taken to update Session Document\t= " + (System.currentTimeMillis() - time)); time = System.currentTimeMillis(); } @@ -619,7 +624,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource recover_objectMappingBackup(); storedviews = 0; } - Cache.log.debug("Finished updating from document change."); + Console.debug("Finished updating from document change."); disableGui(false); return storedviews; } @@ -629,14 +634,15 @@ public class VamsasApplication implements SelectionSource, VamsasSource final VamsasApplication client = this; vclient.addDocumentUpdateHandler(new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { - Cache.log.debug("Dealing with document update event."); + Console.debug("Dealing with document update event."); client.dealWithDocumentUpdate(false); - Cache.log.debug("finished dealing with event."); + Console.debug("finished dealing with event."); } }); - Cache.log.debug("Added Jalview handler for vamsas document updates."); + Console.debug("Added Jalview handler for vamsas document updates."); } private void addStoreDocumentHandler() @@ -646,43 +652,43 @@ public class VamsasApplication implements SelectionSource, VamsasSource uk.ac.vamsas.client.Events.DOCUMENT_REQUESTTOCLOSE, new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { if (client.promptUser) { - Cache.log - .debug("Asking user if the vamsas session should be stored."); - int reply = JOptionPane - .showInternalConfirmDialog( - Desktop.desktop, - "The current VAMSAS session has unsaved data - do you want to save it ?", - "VAMSAS Session Shutdown", - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE); - - if (reply == JOptionPane.YES_OPTION) + Console.debug( + "Asking user if the vamsas session should be stored."); + int reply = JvOptionPane.showInternalConfirmDialog( + Desktop.desktop, + "The current VAMSAS session has unsaved data - do you want to save it ?", + "VAMSAS Session Shutdown", + JvOptionPane.YES_NO_OPTION, + JvOptionPane.QUESTION_MESSAGE); + + if (reply == JvOptionPane.YES_OPTION) { - Cache.log.debug("Prompting for vamsas store filename."); + Console.debug("Prompting for vamsas store filename."); Desktop.instance.vamsasSave_actionPerformed(null); - Cache.log - .debug("Finished attempt at storing document."); + Console.debug("Finished attempt at storing document."); } - Cache.log - .debug("finished dealing with REQUESTTOCLOSE event."); + Console.debug( + "finished dealing with REQUESTTOCLOSE event."); } else { - Cache.log - .debug("Ignoring store document request (promptUser==false)"); + Console.debug( + "Ignoring store document request (promptUser==false)"); } } }); - Cache.log.debug("Added Jalview handler for vamsas document updates."); + Console.debug("Added Jalview handler for vamsas document updates."); } public void disableGui(boolean b) { - Desktop.instance.setVamsasUpdate(b); + // JAL-3311 TODO: remove this class! + // Desktop.instance.setVamsasUpdate(b); } Hashtable _backup_vobj2jv; @@ -715,7 +721,8 @@ public class VamsasApplication implements SelectionSource, VamsasSource return; } - throw new Error(MessageManager.getString("error.implementation_error_cannot_recover_vamsas_object_mappings")); + throw new Error( + "IMPLEMENTATION ERROR: Cannot recover vamsas object mappings - no backup was made"); } jv2vobj.clear(); Iterator el = _backup_jv2vobj.entrySet().iterator(); @@ -749,7 +756,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource } catch (Exception e) { // Complain to GUI - Cache.log.error("Failed to join vamsas session.", e); + Console.error("Failed to join vamsas session.", e); vclient = null; } try @@ -762,6 +769,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource { String last = null; + @Override public void handleMessage(Message message) { if (vobj2jv == null) @@ -777,16 +785,16 @@ public class VamsasApplication implements SelectionSource, VamsasSource { return; } - // if (Cache.log.isDebugEnabled()) + // if (Cache.isDebugEnabled()) // { - // Cache.log.debug("Received MouseOverMessage "+mm.getVorbaID()+" + // Cache.debug("Received MouseOverMessage "+mm.getVorbaID()+" // "+mm.getPosition()); // } Object jvobj = vobj2jv.get(mm.getVorbaID()); if (jvobj != null && jvobj instanceof SequenceI) { last = mstring; - // Cache.log.debug("Handling Mouse over "+mm.getVorbaID()+" + // Cache.debug("Handling Mouse over "+mm.getVorbaID()+" // bound to "+jvobj+" at "+mm.getPosition()); // position is character position in aligned sequence ssm.mouseOverVamsasSequence((SequenceI) jvobj, @@ -805,7 +813,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource { // TODO: rationalise : can only clear a selection over a // referred to object - ssm.sendSelection(null, null, me); + ssm.sendSelection(null, null, null, me); return; } Class type = null; @@ -921,8 +929,8 @@ public class VamsasApplication implements SelectionSource, VamsasSource { jselection.setStartRes(prange[p + l] - 1); } - if (jselection.getEndRes() <= maxWidth - && prange[p + u] == (jselection.getEndRes() + 2)) + if (jselection.getEndRes() <= maxWidth && prange[p + + u] == (jselection.getEndRes() + 2)) { jselection.setEndRes(prange[p + u] - 1); } @@ -939,7 +947,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource } if (send) { - ssm.sendSelection(jselection, colsel, me); + ssm.sendSelection(jselection, colsel, null, me); } // discard message. for (int c = 0; c < jvobjs.length; c++) @@ -958,18 +966,21 @@ public class VamsasApplication implements SelectionSource, VamsasSource int i = -1; - public void mouseOver(SequenceI seq, int index, + @Override + public void mouseOverSequence(SequenceI seq, int index, VamsasSource source) { if (jv2vobj == null) + { return; + } if (seq != last || i != index) { VorbaId v = (VorbaId) jv2vobj.get(seq); if (v != null) { // this should really be a trace message. - // Cache.log.debug("Mouse over " + v.getId() + " bound to " + // Cache.debug("Mouse over " + v.getId() + " bound to " // + seq + " at " + index); last = seq; i = index; @@ -983,13 +994,15 @@ public class VamsasApplication implements SelectionSource, VamsasSource selecter = new SelectionListener() { + @Override public void selection(SequenceGroup seqsel, - ColumnSelection colsel, SelectionSource source) + ColumnSelection colsel, HiddenColumns hidden, + SelectionSource source) { if (vobj2jv == null) { - Cache.log - .warn("Selection listener still active for dead session."); + Console.warn( + "Selection listener still active for dead session."); // not in a session. return; } @@ -998,19 +1011,21 @@ public class VamsasApplication implements SelectionSource, VamsasSource AlignmentI visal = null; if (source instanceof AlignViewport) { - visal = ((AlignViewport) source).getAlignment(); + visal = ((AlignmentViewport) source).getAlignment(); } SelectionMessage sm = null; if ((seqsel == null || seqsel.getSize() == 0) - && (colsel == null || colsel.getSelected() == null || colsel - .getSelected().size() == 0)) + && (colsel == null || colsel.getSelected() == null + || colsel.getSelected().size() == 0)) { if (source instanceof AlignViewport) { // the empty selection. - sm = new SelectionMessage("jalview", new String[] - { ((AlignViewport) source).getSequenceSetId() }, null, - true); + sm = new SelectionMessage("jalview", + new String[] + { ((AlignmentViewport) source) + .getSequenceSetId() }, + null, true); } else { @@ -1050,25 +1065,25 @@ public class VamsasApplication implements SelectionSource, VamsasSource { // gather selected columns outwith the sequence positions // too - Enumeration cols = colsel.getSelected().elements(); - while (cols.hasMoreElements()) + for (Integer ival : colsel.getSelected()) { - int ival = ((Integer) cols.nextElement()).intValue(); Pos p = new Pos(); - p.setI(ival + 1); + p.setI(ival.intValue() + 1); range.addPos(p); } } else { - int[] intervals = colsel.getVisibleContigs( - seqsel.getStartRes(), seqsel.getEndRes() + 1); - for (int iv = 0; iv < intervals.length; iv += 2) + Iterator intervals = hidden + .getVisContigsIterator(seqsel.getStartRes(), + seqsel.getEndRes() + 1, false); + while (intervals.hasNext()) { + int[] region = intervals.next(); Seg s = new Seg(); - s.setStart(intervals[iv] + 1); // vamsas indices begin at - // 1, not zero. - s.setEnd(intervals[iv + 1] + 1); + s.setStart(region[0] + 1); // vamsas indices begin at 1, + // not zero. + s.setEnd(region[1] + 1); s.setInclusive(true); range.addSeg(s); } @@ -1086,7 +1101,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource if (sm != null) { sm.validate(); // debug - Cache.log.debug("Selection Message\n" + sm.getRawMessage()); + Console.debug("Selection Message\n" + sm.getRawMessage()); pm.sendMessage(sm); } } @@ -1097,7 +1112,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource ssm.addSelectionListener(selecter); } catch (Exception e) { - Cache.log.error("Failed to init Vamsas Picking", e); + Console.error("Failed to init Vamsas Picking", e); } } }