tidy

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@2204 ee4ac58c-ac51-4696-9907-e4b3aa274f04

uk/ac/sanger/artemis/components/FeatureViewer.java

@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FeatureViewer.java,v 1.1 2004-06-09 09:46:46 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FeatureViewer.java,v 1.2 2005-01-11 16:07:35 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -34,29 +34,49 @@ import java.awt.event.*;
  *  A viewer for Feature objects.
  *
  *  @author Kim Rutherford
- *  @version $Id: FeatureViewer.java,v 1.1 2004-06-09 09:46:46 tjc Exp $
+ *  @version $Id: FeatureViewer.java,v 1.2 2005-01-11 16:07:35 tjc Exp $
  *
  **/
 
 public class FeatureViewer
-    implements EntryChangeListener, FeatureChangeListener {
+    implements EntryChangeListener, FeatureChangeListener 
+{
+
+  /**
+   *  The Feature this object is displaying.
+   **/
+  private Feature view_feature;
+
+  /**
+   *  The Entry that contains the Feature this object is displaying.
+   **/
+//private Entry entry;
+
+  /**
+   *  The FileViewer object that is displaying the feature.
+   **/
+  private FileViewer file_viewer;
+
   /**
    *  Create a new FeatureViewer object from the given Feature.
    **/
-  public FeatureViewer (Feature view_feature) {
+  public FeatureViewer(Feature view_feature) 
+  {
     this.view_feature = view_feature;
-    this.entry = view_feature.getEntry ();
+//  this.entry = view_feature.getEntry();
     
-    file_viewer = new FileViewer ("Artemis Feature View: " +
-                                  view_feature.getIDString ());
-    readFeature (view_feature);
-
-    view_feature.getEntry ().addEntryChangeListener (this);
-    view_feature.addFeatureChangeListener (this);
-
-    file_viewer.addWindowListener (new WindowAdapter () {
-      public void windowClosed (WindowEvent event) {
-        stopListening ();
+    file_viewer = new FileViewer("Artemis Feature View: " +
+                                 view_feature.getIDString());
+    readFeature(view_feature);
+
+    view_feature.getEntry().addEntryChangeListener(this);
+    view_feature.addFeatureChangeListener(this);
+
+    file_viewer.addWindowListener(new WindowAdapter() 
+    {
+      public void windowClosed(WindowEvent event)
+      {
+        stopListening();
       }
     });
   }
@@ -64,9 +84,10 @@ public class FeatureViewer
   /**
    *  Remove this object as a feature and entry change listener.
    **/
-  public void stopListening () {
-    getEntry ().removeEntryChangeListener (this);
-    getFeature ().removeFeatureChangeListener (this);
+  public void stopListening()
+  {
+    view_feature.getEntry().removeEntryChangeListener(this);
+    getFeature().removeFeatureChangeListener(this);
   }
   
   /**
@@ -74,17 +95,20 @@ public class FeatureViewer
    *  EntryChange events so we can delete this component if the feature gets
    *  deleted.
    **/
-  public void entryChanged (EntryChangeEvent event) {
-    switch (event.getType ()) {
-    case EntryChangeEvent.FEATURE_DELETED:
-      if (event.getFeature () == view_feature) {
-        stopListening ();
-        file_viewer.dispose ();
-      }
-      break;
-    default:
-      // do nothing;
-      break;
+  public void entryChanged(EntryChangeEvent event) 
+  {
+    switch(event.getType()) 
+    {
+      case EntryChangeEvent.FEATURE_DELETED:
+        if(event.getFeature() == view_feature) 
+        {
+          stopListening();
+          file_viewer.dispose();
+        }
+        break;
+      default:
+        // do nothing;
+        break;
     }
   }
 
@@ -94,58 +118,52 @@ public class FeatureViewer
    *  we can keep the display up to date.
    *  @param event The change event.
    **/
-  public void featureChanged (FeatureChangeEvent event) {
+  public void featureChanged(FeatureChangeEvent event) 
+  {
     // re-read the information from the feature
-    readFeature (view_feature);
+    readFeature(view_feature);
   }
 
   /**
    *  Read the given Feature into this FeatureViewer object.
    **/
-  public void readFeature (Feature feature) {
-    try {
-      file_viewer.clear ();
-      file_viewer.appendFile (view_feature.toReader ());
-    } catch (uk.ac.sanger.artemis.io.ReadFormatException e) {
-      throw new Error ("internal error - unexpected exception: " +
-                       e.getMessage () +
-                       (e.getLineNumber () > 1 ?
-                        " at line " + e.getLineNumber () :
-                        ""));
-    } catch (IOException e) {
-      throw new Error ("internal error - unexpected exception: " +
-                       e.getMessage ());
+  public void readFeature(Feature feature) 
+  {
+    try 
+    {
+      file_viewer.clear();
+      file_viewer.appendFile(view_feature.toReader());
+    }
+    catch(uk.ac.sanger.artemis.io.ReadFormatException e) 
+    {
+      throw new Error("internal error - unexpected exception: " +
+                      e.getMessage() +
+                      (e.getLineNumber() > 1 ?
+                       " at line " + e.getLineNumber() :
+                       ""));
+    } 
+    catch(IOException e)
+    {
+      throw new Error("internal error - unexpected exception: " +
+                      e.getMessage());
     }
   }
 
   /**
    *  Return the Feature we are viewing.
    **/
-  public Feature getFeature () {
+  public Feature getFeature() 
+  {
     return view_feature;
   }
   
   /**
    *  Return the Entry that contains the Feature this object is displaying.
    **/
-  private Entry getEntry () {
-    return entry;
-  }
+//private Entry getEntry()
+//{
+//  return entry;
+//}
 
-  /**
-   *  The Feature this object is displaying.
-   **/
-  private Feature view_feature;
-
-  /**
-   *  The Entry that contains the Feature this object is displaying.
-   **/
-  private Entry entry;
-
-  /**
-   *  The FileViewer object that is displaying the feature.
-   **/
-  private FileViewer file_viewer;
 }
 
-