[Treebase-guts] SF.net SVN: treebase:[774] trunk/treebase-core/src/main/java/org/cipres/ treebase/domain/nexus/mesquite/MesquiteStandardMatrixConverter.java

[<hs...@us...>]

Revision: 774
          http://treebase.svn.sourceforge.net/treebase/?rev=774&view=rev
Author:   hshyket
Date:     2011-03-16 16:21:59 +0000 (Wed, 16 Mar 2011)

Log Message:
-----------
Does not allow the Martixelement table to be populated when the matrix is either of a type sequence or standard

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteStandardMatrixConverter.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteStandardMatrixConverter.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteStandardMatrixConverter.java	2011-02-04 22:02:15 UTC (rev 773)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteStandardMatrixConverter.java	2011-03-16 16:21:59 UTC (rev 774)
@@ -507,7 +507,10 @@
 		}
 
 		discreteMatrixJDBC.batchUpdateRowSymbol(pCon);
-		DiscreteMatrixElementJDBC.batchDiscreteElements(elements, pCon);
+		if (!(discreteMatrixJDBC.getCharacterMatrix().getDataType().isSequence())
+			&& !(discreteMatrixJDBC.getCharacterMatrix().getDataType().isStandard())) {
+			DiscreteMatrixElementJDBC.batchDiscreteElements(elements, pCon);
+		}
 	}
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.