[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Tue Aug 18 14:22:07 EDT 2009
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services
In directory dev.open-bio.org:/tmp/cvs-serv30307/src/main/ca/ucalgary/seahawk/services

Modified Files:
	MobyClient.java 
Log Message:
Can take any CharSequence now for regexes, not just Strings (more convenient and efficient for StringBuffers to not use toString(), for example)
moby-live/Java/src/main/ca/ucalgary/seahawk/services MobyClient.java,1.23,1.24
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java	2009/08/17 21:27:30	1.23
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java	2009/08/18 18:22:07	1.24
@@ -675,7 +675,7 @@
 	return getServices(getMobyObjects(u));
     }
 
-    public MobyDataObject[] getMobyObjects(String textData, MobyDataType targetDataType){
+    public MobyDataObject[] getMobyObjects(CharSequence textData, MobyDataType targetDataType){
 	return getMobyObjects(textData, targetDataType, null);
     }
     /**
@@ -683,7 +683,7 @@
      * maps a string using rules producing moby objects of the given type.
      * @param targetDataType matches any data type if null, otherwise restricts returned items to those that are of (or inherit from) the given type
      */
-    public MobyDataObject[] getMobyObjects(String textData, MobyDataType targetDataType, MobyNamespace targetNS){
+    public MobyDataObject[] getMobyObjects(CharSequence textData, MobyDataType targetDataType, MobyNamespace targetNS){
 	Vector<MobyDataObject> objectVector = new Vector<MobyDataObject>();
 
 	if(textData == null){
@@ -1024,7 +1024,7 @@
      * Using the regular expression mappings that have been set up, 
      * maps a string to moby objects.
      */
-    public MobyDataObject[] getMobyObjects(String textData){
+    public MobyDataObject[] getMobyObjects(CharSequence textData){
 	return getMobyObjects(textData, (byte[]) null);
     }
 
@@ -1033,11 +1033,11 @@
      * are derived from URN-addressable rules (which are the keys), mostly for provenance 
      * and reproducibility purposes.
      */
-    public Map<String,MobyDataObject[]> getMobyObjectsURNMap(String textData){
+    public Map<String,MobyDataObject[]> getMobyObjectsURNMap(CharSequence textData){
 	return getMobyObjectsURNMap(textData, (byte[]) null);
     }
 
-    public Map<String,MobyDataObject[]> getMobyObjectsURNMap(String textData, byte[] bytes){
+    public Map<String,MobyDataObject[]> getMobyObjectsURNMap(CharSequence textData, byte[] bytes){
 	Map results = new HashMap<String,MobyDataObject[]>();
 	if(regexMap.isEmpty()){
 	    System.out.println("The MOBY Client has not been provided any regex->moby data mappings!");
@@ -1074,7 +1074,7 @@
 	return results;
     }
 
-    public MobyDataObject[] getMobyObjects(String textData, byte[] bytes){
+    public MobyDataObject[] getMobyObjects(CharSequence textData, byte[] bytes){
 	if(regexMap.isEmpty()){
 	    System.out.println("The MOBY Client has not been provided any regex->moby data mappings!");
 	    return new MobyDataObject[0];