Author: apico
Date: 2012-09-19 20:29:31 -0700 (Wed, 19 Sep 2012)
New Revision: 30414
Modified:
core3/impl/trunk/equations-impl/src/main/java/org/cytoscape/equations/internal/interpreter/InterpreterImpl.java
Log:
#1466
Modified:
core3/impl/trunk/equations-impl/src/main/java/org/cytoscape/equations/internal/interpreter/InterpreterImpl.java
===================================================================
---
core3/impl/trunk/equations-impl/src/main/java/org/cytoscape/equations/internal/interpreter/InterpreterImpl.java
2012-09-20 03:28:25 UTC (rev 30413)
+++
core3/impl/trunk/equations-impl/src/main/java/org/cytoscape/equations/internal/interpreter/InterpreterImpl.java
2012-09-20 03:29:31 UTC (rev 30414)
@@ -354,7 +354,7 @@
// 1. get the function
final Object o = argumentStack.pop();
if (!(o instanceof Function))
- throw new IllegalStateException("expected an attribute
function after the CALL opcode but found \"" + o.getClass() + "\" instead.");
+ throw new IllegalStateException("expected a column
function after the CALL opcode but found \"" + o.getClass() + "\" instead.");
final Function func = (Function)o;
// 2. get and validate the argument count
@@ -393,10 +393,10 @@
final String attribName = (String)argumentStack.pop();
final IdentDescriptor identDescriptor =
variableNameToDescriptorMap.get(attribName);
if (identDescriptor == null)
- throw new IllegalStateException("unknown attribute
reference: \"" + attribName + "\" (1).");
+ throw new IllegalStateException("unknown column
reference: \"" + attribName + "\" (1).");
final Object value = identDescriptor.getValue();
if (value == null)
- throw new IllegalStateException("undefined attribute
reference: \"" + attribName + "\".");
+ throw new IllegalStateException("undefined column
reference: \"" + attribName + "\".");
argumentStack.push(value);
}
@@ -405,7 +405,7 @@
final Object defaultValue = argumentStack.pop();
final IdentDescriptor identDescriptor =
variableNameToDescriptorMap.get(attribName);
if (identDescriptor == null)
- throw new IllegalStateException("unknown attribute
reference: \"" + attribName + "\" (2).");
+ throw new IllegalStateException("unknown column
reference: \"" + attribName + "\" (2).");
final Object value = identDescriptor.getValue();
argumentStack.push(value != null ? value : defaultValue);
}
--
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.
