Author: apico
Date: 2012-09-19 20:12:10 -0700 (Wed, 19 Sep 2012)
New Revision: 30401
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
Log:
#1466
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
2012-09-20 03:09:19 UTC (rev 30400)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
2012-09-20 03:12:10 UTC (rev 30401)
@@ -256,7 +256,7 @@
JLabel label =
(JLabel) defaultRenderer.getTableCellRendererComponent(table, value,
isSelected, hasFocus, row, column);
label.setBackground(Color.LIGHT_GRAY);
-
label.setToolTipText("Only types of new attribute are changeable");
+
label.setToolTipText("Only types of new columns are changeable");
if (isSelected)
{
label.setForeground(table.getSelectionForeground());
} else {
@@ -409,7 +409,7 @@
@Override
public String getColumnName(final int col) {
if (isColumnMergedType(col)) {
- return "Attribute type";
+ return "Column type";
}
if (isColumnMergedNetwork(col)) {
@@ -507,15 +507,15 @@
}
if (v.length() == 0) {
-
JOptionPane.showMessageDialog(getParent(), "Please use a non-empty name for the
attribute.",
- "Error: empty attribute
Name", JOptionPane.ERROR_MESSAGE);
+
JOptionPane.showMessageDialog(getParent(), "Please use a non-empty name for the
column.",
+ "Error: empty column
name", JOptionPane.ERROR_MESSAGE);
return;
}
if
(attributeMapping.containsMergedAttribute(v)) {
-
JOptionPane.showMessageDialog(getParent(), "Atribute " + v
- + " is already exist.
Please use another name for this attribute.",
- "Error: duplicated
attribute Name", JOptionPane.ERROR_MESSAGE);
+
JOptionPane.showMessageDialog(getParent(), "Column " + v
+ + " already exist.
Please use another name for this column.",
+ "Error: duplicated
column name", JOptionPane.ERROR_MESSAGE);
return;
}
--
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.
