X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=c1de259629971a2732213e1fe32035acb77b71e8;hb=ae3fad8019274ca3ab1258a480ba15dd9adac1e9;hp=2bead4674fc27e795f0c6d832620bb1eb844dd0d;hpb=c0b77a767e71bffd8f55704f9a64f943f559e4f6;p=jalview.git

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index 2bead46..c1de259 100644
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -71,20 +71,20 @@ public class AlignViewport extends AlignmentViewport
       {
         try
         {
-          widthScale = new Float(param).floatValue();
+          widthScale = Float.valueOf(param).floatValue();
         } catch (Exception e)
         {
         }
         if (widthScale <= 1.0)
         {
-          System.err.println(
+          jalview.bin.Console.errPrintln(
                   "Invalid alignment character width scaling factor ("
                           + widthScale + "). Ignoring.");
           widthScale = 1;
         }
         if (JalviewLite.debug)
         {
-          System.err.println(
+          jalview.bin.Console.errPrintln(
                   "Alignment character width scaling factor is now "
                           + widthScale);
         }
@@ -94,20 +94,20 @@ public class AlignViewport extends AlignmentViewport
       {
         try
         {
-          heightScale = new Float(param).floatValue();
+          heightScale = Float.valueOf(param).floatValue();
         } catch (Exception e)
         {
         }
         if (heightScale <= 1.0)
         {
-          System.err.println(
+          jalview.bin.Console.errPrintln(
                   "Invalid alignment character height scaling factor ("
                           + heightScale + "). Ignoring.");
           heightScale = 1;
         }
         if (JalviewLite.debug)
         {
-          System.err.println(
+          jalview.bin.Console.errPrintln(
                   "Alignment character height scaling factor is now "
                           + heightScale);
         }
@@ -192,9 +192,8 @@ public class AlignViewport extends AlignmentViewport
 
       if (colour != null)
       {
-        residueShading = new ResidueShader(
-                ColourSchemeProperty.getColourScheme(this, alignment,
-                        colour));
+        residueShading = new ResidueShader(ColourSchemeProperty
+                .getColourScheme(this, alignment, colour));
         if (residueShading != null)
         {
           residueShading.setConsensus(hconsensus);
@@ -395,7 +394,7 @@ public class AlignViewport extends AlignmentViewport
    * Applies the supplied feature settings descriptor to currently known
    * features. This supports an 'initial configuration' of feature colouring
    * based on a preset or user favourite. This may then be modified in the usual
-   * way using the Feature Settings dialogue.
+   * way using the Feature Settings dialogue. NOT IMPLEMENTED FOR APPLET
    * 
    * @param featureSettings
    */
@@ -405,4 +404,18 @@ public class AlignViewport extends AlignmentViewport
     // TODO implement for applet
   }
 
+  /**
+   * Merges the supplied feature settings descriptor with existing feature
+   * styles. This supports an 'initial configuration' of feature colouring based
+   * on a preset or user favourite. This may then be modified in the usual way
+   * using the Feature Settings dialogue. NOT IMPLEMENTED FOR APPLET
+   * 
+   * @param featureSettings
+   */
+  @Override
+  public void mergeFeaturesStyle(FeatureSettingsModelI featureSettings)
+  {
+    // TODO Auto-generated method stub
+
+  }
 }