Bundle-ManifestVersion: 2
Bundle-Name: Application
Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</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.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<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-SNAPSHOT.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.5.0-SNAPSHOT-sources.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.5.0-SNAPSHOT-sources.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.5.0-SNAPSHOT-sources.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.5.0-SNAPSHOT.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.5.0-SNAPSHOT.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.5.0-SNAPSHOT.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.5.0-SNAPSHOT-sources.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.5.0-SNAPSHOT.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.6.0-SNAPSHOT.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.6.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.6.0-SNAPSHOT-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.6.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.6.0-SNAPSHOT-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.6.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.6.0-SNAPSHOT-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.6.0-SNAPSHOT.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.6.0-SNAPSHOT.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.6.0-SNAPSHOT.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.6.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.6.0-SNAPSHOT-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.6.0-SNAPSHOT.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.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT.jar,
- lib/cdmlib-ext-4.5.0-SNAPSHOT.jar,
- lib/cdmlib-io-4.5.0-SNAPSHOT.jar,
- lib/cdmlib-model-4.5.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-4.5.0-SNAPSHOT.jar,
- lib/cdmlib-print-4.5.0-SNAPSHOT.jar,
- lib/cdmlib-remote-4.5.0-SNAPSHOT.jar,
- lib/cdmlib-services-4.5.0-SNAPSHOT.jar,
- lib/cdmlib-test-4.5.0-SNAPSHOT.jar,
+ lib/cdmlib-commons-4.6.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-4.6.0-SNAPSHOT.jar,
+ lib/cdmlib-io-4.6.0-SNAPSHOT.jar,
+ lib/cdmlib-model-4.6.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-4.6.0-SNAPSHOT.jar,
+ lib/cdmlib-print-4.6.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-4.6.0-SNAPSHOT.jar,
+ lib/cdmlib-services-4.6.0-SNAPSHOT.jar,
+ lib/cdmlib-test-4.6.0-SNAPSHOT.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-SNAPSHOT.jar,\
- lib/cdmlib-ext-4.5.0-SNAPSHOT.jar,\
- lib/cdmlib-io-4.5.0-SNAPSHOT.jar,\
- lib/cdmlib-model-4.5.0-SNAPSHOT.jar,\
- lib/cdmlib-persistence-4.5.0-SNAPSHOT.jar,\
- lib/cdmlib-print-4.5.0-SNAPSHOT.jar,\
- lib/cdmlib-remote-4.5.0-SNAPSHOT.jar,\
- lib/cdmlib-services-4.5.0-SNAPSHOT.jar,\
- lib/cdmlib-test-4.5.0-SNAPSHOT.jar,\
+ lib/cdmlib-commons-4.6.0-SNAPSHOT.jar,\
+ lib/cdmlib-ext-4.6.0-SNAPSHOT.jar,\
+ lib/cdmlib-io-4.6.0-SNAPSHOT.jar,\
+ lib/cdmlib-model-4.6.0-SNAPSHOT.jar,\
+ lib/cdmlib-persistence-4.6.0-SNAPSHOT.jar,\
+ lib/cdmlib-print-4.6.0-SNAPSHOT.jar,\
+ lib/cdmlib-remote-4.6.0-SNAPSHOT.jar,\
+ lib/cdmlib-services-4.6.0-SNAPSHOT.jar,\
+ lib/cdmlib-test-4.6.0-SNAPSHOT.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-SNAPSHOT</version>\r
+ <version>4.6.0-SNAPSHOT</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
Bundle-ManifestVersion: 2
Bundle-Name: Editor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.handlers.HandlerUtil;
+import eu.etaxonomy.cdm.api.service.config.MediaDeletionConfigurator;
import eu.etaxonomy.cdm.model.description.DescriptionBase;
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
import eu.etaxonomy.cdm.model.description.SpecimenDescription;
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteSpecimenDescriptionOperation;
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteTaxonDescriptionOperation;
import eu.etaxonomy.taxeditor.editor.view.media.operation.DeleteMediaOperation;
+import eu.etaxonomy.taxeditor.editor.view.media.operation.RemoveImageFromDescriptionElementOperation;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
+import eu.etaxonomy.taxeditor.ui.dialog.deleteConfigurator.DeleteConfiguratorDialog;
/**
* <p>DeleteDescriptionHandler class.</p>
DescriptionBase<?> imageGallery = (DescriptionBase<?>) path[0].getFirstSegment();
- operations.add(new DeleteMediaOperation(label, undoContext, imageGallery, (Media) object, postOperationEnabled));
+ // TODO use undo context specific to editor
+ MediaDeletionConfigurator config = new MediaDeletionConfigurator();
+
+ DeleteConfiguratorDialog dialog;
+ dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion", null, "Do you really want to delete the media?", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0);
+ int result_dialog= dialog.open();
+ if (result_dialog != Status.OK){
+ return null;
+ }
+
+
+
+ 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));
+ }
+
+
+
}
else{
MessagingUtils.error(getClass(), "Selection is not valid for this delete handler", null);
monitor.worked(20);
if (description != null){
+ element.removeDescription(description);
CdmStore.getService(IDescriptionService.class).deleteDescription(description.getUuid());
return postExecute(description);
}
/**
- *
+ *
*/
package eu.etaxonomy.taxeditor.editor.view.media.handler;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.handlers.HandlerUtil;
+import eu.etaxonomy.cdm.api.service.config.MediaDeletionConfigurator;
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
import eu.etaxonomy.cdm.model.media.ImageFile;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
-import eu.etaxonomy.taxeditor.editor.view.media.operation.RemoveImageFromDescriptionElementOperation;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.ui.dialog.deleteConfigurator.DeleteConfiguratorDialog;
/**
* <p>DeleteMediaHandler class.</p>
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
/** {@inheritDoc} */
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
IWorkbenchPart part = HandlerUtil.getActivePart(event);
IPostOperationEnabled postOperationEnabled = (part instanceof IPostOperationEnabled) ? (IPostOperationEnabled) part : null;
-
+
IEditorPart editor = HandlerUtil.getActiveEditor(event);
if (editor instanceof FormEditor) {
editor = ((FormEditor) editor).getActiveEditor();
IEditorInput input = editor.getEditorInput();
if (input instanceof TaxonEditorInput) {
Taxon taxon = ((TaxonEditorInput) input).getTaxon();
-
+
ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof TreeSelection) {
TreePath[] paths = ((TreeSelection) selection).getPaths();
-
+
int count = paths[0].getSegmentCount();
DescriptionElementBase element = null;
for (int i = 0; i < count; i++ ) {
}
}
ImageFile image = (ImageFile) paths[0].getLastSegment();
-
+
AbstractPostOperation operation = null;
- try {
- // TODO use undo context specific to editor
- operation = new RemoveImageFromDescriptionElementOperation(event.getCommand().getName(),
- EditorUtil.getUndoContext(), taxon, image, element, postOperationEnabled);
- EditorUtil.executeOperation(operation);
- } catch (NotDefinedException e) {
- MessagingUtils.warn(getClass(), "Command name not set.");
- }
+ // TODO use undo context specific to editor
+ MediaDeletionConfigurator config = new MediaDeletionConfigurator();
+
+ DeleteConfiguratorDialog dialog;
+ dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion", null, "Do you really want to delete the media?", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0);
+ int result_dialog= dialog.open();
+ if (result_dialog != Status.OK){
+ return null;
+ }
+
+
+//
+// if (config.isOnlyRemoveFromGallery()){
+// operation = new RemoveImageFromDescriptionElementOperation(event.getCommand().getName(), EditorUtil.getUndoContext(), taxon, image, element, postOperationEnabled);
+// }else{
+// operation = new DeleteMediaOperation(event.getCommand().getName(), EditorUtil.getUndoContext(), element, image, config, postOperationEnabled);
+// }
+
+ EditorUtil.executeOperation(operation);
}
}
return null;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import eu.etaxonomy.cdm.api.service.IMediaService;
+import eu.etaxonomy.cdm.api.service.config.MediaDeletionConfigurator;
import eu.etaxonomy.cdm.api.utility.ImagesUtility;
import eu.etaxonomy.cdm.model.description.DescriptionBase;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.store.CdmStore;
/**
* <p>DeleteMediaOperation class.</p>
private final DescriptionBase<?> description;
+ private final MediaDeletionConfigurator config;
+
/**
* <p>Constructor for DeleteMediaOperation.</p>
*
* @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
*/
public DeleteMediaOperation(String label, IUndoContext undoContext,
- DescriptionBase<?> description, Media media, IPostOperationEnabled postOperationEnabled) {
+ DescriptionBase<?> description, Media media, MediaDeletionConfigurator config, IPostOperationEnabled postOperationEnabled) {
super(label, undoContext, postOperationEnabled);
-
+ this.config = config;
this.media = media;
this.description = description;
}
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
+ ImagesUtility.removeMediaFromGallery(description, media);
+
monitor.worked(20);
- ImagesUtility.removeMediaFromGallery(description, media);
+ CdmStore.getService(IMediaService.class).delete(media.getUuid(), config);
monitor.worked(40);
return postExecute(null);
/**
* 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.
*/
import org.eclipse.core.runtime.IStatus;
import eu.etaxonomy.cdm.api.utility.ImagesUtility;
-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
-import eu.etaxonomy.cdm.model.media.ImageFile;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.description.DescriptionBase;
+import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
* @version 1.0
*/
public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxonOperation {
-
- private DescriptionElementBase element;
- private ImageFile image;
+
+ private DescriptionBase element;
+ private Media media;
/**
* <p>Constructor for RemoveImageFromDescriptionElementOperation.</p>
* @param element a {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase} object.
* @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
* @param label a {@link java.lang.String} object.
+ * @param config
* @param image a {@link eu.etaxonomy.cdm.model.media.ImageFile} object.
*/
public RemoveImageFromDescriptionElementOperation(String label,
- IUndoContext undoContext, Taxon taxon, ImageFile image,
- DescriptionElementBase element, IPostOperationEnabled postOperationEnabled) {
- super(label, undoContext, taxon, postOperationEnabled);
-
- this.image = image;
+ IUndoContext undoContext, Media media,
+ DescriptionBase element, IPostOperationEnabled postOperationEnabled) {
+ super(label, undoContext, postOperationEnabled);
+
+ this.media = media;
this.element = element;
}
throws ExecutionException {
monitor.worked(20);
- ImagesUtility.removeImage(element, image);
+ ImagesUtility.removeMediaFromGallery(element, media);
monitor.worked(40);
return postExecute(element);
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
- image = ImagesUtility.addImagePart(element);
- return postExecute(image);
+ ImagesUtility.addMediaToGallery(element, media);
+ return postExecute(media);
}
}
<feature
id="eu.etaxonomy.taxeditor.feature.jre.linux64"
label="Taxonomic Editor JRE Linux64"
- version="4.5.0.qualifier"
+ version="4.6.0.qualifier"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</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.qualifier"
+ version="4.6.0.qualifier"
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</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.qualifier"
+ version="4.6.0.qualifier"
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</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.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
Bundle-ClassPath: .,
lib/owlapi-xmlutils-4.1.4.jar,
lib/commons-collections4-4.1.jar,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<build>
Bundle-ManifestVersion: 2
Bundle-Name: Molecular Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</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.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</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.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</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.qualifier
+Bundle-Version: 4.6.0.qualifier
Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.cdm,
PresenceAbsenceTermDetailElement_CHOOSE_COLOR=Choose color
PresenceAbsenceTermDetailElement_COLOR_NOT_SET=Color could not be set
-PresenceAbsenceTermDetailElement_LABEL_COLOR=Color
+PresenceAbsenceTermDetailElement_LABEL_COLOR=Color
+
+DeleteConfiguration_media_removeFromGallery=Remove the media from the image gallery but leave it in database
+DeleteConfiguration_media_deleteIfUsedInTaxonDescription=Delete also if media is used in taxon description
+DeleteConfiguration_media_deleteIfUsedInSpecimenDescription=Delete also if media is used in specimen description
+DeleteConfiguration_media_delete=Delete the media completely
\ No newline at end of file
PresenceAbsenceTermDetailElement_CHOOSE_COLOR=Farbe wählen
PresenceAbsenceTermDetailElement_COLOR_NOT_SET=Farbe konnte nicht gespeichert werden
PresenceAbsenceTermDetailElement_LABEL_COLOR=Farbe
+
+DeleteConfiguration_media_removeFromGallery=Entferne Medienobjekt aus der Gallerie, aber behalte es in der Datenbank
+DeleteConfiguration_media_deleteIfUsedInTaxonDescription=Lösche das Medienobjekt, auch wenn es von einem Taxon verwendet wird
+DeleteConfiguration_media_deleteIfUsedInSpecimenDescription=Lösche das Medienobjekt, auch wenn es von einem Specimen verwendet wird
+DeleteConfiguration_media_delete=Lösche das Medienobjekt
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
public static String SearchManager_LARGE_RESULT_EXPECTED;
public static String SearchManager_LONG_SEARCH_WARNING;
public static String SupplementalDataViewPart_VIEWER_NAME;
+ public static String DeleteConfiguration_media_removeFromGallery;
+ public static String DeleteConfiguration_media_deleteIfUsedInTaxonDescription;
+ public static String DeleteConfiguration_media_deleteIfUsedInSpecimenDescription;
+ public static String DeleteConfiguration_media_delete;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
dtMenuManager.add(addChildTermsToMenuManager(TermType.NamedArea));
MenuManager otherMenuManager =
- new MenuManager("Other","eu.etaxonomy.taxeditor.store.term.other.menu");
+ new MenuManager("Others","eu.etaxonomy.taxeditor.store.term.other.menu");
otherMenuManager.setVisible(true);
dtMenuManager.add(otherMenuManager);
public final static String CONTACT_MESSAGE = System.getProperty("line.separator") + "Please contact EDIT Support (EditSupport@bgbm.org) with the error trace below (click on the 'Details' button).";
public final static String DEFAULT_MESSAGE = "Error thrown but no associated message";
public final static String CONNECTION_FAILURE_MESSAGE = "The connection to the remote server has been broken";
- public final static String REMOTE_ACCESS_FAILURE_MESSAGE = "Problem accessing remote server";
+ public final static String REMOTE_ACCESS_FAILURE_MESSAGE = "Maybe the server is currently not available. If the problem persists please contact the server admin with the error trace below.";
public static final String WIDGET_IS_DISPOSED_MESSAGE = "A widget was called, which was already disposed";
/**
server = activeCdmSource.getServer();
if(activeCdmSource instanceof CdmRemoteSource){
contextPath = ((CdmRemoteSource) activeCdmSource).getContextPath();
+ if (contextPath != null && contextPath.startsWith("cdmserver/")){
+ contextPath = contextPath.substring("cdmserver/".length());
+ }
}
}
}
contextInfo.add("login : " + login);
contextInfo.add("editor version : " + version);
- contextInfo.add("server : " + server + " / " + name + (CdmUtils.isNotBlank(contextPath)?" / "+contextPath:""));
+ contextInfo.add("server : " + server + " (" + name + ")" + (CdmUtils.isNotBlank(contextPath)?" / "+contextPath:""));
contextInfo.add("schema version : " + schemaVersion);
contextInfo.add("os : " + System.getProperty("os.name")+" "+System.getProperty("os.version")+" "+System.getProperty("os.arch"));
contextInfo.add("java : "+System.getProperty("java.version"));
import org.eclipse.core.commands.Parameterization;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.preference.wizard.VocabularyTermWizard;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.TermStore;
private Button toggleButton;
protected HashMap<DefinedTermBase<T>, Button> menuButtons;
- protected Button newButton;
protected Button editButton;
protected Button removeButton;
}
protected List<T> getTerms(){
- if(!CdmStore.isActive() || getTermClass()==null) {
- return new ArrayList<T>();
- } else {
- return TermStore.getTerms(getTermClass());
+ if(CdmStore.isActive() && getTermType()!=null){
+ return TermStore.getTerms(getTermType(), null);
}
+ return new ArrayList<T>();
}
/**
addEditButtonListeners();
}
- /**
- * Implement this method in MenuPreference Pages where the vocabulary should be editable, editable flag
- * is set.
- */
- protected void addNewButtonListeners() {
- newButton.addSelectionListener(new SelectionAdapter(){
- @Override
- public void widgetSelected(SelectionEvent e) {
- VocabularyTermWizard<T> wizard = new VocabularyTermWizard<T>(getTermClass(), getConversationHolder());
-
- WizardDialog dialog = new WizardDialog(AbstractUtility.getShell(), wizard);
- if(dialog.open() == IStatus.OK){
- tableViewer.setInput(getTerms());
- }
- }
-
- });
- }
-
/**
* Implement this method in MenuPreference Pages where the vocabulary should be editable, editable flag
* is set.
parameter = command.getParameter("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.termTypeUuid");
Parameterization[] parameterizations = new Parameterization[]{
- new Parameterization(parameter, TermType.valueOf(getTermClass().getSimpleName()).getUuid().toString())
+ new Parameterization(parameter, getTermType().getUuid().toString())
};
ParameterizedCommand pCommand = new ParameterizedCommand(command, parameterizations);
}
}
- protected abstract Class<T> getTermClass();
+ protected abstract TermType getTermType();
@Override
public ConversationHolder getConversationHolder() {
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
import eu.etaxonomy.cdm.model.common.ExtensionType;
+import eu.etaxonomy.cdm.model.common.TermType;
/**
* <p>ExtensionTypeMenuPreferences class.</p>
* <p>Constructor for ExtensionTypeMenuPreferences.</p>
*/
public ExtensionTypeMenuPreferences() {
- super("Extension Type Preferences" ,
+ super("Extension Type Preferences" ,
"Choose which extension types to display",
false);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<ExtensionType> getTermClass() {
- return ExtensionType.class;
+ protected TermType getTermType() {
+ return TermType.ExtensionType;
}
}
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.description.Feature;
/**
/** Constant <code>PLUGIN_ID="eu.etaxonomy.taxeditor.preferences.feat"{trunked}</code> */
public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.feature";
-
+
/**
* <p>Constructor for FeatureMenuPreferences.</p>
*/
public FeatureMenuPreferences() {
- super("Feature Preferences",
- "Choose which features you would like to use for descriptive elements.",
+ super("Feature Preferences",
+ "Choose which features you would like to use for descriptive elements.",
false);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<Feature> getTermClass() {
- return Feature.class;
+ protected TermType getTermType() {
+ return TermType.Feature;
}
}
/**
* 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.
*/
import org.eclipse.swt.widgets.Control;
import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.TermType;
/**
* <p>LanguageMenuPreferences class.</p>
* @version 1.0
*/
public class LanguageMenuPreferences extends AbstractMenuPreferences<Language> {
-
+
/** Constant <code>ID="eu.etaxonomy.taxeditor.preferences.lang"{trunked}</code> */
public final static String ID = "eu.etaxonomy.taxeditor.preferences.languages";
-
+
/**
* <p>Constructor for LanguageMenuPreferences.</p>
*/
public LanguageMenuPreferences() {
- super("Language Preferences",
+ super("Language Preferences",
"Configure language preferences.",
false);
}
-
+
/* (non-Javadoc)
* @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences#createContents(org.eclipse.swt.widgets.Composite)
*/
@Override
public Control createContents(Composite parent) {
Control control = super.createContents(parent);
-
+
tableViewer.setLabelProvider(new LanguagePreferenceLabelProvider());
tableViewer.setComparator(new ViewerComparator());
-
+
return control;
}
-
+
class LanguagePreferenceLabelProvider extends LabelProvider implements ITableLabelProvider{
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
*/
- public Image getColumnImage(Object element, int columnIndex) {
+ @Override
+ public Image getColumnImage(Object element, int columnIndex) {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
*/
- public String getColumnText(Object element, int columnIndex) {
+ @Override
+ public String getColumnText(Object element, int columnIndex) {
String description = ((Language)element).getDescription();
if (description == null) {
description = ((Language)element).getLabel() + " - Warning: no description - not shown in menus";
}
return description;
}
-
+
}
/* (non-Javadoc)
*/
/** {@inheritDoc} */
@Override
- protected Class<Language> getTermClass() {
- return Language.class;
+ protected TermType getTermType() {
+ return TermType.Language;
}
}
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.common.TermType;
/**
* <p>MarkerTypeMenuPreferences class.</p>
* <p>Constructor for MarkerTypeMenuPreferences.</p>
*/
public MarkerTypeMenuPreferences() {
- super("Marker Type Preferences" ,
+ super("Marker Type Preferences" ,
"Choose which markers to display",
true);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<MarkerType> getTermClass() {
- return MarkerType.class;
+ protected TermType getTermType() {
+ return TermType.MarkerType;
}
}
/**
- *
+ *
*/
package eu.etaxonomy.taxeditor.preference.menu;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.description.MeasurementUnit;
/**
* <p>Constructor for MeasurementUnitMenuPreferences.</p>
*/
public MeasurementUnitMenuPreferences() {
- super("Measurement Units",
- "Edit displayed measurement units",
+ super("Measurement Units",
+ "Edit displayed measurement units",
true);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<MeasurementUnit> getTermClass() {
- return MeasurementUnit.class;
+ protected TermType getTermType() {
+ return TermType.MeasurementUnit;
}
}
/**
* 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.
*/
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
import eu.etaxonomy.taxeditor.labels.ILabelImageStrategy;
import eu.etaxonomy.taxeditor.labels.LabelImageProvider;
public class NameRelationshipTypeMenuPreferences extends
AbstractMenuPreferences<NameRelationshipType> {
-
+
/**
* <p>Constructor for NameRelationshipTypeMenuPreferences.</p>
*/
public NameRelationshipTypeMenuPreferences() {
- super("Name relationship types",
+ super("Name relationship types",
"Configure name relationship types",
false);
}
-
+
/* (non-Javadoc)
* @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences#createContents(org.eclipse.swt.widgets.Composite)
*/
getTableViewer().setLabelProvider(new NameRelationLabelProvider());
return container;
}
-
+
public class NameRelationLabelProvider extends DefinedTermBaseLabelProvider {
private LabelImageProvider labelProvider;
public NameRelationLabelProvider() {
super();
-
+
ILabelImageStrategy strategy = LabelImageProvider.getLabelStrategy(
PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null));
this.labelProvider = new LabelImageProvider(strategy);
}
-
+
/* (non-Javadoc)
* @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences.MenuPreferenceLabelProvider#getColumnImage(java.lang.Object, int)
*/
@Override
public Image getColumnImage(Object element, int columnIndex) {
- // The preference page looked lame with images
+ // The preference page looked lame with images
// if (element instanceof NameRelationshipType) {
// return labelProvider.getNameRelationImage((NameRelationshipType) element);
// }
return super.getColumnImage(element, columnIndex);
}
-
+
/* (non-Javadoc)
* @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences.MenuPreferenceLabelProvider#getColumnText(java.lang.Object, int)
*/
*/
/** {@inheritDoc} */
@Override
- protected Class<NameRelationshipType> getTermClass() {
- return NameRelationshipType.class;
+ protected TermType getTermType() {
+ return TermType.NameRelationshipType;
}
}
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
/**
* <p>Constructor for NameTypeDesignationStatusMenuPreferences.</p>
*/
public NameTypeDesignationStatusMenuPreferences() {
- super("Name Type Designation Status Preferences",
+ super("Name Type Designation Status Preferences",
"Configure name type designation status",
false);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<NameTypeDesignationStatus> getTermClass() {
- return NameTypeDesignationStatus.class;
+ protected TermType getTermType() {
+ return TermType.NameTypeDesignationStatus;
}
}
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.location.NamedAreaType;
/**
* <p>Constructor for NamedAreaTypeMenuPreferences.</p>
*/
public NamedAreaTypeMenuPreferences() {
- super("Named Area Types",
- "Edit displayed named area types",
+ super("Named Area Types",
+ "Edit displayed named area types",
false);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<NamedAreaType> getTermClass() {
- return NamedAreaType.class;
+ protected TermType getTermType() {
+ return TermType.NamedAreaType;
}
}
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
/**
* <p>Constructor for NomenclaturalStatusTypeMenuPreferences.</p>
*/
public NomenclaturalStatusTypeMenuPreferences() {
- super("Nomenlcatural Status Type Preferences",
+ super("Nomenlcatural Status Type Preferences",
"Configure nomenclatural status types",
false);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<NomenclaturalStatusType> getTermClass() {
- return NomenclaturalStatusType.class;
+ protected TermType getTermType() {
+ return TermType.NomenclaturalStatusType;
}
-
+
}
import org.eclipse.ui.IWorkbenchPreferencePage;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
/**
*/
/** {@inheritDoc} */
@Override
- protected Class<PresenceAbsenceTerm> getTermClass() {
- return PresenceAbsenceTerm.class;
+ protected TermType getTermType() {
+ return TermType.PresenceAbsenceTerm;
}
}
package eu.etaxonomy.taxeditor.preference.menu;
import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
/**
* <p>PreservationMethodMenuPreferences class.</p>
*/
/** {@inheritDoc} */
@Override
- protected Class<DefinedTerm> getTermClass() {
- return null;
+ protected TermType getTermType() {
+ return TermType.MaterialOrMethod;
}
}
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbenchPreferencePage;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.name.Rank;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
*/
/** {@inheritDoc} */
@Override
- protected Class<Rank> getTermClass() {
- return Rank.class;
+ protected TermType getTermType() {
+ return TermType.Rank;
}
}
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
/**
* <p>Constructor for SpecimenTypeDesignationStatusMenuPreferences.</p>
*/
public SpecimenTypeDesignationStatusMenuPreferences() {
- super("Specimen Type Designation Status Preferences",
+ super("Specimen Type Designation Status Preferences",
"Configure specimen type designation status",
false);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<SpecimenTypeDesignationStatus> getTermClass() {
- return SpecimenTypeDesignationStatus.class;
+ protected TermType getTermType() {
+ return TermType.SpecimenTypeDesignationStatus;
}
}
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
/**
* @version 1.0
*/
public class StageMenuPreferences extends AbstractMenuPreferences<DefinedTerm> {
-
+
/**
* <p>Constructor for StageMenuPreferences.</p>
*/
public StageMenuPreferences() {
- super("Stage Preferences",
- "Choose stages to be shown in selection combos",
+ super("Stage Preferences",
+ "Choose stages to be shown in selection combos",
false);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<DefinedTerm> getTermClass() {
- return null;
+ protected TermType getTermType() {
+ return TermType.Stage;
}
}
/**
* 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.
*/
package eu.etaxonomy.taxeditor.preference.menu;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
/**
* <p>Constructor for TaxonRelationshipTypeMenuPreferences.</p>
*/
public TaxonRelationshipTypeMenuPreferences() {
- super("Taxon Relationship Type Preferences",
+ super("Taxon Relationship Type Preferences",
"Configure taxon relationship types",
false);
}
*/
/** {@inheritDoc} */
@Override
- protected Class<TaxonRelationshipType> getTermClass() {
- return TaxonRelationshipType.class;
+ protected TermType getTermType() {
+ return TermType.TaxonRelationshipType;
}
-
+
}
public class DeleteConfiguratorDialog extends MessageDialog{
private final DeleteConfiguratorBase configurator;
+ private final boolean fromBulkEditor;
+
+ public DeleteConfiguratorDialog(DeleteConfiguratorBase configurator, Shell parentShell, String dialogTitle,
+ Image dialogTitleImage, String dialogMessage, int dialogImageType, String[] dialogButtonLabels, int defaultIndex, boolean fromBulkEditor) {
+ super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
+ this.configurator = configurator;
+ this.fromBulkEditor = fromBulkEditor;
+ }
public DeleteConfiguratorDialog(DeleteConfiguratorBase configurator, Shell parentShell, String dialogTitle,
Image dialogTitleImage, String dialogMessage, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) {
super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
this.configurator = configurator;
+ this.fromBulkEditor = false;
}
@Override
} else if(configurator instanceof NameDeletionConfigurator){
composite.addConfiguratorComposite(new DeleteNameConfiguratorComposite((NameDeletionConfigurator) configurator, composite.getSectionConfigure(), SWT.NONE));
} else if(configurator instanceof MediaDeletionConfigurator){
- composite.addConfiguratorComposite(new DeleteMediaConfiguratorComposite((MediaDeletionConfigurator) configurator, composite.getSectionConfigure(), SWT.NONE));
+ if (!fromBulkEditor){
+ composite.addConfiguratorComposite(new DeleteMediaConfiguratorComposite((MediaDeletionConfigurator) configurator, composite.getSectionConfigure(), SWT.NONE, fromBulkEditor));
+ }else{
+ composite.addConfiguratorComposite(new DeleteMediaConfiguratorComposite((MediaDeletionConfigurator) configurator, composite.getSectionConfigure(), SWT.NONE));
+ }
}
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
import org.eclipse.ui.forms.widgets.FormToolkit;
import eu.etaxonomy.cdm.api.service.config.MediaDeletionConfigurator;
+import eu.etaxonomy.taxeditor.Messages;
/**
* @author k.luther
private final MediaDeletionConfigurator configurator;
private final Button btnDeleteIfUsedInTaxonDescription;
private final Button btnDeleteIfUsedInSpecimenDescription;
+ private final Button btnRemoveFromImageGallery;
+ private final boolean isInBulkEditor;
/**
public DeleteMediaConfiguratorComposite(MediaDeletionConfigurator configurator, Composite parent, int style) {
super(parent, style);
this.configurator = configurator;
+ this.isInBulkEditor = false;
addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
setLayout(new RowLayout(SWT.VERTICAL));
setBackground(getBackground());
+ btnRemoveFromImageGallery = null;
+
btnDeleteIfUsedInTaxonDescription = new Button(this, SWT.CHECK);
- btnDeleteIfUsedInTaxonDescription.setText("Delete also if media is used in taxon description. ");
+ btnDeleteIfUsedInTaxonDescription.setText(Messages.DeleteConfiguration_media_deleteIfUsedInTaxonDescription);
btnDeleteIfUsedInTaxonDescription.setSelection(false);
btnDeleteIfUsedInSpecimenDescription = new Button(this, SWT.CHECK);
- btnDeleteIfUsedInSpecimenDescription.setText("Delete also if media is used in specimen description. ");
+ btnDeleteIfUsedInSpecimenDescription.setText(Messages.DeleteConfiguration_media_deleteIfUsedInSpecimenDescription);
btnDeleteIfUsedInSpecimenDescription.setSelection(false);
+ m_bindingContext = initDataBindings();
+
+ }
+
+ public DeleteMediaConfiguratorComposite(MediaDeletionConfigurator configurator, Composite parent, int style, boolean inBulkEditor) {
+ super(parent, style);
+ this.configurator = configurator;
+ this.isInBulkEditor = inBulkEditor;
+ addDisposeListener(new DisposeListener() {
+ @Override
+ public void widgetDisposed(DisposeEvent e) {
+ toolkit.dispose();
+ }
+ });
+ toolkit.paintBordersFor(this);
+ setLayout(new GridLayout());
+ setBackground(getBackground());
+
+
+
+
+ if (!inBulkEditor){
+ btnRemoveFromImageGallery = new Button(this, SWT.RADIO);
+ btnRemoveFromImageGallery.setText(Messages.DeleteConfiguration_media_removeFromGallery);
+
+ btnRemoveFromImageGallery.setSelection(true);
+ btnRemoveFromImageGallery.setVisible(true);
+ btnDeleteIfUsedInTaxonDescription = new Button(this, SWT.RADIO);
+ btnDeleteIfUsedInTaxonDescription.setSelection(false);
+ btnDeleteIfUsedInTaxonDescription.setVisible(true);
+ btnDeleteIfUsedInTaxonDescription.setText(Messages.DeleteConfiguration_media_delete);
+ btnDeleteIfUsedInSpecimenDescription = new Button(this, SWT.CHECK);
+ btnDeleteIfUsedInSpecimenDescription.setText(Messages.DeleteConfiguration_media_deleteIfUsedInSpecimenDescription);
+ btnDeleteIfUsedInSpecimenDescription.setVisible(false);
+ btnDeleteIfUsedInTaxonDescription.addListener(SWT.Selection, new Listener() {
+ @Override
+ public void handleEvent(Event e) {
+ Button b = (Button) e.widget;
+ GridData data = (GridData) btnDeleteIfUsedInTaxonDescription.getLayoutData();
+ data.exclude = b.getSelection();
+ btnDeleteIfUsedInSpecimenDescription.setVisible(data.exclude);
+
+ }
+ });
+
+
+
+
+ } else{
+ btnRemoveFromImageGallery =null;
+ btnDeleteIfUsedInTaxonDescription = new Button(this, SWT.CHECK);
+ btnDeleteIfUsedInTaxonDescription.setSelection(false);
+ btnDeleteIfUsedInTaxonDescription.setText(Messages.DeleteConfiguration_media_deleteIfUsedInTaxonDescription);
+ btnDeleteIfUsedInTaxonDescription.setVisible(true);
+
+ btnDeleteIfUsedInSpecimenDescription = new Button(this, SWT.CHECK);
+ btnDeleteIfUsedInSpecimenDescription.setText(Messages.DeleteConfiguration_media_deleteIfUsedInSpecimenDescription);
+ btnDeleteIfUsedInSpecimenDescription.setVisible(true);
+ }
+
+
+
+
+
+
+
m_bindingContext = initDataBindings();
}
IObservableValue observeSelectionBtnDeleteIfUsedInTaxonDescription = WidgetProperties.selection().observe(btnDeleteIfUsedInTaxonDescription);
IObservableValue deleteIfUsedInTaxonDescriptionConfiguratorObserveValue = PojoProperties.value("deleteIfUsedInTaxonDescription").observe(configurator);
bindingContext.bindValue(observeSelectionBtnDeleteIfUsedInTaxonDescription, deleteIfUsedInTaxonDescriptionConfiguratorObserveValue, null, null);
-
- IObservableValue observeSelectionBtnDeleteIfUsedInSpecimenDescription = WidgetProperties.selection().observe(btnDeleteIfUsedInSpecimenDescription);
- IObservableValue deleteIfUsedInSpecimenDescriptionConfiguratorObserveValue = PojoProperties.value("deleteIfUsedInSpecimenDescription").observe(configurator);
- bindingContext.bindValue(observeSelectionBtnDeleteIfUsedInSpecimenDescription, deleteIfUsedInSpecimenDescriptionConfiguratorObserveValue, null, null);
+ if (isInBulkEditor){
+ IObservableValue observeSelectionBtnDeleteIfUsedInSpecimenDescription = WidgetProperties.selection().observe(btnDeleteIfUsedInSpecimenDescription);
+ IObservableValue deleteIfUsedInSpecimenDescriptionConfiguratorObserveValue = PojoProperties.value("deleteIfUsedInSpecimenDescription").observe(configurator);
+ bindingContext.bindValue(observeSelectionBtnDeleteIfUsedInSpecimenDescription, deleteIfUsedInSpecimenDescriptionConfiguratorObserveValue, null, null);
+ }else{
+ IObservableValue observeSelectionBtnRemoveFromImageGallery = WidgetProperties.selection().observe(btnRemoveFromImageGallery);
+ IObservableValue removeFromImageGalleryConfiguratorObserveValue = PojoProperties.value("onlyRemoveFromGallery").observe(configurator);
+ bindingContext.bindValue(observeSelectionBtnRemoveFromImageGallery, removeFromImageGalleryConfiguratorObserveValue, null, null);
+
+ IObservableValue observeSelectionBtnDeleteIfUsedInSpecimenDescription = WidgetProperties.selection().observe(btnDeleteIfUsedInSpecimenDescription);
+ IObservableValue deleteIfUsedInSpecimenDescriptionConfiguratorObserveValue = PojoProperties.value("deleteIfUsedInSpecimenDescription").observe(configurator);
+ bindingContext.bindValue(observeSelectionBtnDeleteIfUsedInSpecimenDescription, deleteIfUsedInSpecimenDescriptionConfiguratorObserveValue, null, null);
+ }
return bindingContext;
}
*
*/
protected static final String TEAM = "Team";
-
+
protected static boolean selectTeamMember;
/**
if (control != null){
pattern = ((Text)control).getText();
}
-
-
- model = CdmStore.getService(IAgentService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
+ if (pattern == null || pattern.equals("?")){
+ model = CdmStore.getService(IAgentService.class).getUuidAndTitleCache(null, null);
+ }else{
+ model = CdmStore.getService(IAgentService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
+ }
}
pattern = ((Text)control).getText();
}
+ if (pattern == null || pattern.equals("?")){
+ model = CdmStore.getService(IClassificationService.class).getUuidAndTitleCache(null, null);
+ }else{
+ model = CdmStore.getService(IClassificationService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
+ }
- model = CdmStore.getService(IClassificationService.class)
- .getUuidAndTitleCache(limitOfInitialElements, pattern);
}
/** {@inheritDoc} */
pattern = ((Text)control).getText();
}
-
- model = CdmStore.getService(INameService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
+ if (pattern == null || pattern.equals("?")){
+ model = CdmStore.getService(INameService.class).getUuidAndTitleCache(null, null);
+ }else{
+ model = CdmStore.getService(INameService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
+ }
}
/** {@inheritDoc} */
import java.text.Collator;
import java.util.Comparator;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.ILabelDecorator;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
-import org.eclipse.ui.internal.WorkbenchImages;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.dialog.selection.AbstractFilteredCdmResourceSelectionDialog.FilteredCdmResourceLabelProvider;
-import eu.etaxonomy.taxeditor.ui.dialog.selection.CdmFilteredItemsSelectionDialog.ItemsFilter;
-import eu.etaxonomy.taxeditor.ui.dialog.selection.CdmFilteredItemsSelectionDialog.ItemsListSeparator;
/**
* @author k.luther
if (control != null){
pattern = ((Text)control).getText();
}
-
- model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern, null);
+ if (pattern == null || pattern.equals("?")){
+ model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(null, null, null);
+ }else{
+ model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern, null);
+ }
}
/** {@inheritDoc} */
" supports cdmObject of type IIdentifiableEntity." +
" Please implement specific method in subclass.");
}
-
-
-
+
+
+
public class FilteredCdmResourceAbbrevLabelProvider extends LabelProvider {
@Override
public String getText(Object element) {
return abbrevTitleCache;
}
};
-
+
/** {@inheritDoc} */
@Override
protected ItemsFilter createFilter() {
if(item instanceof UuidAndTitleCache){
if (((UuidAndTitleCache) item).getAbbrevTitleCache() != null){
abbrevTitleCache = ((UuidAndTitleCache) item).getAbbrevTitleCache();
- }
+ }
if (((UuidAndTitleCache) item).getTitleCache() != null ){
textTitleCache = ((UuidAndTitleCache) item).getTitleCache();
}
}else if(item instanceof String){
textTitleCache = (String) item;
}
-
+
return (matches(textTitleCache) || matches(abbrevTitleCache)) ;
-
+
}
};
}
-
+
@Override
protected Comparator getItemsComparator() {
return new Comparator<UuidAndTitleCache>() {
if (entity1.getTitleCache() != null){
compareString1 += entity1.getTitleCache();
}
-
-
+
+
String compareString2 = "";
if (entity2.getAbbrevTitleCache() != null){
compareString2 = entity2.getAbbrevTitleCache();
if (entity2.getTitleCache() != null){
compareString2 += entity2.getTitleCache();
}
-
-
+
+
return collator.compare(compareString1, compareString2);
}
};
pattern = ((Text)control).getText();
}
-
- model = CdmStore.getService(IReferenceService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern);
+ if (pattern == null || pattern.equals("?")){
+ model = CdmStore.getService(IReferenceService.class).getUuidAndAbbrevTitleCache(null, null);
+ }else{
+ model = CdmStore.getService(IReferenceService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern);
+ }
}
/**
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IReferenceService;
import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.cdm.strategy.cache.reference.DefaultReferenceCacheStrategy;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
import eu.etaxonomy.taxeditor.newWizard.NewReferenceWizard;
import eu.etaxonomy.taxeditor.store.CdmStore;
pattern = ((Text)control).getText();
}
-
- model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCache(limitOfInitialElements,pattern);
+ if (pattern == null || pattern.equals("?")){
+ model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCache(null,null);
+ }else{
+ model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCache(limitOfInitialElements,pattern);
+ }
}
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
import eu.etaxonomy.cdm.model.location.Country;
import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
if(clazz.equals(Reference.class)){
return (T) ReferenceSelectionDialog.select(shell, conversation, (Reference) currentSelection);
}
-
+
if(clazz.equals(TaxonNameBase.class)){
return (T) NameSelectionDialog.select(shell, conversation, (TaxonNameBase) currentSelection);
}
if(clazz.equals(Amplification.class)){
return (T) AmplificationSelectionDialog.select(shell, conversation, (Amplification) currentSelection);
}
+ if(clazz.equals(Media.class)){
+ return (T) MediaSelectionDialog.select(shell, conversation, (Media) currentSelection);
+ }
return null;
}
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
import eu.etaxonomy.taxeditor.newWizard.NewTaxonWizard;
import eu.etaxonomy.taxeditor.store.CdmStore;
pattern = ((Text)control).getText();
}
-
-
- model = (List)CdmStore.getService(ITaxonService.class).getUuidAndTitleCache(Taxon.class, limitOfInitialElements, pattern);
+ if (pattern == null || pattern.equals("?")){
+ model = (List)CdmStore.getService(ITaxonService.class).getUuidAndTitleCache(Taxon.class, null, null);
+ }else{
+ model = (List)CdmStore.getService(ITaxonService.class).getUuidAndTitleCache(Taxon.class, limitOfInitialElements, pattern);
+ }
}
/** {@inheritDoc} */
selectedClassification = this.cdmBaseToBeFiltered.getClassification();
}
}
-
- //FIXME prelim
- pattern = pattern + "*";
- model = CdmStore.getService(IClassificationService.class).getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(selectedClassification.getUuid(), limitOfInitialElements, pattern);
+ if (pattern == null || pattern.equals("?")){
+ model = CdmStore.getService(IClassificationService.class).getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(selectedClassification.getUuid(), limitOfInitialElements, pattern);
+ }else{
+ model = CdmStore.getService(IClassificationService.class).getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(selectedClassification.getUuid(), null, null);
+ }
}
/** {@inheritDoc} */
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, false, style, false);
}
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
} else if (entity instanceof TaxonNodeAgentRelation) {
element = new TaxonNodeAgentRelationCollectionElement(this, parentElement, (TaxonNodeAgentRelation) entity, removeListener, backgroundColor, style);
}else if (entity instanceof Media) {
- element = new MediaMetaElement(this, parentElement, (Media) entity, removeListener, true, style);
+ element = new MediaMetaElement(this, parentElement, (Media) entity, removeListener, style);
} else if (entity instanceof MediaRepresentation) {
element = new MediaRepresentationElement(this, parentElement, (MediaRepresentation) entity, removeListener,
style);
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
import org.eclipse.ui.forms.widgets.TableWrapLayout;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
private Color backgroundColor;
- public AbstractEntityCollectionElement(CdmFormFactory formFactory,
- AbstractFormSection section, ENTITY entity,
- SelectionListener removeListener, Color backgroundColor, int style) {
- this(formFactory, section, entity, removeListener, false, backgroundColor, style);
- }
public AbstractEntityCollectionElement(CdmFormFactory formFactory,
AbstractFormSection section, ENTITY entity, SelectionListener removeListener,
- boolean isChoosableEntity, Color backgroundColor, int style) {
+ Color backgroundColor, int style) {
super(formFactory, (ICdmFormElement) section);
this.entity = entity;
container.setLayout(containerLayout);
container.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
- if(isChoosableEntity){
- btnChooseEntity = formFactory.createButton(box, null, SWT.PUSH);
- addControl(btnChooseEntity);
-
- btnChooseEntity.setLayoutData(LayoutConstants.RIGHT());
- btnChooseEntity.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
- btnChooseEntity.setToolTipText("Browse");
- btnChooseEntity.addListener(SWT.Selection, new Listener() {
-
- @Override
- public void handleEvent(Event event) {
- ENTITY entity = selectFromDialog();
- if(entity!=null){
- if(getParentElement() instanceof AbstractEntityCollectionSection){
- ((AbstractEntityCollectionSection)getParentElement()).removeElement(getEntity());
- setEntity(entity);
- ((AbstractEntityCollectionSection)getParentElement()).addElement(entity);
- ((AbstractEntityCollectionSection)getParentElement()).firePropertyChangeEvent(getParentElement());
- }
-
- }
- }
- });
- }
-
if (removeListener != null) {
btnRemove = formFactory.createButton(box, null, SWT.PUSH);
addControl(btnRemove);
protected Control createToolbar() {
ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
- Action addAction = new Action("add", IAction.AS_PUSH_BUTTON){
+ Action addAction = new Action("Add", IAction.AS_PUSH_BUTTON){
@Override
public void run() {
- ELEMENT element = createNewElement();
- if(element != null){
- addElement(element);
- if(! getSection().isExpanded()) {
- getSection().setExpanded(true);
- }
- internalUpdateSection(true);
- }
+ ELEMENT element = createNewElement();
+ if(element != null){
+ addElement(element);
+ if(! getSection().isExpanded()) {
+ getSection().setExpanded(true);
+ }
+ internalUpdateSection(true);
+ }
}
};
addAction.setImageDescriptor(new ImageDescriptor() {
});
addAction.setToolTipText(getTooltipString());
+ Action browseAction = null;
+ if(allowAddExisting()){
+ browseAction = new Action("Browse", IAction.AS_PUSH_BUTTON){
+ @Override
+ public void run() {
+ ELEMENT element = addExisting();
+ if(element != null){
+ addElement(element);
+ if(! getSection().isExpanded()) {
+ getSection().setExpanded(true);
+ }
+ internalUpdateSection(true);
+ }
+ }
+ };
+ browseAction.setImageDescriptor(new ImageDescriptor() {
+
+ @Override
+ public ImageData getImageData() {
+ return ImageResources.getImage(ImageResources.BROWSE_ICON).getImageData();
+ }
+ });
+ browseAction.setToolTipText("Browse");
+ }
+
toolBarManager.add(addAction);
+ if(browseAction!=null){
+ toolBarManager.add(browseAction);
+ }
return toolBarManager.createControl(this);
}
return entityCollectionElement;
}
+
/**
* Get the specific collection of this entity
*
*/
public abstract void addElement(ELEMENT element);
+ /**
+ * Add an existing element to the entities collection.
+ * @return the existing element
+ */
+ public abstract ELEMENT addExisting();
+
+ /**
+ * If <code>true</code> the section will also display
+ * a browse icon to choose from existing elements.
+ * <br>
+ * <b>Note:</b> when returning true you have to make sure
+ * to implement the {@link #addExisting()} method
+ * @return true if existing entities can be added;
+ * false otherwise
+ */
+ public abstract boolean allowAddExisting();
+
/**
* Remove an element from the entities collection
*
return isNomenclaturalTeam;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Person addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
-
- * @param style
- */
public TaxonNodeAgentRelationCollectionSection (CdmFormFactory formFactory, ConversationHolder conversation,
ICdmFormElement parentElement, int style) {
super(formFactory, conversation, parentElement, "Related persons or teams", style);
return false;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TaxonNodeAgentRelation addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
/**
* 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.
*/
int style) {
super(formFactory, conversation, parentElement, "Described Specimen", style);
}
-
+
/** {@inheritDoc} */
@Override
public Collection<SpecimenOrObservationBase> getCollection(
TaxonDescription entity) {
- //FIXME:This class is not really an entity collection section, and should be moved
+ //FIXME:This class is not really an entity collection section, and should be moved
// to a single entity section, but one with the possibility of launching a wizard
List<SpecimenOrObservationBase> collection = new ArrayList<SpecimenOrObservationBase>();
if(entity.getDescribedSpecimenOrObservation() != null) {
- collection.add(entity.getDescribedSpecimenOrObservation());
- }
+ collection.add(entity.getDescribedSpecimenOrObservation());
+ }
return collection;
}
/** {@inheritDoc} */
@Override
public SpecimenOrObservationBase createNewElement() {
- DerivedUnit selection = DerivedUnitSelectionDialog.select(getShell(), getConversationHolder(), null);
+ DerivedUnit selection = DerivedUnitSelectionDialog.select(getShell(), getConversationHolder(), null);
return selection;
}
/** {@inheritDoc} */
@Override
public void removeElement(SpecimenOrObservationBase element) {
- getEntity().setDescribedSpecimenOrObservation(null);
+ getEntity().setDescribedSpecimenOrObservation(null);
}
/** {@inheritDoc} */
protected String getTooltipString() {
return "Add a described specimen.";
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public SpecimenOrObservationBase addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
getEntity().removeMedia(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Media addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
public void removeElement(DescriptionElementSource element) {
getEntity().removeSource(element);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DescriptionElementSource addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
/**
* 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 DescriptionSourceSection extends
AbstractEntityCollectionSection<DescriptionBase, IdentifiableSource>{
-
+
/**
* <p>Constructor for DescriptionSourceSection.</p>
*
super(cdmFormFactory, conversation, parentElement, "Description Sources", style);
}
-
+
/** {@inheritDoc} */
@Override
/** {@inheritDoc} */
@Override
public IdentifiableSource createNewElement() {
- OriginalSourceType ost = OriginalSourceTypeSelectionDialog.select(getShell(), getConversationHolder());
+ OriginalSourceType ost = OriginalSourceTypeSelectionDialog.select(getShell(), getConversationHolder());
if(ost != null) {
return IdentifiableSource.NewInstance(ost);
} else {
public void removeElement(IdentifiableSource element) {
getEntity().removeSource(element);
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public IdentifiableSource addExisting() {
+ return null;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
/**
* 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 GeoScopeSection extends AbstractEntityCollectionSection<TaxonDescription, NamedArea> {
-
+
/**
* <p>Constructor for GeoScopeSection.</p>
*
ConversationHolder conversation, ICdmFormElement parentElement, int style) {
super(formFactory, conversation, parentElement, "Geo Scope", style);
}
-
+
/** {@inheritDoc} */
@Override
public Collection<NamedArea> getCollection(TaxonDescription entity) {
protected String getTooltipString() {
return "Add a new geo scope.";
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NamedArea addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
protected Collection<DefinedTerm> getEntityCollection(IModifiable entity) {
return entity.getModifiers();
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DefinedTerm addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
protected Collection<DefinedTerm> getEntityCollection(TaxonDescription entity) {
return entity.getScopes();
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DefinedTerm addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
/**
* 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.
*/
int style) {
super(formFactory, conversation, parentElement, "State Data", style);
}
-
+
/** {@inheritDoc} */
@Override
public Collection<StateData> getCollection(CategoricalData entity) {
return "Create new state data";
}
-
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public StateData addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
+
}
/**
* 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 StatisticalMeasurementValueSection extends
AbstractEntityCollectionSection<QuantitativeData, StatisticalMeasurementValue> {
-
+
/**
* <p>Constructor for StatisticalMeasurementValueSection.</p>
*
int style) {
super(formFactory, conversation, parentElement, "Statistical Measurement Value", style);
}
-
+
/** {@inheritDoc} */
@Override
public Collection<StatisticalMeasurementValue> getCollection(
protected String getTooltipString() {
return "Create new statistical value";
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public StatisticalMeasurementValue addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
/**
* 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.
*/
/*
* (non-Javadoc)
- *
+ *
* @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#
* getCollection(java.lang.Object)
*/
/*
* (non-Javadoc)
- *
+ *
* @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#
* createNewElement()
*/
// StoreUtil
// .warningDialog("Not implemented yet", getClass(),
// "This functionality needs to be implemented in CDM Library first.");
-
+
GrantedAuthority selection = GrantedAuthoritySelectionDialog.select(getLayoutComposite().getShell(), getConversationHolder(), null);
return selection;
}
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#addElement
* (java.lang.Object)
/*
* (non-Javadoc)
- *
+ *
* @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#
* removeElement(java.lang.Object)
*/
/*
* (non-Javadoc)
- *
+ *
* @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#
* getEmptyString()
*/
/*
* (non-Javadoc)
- *
+ *
* @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#
* getTooltipString()
*/
return "Add a Granted Authority";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public GrantedAuthority addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
return "Add a memeber to this group";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public User addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
return "Add a scope restriction";
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DefinedTerm addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
return "Add a taxon to the scope of this key";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Taxon addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
public MediaMetaElement(CdmFormFactory cdmFormFactory,
AbstractFormSection<?> formElement, Media element,
- SelectionListener removeListener, boolean isChoosableEntity, int style) {
- super(cdmFormFactory, formElement, element, removeListener, isChoosableEntity, null, style);
+ SelectionListener removeListener, int style) {
+ super(cdmFormFactory, formElement, element, removeListener, null, style);
//make element selectable
if(cdmFormFactory.getSelectionProvider() != null){
selectionArbitrator = cdmFormFactory.createSelectionArbitrator(this);
}
-
-
+
+
}
/** {@inheritDoc} */
}
text_title.setLanguageString(title);
-
+
}
@Override
protected Media selectFromDialog() {
-
+
setEntity(MediaSelectionDialog.select(AbstractUtility.getShell(), null, null));
return entity;
}
*/
public class MediaRepresentationPartSection extends
AbstractEntityCollectionSection<MediaRepresentation, MediaRepresentationPart> {
-
+
/**
* <p>Constructor for MediaRepresentationPartSection.</p>
*
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
super.propertyChange(event);
}
- }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public MediaRepresentationPart addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
/**
* 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.
*/
ICdmFormElement parentElement, int style) {
super(cdmFormFactory, conversation, parentElement, "Media Representation", style);
}
-
+
/** {@inheritDoc} */
@Override
public void addElement(MediaRepresentation element) {
getEntity().removeRepresentation(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public MediaRepresentation addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
/**
- *
+ *
*/
package eu.etaxonomy.taxeditor.ui.section.media;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;
import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.taxeditor.ui.dialog.selection.MediaSelectionDialog;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
getEntity().removeMedia(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Media addExisting() {
+ return MediaSelectionDialog.select(getShell(), getConversationHolder(), null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return true;
+ }
+
}
public TaxonBase getTaxonBase() {
return taxonBase;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NameRelationship addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
/**
* 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.
*/
}
/** {@inheritDoc} */
- public void setTaxonBase(TaxonBase entity) {
+ @Override
+ public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
NonViralName nonViralName = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
setEntity(nonViralName);
}
-
+
/* (non-Javadoc)
* @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
*/
return taxonBase;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NomenclaturalStatus addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
import org.eclipse.swt.widgets.Control;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.taxeditor.model.ImageResources;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.dialog.selection.NameSelectionDialog;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
TaxonNameBase taxonName = NameSelectionDialog.select(getShell(), getConversationHolder(), getEntity());
if(taxonName!=null){
if(taxonName.isInstanceOf(NonViralName.class)){
- CdmStore.getService(ITaxonNodeService.class).list(TaxonNode.class, null, null, null, null);
NonViralName nonViralName = HibernateProxyHelper.deproxy(taxonName, NonViralName.class);
taxonBase.setName(nonViralName);
// taxonBase.getTitleCache();
public TaxonBase getTaxonBase() {
return taxonBase;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DescriptionElementBase addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
public TaxonBase getTaxonBase() {
return taxonBase;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TypeDesignationBase addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
return "Add a collecting area";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NamedArea addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
return "Create new current determination event";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DeterminationEvent addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
/**
* 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 Collection<DeterminationEvent> getCollection(DerivedUnitFacade entity) {
return entity != null ? entity.getOtherDeterminations() : null;
}
-
+
@Override
public void refresh() {
internalUpdateSection(false);
}
-
+
/* (non-Javadoc)
* @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#getTooltipString()
return "Add a determination event to the history";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DeterminationEvent addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
return "Add a geo scope";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NamedArea addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
return "Add a geo scope";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NamedArea addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
/**
* 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.
*/
/** {@inheritDoc} */
@Override
public IdentifiableSource createNewElement() {
- return IdentifiableSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource);
+ return IdentifiableSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource);
}
/* (non-Javadoc)
return "Add source";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public IdentifiableSource addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
/**
* 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.
*/
*/
/** {@inheritDoc} */
@Override
- public DerivedUnit createNewElement() {
- return DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
+ public DerivedUnit createNewElement() {
+ return DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
}
/* (non-Javadoc)
return "Add a duplicate";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DerivedUnit addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
return "Add a type designation";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public SpecimenTypeDesignation addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
return "Create new current determination event";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public DeterminationEvent addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
return "Add source";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public IdentifiableSource addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
return "Add a gel photo";
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Media addExisting() {
+ return null;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
getEntity().addIdentifier(0, sampleDesignation);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Identifier addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
getEntity().addIdentifier(indexOfCurrentSampleDesignation+1, sampleDesignation);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Identifier addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
getEntity().setContigFile(element);
/*
* merge to avoid duplicate key exception
- * the exception seems to be caused by the two links to the Media object:
+ * the exception seems to be caused by the two links to the Media object:
* - Sequence->contigFile (used to be not in the cache after saving)
* - MediaRepresentationPart->media
* Invoking merge() solves this problem
protected String getTooltipString() {
return "Add a contig file";
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Media addExisting() {
+ return null;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
return "Add a reference";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Reference addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
}
getEntity().setPherogram(element);
/*
* merge to avoid duplicate key exception
- * the exception seems to be caused by the two links to the Media object:
+ * the exception seems to be caused by the two links to the Media object:
* - SingleRead->pherogram (used to be not in the cache after saving)
* - MediaRepresentationPart->media
* Invoking merge() solves this problem
protected String getTooltipString() {
return "Add a read chromatogram";
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Media addExisting() {
+ return null;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
}
return -1;
}
else if(o1!=null && o2 !=null){
- if(entity.getType().equals(OriginalSourceType.PrimaryMediaSource)){
- if(o1.equals(OriginalSourceType.PrimaryMediaSource)){
+ //both are either taxonomic or media
+ if(o1.equals(OriginalSourceType.PrimaryTaxonomicSource)
+ && o2.equals(OriginalSourceType.PrimaryMediaSource)){
+ if(entity.getType().equals(OriginalSourceType.PrimaryMediaSource)){
+ return 1;
+ }
+ else{
+ return -1;
+ }
+ }
+ else if(o2.equals(OriginalSourceType.PrimaryTaxonomicSource)
+ && o1.equals(OriginalSourceType.PrimaryMediaSource)){
+ if(entity.getType().equals(OriginalSourceType.PrimaryMediaSource)){
return -1;
}
- else if(o2.equals(OriginalSourceType.PrimaryMediaSource)){
+ else{
return 1;
}
}
+ //one is not taxonomic or media
else{
- if(o1.equals(OriginalSourceType.PrimaryTaxonomicSource)){
+ if(o1.equals(OriginalSourceType.PrimaryTaxonomicSource)
+ ||o1.equals(OriginalSourceType.PrimaryMediaSource)){
return -1;
+
}
- else if(o2.equals(OriginalSourceType.PrimaryTaxonomicSource)){
+ else if(o2.equals(OriginalSourceType.PrimaryTaxonomicSource)
+ || o2.equals(OriginalSourceType.PrimaryMediaSource)){
return 1;
}
+ String message1 = o1.getKey();
+ String message2 = o2.getKey();
+ return message1.compareTo(message2);
}
- String message1 = o1.getMessage();
- String message2 = o2.getMessage();
- return message1.compareTo(message2);
}
return 0;
}
@Override
public void removeElement(Annotation element) {
getEntity().removeAnnotation(element);
- }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Annotation addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
getEntity().removeCredit(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Credit addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
getEntity().removeExtension(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Extension addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
return entity.getMarkers();
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Marker addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
getEntity().removeRights(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Rights addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
getEntity().removeSource(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public IdentifiableSource addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
getEntity().removeIdentifier(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Identifier addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
getEntity().removeIdentifier(element);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Identifier addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
/**
- *
+ *
*/
package eu.etaxonomy.taxeditor.ui.section.user;
protected String getTooltipString() {
return "Add this user to a group";
}
-
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Group addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
*/
public MeasurementUnitCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, MeasurementUnit entity,
SelectionListener removeListener, Color backgroundColor, int style) {
- super(formFactory, section, entity, removeListener, false, backgroundColor, style);
+ super(formFactory, section, entity, removeListener, backgroundColor, style);
}
return "Add a measurement unit";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public MeasurementUnit addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
return "Add a modifier vocabulary";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TermVocabulary<DefinedTerm> addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
*/
public RecommendedModifierVocabulariesElement(CdmFormFactory formFactory, AbstractFormSection section, TermVocabulary<DefinedTerm> entity,
SelectionListener removeListener, Color backgroundColor, int style) {
- super(formFactory, section, entity, removeListener, false, backgroundColor, style);
+ super(formFactory, section, entity, removeListener, backgroundColor, style);
}
*/
public StateVocabularyCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, TermVocabulary<State> entity,
SelectionListener removeListener, Color backgroundColor, int style) {
- super(formFactory, section, entity, removeListener, false, backgroundColor, style);
+ super(formFactory, section, entity, removeListener, backgroundColor, style);
}
return "Add a state vocabulary";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TermVocabulary<State> addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
*/
public StatisticalMeasureCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, StatisticalMeasure entity,
SelectionListener removeListener, Color backgroundColor, int style) {
- super(formFactory, section, entity, removeListener, false, backgroundColor, style);
+ super(formFactory, section, entity, removeListener, backgroundColor, style);
}
return "Add a statistical measure";
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public StatisticalMeasure addExisting() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityLabelTextProvider;
/**
- * <p>
- * Abstract AbstractSelectionElement class.
- * </p>
- *
* @author n.hoffmann
* @created Nov 17, 2009
* @version 1.0
private final ConversationHolder conversation;
private Class<T> clazz;
- /**
- * <p>
- * Constructor for AbstractSelectionElement.
- * </p>
- *
- * @param formFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param conversation
- * TODO
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param labelString
- * a {@link java.lang.String} object.
- * @param entity
- * a T object.
- * @param isEditable
- * a boolean.
- * @param isSelectable
- * a boolean.
- * @param isDeletable
- * a boolean.
- * @param style
- * a int.
- * @param <T>
- * a T object.
- */
public EntitySelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement,
+ ConversationHolder conversation, ICdmFormElement parentElement, Class<T> clazz,
String labelString, T entity, int mode, int style, boolean filterElement) {
super(formFactory, parentElement);
+ this.clazz = clazz;
this.isEditable = (mode & EDITABLE) == EDITABLE;
this.isDeletable = (mode & DELETABLE) == DELETABLE;
boolean isSelectable = (mode & SELECTABLE) == SELECTABLE;
}
}
- public EntitySelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement,
- String labelString, T entity, int mode, int style){
- this(formFactory, conversation, parentElement, labelString, entity, mode, style, false);
- }
-
- /**
- * @param entity2
- */
private void setFilteredEntity(T filterEntity) {
this.filteredEntity =filterEntity;
}
- public EntitySelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement, Class<T> clazz,
- String labelString, T entity, int mode, int style, boolean filterElement) {
- this(formFactory, conversation, parentElement, labelString, entity, mode, style, filterElement);
- this.clazz = clazz;
- }
-
public EntitySelectionElement(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement, Class<T> clazz,
String labelString, T entity, int mode, int style){
- this(formFactory, conversation, parentElement, labelString, entity, mode, style, false);
+ this(formFactory, conversation, parentElement, clazz, labelString, entity, mode, style, false);
}
private void createControls(Composite parent, int style) {
/**
* 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.
*/
* <p>
* NomenclaturalAuthorTeamSelectionElement class.
* </p>
- *
+ *
* @author n.hoffmann
* @created Jun 22, 2010
* @version 1.0
* <p>
* Constructor for NomenclaturalAuthorTeamSelectionElement.
* </p>
- *
+ *
* @param formFactory
* a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
* object.
public NomenclaturalAuthorTeamSelectionElement(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
String labelString, Team entity, int mode, int style) {
- super(formFactory, conversation, parentElement, labelString, entity,
+ super(formFactory, conversation, parentElement, Team.class, labelString, entity,
mode, style);
}
/**
* Copyright (C) 2009 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 TaxonNodeSelectionElement extends EntitySelectionElement<TaxonNode> {
private Classification classification;
-
+
public TaxonNodeSelectionElement(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
String labelString, TaxonNode entity, int mode, int style) {
- super(formFactory, conversation, parentElement, labelString, entity, mode,
+ super(formFactory, conversation, parentElement, TaxonNode.class, labelString, entity, mode,
style);
}
-
+
/**
* @return
*/
public Classification getClassification() {
return classification;
}
-
+
public void setClassification(Classification classification){
this.classification = classification;
}
-
+
/*
* (non-Javadoc)
- *
+ *
* @see
* org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt
* .events.SelectionEvent)
getConversationHolder(), "Select parent taxon", null, null, getClassification());
setSelectionInternal(newSelection);
}
-
+
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement#getTitle
* ()
private void createIdentifiableSections(RootElement parent) {
- ExtensionSection extensionSection = formFactory.createExtensionSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
+ SourceSection sourceSection = formFactory.createSourceSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
formFactory.createHorizontalSeparator(parent, SWT.BORDER);
- SourceSection sourceSection = formFactory.createSourceSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
+ IdentifierSection identifierSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
formFactory.createHorizontalSeparator(parent, SWT.BORDER);
- IdentifierSection identifierSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
+ ExtensionSection extensionSection = formFactory.createExtensionSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
formFactory.createHorizontalSeparator(parent, SWT.BORDER);
Bundle-ManifestVersion: 2
Bundle-Name: Webapp
Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 4.5.0.qualifier
+Bundle-Version: 4.6.0.qualifier
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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?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.qualifier">\r
- <aboutInfo>\r
- <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
- <text>\r
- %productBlurb\r
- </text>\r
- </aboutInfo>\r
- <configIni use="default"></configIni>\r
- <launcherArgs>\r
- <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080\r
- </programArgs>\r
- <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow\r
- </vmArgs>\r
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
- </vmArgsMac>\r
- </launcherArgs>\r
- <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
- <splash location="eu.etaxonomy.taxeditor.application" startupForegroundColor="000000" startupMessageRect="7,432,360,20" startupProgressRect="5,447,366,15"/>\r
- <launcher name="TaxonomicEditor">\r
- <solaris/>\r
- <win useIco="false">\r
- <bmp/>\r
- </win>\r
- </launcher>\r
- <vm></vm>\r
- <plugins></plugins>\r
- <features>\r
- <feature id="eu.etaxonomy.taxeditor.feature"/>\r
- </features>\r
- <configurations>\r
- <plugin autoStart="true" id="eu.etaxonomy.taxeditor.application" startLevel="5"/>\r
- <plugin autoStart="true" id="org.eclipse.core.runtime" startLevel="4"/>\r
- <plugin autoStart="true" id="org.eclipse.equinox.common" startLevel="2"/>\r
- <plugin autoStart="true" id="org.eclipse.equinox.ds" startLevel="2"/>\r
- <plugin autoStart="true" id="org.eclipse.equinox.p2.transport.ecf" startLevel="4"/>\r
- <plugin autoStart="true" id="org.eclipse.equinox.simpleconfigurator" startLevel="1"/>\r
- </configurations>\r
-</product>\r
+<?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.6.0.qualifier">
+ <aboutInfo>
+ <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
+ <text>
+ %productBlurb
+ </text>
+ </aboutInfo>
+ <configIni use="default"></configIni>
+ <launcherArgs>
+ <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080
+ </programArgs>
+ <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow
+ </vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
+ </launcherArgs>
+ <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
+ <splash location="eu.etaxonomy.taxeditor.application" startupForegroundColor="000000" startupMessageRect="7,432,360,20" startupProgressRect="5,447,366,15"/>
+ <launcher name="TaxonomicEditor">
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+ <vm></vm>
+ <plugins></plugins>
+ <features>
+ <feature id="eu.etaxonomy.taxeditor.feature"/>
+ </features>
+ <configurations>
+ <plugin autoStart="true" id="eu.etaxonomy.taxeditor.application" startLevel="5"/>
+ <plugin autoStart="true" id="org.eclipse.core.runtime" startLevel="4"/>
+ <plugin autoStart="true" id="org.eclipse.equinox.common" startLevel="2"/>
+ <plugin autoStart="true" id="org.eclipse.equinox.ds" startLevel="2"/>
+ <plugin autoStart="true" id="org.eclipse.equinox.p2.transport.ecf" startLevel="4"/>
+ <plugin autoStart="true" id="org.eclipse.equinox.simpleconfigurator" startLevel="1"/>
+ </configurations>
+</product>
<?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.qualifier" 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.6.0.qualifier" 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-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</prerequisites>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</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-SNAPSHOT</cdmlib.version>
+ <cdmlib.version>4.6.0-SNAPSHOT</cdmlib.version>
<!-- TODO can we use project.version ????? -->
<tycho.version>0.22.0</tycho.version>
- <taxeditor.version>4.5.0-SNAPSHOT</taxeditor.version>
+ <taxeditor.version>4.6.0-SNAPSHOT</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