Author: jgao
Date: 2009-08-08 21:00:43 -0700 (Sat, 08 Aug 2009)
New Revision: 17752
Added:
csplugins/trunk/soc/jgao/IDMapping/bridgedb_override.patch
Modified:
csplugins/trunk/soc/jgao/IDMapping/build.xml
csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb-bio.jar
csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb.jar
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/CyThesaurusDialog.java
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/TargetAttributeSelectionTable.java
Log:
build.xml patch
Added: csplugins/trunk/soc/jgao/IDMapping/bridgedb_override.patch
===================================================================
--- csplugins/trunk/soc/jgao/IDMapping/bridgedb_override.patch
(rev 0)
+++ csplugins/trunk/soc/jgao/IDMapping/bridgedb_override.patch 2009-08-09
04:00:43 UTC (rev 17752)
@@ -0,0 +1,41 @@
+--- build.xml
++++ build.xml
+@@ -14,6 +14,7 @@
+ <property name="cyrelease" value="../cytoscape"/>
+ <property name="cylib" value = "${cyrelease}/lib"/>
+ <property name="build" location="build"/>
++ <property name="bridgedb.dir" location="./lib"/>
+ <property name="build.classes" location="${build}/classes"/>
+ <property name="build.images" location="${build.classes}/images"/>
+
+@@ -27,9 +28,12 @@
+ <fileset dir="${cyrelease}">
+ <include name="*.jar"/>
+ </fileset>
+- <fileset dir="${lib}">
++ <fileset dir="${bridgedb.dir}">
+ <include name="*.jar"/>
+ </fileset>
++ <fileset dir="${lib}">
++ <include name="cytoscape-plugins-comm.jar"/>
++ </fileset>
+ </path>
+
+ </target>
+@@ -38,6 +42,16 @@
+ <!-- Compiles the project -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="init">
++ <fail message="Can't find ${cyrelease}/cytoscape.jar, please specify
the path to cytoscape with -Dcytoscape.dir=....">
++ <condition>
++ <not><available
file="${cyrelease}/cytoscape.jar"/></not>
++ </condition>
++ </fail>
++ <fail message="Can't find ${bridgedb.dir}/bridgedb.jar, please specify
the path to bridgedb.jar with -Dbridgedb.dir=....">
++ <condition>
++ <not><available
file="${bridgedb.dir}/bridgedb.jar"/></not>
++ </condition>
++ </fail>
+ <mkdir dir="${build}"/>
+ <mkdir dir="${build.classes}"/>
+ <javac srcdir="${src}" destdir="${build.classes}">
Modified: csplugins/trunk/soc/jgao/IDMapping/build.xml
===================================================================
--- csplugins/trunk/soc/jgao/IDMapping/build.xml 2009-08-08 21:18:20 UTC
(rev 17751)
+++ csplugins/trunk/soc/jgao/IDMapping/build.xml 2009-08-09 04:00:43 UTC
(rev 17752)
@@ -14,6 +14,7 @@
<property name="cyrelease" value="../cytoscape"/>
<property name="cylib" value = "${cyrelease}/lib"/>
<property name="build" location="build"/>
+ <property name="bridgedb.dir" location="./lib"/>
<property name="build.classes" location="${build}/classes"/>
<property name="build.images" location="${build.classes}/images"/>
@@ -27,9 +28,12 @@
<fileset dir="${cyrelease}">
<include name="*.jar"/>
</fileset>
- <fileset dir="${lib}">
+ <fileset dir="${bridgedb.dir}">
<include name="*.jar"/>
</fileset>
+ <fileset dir="${lib}">
+ <include name="cytoscape-plugins-comm.jar"/>
+ </fileset>
</path>
</target>
@@ -38,6 +42,16 @@
<!-- Compiles the project -->
<!-- =================================================================== -->
<target name="compile" depends="init">
+ <fail message="Can't find ${cyrelease}/cytoscape.jar, please specify
the path to cytoscape with -Dcytoscape.dir=....">
+ <condition>
+ <not><available
file="${cyrelease}/cytoscape.jar"/></not>
+ </condition>
+ </fail>
+ <fail message="Can't find ${bridgedb.dir}/bridgedb.jar, please specify
the path to bridgedb.jar with -Dbridgedb.dir=....">
+ <condition>
+ <not><available
file="${bridgedb.dir}/bridgedb.jar"/></not>
+ </condition>
+ </fail>
<mkdir dir="${build}"/>
<mkdir dir="${build.classes}"/>
<javac srcdir="${src}" destdir="${build.classes}">
Modified: csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb-bio.jar
===================================================================
(Binary files differ)
Modified: csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb.jar
===================================================================
(Binary files differ)
Modified:
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/CyThesaurusDialog.java
===================================================================
---
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/CyThesaurusDialog.java
2009-08-08 21:18:20 UTC (rev 17751)
+++
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/CyThesaurusDialog.java
2009-08-09 04:00:43 UTC (rev 17752)
@@ -447,7 +447,7 @@
final JTaskConfig jTaskConfig = new JTaskConfig();
jTaskConfig.setOwner(Cytoscape.getDesktop());
jTaskConfig.displayCloseButton(true);
- jTaskConfig.displayCancelButton(false);
+ jTaskConfig.displayCancelButton(true);
jTaskConfig.displayStatus(true);
jTaskConfig.setAutoDispose(false);
jTaskConfig.setMillisToPopup(0); // always pop the task
Modified:
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/TargetAttributeSelectionTable.java
===================================================================
---
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/TargetAttributeSelectionTable.java
2009-08-08 21:18:20 UTC (rev 17751)
+++
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/TargetAttributeSelectionTable.java
2009-08-09 04:00:43 UTC (rev 17752)
@@ -87,11 +87,11 @@
private final String headerIDType = "Target ID Type";
private final String headerAttrName = "Target New Attribute";
- private final String headerOneIDOnly = "Keep only one target ID?";
+ private final String headerOneIDOnly = "Single or all target ID(s)?";
private final String headerBtn = " ";
- private final String oneIDOnly = "Keep one ID only";
- private final String multiIDs = "Keep multiple IDs";
+ private final String oneIDOnly = "Keep single target ID only";
+ private final String multiIDs = "Keep all target IDs";
private java.awt.Color defBgColor = (new JScrollPane()).getBackground();
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
