Bundle-ManifestVersion: 2
Bundle-Name: Application
Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
Bundle-Vendor: EDIT
Bundle-Localization: OSGI-INF/l10n/plugin
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Bulkeditor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
/**
* 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.
*/
* @version 1.0
*/
public class LineAnnotationModel extends AnnotationModel {
-
+
private Comparator<Annotation> comparator;
private IEntityCreator<?> entityCreator;
private Set<LineAnnotation> deletedAnnotations = new HashSet<LineAnnotation>();
private ILineDisplayStrategy lineDisplayStrategy;
-
+
/**
* <p>Constructor for LineAnnotationModel.</p>
*
super();
this.lineDisplayStrategy = lineDisplayStrategy;
}
-
+
/**
* Changes the annotation's type and fires model changed
* notification. Resulting redraw will cause any change
annotation.setType(type);
fireModelChanged(new AnnotationModelEvent(this));
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.text.source.AnnotationModel#removeAnnotation(org.eclipse.jface.text.source.Annotation, boolean)
*/
/** {@inheritDoc} */
- protected void removeAnnotation(Annotation annotation,
+ @Override
+ protected void removeAnnotation(Annotation annotation,
boolean fireModelChanged) {
- // Set data model element for deletion
- annotation.markDeleted(true);
if (annotation instanceof LineAnnotation) {
deletedAnnotations.add((LineAnnotation) annotation);
}
super.removeAnnotation(annotation, fireModelChanged);
}
-
+
/**
* <p>removeTypeFromAllAnnotations</p>
*
}
}
}
-
+
/**
* <p>getAllAnnotationsOfType</p>
*
if (annotation.getType().equals(type)) {
candidates.add(annotation);
}
- }
- return candidates;
- }
-
+ }
+ return candidates;
+ }
+
/**
* <p>getFirstAnnotationOfType</p>
*
if (annotation.getType().equals(type)) {
return annotation;
}
- }
+ }
return null;
}
-
+
/**
* Gets first LineAnnotation in line
*
try {
int offset = document.getLineOffset(line);
int length = document.getLineLength(line);
-
+
Iterator<?> iterator = getAnnotationIterator(offset, length, true, true);
while (iterator.hasNext()) {
Object next = iterator.next();
}
return null;
}
-
+
/**
* <p>getOrderedAnnotations</p>
*
Collections.sort(list, getAnnotationComparator());
return list;
}
-
+
/**
* <p>printAnnotations</p>
*/
logger.debug("Active annotations");
logger.debug("------------------------");
List<Annotation> list = getOrderedAnnotations();
-
+
for (Annotation annotation : list) {
logger.debug(
(annotation.isMarkedDeleted() ? "DELETED " : "") +
(((LineAnnotation) annotation).isDirty() ? "DIRTY " : "") +
(((LineAnnotation) annotation).isMarkedAsNew() ? "NEW " : "") +
annotation.getText() + ": o " +
- getPosition(annotation).getOffset() + ", l " +
+ getPosition(annotation).getOffset() + ", l " +
getPosition(annotation).getLength());
}
logger.debug("------------------------");
for (LineAnnotation annotation : deletedAnnotations) {
logger.debug(
(annotation.isMarkedDeleted() ? "DELETED " : "") +
- (((LineAnnotation) annotation).isMarkedAsMerged() ? "MERGED " : "") +
- (((LineAnnotation) annotation).isDirty() ? "DIRTY " : "") +
- (((LineAnnotation) annotation).isMarkedAsNew() ? "NEW " : "") +
- annotation.getText() + ": o ");
+ (annotation.isMarkedAsMerged() ? "MERGED " : "") +
+ (annotation.isDirty() ? "DIRTY " : "") +
+ (annotation.isMarkedAsNew() ? "NEW " : "") +
+ annotation.getText() + ": o ");
}
}
-
+
/**
* <p>getUndeletedAnnotations</p>
*
* @return a {@link java.util.List} object.
*/
public List<LineAnnotation> getUndeletedAnnotations(int offset, int length) {
-
+
List<LineAnnotation> list = new ArrayList<LineAnnotation>();
-
+
Iterator<?> iterator = getAnnotationIterator(offset, length, true, true);
while (iterator.hasNext()) {
Object next = iterator.next();
if (next instanceof LineAnnotation && !((Annotation) next).isMarkedDeleted()) {
- list.add((LineAnnotation) next);
+ list.add((LineAnnotation) next);
}
}
Collections.sort(list, getAnnotationComparator());
return list;
}
-
+
/**
* <p>Getter for the field <code>deletedAnnotations</code>.</p>
*
public Set<LineAnnotation> getDeletedAnnotations() {
return deletedAnnotations;
}
-
+
/**
* <p>clearDeletedAnnotations</p>
*/
public void clearDeletedAnnotations() {
deletedAnnotations.clear();
}
-
+
private Comparator<Annotation> getAnnotationComparator() {
if (comparator == null) {
this.comparator = new AnnotationComparator();
}
return comparator;
}
-
+
class AnnotationComparator implements Comparator<Annotation> {
/* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(Annotation annotation1, Annotation annotation2) {
+ @Override
+ public int compare(Annotation annotation1, Annotation annotation2) {
if (annotation1.isMarkedDeleted() && !annotation2.isMarkedDeleted()) {
return 1;
}
} else {
return 0;
}
- }
+ }
}
-
+
/**
* The annotation model is assigned responsibility for creating new containers
* from blocks of text.
public void setEntityCreator(IEntityCreator<?> entityCreator) {
this.entityCreator = entityCreator;
}
-
+
/**
* Creates an annotation without adding it to the model.
*
annotation.markAsNew(true);
return annotation;
}
-
+
/* (non-Javadoc)
* @see org.eclipse.jface.text.source.AnnotationModel#addAnnotation(org.eclipse.jface.text.source.Annotation, org.eclipse.jface.text.Position)
*/
public void addAnnotation(Annotation annotation, Position position) {
super.addAnnotation(annotation, position);
}
-
+
/**
* <p>getAnnotation</p>
*
<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.5.0.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.5.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.5.0-sources.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.5.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.5.0-sources.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.5.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.5.0-sources.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.5.0.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.5.0.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.5.0.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.5.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.5.0-sources.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.5.0.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.5.1.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.5.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.5.1-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.5.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.5.1-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.5.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.5.1-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.5.1.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.5.1.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.5.1.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.5.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.5.1-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.5.1.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>\r
Bundle-ManifestVersion: 2
Bundle-Name: CDM Library Dependencies Plugin
Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Eclipse-BundleShape: dir
Export-Package: com.google.api,
com.google.api.detect,
lib/batik-util-1.7.jar,
lib/batik-xml-1.7.jar,
lib/c3p0-0.9.5.2.jar,
- lib/cdmlib-commons-4.5.0.jar,
- lib/cdmlib-ext-4.5.0.jar,
- lib/cdmlib-io-4.5.0.jar,
- lib/cdmlib-model-4.5.0.jar,
- lib/cdmlib-persistence-4.5.0.jar,
- lib/cdmlib-print-4.5.0.jar,
- lib/cdmlib-remote-4.5.0.jar,
- lib/cdmlib-services-4.5.0.jar,
- lib/cdmlib-test-4.5.0.jar,
+ lib/cdmlib-commons-4.5.1.jar,
+ lib/cdmlib-ext-4.5.1.jar,
+ lib/cdmlib-io-4.5.1.jar,
+ lib/cdmlib-model-4.5.1.jar,
+ lib/cdmlib-persistence-4.5.1.jar,
+ lib/cdmlib-print-4.5.1.jar,
+ lib/cdmlib-remote-4.5.1.jar,
+ lib/cdmlib-services-4.5.1.jar,
+ lib/cdmlib-test-4.5.1.jar,
lib/cglib-3.2.0.jar,
lib/cglib-nodep-3.2.0.jar,
lib/classmate-1.3.1.jar,
lib/batik-util-1.7.jar,\
lib/batik-xml-1.7.jar,\
lib/c3p0-0.9.5.2.jar,\
- lib/cdmlib-commons-4.5.0.jar,\
- lib/cdmlib-ext-4.5.0.jar,\
- lib/cdmlib-io-4.5.0.jar,\
- lib/cdmlib-model-4.5.0.jar,\
- lib/cdmlib-persistence-4.5.0.jar,\
- lib/cdmlib-print-4.5.0.jar,\
- lib/cdmlib-remote-4.5.0.jar,\
- lib/cdmlib-services-4.5.0.jar,\
- lib/cdmlib-test-4.5.0.jar,\
+ lib/cdmlib-commons-4.5.1.jar,\
+ lib/cdmlib-ext-4.5.1.jar,\
+ lib/cdmlib-io-4.5.1.jar,\
+ lib/cdmlib-model-4.5.1.jar,\
+ lib/cdmlib-persistence-4.5.1.jar,\
+ lib/cdmlib-print-4.5.1.jar,\
+ lib/cdmlib-remote-4.5.1.jar,\
+ lib/cdmlib-services-4.5.1.jar,\
+ lib/cdmlib-test-4.5.1.jar,\
lib/cglib-3.2.0.jar,\
lib/cglib-nodep-3.2.0.jar,\
lib/classmate-1.3.1.jar,\
<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>taxeditor-parent</artifactId>\r
- <version>4.5.0</version>\r
+ <version>4.5.1</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
\r
</dependencies>\r
</project>\r
-
+\r
Bundle-ManifestVersion: 2
Bundle-Name: Editor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: OSGI-INF/l10n/plugin
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- if (config.isOnlyRemoveFromGallery()){
+ if (config.isOnlyRemoveFromGallery() || ((Media)object).getId() == 0){
operations.add(new RemoveImageFromDescriptionElementOperation(label, undoContext, (Media) object, imageGallery, postOperationEnabled));
}else{
operations.add(new DeleteMediaOperation(label, undoContext, imageGallery, (Media) object, config, postOperationEnabled));
<feature
id="eu.etaxonomy.taxeditor.feature.jre.linux64"
label="Taxonomic Editor JRE Linux64"
- version="4.5.0"
+ version="4.5.1"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>
<feature
id="eu.etaxonomy.taxeditor.feature.platform"
label="Taxeditor Dependencies"
- version="4.5.0"
+ version="4.5.1"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
arch="x86,x86_64">
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
<feature
id="eu.etaxonomy.taxeditor.feature"
label="Taxonomic Editor"
- version="4.5.0"
+ version="4.5.1"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux,macosx,win32"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
Bundle-ManifestVersion: 2
Bundle-Name: Help
Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
Bundle-Vendor: EDIT
Require-Bundle: org.eclipse.ui,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-bio-2.0.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-core-2.2.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swing-2.2.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swt-2.0.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jphyloio-core-0.3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/libralign-biojava1-0.4.0-preview-2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/libralign-core-0.4.0-preview-2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/libralign-io-0.4.0-preview-2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/libralign-swt-0.4.0-preview-2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/tic-core-2.0.0-preview-2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/tic-swt-2.0.0-preview-2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.5.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/owlapi-xmlutils-4.1.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/core-1.9.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/sequencing-1.9.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.5.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-bio-2.0.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-core-2.2.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swing-2.2.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swt-2.0.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jphyloio-core-0.3.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/tic-core-2.0.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/tic-swt-2.0.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/libralign-biojava1-0.4.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/libralign-core-0.4.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/libralign-io-0.4.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/libralign-swt-0.4.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Bundle-ClassPath: .,
lib/owlapi-xmlutils-4.1.4.jar,
lib/commons-collections4-4.1.jar,
lib/bioinfweb-commons-java-swing-2.2.0.jar,
lib/bioinfweb-commons-java-swt-2.0.0.jar,
lib/jphyloio-core-0.3.0.jar,
- lib/libralign-biojava1-0.4.0-preview-2.jar,
- lib/libralign-core-0.4.0-preview-2.jar,
- lib/libralign-io-0.4.0-preview-2.jar,
- lib/libralign-swt-0.4.0-preview-2.jar,
- lib/tic-core-2.0.0-preview-2.jar,
- lib/tic-swt-2.0.0-preview-2.jar
+ lib/tic-core-2.0.0.jar,
+ lib/tic-swt-2.0.0.jar,
+ lib/libralign-biojava1-0.4.0.jar,
+ lib/libralign-core-0.4.0.jar,
+ lib/libralign-io-0.4.0.jar,
+ lib/libralign-swt-0.4.0.jar
Export-Package: info.bioinfweb.commons,
info.bioinfweb.commons.appversion,
info.bioinfweb.commons.beans,
info.bioinfweb.jphyloio.objecttranslation,
info.bioinfweb.jphyloio.objecttranslation.implementations,
info.bioinfweb.jphyloio.utils,
- info.bioinfweb.libralign,
info.bioinfweb.libralign.actions,
info.bioinfweb.libralign.alignmentarea,
info.bioinfweb.libralign.alignmentarea.content,
lib/bioinfweb-commons-java-swing-2.2.0.jar,\
lib/bioinfweb-commons-java-swt-2.0.0.jar,\
lib/jphyloio-core-0.3.0.jar,\
- lib/libralign-biojava1-0.4.0-preview-2.jar,\
- lib/libralign-core-0.4.0-preview-2.jar,\
- lib/libralign-io-0.4.0-preview-2.jar,\
- lib/libralign-swt-0.4.0-preview-2.jar,\
- lib/tic-core-2.0.0-preview-2.jar,\
- lib/tic-swt-2.0.0-preview-2.jar
+ lib/tic-core-2.0.0.jar,\
+ lib/tic-swt-2.0.0.jar,\
+ lib/libralign-biojava1-0.4.0.jar,\
+ lib/libralign-core-0.4.0.jar,\
+ lib/libralign-io-0.4.0.jar,\
+ lib/libralign-swt-0.4.0.jar
lib/jphyloio-core-0-SNAPSHOT.jar,\
lib/owlapi-xmlutils-4.1.4.jar
+++ /dev/null
-bin.includes = META-INF/,\
- lib/tic-swt-2.0.0-preview-1.jar,\
- lib/commons-collections4-4.1.jar,\
- lib/core-1.9.2.jar,\
- lib/sequencing-1.9.2.jar,\
- lib/commons-lang3-3.5.jar,\
- lib/commons-beanutils-1.9.2.jar,\
- lib/bioinfweb-commons-java-bio-2.0.0.jar,\
- lib/bioinfweb-commons-java-core-2.2.0.jar,\
- lib/bioinfweb-commons-java-swing-2.2.0.jar,\
- lib/bioinfweb-commons-java-swt-2.0.0.jar,\
- lib/jphyloio-core-0.3.0.jar,\
- lib/libralign-biojava1-0.4.0-preview-2.jar,\
- lib/libralign-core-0.4.0-preview-2.jar,\
- lib/libralign-io-0.4.0-preview-2.jar,\
- lib/libralign-swt-0.4.0-preview-2.jar,\
- lib/tic-core-2.0.0-preview-2.jar,\
- lib/tic-swt-2.0.0-preview-2.jar
- lib/jphyloio-core-0-SNAPSHOT.jar,\
- lib/owlapi-xmlutils-4.1.4.jar
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<build>
<dependency>
<groupId>info.bioinfweb.tic</groupId>
<artifactId>tic-core</artifactId>
- <version>2.0.0-preview-2</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>info.bioinfweb.tic</groupId>
<artifactId>tic-swt</artifactId>
- <version>2.0.0-preview-2</version>
+ <version>2.0.0</version>
</dependency>
<!-- BioJava -->
<dependency>
<groupId>info.bioinfweb.libralign</groupId>
<artifactId>libralign-core</artifactId>
- <version>0.4.0-preview-2</version>
+ <version>0.4.0</version>
</dependency>
<dependency>
<groupId>info.bioinfweb.libralign</groupId>
<artifactId>libralign-swt</artifactId>
- <version>0.4.0-preview-2</version>
+ <version>0.4.0</version>
</dependency>
<dependency>
<groupId>info.bioinfweb.libralign</groupId>
<artifactId>libralign-biojava1</artifactId>
- <version>0.4.0-preview-2</version>
+ <version>0.4.0</version>
</dependency>
<dependency>
<groupId>info.bioinfweb.libralign</groupId>
<artifactId>libralign-io</artifactId>
- <version>0.4.0-preview-2</version>
+ <version>0.4.0</version>
</dependency>
<!-- JPhyloIO -->
Bundle-ManifestVersion: 2
Bundle-Name: Molecular Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Navigation Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.cdm,
eu.etaxonomy.taxeditor.navigation,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Printpublisher Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Require-Bundle: org.eclipse.osgi,
org.eclipse.ui,
eu.etaxonomy.taxeditor.cdmlib,
<parent>
<artifactId>taxeditor-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: DataStore Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.cdm,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@Deprecated
public <T extends DefinedTermBase> TermComboElement<T> createTermComboElement(Class<T> termComboType,
ICdmFormElement parentElement, String labelString, T selection, int style) {
- TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString,
- selection, true, style);
+ TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString, selection, true, style);
adapt(element);
parentElement.addElement(element);
return element;
String labelString,
T selection,
int style) {
- return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, false, style, true);
+ return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, true, style, false);
}
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
T selection,
boolean addEmptyElement,
int style) {
- return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, true);
+ return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, false);
}
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
TermType termType,
String labelString,
T selection,
int style) {
- return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, false, style, true);
+ return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, true, style, false);
}
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
Bundle-ManifestVersion: 2
Bundle-Name: Webapp
Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 4.5.0
+Bundle-Version: 4.5.1
Require-Bundle: org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="4.5.0">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="4.5.1">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<text>
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.5.0" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.5.1" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</prerequisites>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>EDIT Taxonomic Editor</name>
<description>The Taxonomic Editor for EDIT's platform for
cybertaxonomy
<properties>
<java.codelevel>1.7</java.codelevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cdmlib.version>4.5.0</cdmlib.version>
+ <cdmlib.version>4.5.1</cdmlib.version>
<!-- TODO can we use project.version ????? -->
<tycho.version>0.22.0</tycho.version>
- <taxeditor.version>4.5.0</taxeditor.version>
+ <taxeditor.version>4.5.1</taxeditor.version>
<update.dir>snapshot</update.dir>
<unitils.version>3.4.2</unitils.version>
<log4j.version>1.2.17</log4j.version>
BGBM BDI Projects / taxeditor.git / commitdiff