[Gmod-apollo-cmts] CVS: apollo/src/java/apollo/datamodel Synonym.java,1.4,1.5

[Mark G. <mg...@us...>]

Update of /cvsroot/gmod/apollo/src/java/apollo/datamodel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11716/src/java/apollo/datamodel

Modified Files:
	Synonym.java 
Log Message:
synonyms can now writeback with chado jdbc - problem was writeback was
assuming the owner of the synonym

took out type in querying pub - this is good for a few reasons -
uniquename is a unique key so dont need further specifying with type -
furthermore the type can lead to problems - there
are pub names that are not of type "curator" that are used - in
flybase most of the curators are type "annotated genome..." not
"curator" - for instance sima - which runs into problems in crm - also
the self syns are of type "pub none" or something like that (though
actually self syns shuld not be displayed is my new thought)

todo - still not reading & writing synonym owner to game (also redo
internal syns in game)

todo - take out self synonyms - dont need to see those in apollo (just
chado convenience) and dont want them edited in apollo either



Index: Synonym.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/datamodel/Synonym.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Synonym.java	29 Nov 2005 16:11:13 -0000	1.4
--- Synonym.java	30 Nov 2005 17:40:32 -0000	1.5
***************
*** 36,39 ****
--- 36,57 ----
      return name;
    }
+ 
+   public boolean hasOwner() {
+     return owner != null;
+   }
+   public void setOwner(String owner) {
+     this.owner = owner;
+   }
+   public String getOwner() {
+     return owner;
+   }
+ 
+   /** not sure if we actually need this? */
+   public void setOwnerId(int ownerId) {
+     this.ownerId = ownerId;
+   }
+   public int getOwnerId() {
+     return ownerId;
+   }
    
    public Synonym cloneSynonym() {
***************
*** 131,148 ****
    }
  
-   // eventually put in owner name as well...
-   public void setOwnerId(int ownerId) {
-     this.ownerId = ownerId;
-   }
-   public int getOwnerId() {
-     return ownerId;
-   }
- 
-   public void setOwner(String owner) {
-     this.owner = owner;
-   }
-   public String getOwner() {
-     return owner;
-   }
  
    public String toString() {
--- 149,152 ----