From f9a407ae14e388a7e5eca4bd27429b1c54787a18 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Mon, 2 Nov 2009 17:28:33 +0000 Subject: [PATCH] --- taxeditor-store/.settings/org.eclipse.jdt.core.prefs | 9 +++------ taxeditor-store/META-INF/MANIFEST.MF | 6 ++++-- taxeditor-store/pom.xml | 8 ++++---- .../operations/CreateDescriptionElementOperation.java | 6 +++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/taxeditor-store/.settings/org.eclipse.jdt.core.prefs b/taxeditor-store/.settings/org.eclipse.jdt.core.prefs index ec2cdbc3d..eccf753c2 100644 --- a/taxeditor-store/.settings/org.eclipse.jdt.core.prefs +++ b/taxeditor-store/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,5 @@ -#Fri Oct 16 18:08:11 CEST 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +#Mon Nov 02 18:16:54 CET 2009 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF index 295ffde0e..cc69944f1 100644 --- a/taxeditor-store/META-INF/MANIFEST.MF +++ b/taxeditor-store/META-INF/MANIFEST.MF @@ -18,7 +18,9 @@ Export-Package: dbscripts, eu.etaxonomy.taxeditor.io, eu.etaxonomy.taxeditor.io.wizard, eu.etaxonomy.taxeditor.labels, - eu.etaxonomy.taxeditor.model;uses:="eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon", + eu.etaxonomy.taxeditor.model;uses:="eu.etaxonomy.cdm.model.common, + eu.etaxonomy.cdm.model.name, + eu.etaxonomy.cdm.model.taxon", eu.etaxonomy.taxeditor.operations, eu.etaxonomy.taxeditor.parser, eu.etaxonomy.taxeditor.preference, @@ -30,7 +32,7 @@ Export-Package: dbscripts, eu.etaxonomy.taxeditor.user.handler, eu.etaxonomy.taxeditor.user.view, eu.etaxonomy.taxeditor.user.wizard -Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.filesystem;bundle-version="1.2.0",org.eclipse.core.resources;bundle-version="3.4.1",org.eclipse.ui.editors;bundle-version="3.4.0",org.eclipse.jface.text;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.2",eu.etaxonomy.cdmlib;bundle-version="2.1.0" +Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.filesystem;bundle-version="1.2.0",org.eclipse.core.resources;bundle-version="3.4.1",org.eclipse.ui.editors;bundle-version="3.4.0",org.eclipse.jface.text;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.2",eu.etaxonomy.cdmlib;bundle-version="2.3.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: junit.framework,org.junit Bundle-ActivationPolicy: lazy diff --git a/taxeditor-store/pom.xml b/taxeditor-store/pom.xml index 4333da073..23ac261e1 100644 --- a/taxeditor-store/pom.xml +++ b/taxeditor-store/pom.xml @@ -4,14 +4,14 @@ eu.etaxonomy taxeditor-parent - 1.0 + 2.1 4.0.0 eu.etaxonomy taxeditor-store jar - 1.0 + 2.1 DataStore Bundle Enables access to a CDM DataStore and provides operations on the model http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorDataStoreBundle @@ -20,14 +20,14 @@ eu.etaxonomy cdmlib-services - 2.1 + 2.3 eu.etaxonomy cdmlib-persistence test-jar test - 2.1 + 2.3 diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java index 6b56194f8..6c0a40ac3 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java @@ -73,13 +73,13 @@ public class CreateDescriptionElementOperation extends AbstractPostOperation { throws ExecutionException { if (element == null) { - if (feature.supportsCommonTaxonName()) { + if (feature.isSupportsCommonTaxonName()) { element = CommonTaxonName.NewInstance("", null); - } else if (feature.supportsDistribution()) { + } else if (feature.isSupportsDistribution()) { element = Distribution.NewInstance(); } else if (feature.equals(Feature.IMAGE())){ element = ImagesHelper.createImageElement(ImageFile.NewInstance(null, null)); - } else if(feature.supportsTaxonInteraction()){ + } else if(feature.isSupportsTaxonInteraction()){ element = TaxonInteraction.NewInstance(feature); } else { element = TextData.NewInstance(feature); -- 2.34.1