Author: apico
Date: 2012-09-19 20:52:16 -0700 (Wed, 19 Sep 2012)
New Revision: 30430
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
Log:
#1466
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
2012-09-20 03:51:09 UTC (rev 30429)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
2012-09-20 03:52:16 UTC (rev 30430)
@@ -582,7 +582,7 @@
advancedPanel.setLayout(new GridBagLayout());
attributePanel.setBorder(BorderFactory
- .createTitledBorder("Matching attributes
(attributes to match nodes between networks)"));
+ .createTitledBorder("Matching columns (table
columns to match nodes between networks)"));
attributePanel.setLayout(new GridBagLayout());
attributeScrollPane.setMinimumSize(new Dimension(100, 50));
@@ -603,7 +603,7 @@
gridBagConstraints.weighty = 1.0;
attributePanel.add(attributeScrollPane, gridBagConstraints);
- idmappingCheckBox.setText("Map IDs between the matching
attributes");
+ idmappingCheckBox.setText("Map IDs between the matching
columns");
// idmappingCheckBox.setVisible(checkCyThesaurus);
idmappingCheckBox.setVisible(false);
gridBagConstraints = new GridBagConstraints();
@@ -615,7 +615,7 @@
idmappingLabel.setForeground(new Color(255, 0, 51));
idmappingLabel
- .setText("If you want to map identifiers
between the matching attributes, please install CyThesaurus app version "
+ .setText("If you want to map identifiers
between the matching columns, please install CyThesaurus app version "
+
requiredCyThesaursServiceVersion + " or above.");
// idmappingLabel.setVisible(!checkCyThesaurus);
idmappingLabel.setVisible(false);
@@ -641,7 +641,7 @@
gridBagConstraints.insets = new Insets(5, 5, 5, 5);
advancedPanel.add(jSeparator3, gridBagConstraints);
-
mergeAttributePanel.setBorder(BorderFactory.createTitledBorder("How to merge
attributes?"));
+
mergeAttributePanel.setBorder(BorderFactory.createTitledBorder("How to merge
columns?"));
mergeAttributePanel.setMinimumSize(new Dimension(400, 200));
mergeAttributePanel.setPreferredSize(new Dimension(600, 200));
mergeAttributePanel.setLayout(new
BoxLayout(mergeAttributePanel, BoxLayout.LINE_AXIS));
@@ -1021,4 +1021,4 @@
public List<CyNetwork> getNetworkList() {
return new Vector<CyNetwork>(model.values());
}
-}
\ 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.
