Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / src / jalview / schemes / OceanColourScheme.java

diff --git a/src/jalview/javascript/log4j/SimpleLayout.java b/src/jalview/schemes/OceanColourScheme.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 54%
rename from src/jalview/javascript/log4j/SimpleLayout.java
rename to src/jalview/schemes/OceanColourScheme.java
index 9e5cbba..23834a6
--- a/src/jalview/javascript/log4j/SimpleLayout.java
+++ b/src/jalview/schemes/OceanColourScheme.java
@@ -18,38 +18,47 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package jalview.javascript.log4j;
+package jalview.schemes;
 
-import jalview.javascript.log4j.spi.LoggingEvent;
+import jalview.api.AlignViewportI;
+import jalview.datamodel.AnnotatedCollectionI;
 
-public class SimpleLayout extends Layout
+/**
+ * DOCUMENT ME!
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
+public class OceanColourScheme extends ResidueColourScheme
 {
-
-  StringBuffer sbuf = new StringBuffer(128);
+  /**
+   * Creates a new OceanColourScheme object.
+   */
+  public OceanColourScheme()
+  {
+    super(ResidueProperties.aaIndex, ResidueProperties.ocean);
+  }
 
   @Override
-  public void activateOptions()
+  public boolean isPeptideSpecific()
   {
-    // TODO Auto-generated method stub
-
+    return true;
   }
 
   @Override
-  public String format(LoggingEvent event)
+  public String getSchemeName()
   {
-
-    sbuf.setLength(0);
-    sbuf.append(event.getLevel().toString());
-    sbuf.append(" - ");
-    sbuf.append(event.getRenderedMessage());
-    sbuf.append(LINE_SEP);
-    return sbuf.toString();
+    return JalviewColourScheme.Ocean.toString();
   }
+
+  /**
+   * Returns a new instance of this colour scheme with which the given data may
+   * be coloured
+   */
   @Override
-  public boolean ignoresThrowable()
+  public ColourSchemeI getInstance(AlignViewportI view,
+          AnnotatedCollectionI coll)
   {
-    // TODO Auto-generated method stub
-    return false;
+    return new OceanColourScheme();
   }
-
 }