From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 3 Mar 2015 15:55:46 +0000 (+0000)
Subject: JAL-845 refactor / typo fix
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c4f4962eb930740b364e1404184850c9febca6f4;p=jalview.git

JAL-845 refactor / typo fix
---

diff --git a/src/jalview/api/SplitContainerI.java b/src/jalview/api/SplitContainerI.java
index 2abf4d8..b9c3121 100644
--- a/src/jalview/api/SplitContainerI.java
+++ b/src/jalview/api/SplitContainerI.java
@@ -2,8 +2,6 @@ package jalview.api;
 
 import jalview.datamodel.AlignmentI;
 
-import java.awt.Component;
-
 /**
  * Describes a visual container that can show two alignments.
  * 
@@ -20,13 +18,13 @@ public interface SplitContainerI
    * @param show
    */
   // TODO need an interface for AlignFrame?
-  void setComplementVisible(Component alignFrame, boolean show);
+  void setComplementVisible(Object alignFrame, boolean show);
 
   /**
    * Returns the alignment that is complementary to the one in the given
    * AlignFrame, or null.
    */
-  AlignmentI getComplement(Component af);
+  AlignmentI getComplement(Object af);
 
   /**
    * Returns the frame title for the alignment that is complementary to the one
@@ -35,6 +33,6 @@ public interface SplitContainerI
    * @param af
    * @return
    */
-  String getComplementTitle(Component af);
+  String getComplementTitle(Object af);
 
 }
diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java
index 3382f30..9cbded9 100644
--- a/src/jalview/gui/SplitFrame.java
+++ b/src/jalview/gui/SplitFrame.java
@@ -546,7 +546,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
    * Returns the alignment in the complementary frame to the one given.
    */
   @Override
-  public AlignmentI getComplement(Component alignFrame)
+  public AlignmentI getComplement(Object alignFrame)
   {
     if (alignFrame == this.getTopFrame())
     {
@@ -563,7 +563,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
    * Returns the title of the complementary frame to the one given.
    */
   @Override
-  public String getComplementTitle(Component alignFrame)
+  public String getComplementTitle(Object alignFrame)
   {
     if (alignFrame == this.getTopFrame())
     {
diff --git a/src/jalview/jbgui/GSplitFrame.java b/src/jalview/jbgui/GSplitFrame.java
index 27b3324..2eefde8 100644
--- a/src/jalview/jbgui/GSplitFrame.java
+++ b/src/jalview/jbgui/GSplitFrame.java
@@ -119,7 +119,7 @@ public class GSplitFrame extends JInternalFrame
    * Make the complement of the specified split component visible or hidden,
    * adjusting the position of the split divide.
    */
-  public void setComplementVisible(Component alignFrame, boolean show)
+  public void setComplementVisible(Object alignFrame, boolean show)
   {
     if (alignFrame == this.topFrame)
     {
diff --git a/src/jalview/util/MappingUtils.java b/src/jalview/util/MappingUtils.java
index 6ddaa99..9880ae7 100644
--- a/src/jalview/util/MappingUtils.java
+++ b/src/jalview/util/MappingUtils.java
@@ -288,7 +288,7 @@ public final class MappingUtils
      * scheme
      */
     SequenceGroup mappedGroup = new SequenceGroup(sg);
-    sg.cs = mapTo.getGlobalColourScheme();
+    mappedGroup.cs = mapTo.getGlobalColourScheme();
     mappedGroup.clear();
     // TODO set width of mapped group