JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / io / packed / SimpleDataProvider.java

diff --git a/src/jalview/io/packed/SimpleDataProvider.java b/src/jalview/io/packed/SimpleDataProvider.java
index 4374bd4..e8bb2f9 100644 (file)
--- a/src/jalview/io/packed/SimpleDataProvider.java
+++ b/src/jalview/io/packed/SimpleDataProvider.java
@@ -1,27 +1,31 @@
-/*******************************************************************************
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- *
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
  * This file is part of Jalview.
- *
+ * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
- *******************************************************************************/
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.io.packed;
 
 import jalview.io.FileParse;
 
 /**
- * minimal implementation of the DataProvider interface.
- * Allows a FileParse datasource to be specified as one of the DataProvider.JvDataType content types, with or without some other associated object as external reference.
+ * minimal implementation of the DataProvider interface. Allows a FileParse
+ * datasource to be specified as one of the DataProvider.JvDataType content
+ * types, with or without some other associated object as external reference.
  */
 public class SimpleDataProvider implements DataProvider
 {
@@ -33,9 +37,14 @@ public class SimpleDataProvider implements DataProvider
 
   /**
    * create a SimpleDataProvider
-   * @param type - contents of resource accessible via fp
-   * @param fp - datasource
-   * @param assoc - external object that fp's content should be associated with (may be null)
+   * 
+   * @param type
+   *          - contents of resource accessible via fp
+   * @param fp
+   *          - datasource
+   * @param assoc
+   *          - external object that fp's content should be associated with (may
+   *          be null)
    */
   public SimpleDataProvider(DataProvider.JvDataType type, FileParse fp,
           Object assoc)
@@ -63,4 +72,4 @@ public class SimpleDataProvider implements DataProvider
     return jvtype;
   }
 
-}
\ No newline at end of file
+}