Author: apico
Date: 2012-09-19 20:07:33 -0700 (Wed, 19 Sep 2012)
New Revision: 30399

Modified:
   
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
Log:
#1466

Modified: 
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
===================================================================
--- 
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
      2012-09-20 03:05:53 UTC (rev 30398)
+++ 
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
      2012-09-20 03:07:33 UTC (rev 30399)
@@ -101,7 +101,7 @@
     @Override
     public String setMergedAttribute(final int index, final String 
attributeName) {
         if (attributeName==null) {
-            throw new java.lang.NullPointerException("Attribute name is 
null.");
+            throw new java.lang.NullPointerException("Column name is null.");
         }
         
         String ret = mergedAttributes.set(index, attributeName);
@@ -583,7 +583,7 @@
 
     protected void resetMergedAttributeType(final int index, boolean add) {
         if 
(this.getSizeMergedAttributes()>this.mergedAttributeTypes.size()+(add?1:0)) {
-                throw new java.lang.IllegalStateException("attribute type not 
complete");
+                throw new java.lang.IllegalStateException("column type not 
complete");
         }
 
         if (index>=this.getSizeMergedAttributes()||index<0) {

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to