From 37c7865a909d59d13d578a209c9c668ae2f1a854 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Tue, 22 Apr 2008 14:28:05 +0000
Subject: [PATCH] fix
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@7306 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/io/SimpleDocumentEntry.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java b/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java
index 985a7d902..4261727c0 100644
--- a/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java
+++ b/uk/ac/sanger/artemis/io/SimpleDocumentEntry.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/io/SimpleDocumentEntry.java,v 1.22 2008-04-01 10:14:42 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java,v 1.23 2008-04-22 14:28:05 tjc Exp $
*/
package uk.ac.sanger.artemis.io;
@@ -38,7 +38,7 @@ import javax.swing.JOptionPane;
* This class contains the methods common to all DocumentEntry objects.
*
* @author Kim Rutherford <kmr@sanger.ac.uk>
- * @version $Id: SimpleDocumentEntry.java,v 1.22 2008-04-01 10:14:42 tjc Exp $
+ * @version $Id: SimpleDocumentEntry.java,v 1.23 2008-04-22 14:28:05 tjc Exp $
**/
abstract public class SimpleDocumentEntry
@@ -335,7 +335,7 @@ abstract public class SimpleDocumentEntry
while(feature_enum.hasMoreFeatures())
{
final Feature new_feature = feature_enum.nextFeature();
-
+
try
{
if(force)
@@ -357,7 +357,7 @@ abstract public class SimpleDocumentEntry
for(int i=0; i<docFeatures.length; i++)
add((SimpleDocumentFeature)docFeatures[i]);
}
- else
+ else if(docFeature != null)
add((SimpleDocumentFeature)docFeature);
}
}
--
GitLab