-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>eu.etaxonomy</groupId>
--- /dev/null
+This is only a placeholder file to allow an empty folder. Can be deleted once another file is present in this folder.
\ No newline at end of file
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>eu.etaxonomy</groupId>
<packaging>eclipse-plugin</packaging>
<name>Bulkeditor Bundle</name>
- <description></description>
+ <description />
<url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorBulkeditorBundle</url>
</project>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
+<<<<<<< HEAD
bin
+=======
+bin
+>>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf
+<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>\r
<project>\r
\r
</dependency>\r
<!-- For Hibernate Mapping End -->\r
</dependencies>\r
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>taxeditor-parent</artifactId>
+ <version>3.6.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <name>CDM Library Dependencies Plugin</name>
+ <description>CDM Library and dependencies as a plugin</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
+ <outputDirectory>lib</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-dependencies-sources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+ <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
+ <outputDirectory>lib</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <excludeTransitive>true</excludeTransitive>
+ <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>remove-existing-jars</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Remove all cdmlib jars</echo>
+ <delete>
+ <fileset dir="./lib" includes="cdmlib-*" />
+ </delete>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>update-snapshot-jar-names</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Update cdmlib jars to SNAPSHOT when build with timestamp</echo>
+ <move todir="./lib">
+ <fileset dir="./lib" />
+ <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
+ </move>
+ <move todir="./lib">
+ <fileset dir="./lib" />
+ <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" to="\1SNAPSHOT\2" />
+ </move>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>identificationKeyAPI</groupId>
+ <artifactId>identificationKeyAPI</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-commons</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-model</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-persistence</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-remote</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-print</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-services</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-io</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-ext</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+
+ <!-- for ikey-plus
+ TODO this should not be needed but the utils class contained in this jar
+ seems to be loaded as bean by spring
+ -->
+ </dependencies>
+>>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf
</project>
cacheLoader = new CacheLoader(this);
}
+
@Override
protected CacheConfiguration getDefaultCacheConfiguration() {
// For a better understanding on how to size caches, refer to
}
}
+
public CdmTransientEntityCacher getCurrentCacher() {
ICdmEntitySession cdmEntitySession = cdmEntitySessionManager.getActiveSession();
if(cdmEntitySession != null && cdmEntitySession instanceof CdmEntitySession) {
this.cdmTransientEntityCacher = null;
}
}
-
-
}
return defaultService.convertTeam2Person(arg0);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
+ /**
+ * {@inheritDoc}
*/
@Override
- public DeleteResult delete(UUID uuid) {
- return defaultService.delete(uuid);
+ public DeleteResult delete(UUID arg0) {
+ return defaultService.delete(arg0);
}
}
this.defaultService = defaultClassificationService;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DeleteResult delete(UUID arg0) {
+ return defaultService.delete(arg0);
+ }
+
/**
* @param t
* @param pageSize
public UpdateResult createHierarchyInClassification(Classification arg1, CreateHierarchyForClassificationConfigurator arg2) {
return defaultService.createHierarchyInClassification(arg1, arg2);
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
- */
- @Override
- public DeleteResult delete(UUID uuid) {
- return defaultService.delete(uuid);
- }
-
-
}
private final ICollectionService defaultService;
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DeleteResult delete(UUID arg0) {
+ return defaultService.delete(arg0);
+ }
+
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.IService#save(eu.etaxonomy.cdm.model.common.ICdmBase)
*/
public <S extends Collection> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
- */
- @Override
- public DeleteResult delete(UUID uuid) {
- return defaultService.delete(uuid);
- }
}
return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber);
}
+
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
*/
@Override
public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) {
return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid);
+
}
}
return defaultService.findWithoutFlush(uuid);
}
+
@Override
public <S extends TaxonNameBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
}
+
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.INameService#setAsGroupsBasionym(java.util.UUID)
*/
return defaultService.getNameRecords();
}
+
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
*/
+
}
return defaultService.getAllHierarchyDerivatives(specimen);
}
+
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
*/
}
+
}
// $Id$
/**
-* Copyright (C) 2013 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
+ * Copyright (C) 2013 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
import java.io.IOException;
String queryString, Classification classification, Set<NamedArea> namedAreas,
Set<PresenceAbsenceTerm> distributionStatus, List<Language> languages, boolean highlightFragments,
Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths)
- throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
+ throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
}
- @Override
- public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
- TaxonRelationshipType oldRelationshipType,
- SynonymRelationshipType synonymRelationshipType)
- throws DataChangeNoRollbackException {
+ @Override
+ public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
+ TaxonRelationshipType oldRelationshipType,
+ SynonymRelationshipType synonymRelationshipType)
+ throws DataChangeNoRollbackException {
- return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
- }
+ return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
+ }
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.ITaxonService#pageAcceptedTaxaFor(java.util.UUID, java.util.UUID, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
return defaultService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
}
- @Override
- public DeleteResult isDeletable(TaxonBase object,
- DeleteConfiguratorBase config) {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public DeleteResult isDeletable(TaxonBase object,
+ DeleteConfiguratorBase config) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid,
- IncludedTaxonConfiguration configuration) {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid,
+ IncludedTaxonConfiguration configuration) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public TaxonBase findWithoutFlush(UUID uuid) {
- return defaultService.findWithoutFlush(uuid);
- }
+ @Override
+ public TaxonBase findWithoutFlush(UUID uuid) {
+ return defaultService.findWithoutFlush(uuid);
+ }
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaByName(eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator)
return defaultService.findTaxaByName(config);
}
- @Override
- public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
- return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
- }
+ @Override
+ public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
+ return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List)
+ */
+ @Override
+ public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
+ DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
+ Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
+ return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
+ }
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List)
- */
- @Override
- public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
- DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
- Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
- return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
- }
/* (non-Javadoc)
}
+
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(java.util.UUID, java.util.UUID)
*/
return defaultService.deleteTaxon(taxonUuid, config, classificationUuid);
}
- @Override
- public SynonymRelationship moveSynonymToAnotherTaxon(
- SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
- boolean moveHomotypicGroup,
- SynonymRelationshipType newSynonymRelationshipType,
- Reference reference, String referenceDetail, boolean keepReference)
- throws HomotypicalGroupChangeException {
+ @Override
+ public SynonymRelationship moveSynonymToAnotherTaxon(
+ SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
+ boolean moveHomotypicGroup,
+ SynonymRelationshipType newSynonymRelationshipType,
+ Reference reference, String referenceDetail, boolean keepReference)
+ throws HomotypicalGroupChangeException {
+
+ return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
+ }
- return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
- }
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
@Override
public DeleteResult delete(UUID uuid) {
return defaultService.delete(uuid);
+
}
}
// $Id$
/**
-* Copyright (C) 2013 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
+ * Copyright (C) 2013 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
import java.net.URI;
return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz);
}
- @Override
- public DeleteResult isDeletable(DefinedTermBase object,
- DeleteConfiguratorBase config) {
- return defaultService.isDeletable(object, config);
- }
+ @Override
+ public DeleteResult isDeletable(DefinedTermBase object,
+ DeleteConfiguratorBase config) {
+ return defaultService.isDeletable(object, config);
+ }
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
}
- @Override
- public DefinedTermBase findWithoutFlush(UUID uuid) {
- return defaultService.findWithoutFlush(uuid);
- }
+ @Override
+ public DefinedTermBase findWithoutFlush(UUID uuid) {
+ return defaultService.findWithoutFlush(uuid);
+ }
- @Override
- public <S extends DefinedTermBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
- return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
- }
+ @Override
+ public <S extends DefinedTermBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
+ return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
+ }
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.TreeNode;
import org.eclipse.jface.viewers.ViewerDropAdapter;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.TransferData;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
return LocalSelectionTransfer.getTransfer().isSupportedType(transferType) && target instanceof TreeNode;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void dragOver(DropTargetEvent event) {
+ super.dragOver(event);
+ event.feedback = DND.FEEDBACK_SELECT | DND.FEEDBACK_SCROLL;
+ }
+
}
<packaging>eclipse-feature</packaging>
<name>Taxonomic Editor Platform Dependencies</name>
- <description/>
+ <description />
<url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
</project>
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>eu.etaxonomy</groupId>
\r
menu.label.0 = Aktualisieren\r
command.label.17 = Liste\r
-command.label.18 = Schl�sselknoten\r
+command.label.18 = Schl\u00fcsselknoten\r
command.label.19 = L\u00F6schen\r
command.name = Neuer Taxonknoten\r
command.name.0 = Neue Klassifikation\r
command.name.3 = Aktualisieren\r
command.name.4 = Kopieren\r
command.name.5 = Verschiebe akzeptiertes Taxon in Synonymie\r
-command.name.6 = Neuer Polytomer Schl�ssel\r
-command.name.7 = Bearbeite Schl�ssel-Knoten\r
-command.name.8 = Aktualisiere Schl�ssel-Liste\r
-command.name.9 = Aktualisiere Schl�ssel-Knoten\r
+command.name.6 = Neuer Polytomer Schl\u00fcssel\r
+command.name.7 = Bearbeite Schl\u00fcssel-Knoten\r
+command.name.8 = Aktualisiere Schl\u00fcssel-Liste\r
+command.name.9 = Aktualisiere Schl\u00fcssel-Knoten\r
command.name.10 = Erzeuge Taxon-Hierarchie\r
view.name.2 = Taxonomiebaum\r
navigatorContent.name = Klassifikation\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>eu.etaxonomy</groupId>
<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>taxeditor-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
<packaging>eclipse-plugin</packaging>
<name>Printpublisher Bundle</name>
- <description></description>
+ <description />
<url>http://wp5.e-taxonomy.eu/printpublisher</url>
</project>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>eu.etaxonomy</groupId>
// $Id$
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
*/
public class ProtologueElement extends AbstractEntityCollectionElement<DescriptionElementBase> implements ISelectableElement, IOpenUrlEnabled{
- private SelectionArbitrator selectionArbitrator;
+ private final SelectionArbitrator selectionArbitrator;
private TextWithLabelElement protologueUriText;
private MediaRepresentationPart mediaRepresentationPart;
selectionArbitrator = cdmFormFactory.createSelectionArbitrator(this);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetElementComposite#createControls(org.eclipse.swt.widgets.Composite, int)
- */
/** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement element, int style) {
formFactory.createOpenUrlSelectorElement(element, "Query BHL for Reference Image", this, style);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetElementComposite#setElement(eu.etaxonomy.cdm.model.common.VersionableEntity)
- */
/** {@inheritDoc} */
@Override
public void setEntity(DescriptionElementBase element) {
this.entity = element;
-
+
if(element.getMedia().size() == 0){
element.addMedia(Media.NewInstance());
}
media = element.getMedia().iterator().next();
-
+
if(media.getRepresentations().size() == 0){
media.addRepresentation(MediaRepresentation.NewInstance());
- }
+ }
mediaRepresentation = media.getRepresentations().iterator().next();
-
+
if(mediaRepresentation.getParts().size() == 0){
mediaRepresentation.addRepresentationPart(MediaRepresentationPart.NewInstance(null, null));
}
-
+
mediaRepresentationPart = mediaRepresentation.getParts().iterator().next();
-
+
if(mediaRepresentationPart.getUri() != null){
protologueUriText.setText(mediaRepresentationPart.getUri().toString());
}
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.section.cdmdetail.ISelectableElement#getSelectionArbitrator()
- */
+
/**
* <p>Getter for the field <code>selectionArbitrator</code>.</p>
*
* @return a {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator} object.
*/
- public SelectionArbitrator getSelectionArbitrator() {
+ @Override
+ public SelectionArbitrator getSelectionArbitrator() {
return selectionArbitrator;
}
-
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent(java.lang.Object)
- */
+
/** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
- if(eventSource == protologueUriText){
+ if(eventSource == protologueUriText && protologueUriText.getText()!=null){
try {
mediaRepresentationPart.setUri(new URI(protologueUriText.getText()));
} catch (URISyntaxException e) {
MessagingUtils.warningDialog("Could not parse URI", getClass(), e.getMessage());
}
- }
+ }
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.openurl.IOpenUrlEnabled#setOpenUrl(java.net.URI)
- */
@Override
public void setOpenUrl(URI uri) {
protologueUriText.setText(uri.toString());
firePropertyChangeEvent(new CdmPropertyChangeEvent(protologueUriText, null));
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.openurl.IOpenUrlEnabled#getReference()
- */
@Override
public Reference getReference() {
return (Reference) getName().getNomenclaturalReference();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.openurl.IOpenUrlEnabled#getDetail()
- */
@Override
public String getDetail() {
return getName().getNomenclaturalMicroReference();
}
-
+
private TaxonNameBase getName(){
TaxonNameDescription description = (TaxonNameDescription) entity.getInDescription();
-
+
TaxonNameBase taxonName = description.getTaxonName();
-
+
return taxonName;
}
}
*/
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
Collection<ELEMENT> elements = getEntityCollection(entity);
if(addUnboundElement){
//cloning to avoid saving the dummy element
- Collection<ELEMENT> clonedElements = new HashSet<ELEMENT>();
+ Collection<ELEMENT> clonedElements = new ArrayList<ELEMENT>();
clonedElements.addAll(elements);
clonedElements.add(createNewElement()); //add dummy element which is not bound to entity
return clonedElements;
--- /dev/null
+/rcp.target
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Indigo Target" sequenceNumber="28">
+<?pde version="3.8"?><target name="Eclipse Indigo Target" sequenceNumber="7">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jdt.feature.group" version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
<unit id="org.eclipse.pde.source.feature.group" version="3.7.2.v20120120-1420-7b7rFUOFEx2Xnqafnpz0E--0"/>
<unit id="org.eclipse.platform.feature.group" version="3.7.2.v20120207-1839-9gF7UHPDFxGjd-PqDr2jX_4yKaumkoHTz04_q-q"/>
<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201409040043"/>
<repository location="http://download.eclipse.org/technology/nebula/archives/Q32014/release/"/>
</location>
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
-</location>
</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_60"/>
-<launcherArgs>
-<vmArgs>-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m</vmArgs>
-</launcherArgs>
</target>
<tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
</configuration>
</plugin>
+ <plugin>
+ <groupId>external.atlassian.jgitflow</groupId>
+ <artifactId>jgitflow-maven-plugin</artifactId>
+ <version>1.0-m4.3</version>
+ <configuration>
+ <pushHotfixes>true</pushHotfixes>
+ <pushReleases>true</pushReleases>
+ <enableSshAgent>true</enableSshAgent>
+ <allowSnapshots>true</allowSnapshots>
+ <allowUntracked>true</allowUntracked>
+ </configuration>
+ </plugin>
</plugins>
<extensions>
<extension>
BGBM BDI Projects / taxeditor.git / commitdiff