Author: apico
Date: 2012-09-19 20:51:09 -0700 (Wed, 19 Sep 2012)
New Revision: 30429

Modified:
   
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.form
Log:
#146

Modified: 
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.form
===================================================================
--- 
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.form
    2012-09-20 03:49:49 UTC (rev 30428)
+++ 
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.form
    2012-09-20 03:51:09 UTC (rev 30429)
@@ -310,7 +310,7 @@
               <Properties>
                 <Property name="border" type="javax.swing.border.Border" 
editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border 
info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                    <TitledBorder title="Matching attributes (attributes to 
match nodes between networks)"/>
+                    <TitledBorder title="Matching columns (table columns to 
match nodes between networks)"/>
                   </Border>
                 </Property>
               </Properties>
@@ -346,7 +346,7 @@
                 </Container>
                 <Component class="javax.swing.JCheckBox" 
name="idmappingCheckBox">
                   <Properties>
-                    <Property name="text" type="java.lang.String" value="Map 
IDs between the matching attributes"/>
+                    <Property name="text" type="java.lang.String" value="Map 
IDs between the matching columns"/>
                   </Properties>
                   <AuxValues>
                     <AuxValue name="JavaCodeGenerator_InitCodePost" 
type="java.lang.String" 
value="idmappingCheckBox.setVisible(checkCyThesaurus);"/>
@@ -363,7 +363,7 @@
                       <Color blue="33" green="0" red="ff" type="rgb"/>
                     </Property>
                     <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-                      <Connection code="&quot;If you want to map identifiers 
between the matching attributes, please install CyThesaurus app version 
&quot;+requiredCyThesaursServiceVersion+&quot; or above.&quot;" type="code"/>
+                      <Connection code="&quot;If you want to map identifiers 
between the matching columns, please install CyThesaurus app version 
&quot;+requiredCyThesaursServiceVersion+&quot; or above.&quot;" type="code"/>
                     </Property>
                   </Properties>
                   <AuxValues>
@@ -394,7 +394,7 @@
               <Properties>
                 <Property name="border" type="javax.swing.border.Border" 
editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border 
info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                    <TitledBorder title="How to merge attributes?"/>
+                    <TitledBorder title="How to merge columns?"/>
                   </Border>
                 </Property>
                 <Property name="minimumSize" type="java.awt.Dimension" 
editor="org.netbeans.beaninfo.editors.DimensionEditor">

-- 
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.

Reply via email to