Author: apico
Date: 2012-09-19 20:47:49 -0700 (Wed, 19 Sep 2012)
New Revision: 30425
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:45:18 UTC (rev 30424)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
2012-09-20 03:47:49 UTC (rev 30425)
@@ -127,7 +127,7 @@
final int index = mergedAttributes.indexOf(mergedAttributeName);
if (index==-1) {
- throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged attributes");
+ throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged table columns");
}
return getMergedAttributeType(index);
@@ -161,7 +161,7 @@
final int index = mergedAttributes.indexOf(mergedAttributeName);
if (index==-1) {
- throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged attributes");
+ throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged table columns");
}
return setMergedAttributeType(index,type);
@@ -170,7 +170,7 @@
@Override
public boolean containsMergedAttribute(final String attributeName) {
if (attributeName==null) {
- throw new java.lang.NullPointerException("Attribute name is
null.");
+ throw new java.lang.NullPointerException("Column name is null.");
}
return mergedAttributes.contains(attributeName);
}
@@ -182,7 +182,7 @@
}
final int index = mergedAttributes.indexOf(mergedAttributeName);
if (index==-1) {
- throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged attributes");
+ throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged table columns");
}
return getOriginalAttribute(net, index);
}
@@ -208,7 +208,7 @@
}
final int index = mergedAttributes.indexOf(mergedAttributeName);
if (index==-1) {
- throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged attributes");
+ throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged table columns");
}
return getOriginalAttributeMap(index);
}
@@ -242,7 +242,7 @@
}
final int index = mergedAttributes.indexOf(mergedAttributeName);
if (index==-1) {
- throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged attributes");
+ throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged table columns");
}
return setOriginalAttribute(net, attributeName, index);
}
@@ -276,7 +276,7 @@
final int index = mergedAttributes.indexOf(mergedAttributeName);
if (index==-1) {
- throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged attributes");
+ throw new java.lang.IllegalArgumentException("No
"+mergedAttributeName+" is contained in merged table columns");
}
return removeOriginalAttribute(net, index);
--
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.
