Author: apico
Date: 2012-09-19 20:39:51 -0700 (Wed, 19 Sep 2012)
New Revision: 30422
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/EqnSupport.java
Log:
#1466
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/EqnSupport.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/EqnSupport.java
2012-09-20 03:37:59 UTC (rev 30421)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/EqnSupport.java
2012-09-20 03:39:51 UTC (rev 30422)
@@ -140,14 +140,14 @@
currentlyActiveAttributes.clear();
try {
lastInternalError.append(
- "Missing value for
referenced attribute \""
+ "Missing value for
referenced column \""
+ attribRef + "\".");
} catch (Exception e) {
// Intentionally empty!
}
logger.warn("Missing value for \"" +
attribRef
+ "\" while evaluating an
equation (ID:" + key
- + ", attribute name:" +
columnName + ")");
+ + ", column name:" +
columnName + ")");
return null;
}
}
@@ -157,14 +157,14 @@
} catch (final Exception e) {
currentlyActiveAttributes.clear();
try {
- lastInternalError.append("Bad attribute
reference to \""
+ lastInternalError.append("Bad column
reference to \""
+ attribRef +
"\".");
} catch (Exception e2) {
// Intentionally empty!
}
- logger.warn("Bad attribute reference to \"" +
attribRef
+ logger.warn("Bad column reference to \"" +
attribRef
+ "\" while evaluating an equation
(ID:" + key
- + ", attribute name:" + columnName
+ ")");
+ + ", column name:" + columnName +
")");
return null;
}
}
@@ -181,7 +181,7 @@
// Intentionally empty!
}
logger.warn("Error while evaluating an equation: " +
e.getMessage() + " (ID:"
- + key + ", attribute name:" + columnName +
")");
+ + key + ", column name:" + columnName +
")");
return null;
}
}
@@ -294,7 +294,7 @@
if (retVal == null)
logger.warn("Cannot convert a floating point
value ("
+ equationValue + ") to an integer.
(ID:" + id
- + ", attribute name:" + columnName
+ ")");
+ + ", column name:" + columnName +
")");
return retVal;
}
else if (equationValue.getClass() == Long.class) {
@@ -302,7 +302,7 @@
if (retVal == null)
logger.warn("Cannot convert a large integer
(long) value ("
+ equationValue + ") to an integer.
(ID:" + id
- + ", attribute name:" + columnName
+ ")");
+ + ", column name:" + columnName +
")");
return retVal;
}
else if (equationValue.getClass() == Boolean.class) {
@@ -334,7 +334,7 @@
} catch (final NumberFormatException e) {
logger.warn("Cannot convert a string (\"" +
valueAsString
+ "\") to a floating point value.
(ID:" + id
- + ", attribute name:" + columnName
+ ")");
+ + ", column name:" + columnName +
")");
return null;
}
}
@@ -364,11 +364,11 @@
else {
logger.warn("Cannot convert a string (\"" +
stringValue
+ "\") to a boolean value. (ID:" +
id
- + ", attribute name:" + columnName
+ ")");
+ + ", column name:" + columnName +
")");
return null;
}
}
else
throw new IllegalStateException("we should never get
here.");
}
-}
\ No newline at end of file
+}
--
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.
