/ - Diff - EDIT - EDIT Project Management

.gitattributes
86	86	cdmlib-model/src/main/java/eu/etaxonomy/cdm/aspectj/PropertyChangeAspect.aj -text
87	87	cdmlib-model/src/main/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java -text
88	88	cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmDocumentBuilder.java -text
	89	cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmMarshallerListener.java -text
89	90	cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmResourceResolver.java -text
90	91	cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmSchemaGenerator.java -text
91	92	cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/DataSet.java -text

+    	}
     	public void marshal(Object object, Writer writer) throws JAXBException {
     		Marshaller marshaller;
     		marshaller = jaxbContext.createMarshaller();
     		// For test purposes insert newlines to make the XML output readable
     		marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
     		// UTF-8 encoding delivers error when unmarshalling
     		//marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
     		marshaller.setProperty(Marshaller.JAXB_ENCODING, "ISO-8859-1");
     		// validate with explicit schema
     		//marshaller.setSchema(cdmSchema);
     		marshaller.marshal(object, writer);
+    	}
     	public void marshal(DataSet dataSet, Writer writer) throws JAXBException {
     		Marshaller marshaller;
-...
     		//marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
     		marshaller.setProperty(Marshaller.JAXB_ENCODING, "ISO-8859-1");
     		CdmMarshallerListener marshallerListener = new CdmMarshallerListener();
     		marshaller.setListener(marshallerListener);
     		// validate with explicit schema
     		//marshaller.setSchema(cdmSchema);

     package eu.etaxonomy.cdm.jaxb;
     import javax.xml.bind.Marshaller;
     import eu.etaxonomy.cdm.model.common.DefinedTermBase;
     /**
      * @author a.babadshanjan
      * @created 19.08.2008
      */
     public class CdmMarshallerListener extends Marshaller.Listener {
     	public void beforeMarshal(Object target) {
     		if (target instanceof DefinedTermBase) {
     			((DefinedTermBase)target).setId(0);
+    		}
+    	}
+    }

     import eu.etaxonomy.cdm.model.common.VersionableEntity;
     import eu.etaxonomy.cdm.model.description.Feature;
     import eu.etaxonomy.cdm.model.location.Continent;
     import eu.etaxonomy.cdm.model.location.NamedArea;
     import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
     import eu.etaxonomy.cdm.model.location.NamedAreaType;
     import eu.etaxonomy.cdm.model.location.TdwgArea;
-...
             @XmlElement(name = "Keyword", namespace = "http://etaxonomy.eu/cdm/model/common/1.0", type = Keyword.class),
         	@XmlElement(name = "Language", namespace = "http://etaxonomy.eu/cdm/model/common/1.0", type = Language.class),
         	@XmlElement(name = "MarkerType", namespace = "http://etaxonomy.eu/cdm/model/common/1.0", type = MarkerType.class),
         	@XmlElement(name = "NamedArea", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = NamedArea.class),
         	@XmlElement(name = "NamedAreaLevel", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = NamedAreaLevel.class),
         	@XmlElement(name = "NamedAreaType", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = NamedAreaType.class),
         	@XmlElement(name = "NameRelationshipType", namespace = "http://etaxonomy.eu/cdm/model/name/1.0", type = NameRelationshipType.class),
-...
         public Collection<TaxonBase> getTaxonBases() {
         	Object obj = taxa;
             // FIXME: This is a dirty trick.
             // FIXME: This is a dirty trick. Replace by getTaxonBases_().
         	Collection<TaxonBase> taxonBases = (Collection<TaxonBase>)obj;
             return taxonBases;
+        }
-...
         	Collection<TaxonBase> taxonBases = new HashSet<TaxonBase>();
         	for (Taxon taxon: taxa) {
         		taxonBases.add(taxon);
         	if (taxa != null) {
         		for (Taxon taxon: taxa) {
         			taxonBases.add(taxon);
+        		}
+        	}
         	for (Synonym synonym: synonyms) {
         		taxonBases.add(synonym);
         	if (synonyms != null) {
         		for (Synonym synonym: synonyms) {
         			taxonBases.add(synonym);
+        		}
+        	}
             return taxonBases;
+        }

     	@XmlElementWrapper(name = "Media")
     	@XmlElement(name = "Medium")
         @XmlIDREF
         @XmlSchemaType(name = "IDREF")
     	private Set<Media> media = new HashSet<Media>();
     	@XmlElement(name = "Vocabulary")

     import javax.persistence.OneToMany;
     import javax.persistence.Transient;
     import javax.xml.bind.annotation.XmlAccessType;
     import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlElementWrapper;
     import javax.xml.bind.annotation.XmlElements;
     import javax.xml.bind.annotation.XmlType;
     import org.apache.log4j.Logger;
     import org.hibernate.annotations.Cascade;
-...
      * @created 08-Nov-2007 13:06:24
      */
     @XmlAccessorType(XmlAccessType.FIELD)
     @XmlType(name = "DescriptionBase", propOrder = {
         "describedSpecimenOrObservations",
         "descriptionSources",
         "descriptionElements"
     })
     @Entity
     @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
     public abstract class DescriptionBase extends IdentifiableEntity {

     import java.util.*;
     import javax.persistence.*;
     import javax.xml.bind.annotation.XmlAccessType;
     import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlElementWrapper;
     import javax.xml.bind.annotation.XmlType;
     /**
      * The upmost (abstract) class for a description element of a specimen
-...
      * @version 1.0
      * @created 08-Nov-2007 13:06:24
      */
     @XmlAccessorType(XmlAccessType.FIELD)
     @XmlType(name = "DescriptionElementBase", propOrder = {
     	    "feature",
     	    "modifiers",
     	    "modifyingText",
     	    "media"
     })
     @Entity
     @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
     public abstract class DescriptionElementBase extends ReferencedEntityBase implements IMediaEntity{
-...
+    	}
     	//type, category of information. In structured descriptions characters
     	@XmlElement(name = "Feature")
     	private Feature feature;
     	@XmlElementWrapper(name = "Modifiers")
     	@XmlElement(name = "Modifier")
     	private Set<Modifier> modifiers = new HashSet<Modifier>();
     	@XmlElement(name = "ModifyingText")
     	private MultilanguageSet modifyingText;
     	@XmlElementWrapper(name = "Media")
     	@XmlElement(name = "Medium")
     	private Set<Media> media = new HashSet<Media>();

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java
40	40	"scopes",
41	41	"geoScopes"
42	42	})
43		@XmlRootElement(name = "TaxonDescription")
44	43	@Entity
45	44	public class TaxonDescription extends DescriptionBase {
46	45

     import javax.persistence.Entity;
     import javax.persistence.JoinColumn;
     import javax.persistence.ManyToOne;
     import javax.xml.bind.annotation.XmlAccessType;
     import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlTransient;
     import javax.xml.bind.annotation.XmlType;
     import org.apache.log4j.Logger;
     import org.hibernate.annotations.Cascade;
-...
      * @version 1.0
      * @created 08-Jul-2008
      */
     @XmlAccessorType(XmlAccessType.FIELD)
     @XmlType(name = "TaxonNameDescription", propOrder = {
     })
     @Entity
     public class TaxonNameDescription extends DescriptionBase {
     	static Logger logger = Logger.getLogger(TaxonNameDescription.class);
     	@XmlTransient
     	private TaxonNameBase taxonName;

     import java.util.*;
     import javax.persistence.*;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlElementWrapper;
     /**
      * @author m.doering
-...
     @Entity
     @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
     public class Media extends AnnotatableEntity {
     	private static final Logger logger = Logger.getLogger(Media.class);
     	@XmlElement(name = "Title")
     	private MultilanguageSet title = new MultilanguageSet();
     	//creation date of the media (not of the record)
     	@XmlElement(name = "MediaCreated")
     	private Calendar mediaCreated;
     	@XmlElement(name = "Description")
     	private MultilanguageSet description = new MultilanguageSet();
     	//A single medium such as a picture can have multiple representations in files. Common are multiple resolutions or file
     	//formats for images for example
     	//A single medium such as a picture can have multiple representations in files.
     	//Common are multiple resolutions or file formats for images for example
     	@XmlElementWrapper(name = "MediaRepresentations")
     	@XmlElement(name = "MediaRepresentation")
     	private Set<MediaRepresentation> representations = new HashSet<MediaRepresentation>();
     	@XmlElementWrapper(name = "Rights")
     	@XmlElement(name = "Right")
     	private Set<Rights> rights = new HashSet<Rights>();
     	private Agent artist;
     	/**

     import eu.etaxonomy.cdm.model.common.VersionableEntity;
     import javax.persistence.*;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlElementWrapper;
     import javax.xml.bind.annotation.XmlTransient;
     /**
      * metadata for an external file such as images, phylogenetic trees, or audio
-...
     @Entity
     @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
     public class MediaRepresentation extends VersionableEntity {
     	private static final Logger logger = Logger.getLogger(MediaRepresentation.class);
     	//http://www.iana.org/assignments/media-types
     	@XmlElement(name = "MimeType")
     	private String mimeType;
     	//the file suffix (e.g. jpg, tif, mov)
     	@XmlElement(name = "Suffix")
     	private String suffix;
     	@XmlTransient
     	private Media media;
     	@XmlElementWrapper(name = "MediaRepresentationParts")
     	@XmlElement(name = "MediaRepresentationPart")
     	private List<MediaRepresentationPart> mediaRepresentationParts = new ArrayList<MediaRepresentationPart>();

     package eu.etaxonomy.cdm.model.media;
     import javax.persistence.Entity;
     import javax.persistence.ManyToOne;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlTransient;
     import org.apache.log4j.Logger;
     import eu.etaxonomy.cdm.model.common.VersionableEntity;
-...
     	private static final Logger logger = Logger.getLogger(MediaRepresentationPart.class);
     	//sorting index
     	@XmlElement(name = "SortIndex")
     	private int sortIndex;
     	//where the media file is stored
     	@XmlElement(name = "URI")
     	private String uri;
     	//in bytes
     	@XmlElement(name = "Size")
     	private Integer size;
     	//the MEdiaRepresentation this MediaRepresentation
     	@XmlTransient
     	private MediaRepresentation mediaRepresentation;
     	/**

Project

General

Profile

EDIT

Revision 0ae18eec

Added by Anahit Babadshanjan about 16 years ago