RIght align seq ids

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index dd11f68..65cf2f8 100755 (executable)
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -69,6 +69,7 @@
                                                <xs:attribute name="pidThreshold" type="xs:int"/>\r
                                                <xs:attribute name="title" type="xs:string"/>\r
                                                <xs:attribute name="showFullId" type="xs:boolean"/>\r
+                                               <xs:attribute name="rightAlignIds" type="xs:boolean"/>\r
                                                <xs:attribute name="showText" type="xs:boolean"/>\r
                                                <xs:attribute name="showColourText" type="xs:boolean"/>\r
                                                <xs:attribute name="showBoxes" type="xs:boolean"/>\r

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 615e9bb..d032756 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -147,6 +147,7 @@ public class GAlignFrame
   JMenu jMenu1 = new JMenu();\r
   JCheckBoxMenuItem jCheckBoxMenuItem1 = new JCheckBoxMenuItem();\r
   JMenu jMenu4 = new JMenu();\r
+  protected JCheckBoxMenuItem idRightAlign = new JCheckBoxMenuItem();\r
   public GAlignFrame()\r
   {\r
     try\r
@@ -1172,6 +1173,14 @@ public class GAlignFrame
     jMenu1.setText("Format");\r
     jCheckBoxMenuItem1.setText("Right Align Ids");\r
     jMenu4.setText("Select");\r
+    idRightAlign.setText("Right Align Sequence Id");\r
+    idRightAlign.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        idRightAlign_actionPerformed(e);\r
+      }\r
+    });\r
 \r
     alignFrameMenuBar.add(fileMenu);\r
     alignFrameMenuBar.add(editMenu);\r
@@ -1278,11 +1287,12 @@ public class GAlignFrame
     hideMenu.add(hideSelSequences);\r
     jMenu1.add(font);\r
     jMenu1.addSeparator();\r
-    jMenu1.add(seqLimits);\r
     jMenu1.add(wrapMenuItem);\r
     jMenu1.add(scaleAbove);\r
     jMenu1.add(scaleLeft);\r
     jMenu1.add(scaleRight);\r
+    jMenu1.add(seqLimits);\r
+    jMenu1.add(idRightAlign);\r
     jMenu1.add(hiddenMarkers);\r
     jMenu1.add(viewBoxesMenuItem);\r
     jMenu1.add(viewTextMenuItem);\r
@@ -1724,4 +1734,9 @@ public class GAlignFrame
   {\r
 \r
   }\r
+\r
+  public void idRightAlign_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r

diff --git a/src/jalview/schemabinding/version2/Viewport.java b/src/jalview/schemabinding/version2/Viewport.java
index db055bf..6dfb14f 100755 (executable)
--- 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;\r
 \r
     /**\r
+     * Field _rightAlignIds\r
+     */\r
+    private boolean _rightAlignIds;\r
+\r
+    /**\r
+     * keeps track of state for field: _rightAlignIds\r
+     */\r
+    private boolean _has_rightAlignIds;\r
+\r
+    /**\r
      * Field _showText\r
      */\r
     private boolean _showText;\r
@@ -434,6 +444,15 @@ public class Viewport implements java.io.Serializable {
     } //-- void deleteRenderGaps() \r
 \r
     /**\r
+     * Method deleteRightAlignIds\r
+     * \r
+     */\r
+    public void deleteRightAlignIds()\r
+    {\r
+        this._has_rightAlignIds= false;\r
+    } //-- void deleteRightAlignIds() \r
+\r
+    /**\r
      * Method deleteShowAnnotation\r
      * \r
      */\r
@@ -761,6 +780,17 @@ public class Viewport implements java.io.Serializable {
     } //-- boolean getRenderGaps() \r
 \r
     /**\r
+     * Returns the value of field 'rightAlignIds'.\r
+     * \r
+     * @return boolean\r
+     * @return the value of field 'rightAlignIds'.\r
+     */\r
+    public boolean getRightAlignIds()\r
+    {\r
+        return this._rightAlignIds;\r
+    } //-- boolean getRightAlignIds() \r
+\r
+    /**\r
      * Returns the value of field 'sequenceSetId'.\r
      * \r
      * @return String\r
@@ -1067,6 +1097,18 @@ public class Viewport implements java.io.Serializable {
     } //-- boolean hasRenderGaps() \r
 \r
     /**\r
+     * Method hasRightAlignIds\r
+     * \r
+     * \r
+     * \r
+     * @return boolean\r
+     */\r
+    public boolean hasRightAlignIds()\r
+    {\r
+        return this._has_rightAlignIds;\r
+    } //-- boolean hasRightAlignIds() \r
+\r
+    /**\r
      * Method hasShowAnnotation\r
      * \r
      * \r
@@ -1482,6 +1524,17 @@ public class Viewport implements java.io.Serializable {
     } //-- void setRenderGaps(boolean) \r
 \r
     /**\r
+     * Sets the value of field 'rightAlignIds'.\r
+     * \r
+     * @param rightAlignIds the value of field 'rightAlignIds'.\r
+     */\r
+    public void setRightAlignIds(boolean rightAlignIds)\r
+    {\r
+        this._rightAlignIds = rightAlignIds;\r
+        this._has_rightAlignIds = true;\r
+    } //-- void setRightAlignIds(boolean) \r
+\r
+    /**\r
      * Sets the value of field 'sequenceSetId'.\r
      * \r
      * @param sequenceSetId the value of field 'sequenceSetId'.\r

diff --git a/src/jalview/schemabinding/version2/ViewportDescriptor.java b/src/jalview/schemabinding/version2/ViewportDescriptor.java
index e32317c..09544ef 100755 (executable)
--- 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);\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _rightAlignIds\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_rightAlignIds", "rightAlignIds", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if(!target.hasRightAlignIds())\r
+                    return null;\r
+                return (target.getRightAlignIds() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteRightAlignIds();\r
+                        return;\r
+                    }\r
+                    target.setRightAlignIds( ((java.lang.Boolean)value).booleanValue());\r
+                }\r
+                catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance( java.lang.Object parent ) {\r
+                return null;\r
+            }\r
+        } );\r
+        desc.setHandler(handler);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _rightAlignIds\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            BooleanValidator typeValidator = new BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- _showText\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showText", "showText", org.exolab.castor.xml.NodeType.Attribute);\r
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r