From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 14 Nov 2014 15:49:20 +0000 (+0000)
Subject: Merge branch 'features/JAL-1541_BioJsMSAViewer-export-option' of https://source.jalvi... 
X-Git-Tag: Jalview_2_9~152^2^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=49a7daf06cb98b45ce2d33ea25b15172c4204dda;p=jalview.git

Merge branch 'features/JAL-1541_BioJsMSAViewer-export-option' of https://source.jalview.org/git/jalview.git into features/JAL-1541_BioJsMSAViewer-export-option

Conflicts:
	src/jalview/gui/AlignViewport.java
---

49a7daf06cb98b45ce2d33ea25b15172c4204dda
diff --cc .externalToolBuilders/Jalview Release indices [Builder].launch
index 4c0c7dd,4c0c7dd..9d81cc8
--- a/.externalToolBuilders/Jalview Release indices [Builder].launch
+++ b/.externalToolBuilders/Jalview Release indices [Builder].launch
@@@ -14,6 -14,6 +14,7 @@@
  <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jalview"/>
  <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
++<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value=""/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="buildindices,"/>
  <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
diff --cc .settings/org.eclipse.jdt.core.prefs
index 884491a,884491a..f72955b
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@@ -1,4 -1,4 +1,15 @@@
  eclipse.preferences.version=1
++org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
++org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
++org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
++org.eclipse.jdt.core.compiler.compliance=1.7
++org.eclipse.jdt.core.compiler.debug.lineNumber=generate
++org.eclipse.jdt.core.compiler.debug.localVariable=generate
++org.eclipse.jdt.core.compiler.debug.sourceFile=generate
++org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
++org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
++org.eclipse.jdt.core.compiler.source=1.7
  org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
  org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
  org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --cc src/jalview/gui/AlignViewport.java
index 1a328f9,5c383d8..921189b
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@@ -1265,13 -1279,23 +1279,34 @@@ public class AlignViewport extends Alig
      }
    }
  
++<<<<<<< HEAD
 +  public Hashtable getFeaturesDisplayed()
 +  {
 +    return featuresDisplayed;
 +  }
 +
 +  public void setFeaturesDisplayed(Hashtable featuresDisplayed)
 +  {
 +    this.featuresDisplayed = featuresDisplayed;
++=======
+   protected SequenceAnnotationOrder getSortAnnotationsBy()
+   {
+     return sortAnnotationsBy;
+   }
+ 
+   protected void setSortAnnotationsBy(SequenceAnnotationOrder sortAnnotationsBy)
+   {
+     this.sortAnnotationsBy = sortAnnotationsBy;
+   }
+ 
+   protected boolean isShowAutocalculatedAbove()
+   {
+     return showAutocalculatedAbove;
+   }
+ 
+   protected void setShowAutocalculatedAbove(boolean showAutocalculatedAbove)
+   {
+     this.showAutocalculatedAbove = showAutocalculatedAbove;
++>>>>>>> branch 'features/JAL-1541_BioJsMSAViewer-export-option' of https://source.jalview.org/git/jalview.git
    }
  }