From 8c4f77adba0521e7dc89dcb77fe2f8b28c62f70d Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 15 Nov 2006 15:44:59 +0000 Subject: [PATCH] RIght align seq ids --- schemas/jalview.xsd | 1 + src/jalview/jbgui/GAlignFrame.java | 17 ++++++- src/jalview/schemabinding/version2/Viewport.java | 53 ++++++++++++++++++++ .../schemabinding/version2/ViewportDescriptor.java | 41 +++++++++++++++ 4 files changed, 111 insertions(+), 1 deletion(-) diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd index dd11f68..65cf2f8 100755 --- a/schemas/jalview.xsd +++ b/schemas/jalview.xsd @@ -69,6 +69,7 @@ + diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 615e9bb..d032756 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -147,6 +147,7 @@ public class GAlignFrame JMenu jMenu1 = new JMenu(); JCheckBoxMenuItem jCheckBoxMenuItem1 = new JCheckBoxMenuItem(); JMenu jMenu4 = new JMenu(); + protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem(); public GAlignFrame() { try @@ -1172,6 +1173,14 @@ public class GAlignFrame jMenu1.setText("Format"); jCheckBoxMenuItem1.setText("Right Align Ids"); jMenu4.setText("Select"); + idRightAlign.setText("Right Align Sequence Id"); + idRightAlign.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + idRightAlign_actionPerformed(e); + } + }); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); @@ -1278,11 +1287,12 @@ public class GAlignFrame hideMenu.add(hideSelSequences); jMenu1.add(font); jMenu1.addSeparator(); - jMenu1.add(seqLimits); jMenu1.add(wrapMenuItem); jMenu1.add(scaleAbove); jMenu1.add(scaleLeft); jMenu1.add(scaleRight); + jMenu1.add(seqLimits); + jMenu1.add(idRightAlign); jMenu1.add(hiddenMarkers); jMenu1.add(viewBoxesMenuItem); jMenu1.add(viewTextMenuItem); @@ -1724,4 +1734,9 @@ public class GAlignFrame { } + + public void idRightAlign_actionPerformed(ActionEvent e) + { + + } } diff --git a/src/jalview/schemabinding/version2/Viewport.java b/src/jalview/schemabinding/version2/Viewport.java index db055bf..6dfb14f 100755 --- a/src/jalview/schemabinding/version2/Viewport.java +++ b/src/jalview/schemabinding/version2/Viewport.java @@ -96,6 +96,16 @@ public class Viewport implements java.io.Serializable { private boolean _has_showFullId; /** + * Field _rightAlignIds + */ + private boolean _rightAlignIds; + + /** + * keeps track of state for field: _rightAlignIds + */ + private boolean _has_rightAlignIds; + + /** * Field _showText */ private boolean _showText; @@ -434,6 +444,15 @@ public class Viewport implements java.io.Serializable { } //-- void deleteRenderGaps() /** + * Method deleteRightAlignIds + * + */ + public void deleteRightAlignIds() + { + this._has_rightAlignIds= false; + } //-- void deleteRightAlignIds() + + /** * Method deleteShowAnnotation * */ @@ -761,6 +780,17 @@ public class Viewport implements java.io.Serializable { } //-- boolean getRenderGaps() /** + * Returns the value of field 'rightAlignIds'. + * + * @return boolean + * @return the value of field 'rightAlignIds'. + */ + public boolean getRightAlignIds() + { + return this._rightAlignIds; + } //-- boolean getRightAlignIds() + + /** * Returns the value of field 'sequenceSetId'. * * @return String @@ -1067,6 +1097,18 @@ public class Viewport implements java.io.Serializable { } //-- boolean hasRenderGaps() /** + * Method hasRightAlignIds + * + * + * + * @return boolean + */ + public boolean hasRightAlignIds() + { + return this._has_rightAlignIds; + } //-- boolean hasRightAlignIds() + + /** * Method hasShowAnnotation * * @@ -1482,6 +1524,17 @@ public class Viewport implements java.io.Serializable { } //-- void setRenderGaps(boolean) /** + * Sets the value of field 'rightAlignIds'. + * + * @param rightAlignIds the value of field 'rightAlignIds'. + */ + public void setRightAlignIds(boolean rightAlignIds) + { + this._rightAlignIds = rightAlignIds; + this._has_rightAlignIds = true; + } //-- void setRightAlignIds(boolean) + + /** * Sets the value of field 'sequenceSetId'. * * @param sequenceSetId the value of field 'sequenceSetId'. diff --git a/src/jalview/schemabinding/version2/ViewportDescriptor.java b/src/jalview/schemabinding/version2/ViewportDescriptor.java index e32317c..09544ef 100755 --- a/src/jalview/schemabinding/version2/ViewportDescriptor.java +++ b/src/jalview/schemabinding/version2/ViewportDescriptor.java @@ -342,6 +342,47 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); + //-- _rightAlignIds + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_rightAlignIds", "rightAlignIds", org.exolab.castor.xml.NodeType.Attribute); + handler = (new org.exolab.castor.xml.XMLFieldHandler() { + public java.lang.Object getValue( java.lang.Object object ) + throws IllegalStateException + { + Viewport target = (Viewport) object; + if(!target.hasRightAlignIds()) + return null; + return (target.getRightAlignIds() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); + } + public void setValue( java.lang.Object object, java.lang.Object value) + throws IllegalStateException, IllegalArgumentException + { + try { + Viewport target = (Viewport) object; + // if null, use delete method for optional primitives + if (value == null) { + target.deleteRightAlignIds(); + return; + } + target.setRightAlignIds( ((java.lang.Boolean)value).booleanValue()); + } + catch (java.lang.Exception ex) { + throw new IllegalStateException(ex.toString()); + } + } + public java.lang.Object newInstance( java.lang.Object parent ) { + return null; + } + } ); + desc.setHandler(handler); + addFieldDescriptor(desc); + + //-- validation code for: _rightAlignIds + fieldValidator = new org.exolab.castor.xml.FieldValidator(); + { //-- local scope + BooleanValidator typeValidator = new BooleanValidator(); + fieldValidator.setValidator(typeValidator); + } + desc.setValidator(fieldValidator); //-- _showText desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showText", "showText", org.exolab.castor.xml.NodeType.Attribute); handler = (new org.exolab.castor.xml.XMLFieldHandler() { -- 1.7.10.2