Author: ruschein
Date: 2011-02-15 16:23:56 -0800 (Tue, 15 Feb 2011)
New Revision: 24144
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
Log:
Do not attempt to rename an immutable column!
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
2011-02-16 00:17:48 UTC (rev 24143)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/table/RenameColumnTask.java
2011-02-16 00:23:56 UTC (rev 24144)
@@ -36,7 +36,7 @@
import org.cytoscape.work.TunableValidator;
-final class RenameColumnTask extends AbstractTableColumnTask implements
TunableValidator {
+public final class RenameColumnTask extends AbstractTableColumnTask implements
TunableValidator {
@Tunable(description="New column name:")
public String newColumnName;
@@ -60,7 +60,7 @@
}
final CyTable table = column.getTable();
- if (table.getColumn(column.getName()) != null) {
+ if (table.getColumn(newColumnName) != null) {
try {
errMsg.append("Column name is a duplicate!");
} catch (Exception e) {
@@ -68,6 +68,14 @@
return false;
}
+ if (column.isImmutable()) {
+ try {
+ errMsg.append("Cannot rename an immutable
column!");
+ } catch (Exception e) {
+ }
+ return false;
+ }
+
return true;
}
}
\ 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.
