From drepchevski at dev.open-bio.org Thu May 5 15:30:29 2011 From: drepchevski at dev.open-bio.org (Dmitry Repchevski) Date: Thu, 5 May 2011 15:30:29 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <201105051930.p45JUTg7005392@dev.open-bio.org> drepchevski Thu May 5 15:30:29 EDT 2011 Update of /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/shared/message In directory dev.open-bio.org:/tmp/cvs-serv5357 Modified Files: CrossReference.java Log Message: addObject() method added moby-live/Java/src/main/org/inb/biomoby/shared/message CrossReference.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/shared/message/CrossReference.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/shared/message/CrossReference.java 2009/09/09 19:47:48 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/shared/message/CrossReference.java 2011/05/05 19:30:29 1.2 @@ -23,7 +23,12 @@ public class CrossReference implements Serializable { private ArrayList objects; - + + public void addObject(MobyObject object) + { + getObjects().add(object); + } + @XmlElementRef(type=org.inb.biomoby.shared.message.MobyObject.class) public ArrayList getObjects() { From gordonp at dev.open-bio.org Sun May 1 00:31:56 2011 From: gordonp at dev.open-bio.org (Paul Gordon) Date: Sat, 30 Apr 2011 20:31:56 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <201105010031.p410Vu3o010755@dev.open-bio.org> gordonp Sat Apr 30 20:31:55 EDT 2011 Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui In directory dev.open-bio.org:/tmp/cvs-serv10719/src/main/ca/ucalgary/seahawk/gui Modified Files: MobyContentClipboard.java Log Message: Fixed paste problem of 'for each' menu items moby-live/Java/src/main/ca/ucalgary/seahawk/gui MobyContentClipboard.java,1.12,1.13 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentClipboard.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentClipboard.java 2011/02/03 21:46:40 1.12 +++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentClipboard.java 2011/05/01 00:31:55 1.13 @@ -200,7 +200,13 @@ if(!query.containsKey(CLIPBOARD_COLLECTION_NAME)){ query.put(CLIPBOARD_COLLECTION_NAME, collection); } - if(mdi instanceof MobyDataObjectSet){ + // See if there was a "for each" sent to the clipboard + if(mdi instanceof MobyContentCreator){ + System.err.println("GOT MobyContentCreator in clipboard paste"); + MobyContentInstance mci = ((MobyContentCreator) mdi).getAllContents(mdi.getName()); + collection.addAll(mci.retrieveObjects()); + } + else if(mdi instanceof MobyDataObjectSet){ // Flatten out the set, as a MOBY set cannot contain other sets collection.addAll((MobyDataObjectSet) mdi); } From drepchevski at dev.open-bio.org Thu May 5 19:30:29 2011 From: drepchevski at dev.open-bio.org (Dmitry Repchevski) Date: Thu, 5 May 2011 15:30:29 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <201105051930.p45JUTg7005392@dev.open-bio.org> drepchevski Thu May 5 15:30:29 EDT 2011 Update of /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/shared/message In directory dev.open-bio.org:/tmp/cvs-serv5357 Modified Files: CrossReference.java Log Message: addObject() method added moby-live/Java/src/main/org/inb/biomoby/shared/message CrossReference.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/shared/message/CrossReference.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/shared/message/CrossReference.java 2009/09/09 19:47:48 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/shared/message/CrossReference.java 2011/05/05 19:30:29 1.2 @@ -23,7 +23,12 @@ public class CrossReference implements Serializable { private ArrayList objects; - + + public void addObject(MobyObject object) + { + getObjects().add(object); + } + @XmlElementRef(type=org.inb.biomoby.shared.message.MobyObject.class) public ArrayList getObjects() {