mend
authorKatja Luther <k.luther@bgbm.org>
Tue, 4 Jun 2019 13:46:53 +0000 (15:46 +0200)
committerKatja Luther <k.luther@bgbm.org>
Tue, 4 Jun 2019 13:46:53 +0000 (15:46 +0200)
display of status in drop down according to preference

38 files changed:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
eu.etaxonomy.taxeditor.cdmlib/.classpath.template
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListenerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredIdentifierSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CommonNameNamedAreaSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SearchDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmFormElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityRow.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AbstractTypeDesignationElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractSourcedEntityBaseElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmDataViewerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/CdmServerInfoTest.java
eu.etaxonomy.taxeditor.test/src/test/resources/h2/cdmTest.h2.db
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/WorkbenchUtility.java
eu.etaxonomy.taxeditor/rcp.target

index 222773a07d009669f7bff1e2f83908595e780d89..f00e3d51f8e328f2f8aa46641d94f5d52f46b812 100644 (file)
@@ -48,8 +48,6 @@ public class GroupCreator implements IEntityCreator<Group> {
 
         if (groupList.isEmpty()){
             Group group = Group.NewInstance(text);
-//            UUID groupUuid = CdmStore.getService(IGroupService.class).saveGroup(group);
-//            group = CdmStore.getService(IGroupService.class).loadWithUpdate(groupUuid);
             return group;
         } else{
             MessagingUtils.messageDialog(Messages.GROUP_CREATOR_group_exists_title, text, Messages.GROUP_CREATOR_group_exists);
index c88ba58902faa7d87acaa710c30bc035a92cb33f..388b40e99b9bbb3c000343a913c22cba8747bc7a 100644 (file)
@@ -4,5 +4,233 @@
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/resources"/>
        <classpathentry kind="src" path="src/main/java"/>
+<<<<<<< Updated upstream
+=======
+       <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-5.5.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-5.5.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-5.5.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-5.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/5.5.0-SNAPSHOT/cdmlib-model-5.5.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-5.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-persistence/5.5.0-SNAPSHOT/cdmlib-persistence-5.5.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-5.5.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-5.5.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-cache-5.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-cache/5.5.0-SNAPSHOT/cdmlib-cache-5.5.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-5.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/5.5.0-SNAPSHOT/cdmlib-services-5.5.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-5.5.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-csv-1.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/dtd-parser-1.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-5.0.7.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-5.0.1.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-core-5.0.7.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-5.0.7.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-5.0.7.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-5.0.7.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-5.5.2.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-5.5.2.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-5.2.2.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-cdi-5.2.2.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/httpclient-cache-4.2.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.6.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.3.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/joda-time-2.9.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-aop-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-aspects-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-beans-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-context-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-context-support-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-core-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-expression-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-jdbc-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-orm-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-oxm-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-plugin-core-1.2.0.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-plugin-metadata-1.2.0.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-security-config-4.0.3.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-security-core-4.0.3.RELEASE.jar" sourcepath="lib/spring-security-core-4.0.3.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-security-web-4.0.3.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-test-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-tx-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-web-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-webmvc-4.2.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/springfox-core-2.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/springfox-schema-2.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/springfox-spi-2.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/springfox-spring-web-2.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/springfox-swagger-common-2.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/springfox-swagger2-2.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/standard-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/tools.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/txw2-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.6.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xom-1.2.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xsom-20140925.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-security-oauth2-2.0.11.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.6.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jandex-2.0.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/javassist-3.20.0-GA.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/javax.el-2.2.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/javax.el-api-2.2.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.12.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-jxc-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.7.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-arq-2.13.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-core-2.13.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-tdb-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jsonld-java-0.5.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jta-1.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.7.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/easymock-2.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/FastInfoset-1.2.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/libthrift-0.9.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/mapstruct-1.0.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-3.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1206-jdbc4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/relaxngDatatype-20020414.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/rngom-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.7.0-2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-2.21.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/istack-commons-tools-2.21.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/redmine-java-api-3.1.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/org.swtchart_0.10.0.v20160212.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-math3-3.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/docx4j-6.0.1.jar"/>
+>>>>>>> Stashed changes
        <classpathentry kind="output" path="target/classes"/>
 </classpath>
index 8a1d58bae664eba94461ffa53bde218eaf848f1c..0ee91ed0ad39bccd04a0d33c6be645f52dfd7782 100644 (file)
@@ -75,7 +75,9 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
                   dropTargetEvent.detail = DND.DROP_NONE;
               return;
                }
-
+               if (getEditor()== null){
+                   return;
+               }
                // Execute operations at end of drag event
                AbstractPostOperation operation = createOperation(taxonBase);
 
@@ -97,7 +99,7 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
        }
 
        private AbstractPostOperation createOperation(TaxonBase taxonBase) {
-
+           Assert.isNotNull(getEditor());
                if(taxonBase instanceof Synonym){
                        Synonym synonym = (Synonym) taxonBase;
 
index 833960d2c63fa5fdb67e7e14b6dac139e2290864..6ac2b7bee9ee9ad0a288c320b9dad6401a8de3c3 100755 (executable)
@@ -87,11 +87,14 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
             service.set(pref);
         }
 
-        if (ownDescriptionForDistributionEditor == null){
-            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.OwnDescriptionForDistributionEditor));
+        if (displayStatusCombo == null){
+            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfStatusInCombo));
         }else{
-            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.OwnDescriptionForDistributionEditor, Boolean.toString(ownDescriptionForDistributionEditor));
-            pref.setAllowOverride(prefOwnDescription.isAllowOverride());
+            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatusInCombo, displayStatusCombo);
+            if (prefStatusDisplayInCombo == null){
+                prefStatusDisplayInCombo = pref;
+            }
+            pref.setAllowOverride(prefStatusDisplayInCombo.isAllowOverride());
             service.set(pref);
         }
 //        if (statusPref != null){
@@ -129,6 +132,13 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
             this.displayStatus = Messages.Preference_Use_Default;
         }
 
+        if (prefStatusDisplayInCombo != null){
+            this.displayStatusCombo = prefStatusDisplayInCombo.getValue();
+        }else{
+            this.displayStatusCombo = Messages.Preference_Use_Default;
+        }
+
+
         if (prefAreaSort != null){
             if (prefAreaSort.getValue() != null){
                 this.orderAreas = prefAreaSort.getValue().toString();
index decfb36ed6015d4dd3a8028879dbf4277257d2bf..db4014e8e57cd8c820ae8e96fed8c22f360f3085 100644 (file)
@@ -581,6 +581,7 @@ public class Messages extends NLS {
     public static String ChecklistEditorGeneralPreference_show_title;
     public static String ChecklistEditorGeneralPreference_Configure_display_of_Areas;
     public static String ChecklistEditorGeneralPreference_Configure_display_of_Status;
+    public static String ChecklistEditorGeneralPreference_Configure_display_of_Status_in_Combo;
     public static String ChecklistEditorGeneralPreference_STATUS_DISPLAY_TEXT;
     public static String ChecklistEditorGeneralPreference_own_Description;
     public static String GeneralPreference_override;
index 0c65a44c878970d49556c33edf11dd38a24c6c2d..791a1fd1f308bd1d5f55c072f26e589b77a525af 100644 (file)
@@ -408,7 +408,7 @@ ChecklistEditorGeneralPreference_own_DescriptionToolTip=Entries created with the
 GeneralPreference_override=Override
 ChecklistEditorGeneralPreference_Configure_display_of_Areas=Display of areas in the header
 ChecklistEditorGeneralPreference_Configure_display_of_Status=Display of distribution status in the table
-
+ChecklistEditorGeneralPreference_Configure_display_of_Status_in_Combo=Display of distribution status in drop-down
 
 GfBioTerminologyImportPresenter_NO_CONNECTION_MESSAGE=Could not retrieve data from web service
 GfBioTerminologyImportPresenter_NO_CONNECTION_TITLE=Web service unavailable
index ba843c5b515282ef0570d34076bc987e49a5f5d9..6b45f75b472f8bdda23a6f4bad77deb55d6322d6 100644 (file)
@@ -408,6 +408,7 @@ ChecklistEditorGeneralPreference_own_DescriptionToolTip=Eintr
 GeneralPreference_override=Ãœberschreiben
 ChecklistEditorGeneralPreference_Configure_display_of_Areas=Darstellung der Areale in der Kopfzeile
 ChecklistEditorGeneralPreference_Configure_display_of_Status=Darstellung der Verbreitung-Status in Tabelle
+ChecklistEditorGeneralPreference_Configure_display_of_Status_in_Combo=Darstellung der Verbreitung-Status in Drop-Down
 
 
 GfBioTerminologyImportPresenter_NO_CONNECTION_MESSAGE=Konnte keine Verbindung zum Webservice herstellen.
index ea393bff3eac53157414e34aff5c5bda121c9d7b..b24d49e5381b1779ee95e029d6b0d98b500e9955 100644 (file)
@@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.Listener;
 
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.model.metadata.TermComboEnum;
 import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
 import eu.etaxonomy.cdm.model.metadata.TermOrder;
 import eu.etaxonomy.taxeditor.l10n.Messages;
@@ -47,6 +48,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
     protected Boolean isShowRank;
     protected String orderAreas;
     protected String displayStatus;
+    protected String displayStatusCombo;
     protected String displayArea;
     protected Boolean ownDescriptionForDistributionEditor;
 
@@ -56,11 +58,14 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
     protected boolean overrideOrderAreas;
     protected boolean overrideAreaDisplay;
     protected boolean overrideStatusDisplay;
+    protected boolean overrideStatusDisplayCombo;
 
     protected Combo areaOrderSelectionCombo;
     protected Button allowOverrideOrderAreasButton;
     protected Combo statusDisplaySelectionCombo;
     protected Button allowOverrideStatusDisplayButton;
+    protected Combo statusDisplayInComboSelectionCombo;
+    protected Button allowOverrideStatusDisplayInComboButton;
     protected Combo areaDisplaySelectionCombo;
     protected Button allowOverrideAreaDisplayButton;
     protected String commandHandlerString;
@@ -71,6 +76,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
     protected CdmPreference prefAreaVoc;
     protected CdmPreference prefAreaDisplay;
     protected CdmPreference prefStatusDisplay;
+    protected CdmPreference prefStatusDisplayInCombo;
     protected CdmPreference prefAreaSort;
     protected CdmPreference prefRank;
     protected CdmPreference prefOwnDescription;
@@ -187,6 +193,9 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     @Override
                     public void widgetSelected(SelectionEvent e) {
                         setApply(true);
+                        if (prefRank == null){
+                            prefRank = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowRankInDistributionEditor, PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString(): null);
+                        }
                         prefRank.setAllowOverride(allowOverrideRankButton.getSelection());
                     }
                 });
@@ -230,6 +239,9 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     @Override
                     public void widgetSelected(SelectionEvent e) {
                         setApply(true);
+                        if (prefAreaSort == null){
+                            prefAreaSort = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AreasSortedInDistributionEditor, PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString(): null);
+                        }
                         prefAreaSort.setAllowOverride(allowOverrideOrderAreasButton.getSelection());
                     }
                 });
@@ -272,6 +284,9 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     @Override
                     public void widgetSelected(SelectionEvent e) {
                         setApply(true);
+                        if (prefAreaDisplay == null){
+                            prefAreaDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfAreasInDistributionEditor, PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString(): null);
+                        }
                         prefAreaDisplay.setAllowOverride(allowOverrideOrderAreasButton.getSelection());
                     }
                 });
@@ -312,11 +327,58 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     @Override
                     public void widgetSelected(SelectionEvent e) {
                         setApply(true);
+                        if (prefStatusDisplay == null){
+                            prefStatusDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfStatus, PreferencePredicate.DisplayOfStatus.getDefaultValue() != null ?  PreferencePredicate.DisplayOfStatus.getDefaultValue().toString(): null);
+                        }
                         prefStatusDisplay.setAllowOverride(allowOverrideStatusDisplayButton.getSelection());
                     }
                 });
             }
 
+            statusDisplayInComboSelectionCombo = createCombo(child, TermComboEnum.values(), PreferencePredicate.DisplayOfStatusInCombo, Messages.ChecklistEditorGeneralPreference_Configure_display_of_Status_in_Combo, isAdminPreference);
+
+            index = 0;
+            TermComboEnum statusComboDisplay;
+            try {
+                if (displayStatusCombo != null) {
+                    statusComboDisplay = TermComboEnum.byKey(displayStatusCombo);
+                } else {
+                    statusComboDisplay = TermComboEnum.Title;
+                }
+            } catch (IllegalArgumentException e) {
+                statusComboDisplay = TermComboEnum.Title;
+            }
+            for (String itemLabel : statusDisplayInComboSelectionCombo.getItems()) {
+                if (itemLabel.equals(Messages.Preference_Use_Default) && displayStatusCombo.equals(Messages.Preference_Use_Default)){
+                    statusDisplayInComboSelectionCombo.select(index);
+                    break;
+                }
+                if (itemLabel.startsWith(statusComboDisplay.getLabel())) {
+                    statusDisplayInComboSelectionCombo.select(index);
+                    break;
+                }
+
+                index++;
+            }
+
+            statusDisplayInComboSelectionCombo.addSelectionListener(this);
+
+            if (isAdminPreference) {
+                allowOverrideStatusDisplayInComboButton = createAllowOverrideButton(child);
+                allowOverrideStatusDisplayInComboButton.setSelection(prefStatusDisplayInCombo != null ? prefStatusDisplayInCombo.isAllowOverride(): true);
+                allowOverrideStatusDisplayInComboButton.addSelectionListener(new SelectionAdapter() {
+                    @Override
+                    public void widgetSelected(SelectionEvent e) {
+                        setApply(true);
+                        if (prefStatusDisplayInCombo == null){
+                            prefStatusDisplayInCombo = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfStatusInCombo, PreferencePredicate.DisplayOfStatusInCombo.getDefaultValue() != null ?  PreferencePredicate.DisplayOfStatusInCombo.getDefaultValue().toString(): null);
+                        }
+                        prefStatusDisplayInCombo.setAllowOverride(allowOverrideStatusDisplayInComboButton.getSelection());
+                    }
+                });
+            }
+
+
             final CLabel labelStatus = new CLabel(child, SWT.NULL);
             labelStatus.setText(Messages.DistributionAdminPreferences_SELECT_STATUS);
             labelStatus.setLayoutData(textGrid);
@@ -369,6 +431,9 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 if (prefStatusDisplay != null && !prefStatusDisplay.isAllowOverride()) {
                     statusDisplaySelectionCombo.setEnabled(false);
                 }
+                if (prefStatusDisplayInCombo != null && !prefStatusDisplayInCombo.isAllowOverride()) {
+                    statusDisplayInComboSelectionCombo.setEnabled(false);
+                }
             }
 
         }
@@ -423,6 +488,14 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()),
                     override);
 
+            override = false;
+            if (!displayStatusCombo.equals(Messages.Preference_Use_Default)) {
+               override = true;
+               PreferencesUtil.setStringValue(PreferencePredicate.DisplayOfStatusInCombo.getKey(), displayStatusCombo);
+            }
+            PreferencesUtil.setBooleanValue(
+                    PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatusInCombo.getKey()),
+                    override);
 
 
 
@@ -472,6 +545,25 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 
             }
         }
+        if (e.getSource().equals(statusDisplayInComboSelectionCombo)) {
+            String text = statusDisplayInComboSelectionCombo.getText();
+            if(text.equals(Messages.Preference_Use_Default)){
+                displayStatusCombo = Messages.Preference_Use_Default;
+                if(isAdminPreference){
+                    prefStatusDisplayInCombo.setAllowOverride(true);
+                    allowOverrideStatusDisplayInComboButton.setSelection(true);
+                }
+
+                return;
+            }
+            for (TermComboEnum display : TermComboEnum.values()) {
+                if (text.startsWith(display.getLabel())) {
+                    displayStatusCombo = display.getKey();
+                    break;
+                }
+
+            }
+        }
         if (e.getSource().equals(areaDisplaySelectionCombo)) {
             String text = areaDisplaySelectionCombo.getText();
             if(text.equals(Messages.Preference_Use_Default)){
@@ -642,6 +734,29 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             //prefStatusDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfStatus, PreferencePredicate.DisplayOfStatus.getDefaultValue() != null ?  PreferencePredicate.DisplayOfStatus.getDefaultValue().toString(): null);
         }
 
+        prefStatusDisplayInCombo = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfStatusInCombo);
+        overrideStatusDisplayCombo = PreferencesUtil
+                .getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatusInCombo.getKey()), true);
+        if (prefStatusDisplayInCombo != null) {
+            if (prefStatusDisplayInCombo.isAllowOverride()){
+                if (overrideStatusDisplayCombo) {
+                    displayStatusCombo = PreferencesUtil.getStringValue(PreferencePredicate.DisplayOfStatusInCombo.getKey());
+                }else{
+                    displayStatusCombo = Messages.Preference_Use_Default;
+                }
+            } else {
+                this.displayStatusCombo = prefStatusDisplayInCombo.getValue();
+            }
+        } else {
+            if (overrideStatusDisplayCombo){
+                displayStatusCombo = PreferencesUtil.getStringValue(PreferencePredicate.DisplayOfStatusInCombo.getKey());
+            } else{
+                displayStatusCombo = Messages.Preference_Use_Default;
+            }
+
+        }
+
+
         prefAreaSort = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AreasSortedInDistributionEditor);
         overrideOrderAreas = PreferencesUtil.getBooleanValue(
                 PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), true);
index aa7057e6e54d100a4ec2617292a7f5940f722fc3..a157bb04b97d6941b315800038f1244eb1d028d2 100644 (file)
@@ -128,7 +128,8 @@ public class LanguageRepresentationPreferencePage extends CdmPreferencePage{
 
        @Override
        public boolean performOk() {
-               getPreferenceStore().setValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability);
+
+               PreferencesUtil.setBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability);
                PreferencesUtil.setGlobalLanguage(globalLanguage);
 
                return super.performOk();
index 841bdd59059e1ab5a32bbd8dde31ae135b221190..86dbc0ae829587741f82b50a5daa672b77cbf39d 100644 (file)
@@ -27,6 +27,8 @@ import java.util.UUID;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.preferences.ConfigurationScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.equinox.internal.p2.ui.model.MetadataRepositoryElement;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.window.Window;
@@ -34,6 +36,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
+import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
 
 import eu.etaxonomy.cdm.api.application.ICdmRepository;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator;
@@ -81,19 +85,95 @@ import eu.etaxonomy.taxeditor.ui.dialog.DefaultLanguageDialog;
  * @created 05.12.2008
  */
 public class PreferencesUtil implements IPreferenceKeys {
+    private final static String EDITOR_PREFERENCES_NODE = "eu.etaxonomy.taxeditor";
 
        public static final String PREFERRED_TERMS_CHANGE = "preferred_terms";
 
        public static final String P2_REPOSITORIES_DELIM = ",";
        public static final String P2_REPOSITORY_FIELDS_DELIM = ";";
-
+       public static final String SUBJECT_DELIM = "/";
        private final static Logger logger = Logger.getLogger(PreferencesUtil.class);
 
        public static IPreferenceStore getPreferenceStore() {
-               return TaxeditorStorePlugin.getDefault().getPreferenceStore();
+          return TaxeditorStorePlugin.getDefault().getPreferenceStore();
+       }
+
+       public static String[] extractSubjectParts(String subject){
+          String[] result = subject.split("/");
+          return result;
+       }
+
+       public static IEclipsePreferences getEditorPreferences(){
+           return ConfigurationScope.INSTANCE.getNode(EDITOR_PREFERENCES_NODE);
        }
 
-       private static String prefKey(String name) {
+       public static String getPreferenceValue(PrefKey prefKey){
+           try {
+            if(getEditorPreferences().nodeExists(prefKey.getPredicate())){
+                Preferences predicateNode = getEditorPreferences().node(prefKey.getPredicate());
+                String[] splittedSubject = extractSubjectParts(prefKey.getSubject());
+                String value = predicateNode.get(splittedSubject[splittedSubject.length-1], PreferencePredicate.getByKey(prefKey.getPredicate()).getDefaultValue() != null? PreferencePredicate.getByKey(prefKey.getPredicate()).getDefaultValue().toString(): "");
+                int index = splittedSubject.length -2;
+                while (value != null && index >= 0){
+                   value = predicateNode.get(splittedSubject[index], prefKey.getPredicate());
+                   index--;
+                }
+                return value;
+            }
+
+        } catch (BackingStoreException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+           return null;
+       }
+
+       public static List<CdmPreference> getPreference(PreferencePredicate prefPredicate){
+        try {
+            List<CdmPreference> prefs = new ArrayList();
+            CdmPreference pref;
+            PreferenceSubject subject;
+            if(getEditorPreferences().nodeExists(prefPredicate.getKey())){
+                Preferences predicateNode = getEditorPreferences().node(prefPredicate.getKey());
+                for (String childName: predicateNode.childrenNames()){
+                    Preferences child = predicateNode.node(childName);
+                    String subjectString = "";
+                    subjectString = createSubjectStringForChildNodes(childName, child);
+                    String value = child.get(subjectString, "");
+                    subject = PreferenceSubject.NewInstance(subjectString);
+                    pref = CdmPreference.NewInstance(subject, prefPredicate, value);
+                    prefs.add(pref);
+                }
+
+            }
+
+        } catch (BackingStoreException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+       /**
+     * @param childName
+     * @param child
+     */
+    private static String createSubjectStringForChildNodes(String subject, Preferences parent) {
+        try {
+            for (String childName: parent.childrenNames()){
+                subject = childName+SUBJECT_DELIM+subject;
+                Preferences child = parent.node(childName);
+                createSubjectStringForChildNodes(subject, child);
+            }
+        } catch (BackingStoreException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return subject;
+
+    }
+
+    private static String prefKey(String name) {
            return name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString();
        }
 
@@ -1598,7 +1678,8 @@ public class PreferencesUtil implements IPreferenceKeys {
     }
 
     public static void updateDBPreferences() {
-        CdmPreference preference = null;
+
+
         CdmPreferenceCache cache = CdmPreferenceCache.instance();
         cache.getAllTaxEditorDBPreferences();
 
index ea61ce8780171f7d4aab72cbd792dbe12e101140..7783ba245100c56864c350a44cacf6db4e0676aa 100644 (file)
@@ -91,7 +91,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
 
         boolean isEditingAllowed = true;
         if(!isAdminPreference){
-            CdmPreferenceCache cache = CdmPreferenceCache.instance();
+           // CdmPreferenceCache cache = CdmPreferenceCache.instance();
 
             if (showSpecimenPref != null){
                 if (!showSpecimenPref.isAllowOverride() ){
index 250d11e1e9064c5e1eafc085b34180d7583037e1..1c43a90ca7b6bf494e0de6f81a884c84866d70b4 100644 (file)
@@ -9,6 +9,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -257,8 +258,11 @@ public class TermComboElement<T extends DefinedTermBase>
                }else{
                        String termLabel = null;
                        if (useAbbrevLabel){
-                               termLabel = term.getIdInVocabulary();
-                       }else{
+                           if (!StringUtils.isBlank(term.getIdInVocabulary())){
+                               termLabel = term.getIdInVocabulary();
+                           }
+                       }
+                       if (termLabel == null){
                                termLabel = term.getLabel(CdmStore.getDefaultLanguage());
                        }
                        if (termLabel == null){
index 97edc8de649ff25ac3362bfb689a943c6d8b8e19..d8613a5430d9b1ff2b4e5806421afec04ac2851e 100644 (file)
@@ -52,7 +52,7 @@ public abstract class AbstractFilteredIdentifierSelectionDialog<T extends ICdmBa
                @Override
         void callService(String pattern){
 
-                   model = CdmStore.getService(IIdentifiableEntityService.class).listByIdentifier(type, pattern, identifierType, matchMode, true, null, limitOfInitialElements);
+                   model = CdmStore.getService(IIdentifiableEntityService.class).listByIdentifier(type, pattern, identifierType, matchMode, true, null, null);
                }
 
 
index e6d87905a40fad223a73c1926945853d48bd73ef..5a0fb678bdb318f4eac8ca5f217aabb980cf825f 100755 (executable)
@@ -16,11 +16,13 @@ import org.apache.commons.lang.StringUtils;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
+import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -48,7 +50,7 @@ public class CommonNameNamedAreaSelectionDialog extends NamedAreaSelectionDialog
     }
 
     private static UUID[] createVocabularyUuidList() {
-        String preselectedVocString = PreferencesUtil.getStringValue(PreferencePredicate.CommonNameAreaVocabularies.getKey());
+        String preselectedVocString = PreferencesUtil.getStringValue(PreferencePredicate.CommonNameAreaVocabularies.getKey(), false);
         if (StringUtils.isBlank(preselectedVocString)){
             return null;
         }
@@ -72,17 +74,23 @@ public class CommonNameNamedAreaSelectionDialog extends NamedAreaSelectionDialog
 
         UUID[] preselectedVocabularyUuids = createVocabularyUuidList();
         CdmPreferenceCache cache = CdmPreferenceCache.instance();
-        CdmPreference pref = cache.get(PreferencePredicate.CommonNameAreaVocabularies.getKey());
+        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.CommonNameAreaVocabularies);
+        CdmPreference pref = cache.findBestMatching(key);
+        if (preselectedVocabularyUuids != null){
+            for(int i=0;i<preselectedVocabularyUuids.length;i++){
+                TermVocabulary preselectedVocabulary = CdmStore.getService(IVocabularyService.class).find(preselectedVocabularyUuids[i]);
+                vocabularies.add(preselectedVocabulary);
+            }
+        }
         if ((pref != null && !pref.isAllowOverride()) && preselectedVocabularyUuids!=null) {
-                for(int i=0;i<preselectedVocabularyUuids.length;i++){
-                    TermVocabulary preselectedVocabulary = CdmStore.getService(IVocabularyService.class).find(preselectedVocabularyUuids[i]);
-                    vocabularies.add(preselectedVocabulary);
-                }
+             return vocabularies;
         }else{
-            vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
+            selectedVocabularies = vocabularies;
+
+            return CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
         }
 
-        return vocabularies;
+
     }
 
     /**
@@ -104,4 +112,6 @@ public class CommonNameNamedAreaSelectionDialog extends NamedAreaSelectionDialog
                 "Choose an area", false, namedArea, preferenceId);
         return getSelectionFromDialog(dialog);
     }
+
+
 }
index 5bd973b915c0428456e577d737dda478d4b525b4..59b599e6d8026e7c4dca35f2ac168f0fd94a2be8 100644 (file)
@@ -163,42 +163,11 @@ public class NamedAreaSelectionDialog extends
        private List<TermVocabulary> getAvailableVocabularies(){
            vocabularies = new ArrayList();
            CdmPreferenceCache cache = CdmPreferenceCache.instance();
-//        CdmPreference pref = cache.get(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());
-//         if (pref != null && !pref.isAllowOverride()){
-//            UUID[] preselectedVocabularyUuids = createVocabularyUuidList();
-//
-//            for(int i=0;i<preselectedVocabularyUuids.length;i++){
-//                TermVocabulary preselectedVocabulary = CdmStore.getService(IVocabularyService.class).find(preselectedVocabularyUuids[i]);
-//                vocabularies.add(preselectedVocabulary);
-//            }
-//        }else{
-            vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
-//        }
-               //List<TermVocabulary> vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
-               return vocabularies;
+           vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
+           return vocabularies;
        }
 
-//     /** {@inheritDoc} */
-//     @Override
-//     protected void search() {
-//         Control control =getSearchField();
-//        String pattern = null;
-//        if (control != null){
-//            pattern = ((Text)control).getText();
-//        }
-//
-//        if (pattern == null || pattern.equals("?")){
-//            model = CdmStore.getService(ITermService.class).getUuidAndTitleCache(selectedVocabularies, limitOfInitialElements, null, PreferencesUtil.getGlobalLanguage());
-//        }else{
-//            model = CdmStore.getService(ITermService.class).getUuidAndTitleCache(selectedVocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage());
-//        }
-//     }
 
-//     /** {@inheritDoc} */
-//     @Override
-//     protected Control createExtendedContentArea(Composite parent) {
-//             return null;
-//     }
 
        /** {@inheritDoc} */
        @Override
index 3e731f3286c877fd56667f46b82b1b83167386ec..37645b38952733a2deeddcce3d8cbfe6e2260735 100644 (file)
@@ -408,20 +408,20 @@ public abstract class SearchDialog<T extends ICdmBase> extends Dialog{// impleme
                 this.items.add(item);
             }
 
-            /**
-             * Refresh dialog.
-             */
-            public void refresh() {
-                scheduleRefresh();
-            }
-
-            /**
-             * Schedule refresh job.
-             */
-            public void scheduleRefresh() {
-                refreshCacheJob.cancelAll();
-                refreshCacheJob.schedule();
-            }
+//            /**
+//             * Refresh dialog.
+//             */
+//            public void refresh() {
+//                scheduleRefresh();
+//            }
+//
+//            /**
+//             * Schedule refresh job.
+//             */
+//            public void scheduleRefresh() {
+//                refreshCacheJob.cancelAll();
+//                refreshCacheJob.schedule();
+//            }
 
             /*
              * (non-Javadoc)
index c8d9eba8ca668b064b7fdc4c76897294663a502f..dabd1f463cb4ee7c70921b72ed4e8e610e6d8de2 100644 (file)
@@ -8,6 +8,9 @@
 */
 package eu.etaxonomy.taxeditor.ui.dialog.selection;
 
+import java.util.List;
+import java.util.UUID;
+
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
@@ -27,6 +30,7 @@ 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.media.Rights;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.molecular.Primer;
 import eu.etaxonomy.cdm.model.name.TaxonName;
@@ -170,6 +174,12 @@ public class SelectionDialogFactory {
                         (NamedArea) currentSelection, parentElement.getClass().getCanonicalName());
             }
                    else{
+                       if (parentElement == null){
+                           List<UUID> uuidList = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());
+                           UUID[] uuidArray = new UUID[uuidList.size()];
+                           uuidList.toArray(uuidArray);
+                           return (T)NamedAreaSelectionDialog.select(shell, (NamedArea) currentSelection, null, uuidArray);
+                       }
                        return (T) NamedAreaSelectionDialog.select(shell, //conversation,
                                (NamedArea) currentSelection, parentElement.getClass().getCanonicalName());
                    }
index fbce4c31d87ba6a52be4e914dc0f1e9ebd536333..d18a2667c5eae07189c8cf9aac6ffc548676553d 100644 (file)
@@ -13,9 +13,11 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.forms.widgets.TableWrapData;
 
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@ -212,6 +214,22 @@ public abstract class AbstractCdmFormElement implements ICdmFormElement {
                this.layoutComposite = layoutComposite;
        }
 
+       public void addIndent(int indent)
+       {  this.layoutComposite = formFactory.createComposite(layoutComposite);
+
+           if (this.layoutComposite.getParent().getLayoutData() instanceof TableWrapData){
+               TableWrapData tableWrap = (TableWrapData)this.layoutComposite.getParent().getLayoutData();
+               tableWrap.indent = indent;
+
+               this.layoutComposite.setLayoutData(tableWrap);
+           }
+           if (this.layoutComposite.getLayoutData() instanceof GridData){
+               GridData gridData = new GridData();
+               gridData.verticalIndent = indent;
+            this.layoutComposite.setLayoutData(gridData);
+
+        }
+       }
        /**
         * <p>Getter for the field <code>propertyChangeListeners</code>.</p>
         *
@@ -308,7 +326,7 @@ public abstract class AbstractCdmFormElement implements ICdmFormElement {
        @Override
        public void setBackground(Color color) {
                for(ICdmFormElement element : getElements()){
-                       element.setBackground(color);
+                   element.setBackground(color);
                }
        }
 
index 22834daac24365cbf3e5227beab5a30d80455693..f91e624fa7d597d110cf77d47990a60ff5f99851 100644 (file)
@@ -9,7 +9,6 @@ import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
@@ -123,7 +122,7 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
     protected void initLabel(CdmFormFactory formFactory, String labelString, boolean isMultiLine, Composite layoutComposite) {
         if (labelString != null) {
             label = formFactory.createLabel(layoutComposite, CdmUtils.Nz(labelString), SWT.NULL);
-           
+
             addControl(label);
             if(isMultiLine){
                 label.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
@@ -237,4 +236,12 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
         text.setTextLimit(limit);
     }
 
+    /**
+     *
+     */
+    public String getLabel() {
+        return label.getText();
+
+    }
+
 }
index 716ebd067dac80e984fd78c10d9d37b16f6971ca..ce83cecf45aac0a3e0390daf0c57d633f56a43b6 100644 (file)
@@ -1,8 +1,8 @@
 /**
 * 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.
 */
@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityLabelT
 
 /**
  * Row widget for editing a single CDM Authority
- * 
+ *
  * @author cmathew
  * @created Mar 28, 2013
  *
@@ -41,37 +41,38 @@ public class CdmAuthorityRow extends Composite {
        private Label lblUuid;
        private CRUDOperationChooser operationChooser;
        private Button btnDelete;
-       
+
        private GrantedAuthorityImpl grantedAuthorityI;
        private Label lblDirtyFlag;
-       
+
        private CdmAuthorityCompositeViewer cdmaModel;
        private Label lblType;
-       
+
        /**
         * Create the composite, made up of 5 elements :
-        * 1. '*' or depending on whether the row is being edited 
-        * 2. Classname of entity (e.g. TAXONNODE) 
-        * 3. Uuid of entity 
-        * 4. CRUD operations edit widget (this is essentially 4 checkboxes to select the 4 possible operations) 
-        * 5. Delete button (to delete the row) 
-        * 
+        * 1. '*' or depending on whether the row is being edited
+        * 2. Classname of entity (e.g. TAXONNODE)
+        * 3. Uuid of entity
+        * 4. CRUD operations edit widget (this is essentially 4 checkboxes to select the 4 possible operations)
+        * 5. Delete button (to delete the row)
+        *
         * @param parent
         * @param style
         */
        public CdmAuthorityRow(Composite parent, int style) {
                super(parent, SWT.NONE);
                addDisposeListener(new DisposeListener() {
-                       public void widgetDisposed(DisposeEvent e) {
+                       @Override
+            public void widgetDisposed(DisposeEvent e) {
                                toolkit.dispose();
                        }
                });
                toolkit.adapt(this);
                toolkit.paintBordersFor(this);
                setLayout(new GridLayout(6, false));
-               
 
-               
+
+
                lblDirtyFlag = new Label(this, SWT.NONE);
                lblDirtyFlag.setAlignment(SWT.CENTER);
                GridData gd_lblDirtyFlag = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
@@ -79,7 +80,7 @@ public class CdmAuthorityRow extends Composite {
                lblDirtyFlag.setLayoutData(gd_lblDirtyFlag);
                toolkit.adapt(lblDirtyFlag, true, true);
                lblDirtyFlag.setText("*");
-               
+
                lblType = new Label(this, SWT.BORDER);
                GridData gd_lblType = new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1);
                gd_lblType.heightHint = 30;
@@ -88,7 +89,7 @@ public class CdmAuthorityRow extends Composite {
                lblType.setText("Type");
                lblType.setAlignment(SWT.CENTER);
                toolkit.adapt(lblType, true, true);
-               
+
                lblEntity = new Label(this, SWT.BORDER | SWT.WRAP | SWT.CENTER);
                GridData gd_lblEntity = new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1);
                gd_lblEntity.heightHint = 30;
@@ -97,13 +98,13 @@ public class CdmAuthorityRow extends Composite {
                lblEntity.setAlignment(SWT.CENTER);
                toolkit.adapt(lblEntity, true, true);
                lblEntity.setText("Entity");
-               
-               
+
+
                operationChooser = new CRUDOperationChooser(this, SWT.BORDER);
                operationChooser.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
                toolkit.adapt(operationChooser);
                toolkit.paintBordersFor(operationChooser);
-               
+
                btnDelete = new Button(this, SWT.NONE);
 
                btnDelete.setImage(ImageResources.getImage(ImageResources.TRASH_ICON));
@@ -115,15 +116,15 @@ public class CdmAuthorityRow extends Composite {
                                        cdmaModel.removeCdmAuthority(grantedAuthorityI);
                                }
                        }
-               });             
-               
+               });
+
                toolkit.adapt(btnDelete, true, true);
 
        }
 
        /**
         * Sets the dirty flag for this row
-        * 
+        *
         * @param isDirty
         */
        public void setDirty(boolean isDirty) {
@@ -133,18 +134,18 @@ public class CdmAuthorityRow extends Composite {
                        lblDirtyFlag.setText(" ");
                }
        }
-       
+
        /**
         * Create a {@link CdmAuthority} from a {@link GrantedAuthorityImpl} and create a row from it.
-        * 
+        *
         * @param cdmaModel
         * @param grantedAuthorityI
         * @param isDirty
         */
        public void setRowCdmAuthority(CdmAuthorityCompositeViewer cdmaModel, GrantedAuthorityImpl grantedAuthorityI, boolean isDirty, boolean showUuid) {
-               this.grantedAuthorityI = grantedAuthorityI;             
+               this.grantedAuthorityI = grantedAuthorityI;
                this.cdmaModel = cdmaModel;
-               
+
                try {
                        CdmAuthority cdmAuthority = CdmAuthority.fromGrantedAuthority(grantedAuthorityI);
 
@@ -154,29 +155,35 @@ public class CdmAuthorityRow extends Composite {
                        lblType.setText(entityStr);
                        String targetLabelText = GrantedAuthorityLabelTextProvider.getTargetText(cdmAuthority);
                        lblEntity.setText(targetLabelText);
-                                               
+
                        setUuidCellVisible(showUuid);
                        if(lblUuid != null) {
-                               String targetUuid = cdmAuthority.getTargetUUID().toString();
-                               lblUuid.setText(targetUuid);
+                           if (cdmAuthority.getTargetUUID() != null){
+                               String targetUuid = cdmAuthority.getTargetUUID().toString();
+                               lblUuid.setText(targetUuid);
+                           }
+                           else{
+                               lblUuid.setText("Uuid");
+                           }
+
                        }
-                       
-                       operationChooser.setAuthority(cdmaModel, grantedAuthorityI, cdmAuthority);                              
-                       
+
+                       operationChooser.setAuthority(cdmaModel, grantedAuthorityI, cdmAuthority);
+
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
                }
 
        }
-       
+
        public void setUuidCellVisible(boolean visible) {
                if(visible) {
                        if(lblUuid == null) {
                                createUuidCell();
                        }
                        lblUuid.moveAbove(operationChooser);
-                       
+
                } else {
                        if(lblUuid != null) {
                                lblUuid.dispose();
@@ -185,7 +192,7 @@ public class CdmAuthorityRow extends Composite {
                }
                layout();
        }
-       
+
        private void createUuidCell() {
                lblUuid = new Label(this, SWT.BORDER | SWT.CENTER);
                GridData gd_lblUuid = new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1);
index 0301c49a2bf66d0839bda7fafba9100e3422649e..e436fb8c63263d66b9b64088897d568d9e7d42a4 100644 (file)
@@ -78,7 +78,9 @@ public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm
                    for (TermVocabulary<DefinedTerm> termVocabulary : recommendedModifierEnumeration) {
                        modifierTerms.addAll(termVocabulary.getTerms());
                    }
+
                    combo_modifier.setTerms(modifierTerms);
+
                }
         if(entity!=null && entity.getId()>0){
             combo_modifier.setSelection(entity);
index df231b4804352c044501e8d17faa2929557a9f82..366bab7c6318cd7c1f79038d9872a6ae5618d11b 100644 (file)
@@ -1,8 +1,8 @@
 /**
 * 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.
 */
@@ -23,7 +23,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 public class GroupDetailElement extends AbstractCdmDetailElement<Group> {
 
        private TextWithLabelElement text_name;
-       
+
        /**
         * @param formFactory
         * @param formElement
@@ -50,6 +50,7 @@ public class GroupDetailElement extends AbstractCdmDetailElement<Group> {
                if(eventSource == text_name){
                        getEntity().setName(text_name.getText());
                }
+
        }
 
 }
index adf31bd987cf952bef369804982d0cfad6b9139e..2886b40c25146e00eb684901896161e069cb715a 100644 (file)
@@ -78,6 +78,7 @@ public abstract class AbstractTypeDesignationElement<T extends TypeDesignationBa
 
                 text_referenceDetail = formFactory.createTextWithLabelElement(
                     formElement, "Reference Detail", entity.getCitationMicroReference(), style);
+                //text_referenceDetail.addIndent(10);
                 checkbox_notDesignated = formFactory.createCheckbox(formElement, "Not Designated", entity.isNotDesignated(), style);
                }
         }else{
index 8717937b7b2e313e73d3ed814ffb98efe0e6e092..0f617d2e7909e0ea47d70d548582877293e553a5 100644 (file)
@@ -96,6 +96,7 @@ public class NonViralNameDetailElement
            addControl(section_name);
            addElement(section_name);
 //         if (isAdvancedView || PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP)){
+
            section_author = formFactory.createAuthorshipDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
            section_author.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
            addControl(section_author);
index c0ff345ba7e71733403640fc4b8b985022034414..9cf6c7883bdcacaf29f3f0f16f21850a50e5f1ee 100644 (file)
@@ -64,11 +64,13 @@ public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<
 
     @Override
     protected void createControls(ICdmFormElement formElement, MediaSpecimen entity, int style) {
+
         Media media = entity.getMediaSpecimen();
         if(media==null){
             formFactory.createLabel(formElement, "No media attached to this MediaSpecimen!");
         }
         else{
+            setWarnForReferencingObjects(formElement);
             comboKindOfUnit = formFactory.createDefinedTermComboElement(mediaSpecimenVocabulary, formElement, "Kind of Media", entity.getKindOfUnit(), style);
             textTitleLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Motif", media.getTitle(), style);
             selectionArtist = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
index ae5fddd33d87296c9d569c2c6e557d4dda08f2ef..bfed628ec02637d6c2d1c396e3c47167aa7e539a 100755 (executable)
@@ -26,8 +26,6 @@ public abstract class AbstractSourcedEntityBaseElement<T extends SourcedEntityBa
 
     private SelectionArbitrator selectionArbitrator;
 
-  //  protected SourceSection sources;
-
 
     /**
      * @param formFactory
index f8219d0853cf2ebaaec01a6b247a01b0a391a2c3..37ac349653f5c79f63525b639f126eb69a1ad042 100644 (file)
@@ -7,10 +7,10 @@ import java.util.Collection;
 import java.util.Comparator;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.reference.ISourceable;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
-import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
 import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.cdm.model.reference.ISourceable;
+import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -55,7 +55,7 @@ public class SourceSection extends AbstractEntityCollectionSection<ISourceable,
        /** {@inheritDoc} */
        @Override
        public Collection<IdentifiableSource> getCollection(
-                       ISourceable entity) {
+               ISourceable entity) {
                return entity.getSources();
        }
 
index 3bd4d7c24da074070c3eb635469a1031cd090e3b..535bc009f5aa14ace79bd49bc710aa78c346187c 100644 (file)
@@ -150,7 +150,7 @@ public class TaxonRelationshipDetailElement extends AbstractCdmDetailElement<Tax
                    taxon.getSec(), EntitySelectionElement.ALL,
                    style);
 
-               text_sensu_microreference = formFactory.createTextWithLabelElement(
+            text_sensu_microreference = formFactory.createTextWithLabelElement(
                        formElement, "Detail",
                        taxon.getSecMicroReference(),null,
                        SWT.WRAP);
index 63a6967f1e15d7e631107cb6e431c06b6bf341a0..d141e918176361f9b068ee9288a1d4dbeb76377c 100644 (file)
@@ -479,7 +479,8 @@ public class EntitySelectionElement<T extends CdmBase> extends
        /** {@inheritDoc} */
        @Override
        public void setBackground(Color color) {
-           if(!label.isDisposed()){
+
+           if(label != null && !label.isDisposed()){
                label.setBackground(color);
            }
        }
index 34aa55a0d2fd9de35c8773c3b4ec0d0147bf8904..233ed6bf2a5231a0be13d240f080f21c44abffdf 100644 (file)
@@ -203,6 +203,7 @@ public class CdmSectionPart<T> extends SectionPart implements
        protected void expansionStateChanged(boolean expanded) {
            super.expansionStateChanged(expanded);
            PreferencesUtil.setStringValue(StoreUtil.getPrefKey(formSection.getClass(), rootInput), expanded?EXPANDED:COLLAPSED);
+
        }
 
 }
index 7cfea33174acbfba766e5aeedcc497af8fc526fa..ee4c613b3199a47a4b8e69bfc98d7843a8e43dae 100644 (file)
@@ -179,12 +179,14 @@ public abstract class AbstractCdmDataViewerE4 extends Viewer implements IConvers
 
     protected int getSectionStyle(Class<? extends AbstractFormSection> clazz, boolean initiallyExpanded){
         int style = ExpandableComposite.TWISTIE;
+
         String prefKey = StoreUtil.getPrefKey(clazz, getInput());
         if(PreferencesUtil.contains(prefKey)){
             style = PreferencesUtil.getStringValue(prefKey)==CdmSectionPart.EXPANDED?style |= ExpandableComposite.EXPANDED:style;
         }
         else{
             style = initiallyExpanded?style |= ExpandableComposite.EXPANDED:style;
+
         }
         return style;
     }
index 770f20109641b359dac18ab3938a88d2c56c270d..4ec7a19db49925bcf8f56565cccaef670f434b88 100644 (file)
@@ -229,6 +229,7 @@ public abstract class AbstractCdmEditorPartE4
                 }
 
                 selectionProvidingPart = activePart;
+
                 if (viewer instanceof DetailsViewerE4){
                     ((DetailsViewerE4)viewer).setInput(element, part);
                     if (!selectionProvidingPart.getElementId().equals("eu.etaxonomy.taxeditor.editor.view.checklist.e4.DistributionEditorPart")){
@@ -238,11 +239,12 @@ public abstract class AbstractCdmEditorPartE4
                 }
 
                 else{
-                    if (activePart.getObject() instanceof DetailsPartE4 && element instanceof TaxonName){
+                    if (activePart.getObject() instanceof DetailsPartE4 && element instanceof TaxonName ){
                         selectionProvidingPart = ((DetailsPartE4)activePart.getObject()).getSelectionProvidingPart();
                     }
                     viewer.setInput(element);
                 }
+
             }
         }
     }
index b402e67285da2986b850d3c49dd670ae7c225c13..f8ff79683efb1421c66405c1923c33e65abaec78 100644 (file)
@@ -9,7 +9,7 @@
 \r
   <!-- Local application context and term initializer -->\r
   <import resource="classpath:/eu/etaxonomy/cdm/localApplicationContext.xml"/>\r
-  \r
+   \r
   <!-- Remote application context and term initializer -->\r
   <!--  <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->\r
   \r
index 168d7fe1dc8f1c4abc9e32fa76200a6e16435b2e..6f100913dba6ce87deb5771eadeeff2d15ec7706 100644 (file)
@@ -33,6 +33,7 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.INonViralName;
+import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
@@ -204,7 +205,8 @@ public class TaxonNameEditorTest extends BaseOperationTest {
     public void addTaxon() {
         INonViralName taxonName = TaxonNameFactory.NewNonViralInstance(null);
         Taxon taxon = Taxon.NewInstance(taxonName, null);
-        taxonService.merge(taxon);
+        taxon = (Taxon)taxonService.merge(taxon);
+        taxon.getName().addTypeDesignation(NameTypeDesignation.NewInstance(), true);
     }
 
     @Ignore
index 5ff64a91e346cfaee0fe7062b2d2e78371673e16..c9a133f6c254fef245f2fb3095b6d802810f8325 100644 (file)
@@ -39,7 +39,12 @@ public class CdmServerInfoTest extends UnitilsJUnit4 {
                 //no need to test ping localhost
                 continue;
             }
-            server.pingServer();
+            System.err.println(server.getName());
+            try{
+                server.pingServer();
+            }catch(Exception e){
+                System.err.println(e.getMessage());
+            }
         }
     }
 
index 7579a081185c761cab44572597a626f3300097dc..6e6dd196a858672087378be19f8ead7b8b28e733 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.test/src/test/resources/h2/cdmTest.h2.db and b/eu.etaxonomy.taxeditor.test/src/test/resources/h2/cdmTest.h2.db differ
index 4599dec1d0ff0424471132386005304d3f7b140d..c0dd7275f2fc84c662086e84303c70500bc205f9 100644 (file)
@@ -77,7 +77,7 @@ public class WorkbenchUtility {
     public static MPart findSavablePart(ISelectionElementEditingPart part){
         MPart selectionProvidingPart = part.getSelectionProvidingPart();
         if(selectionProvidingPart!=null){
-            if(selectionProvidingPart.getObject() instanceof ISelectionElementEditingPart){
+            if(selectionProvidingPart.getObject() instanceof ISelectionElementEditingPart && !selectionProvidingPart.getObject().equals(part)){
                 return findSavablePart((ISelectionElementEditingPart) selectionProvidingPart.getObject());
             }
             return selectionProvidingPart;
index b32319bb867a2b353dcb2e3511fabc7ef5f567dd..db61771bed6619fca28a082cb12f0b1c1cf12c86 100644 (file)
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="51">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>
-<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.2.203.v20170131-1444"/>
-<unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="1.2.203.v20170131-1444"/>
-<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.12.3.v20170209-1843"/>
-<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.12.0.v20160815-1406"/>
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.12.3.v20170209-1843"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.3.3.v20170209-1843"/>
-<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="1.3.203.v20170131-1444"/>
-<unit id="org.eclipse.equinox.p2.rcp.feature.source.feature.group" version="1.2.203.v20170131-1444"/>
-<unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="1.3.203.v20170131-1444"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.9.203.v20170131-1444"/>
-<unit id="org.eclipse.objectteams.otequinox.feature.group" version="2.5.2.201612071657"/>
-<unit id="org.eclipse.equinox.p2.extras.feature.source.feature.group" version="1.2.203.v20170131-1444"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.4.0.v20160526-0606"/>
-<unit id="org.eclipse.emf.ecore.feature.group" version="2.12.0.v20160420-0247"/>
-<unit id="org.eclipse.emf.ecore.xcore.lib.feature.group" version="1.2.100.v20160526-0606"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
-<unit id="org.eclipse.emf.common.feature.group" version="2.12.0.v20160420-0247"/>
-<unit id="org.eclipse.emf.ecore.xcore.feature.group" version="1.4.0.v20160526-0606"/>
-<unit id="org.eclipse.emf.feature.group" version="2.12.0.v20160526-0356"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.5.100.v20170131-1452"/>
-<unit id="org.eclipse.equinox.p2.user.ui.source.feature.group" version="2.2.203.v20170131-1444"/>
-<unit id="org.eclipse.e4.rcp.feature.group" version="1.5.3.v20170228-0512"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20161122-1740"/>
-<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.eclipse.help.feature.group" version="2.2.2.v20170301-0400"/>
-<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.100.v20170131-1452"/>
-<unit id="org.eclipse.e4.rcp.source.feature.group" version="1.5.3.v20170228-0512"/>
-<unit id="org.eclipse.sdk.ide" version="4.6.3.M20170301-0400"/>
-<unit id="epp.package.modeling" version="4.6.3.20170314-1500"/>
-<unit id="org.eclipse.platform.sdk" version="4.6.3.M20170301-0400"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.12.3.v20170301-0400"/>
-<unit id="org.eclipse.pde.source.feature.group" version="3.12.3.v20170301-0400"/>
-<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.1.203.v20170209-1843"/>
-<unit id="org.eclipse.pde.feature.group" version="3.12.3.v20170301-0400"/>
-<unit id="org.eclipse.rcp.sdk.id" version="4.6.3.M20170301-0400"/>
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.eclipse.platform.feature.group" version="4.6.3.v20170301-0400"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.1.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.1.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.0.201703192131"/>
-<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
-<repository location="http://download.eclipse.org/nattable/releases/1.5.0/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.oomph.setup.sdk.feature.group" version="1.7.0.v20170305-1123"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201812241324"/>
-<repository location="http://download.eclipse.org/nebula/releases/latest/"/>
-</location>
-</locations>
-<includeBundles>
-<feature id="org.eclipse.core.runtime.feature"/>
-<feature id="org.eclipse.cvs"/>
-<feature id="org.eclipse.cvs.source"/>
-<feature id="org.eclipse.draw2d"/>
-<feature id="org.eclipse.draw2d.sdk"/>
-<feature id="org.eclipse.draw2d.source"/>
-<feature id="org.eclipse.e4.core.tools.feature"/>
-<feature id="org.eclipse.e4.core.tools.feature.source"/>
-<feature id="org.eclipse.e4.rcp"/>
-<feature id="org.eclipse.e4.rcp.source"/>
-<feature id="org.eclipse.ecf.core.feature"/>
-<feature id="org.eclipse.ecf.core.source.feature"/>
-<feature id="org.eclipse.ecf.core.ssl.feature"/>
-<feature id="org.eclipse.ecf.core.ssl.source.feature"/>
-<feature id="org.eclipse.ecf.filetransfer.feature"/>
-<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
-<feature id="org.eclipse.ecf.filetransfer.httpclient4.source.feature"/>
-<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
-<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature"/>
-<feature id="org.eclipse.ecf.filetransfer.source.feature"/>
-<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
-<feature id="org.eclipse.ecf.filetransfer.ssl.source.feature"/>
-<feature id="org.eclipse.emf"/>
-<feature id="org.eclipse.emf.codegen"/>
-<feature id="org.eclipse.emf.codegen.ecore"/>
-<feature id="org.eclipse.emf.codegen.ecore.source"/>
-<feature id="org.eclipse.emf.codegen.ecore.ui"/>
-<feature id="org.eclipse.emf.codegen.ecore.ui.source"/>
-<feature id="org.eclipse.emf.codegen.source"/>
-<feature id="org.eclipse.emf.codegen.ui"/>
-<feature id="org.eclipse.emf.codegen.ui.source"/>
-<feature id="org.eclipse.emf.common"/>
-<feature id="org.eclipse.emf.common.source"/>
-<feature id="org.eclipse.emf.common.ui"/>
-<feature id="org.eclipse.emf.common.ui.source"/>
-<feature id="org.eclipse.emf.converter"/>
-<feature id="org.eclipse.emf.converter.source"/>
-<feature id="org.eclipse.emf.databinding"/>
-<feature id="org.eclipse.emf.databinding.edit"/>
-<feature id="org.eclipse.emf.databinding.edit.source"/>
-<feature id="org.eclipse.emf.databinding.source"/>
-<feature id="org.eclipse.emf.doc"/>
-<feature id="org.eclipse.emf.doc.source"/>
-<feature id="org.eclipse.emf.ecore"/>
-<feature id="org.eclipse.emf.ecore.edit"/>
-<feature id="org.eclipse.emf.ecore.edit.source"/>
-<feature id="org.eclipse.emf.ecore.editor"/>
-<feature id="org.eclipse.emf.ecore.editor.source"/>
-<feature id="org.eclipse.emf.ecore.source"/>
-<feature id="org.eclipse.emf.ecore.xcore"/>
-<feature id="org.eclipse.emf.ecore.xcore.lib"/>
-<feature id="org.eclipse.emf.ecore.xcore.lib.source"/>
-<feature id="org.eclipse.emf.ecore.xcore.sdk"/>
-<feature id="org.eclipse.emf.ecore.xcore.source"/>
-<feature id="org.eclipse.emf.ecore.xcore.ui"/>
-<feature id="org.eclipse.emf.ecore.xcore.ui.source"/>
-<feature id="org.eclipse.emf.edit"/>
-<feature id="org.eclipse.emf.edit.source"/>
-<feature id="org.eclipse.emf.edit.ui"/>
-<feature id="org.eclipse.emf.edit.ui.source"/>
-<feature id="org.eclipse.emf.mapping"/>
-<feature id="org.eclipse.emf.mapping.ecore"/>
-<feature id="org.eclipse.emf.mapping.ecore.editor"/>
-<feature id="org.eclipse.emf.mapping.ecore.editor.source"/>
-<feature id="org.eclipse.emf.mapping.ecore.source"/>
-<feature id="org.eclipse.emf.mapping.source"/>
-<feature id="org.eclipse.emf.mapping.ui"/>
-<feature id="org.eclipse.emf.mapping.ui.source"/>
-<feature id="org.eclipse.emf.sdk"/>
-<feature id="org.eclipse.emf.source"/>
-<feature id="org.eclipse.epp.logging.aeri.feature"/>
-<feature id="org.eclipse.epp.mpc"/>
-<feature id="org.eclipse.epp.package.common.feature"/>
-<feature id="org.eclipse.epp.package.modeling.feature"/>
-<feature id="org.eclipse.equinox.compendium.sdk"/>
-<feature id="org.eclipse.equinox.core.feature"/>
-<feature id="org.eclipse.equinox.core.sdk"/>
-<feature id="org.eclipse.equinox.executable"/>
-<feature id="org.eclipse.equinox.p2.core.feature"/>
-<feature id="org.eclipse.equinox.p2.core.feature.source"/>
-<feature id="org.eclipse.equinox.p2.discovery.feature"/>
-<feature id="org.eclipse.equinox.p2.extras.feature"/>
-<feature id="org.eclipse.equinox.p2.extras.feature.source"/>
-<feature id="org.eclipse.equinox.p2.rcp.feature"/>
-<feature id="org.eclipse.equinox.p2.rcp.feature.source"/>
-<feature id="org.eclipse.equinox.p2.sdk"/>
-<feature id="org.eclipse.equinox.p2.user.ui"/>
-<feature id="org.eclipse.equinox.p2.user.ui.source"/>
-<feature id="org.eclipse.equinox.sdk"/>
-<feature id="org.eclipse.equinox.server.core"/>
-<feature id="org.eclipse.equinox.server.jetty"/>
-<feature id="org.eclipse.equinox.server.p2"/>
-<feature id="org.eclipse.equinox.serverside.sdk"/>
-<feature id="org.eclipse.help"/>
-<feature id="org.eclipse.help.source"/>
-<feature id="org.eclipse.jdt"/>
-<feature id="org.eclipse.jdt.source"/>
-<feature id="org.eclipse.nebula.widgets.compositetable.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.core.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.core.source.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.extension.e4.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.extension.poi.feature"/>
-<feature id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature"/>
-<feature id="org.eclipse.objectteams.otequinox"/>
-<feature id="org.eclipse.oomph.p2"/>
-<feature id="org.eclipse.oomph.setup"/>
-<feature id="org.eclipse.oomph.setup.core"/>
-<feature id="org.eclipse.oomph.setup.git"/>
-<feature id="org.eclipse.oomph.setup.jdt"/>
-<feature id="org.eclipse.oomph.setup.launching"/>
-<feature id="org.eclipse.oomph.setup.maven"/>
-<feature id="org.eclipse.oomph.setup.mylyn"/>
-<feature id="org.eclipse.oomph.setup.pde"/>
-<feature id="org.eclipse.oomph.setup.projects"/>
-<feature id="org.eclipse.oomph.setup.projectset"/>
-<feature id="org.eclipse.oomph.setup.sdk"/>
-<feature id="org.eclipse.oomph.setup.targlets"/>
-<feature id="org.eclipse.oomph.setup.ui.ide"/>
-<feature id="org.eclipse.oomph.setup.workbench"/>
-<feature id="org.eclipse.oomph.setup.workingsets"/>
-<feature id="org.eclipse.pde"/>
-<feature id="org.eclipse.pde.source"/>
-<feature id="org.eclipse.platform"/>
-<feature id="org.eclipse.platform.source"/>
-<feature id="org.eclipse.rcp"/>
-<feature id="org.eclipse.rcp.source"/>
-<feature id="org.eclipse.sdk"/>
-<feature id="org.eclipse.swtbot"/>
-<feature id="org.eclipse.swtbot.eclipse"/>
-<feature id="org.eclipse.swtbot.forms"/>
-<feature id="org.eclipse.zest"/>
-<feature id="org.eclipse.zest.sdk"/>
-<feature id="org.eclipse.zest.source"/>
-<plugin id="com.google.gson"/>
-<plugin id="com.google.guava"/>
-<plugin id="com.google.guava.source"/>
-<plugin id="com.google.inject"/>
-<plugin id="com.google.inject.source"/>
-<plugin id="javaewah"/>
-<plugin id="org.antlr.runtime"/>
-<plugin id="org.antlr.runtime.source"/>
-<plugin id="org.apache.commons.cli"/>
-<plugin id="org.apache.commons.codec.source"/>
-<plugin id="org.apache.commons.httpclient"/>
-<plugin id="org.apache.commons.httpclient.source"/>
-<plugin id="org.apache.commons.io"/>
-<plugin id="org.apache.commons.lang"/>
-<plugin id="org.apache.commons.lang.source"/>
-<plugin id="org.apache.commons.lang3"/>
-<plugin id="org.apache.log4j"/>
-<plugin id="org.apache.log4j.source"/>
-<plugin id="org.apache.xerces"/>
-<plugin id="org.apache.xml.resolver"/>
-<plugin id="org.apache.xml.serializer"/>
-<plugin id="org.eclipse.egit.core"/>
-<plugin id="org.eclipse.egit.core.source"/>
-<plugin id="org.eclipse.emf.mwe.core"/>
-<plugin id="org.eclipse.emf.mwe.core.source"/>
-<plugin id="org.eclipse.emf.mwe.utils"/>
-<plugin id="org.eclipse.emf.mwe.utils.source"/>
-<plugin id="org.eclipse.emf.mwe2.lib"/>
-<plugin id="org.eclipse.emf.mwe2.lib.source"/>
-<plugin id="org.eclipse.emf.mwe2.runtime"/>
-<plugin id="org.eclipse.emf.mwe2.runtime.source"/>
-<plugin id="org.eclipse.epp.logging.aeri.core.source"/>
-<plugin id="org.eclipse.epp.logging.aeri.ide.source"/>
-<plugin id="org.eclipse.epp.mpc.core.source"/>
-<plugin id="org.eclipse.epp.mpc.ui.source"/>
-<plugin id="org.eclipse.jgit"/>
-<plugin id="org.eclipse.jgit.source"/>
-<plugin id="org.eclipse.m2e.archetype.common"/>
-<plugin id="org.eclipse.m2e.core"/>
-<plugin id="org.eclipse.m2e.core.source"/>
-<plugin id="org.eclipse.m2e.maven.indexer"/>
-<plugin id="org.eclipse.m2e.maven.runtime"/>
-<plugin id="org.eclipse.m2e.maven.runtime.slf4j.simple"/>
-<plugin id="org.eclipse.m2e.workspace.cli"/>
-<plugin id="org.eclipse.mylyn.builds.core"/>
-<plugin id="org.eclipse.mylyn.builds.core.source"/>
-<plugin id="org.eclipse.mylyn.builds.ui"/>
-<plugin id="org.eclipse.mylyn.builds.ui.source"/>
-<plugin id="org.eclipse.mylyn.commons.core"/>
-<plugin id="org.eclipse.mylyn.commons.core.source"/>
-<plugin id="org.eclipse.mylyn.commons.identity.core"/>
-<plugin id="org.eclipse.mylyn.commons.identity.core.source"/>
-<plugin id="org.eclipse.mylyn.commons.net"/>
-<plugin id="org.eclipse.mylyn.commons.net.source"/>
-<plugin id="org.eclipse.mylyn.commons.notifications.core"/>
-<plugin id="org.eclipse.mylyn.commons.notifications.core.source"/>
-<plugin id="org.eclipse.mylyn.commons.notifications.feed"/>
-<plugin id="org.eclipse.mylyn.commons.notifications.feed.source"/>
-<plugin id="org.eclipse.mylyn.commons.notifications.ui"/>
-<plugin id="org.eclipse.mylyn.commons.notifications.ui.source"/>
-<plugin id="org.eclipse.mylyn.commons.repositories.core"/>
-<plugin id="org.eclipse.mylyn.commons.repositories.core.source"/>
-<plugin id="org.eclipse.mylyn.commons.repositories.ui"/>
-<plugin id="org.eclipse.mylyn.commons.repositories.ui.source"/>
-<plugin id="org.eclipse.mylyn.commons.screenshots"/>
-<plugin id="org.eclipse.mylyn.commons.screenshots.source"/>
-<plugin id="org.eclipse.mylyn.commons.ui"/>
-<plugin id="org.eclipse.mylyn.commons.ui.source"/>
-<plugin id="org.eclipse.mylyn.commons.workbench"/>
-<plugin id="org.eclipse.mylyn.commons.workbench.source"/>
-<plugin id="org.eclipse.mylyn.context.core"/>
-<plugin id="org.eclipse.mylyn.context.core.source"/>
-<plugin id="org.eclipse.mylyn.context.ui"/>
-<plugin id="org.eclipse.mylyn.context.ui.source"/>
-<plugin id="org.eclipse.mylyn.discovery.core"/>
-<plugin id="org.eclipse.mylyn.discovery.core.source"/>
-<plugin id="org.eclipse.mylyn.discovery.ui"/>
-<plugin id="org.eclipse.mylyn.discovery.ui.source"/>
-<plugin id="org.eclipse.mylyn.monitor.core"/>
-<plugin id="org.eclipse.mylyn.monitor.core.source"/>
-<plugin id="org.eclipse.mylyn.monitor.ui"/>
-<plugin id="org.eclipse.mylyn.monitor.ui.source"/>
-<plugin id="org.eclipse.mylyn.resources.ui"/>
-<plugin id="org.eclipse.mylyn.resources.ui.source"/>
-<plugin id="org.eclipse.mylyn.tasks.core"/>
-<plugin id="org.eclipse.mylyn.tasks.core.source"/>
-<plugin id="org.eclipse.mylyn.tasks.ui"/>
-<plugin id="org.eclipse.mylyn.tasks.ui.source"/>
-<plugin id="org.eclipse.mylyn.team.ui"/>
-<plugin id="org.eclipse.mylyn.team.ui.source"/>
-<plugin id="org.eclipse.mylyn.versions.core"/>
-<plugin id="org.eclipse.mylyn.versions.core.source"/>
-<plugin id="org.eclipse.mylyn.versions.ui"/>
-<plugin id="org.eclipse.mylyn.versions.ui.source"/>
-<plugin id="org.eclipse.oomph.base"/>
-<plugin id="org.eclipse.oomph.base.edit"/>
-<plugin id="org.eclipse.oomph.predicates"/>
-<plugin id="org.eclipse.oomph.predicates.edit"/>
-<plugin id="org.eclipse.oomph.resources"/>
-<plugin id="org.eclipse.oomph.resources.edit"/>
-<plugin id="org.eclipse.oomph.targlets"/>
-<plugin id="org.eclipse.oomph.targlets.core"/>
-<plugin id="org.eclipse.oomph.targlets.edit"/>
-<plugin id="org.eclipse.oomph.ui"/>
-<plugin id="org.eclipse.oomph.util"/>
-<plugin id="org.eclipse.oomph.util.pde"/>
-<plugin id="org.eclipse.oomph.workingsets"/>
-<plugin id="org.eclipse.oomph.workingsets.edit"/>
-<plugin id="org.eclipse.oomph.workingsets.editor"/>
-<plugin id="org.eclipse.xpand"/>
-<plugin id="org.eclipse.xpand.source"/>
-<plugin id="org.eclipse.xtend"/>
-<plugin id="org.eclipse.xtend.lib"/>
-<plugin id="org.eclipse.xtend.lib.macro"/>
-<plugin id="org.eclipse.xtend.lib.macro.source"/>
-<plugin id="org.eclipse.xtend.lib.source"/>
-<plugin id="org.eclipse.xtend.source"/>
-<plugin id="org.eclipse.xtend.typesystem.emf"/>
-<plugin id="org.eclipse.xtend.typesystem.emf.source"/>
-<plugin id="org.eclipse.xtext"/>
-<plugin id="org.eclipse.xtext.builder"/>
-<plugin id="org.eclipse.xtext.builder.source"/>
-<plugin id="org.eclipse.xtext.common.types"/>
-<plugin id="org.eclipse.xtext.common.types.edit"/>
-<plugin id="org.eclipse.xtext.common.types.edit.source"/>
-<plugin id="org.eclipse.xtext.common.types.source"/>
-<plugin id="org.eclipse.xtext.common.types.ui"/>
-<plugin id="org.eclipse.xtext.common.types.ui.source"/>
-<plugin id="org.eclipse.xtext.ecore"/>
-<plugin id="org.eclipse.xtext.ecore.source"/>
-<plugin id="org.eclipse.xtext.generator"/>
-<plugin id="org.eclipse.xtext.generator.source"/>
-<plugin id="org.eclipse.xtext.ide"/>
-<plugin id="org.eclipse.xtext.smap"/>
-<plugin id="org.eclipse.xtext.smap.source"/>
-<plugin id="org.eclipse.xtext.source"/>
-<plugin id="org.eclipse.xtext.ui"/>
-<plugin id="org.eclipse.xtext.ui.codetemplates"/>
-<plugin id="org.eclipse.xtext.ui.codetemplates.source"/>
-<plugin id="org.eclipse.xtext.ui.codetemplates.ui"/>
-<plugin id="org.eclipse.xtext.ui.codetemplates.ui.source"/>
-<plugin id="org.eclipse.xtext.ui.shared"/>
-<plugin id="org.eclipse.xtext.ui.shared.source"/>
-<plugin id="org.eclipse.xtext.ui.source"/>
-<plugin id="org.eclipse.xtext.util"/>
-<plugin id="org.eclipse.xtext.util.source"/>
-<plugin id="org.eclipse.xtext.xbase"/>
-<plugin id="org.eclipse.xtext.xbase.ide"/>
-<plugin id="org.eclipse.xtext.xbase.ide.source"/>
-<plugin id="org.eclipse.xtext.xbase.lib"/>
-<plugin id="org.eclipse.xtext.xbase.lib.source"/>
-<plugin id="org.eclipse.xtext.xbase.source"/>
-<plugin id="org.eclipse.xtext.xbase.ui"/>
-<plugin id="org.eclipse.xtext.xbase.ui.source"/>
-<plugin id="org.eclipse.xtext.xtext.generator"/>
-<plugin id="org.eclipse.xtext.xtext.generator.source"/>
-<plugin id="org.hamcrest.library"/>
-</includeBundles>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="55">\r
+<locations>\r
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>\r
+<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.2.203.v20170131-1444"/>\r
+<unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="1.2.203.v20170131-1444"/>\r
+<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.12.3.v20170209-1843"/>\r
+<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.12.0.v20160815-1406"/>\r
+<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.12.3.v20170209-1843"/>\r
+<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.3.3.v20170209-1843"/>\r
+<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="1.3.203.v20170131-1444"/>\r
+<unit id="org.eclipse.equinox.p2.rcp.feature.source.feature.group" version="1.2.203.v20170131-1444"/>\r
+<unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="1.3.203.v20170131-1444"/>\r
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.9.203.v20170131-1444"/>\r
+<unit id="org.eclipse.objectteams.otequinox.feature.group" version="2.5.2.201612071657"/>\r
+<unit id="org.eclipse.equinox.p2.extras.feature.source.feature.group" version="1.2.203.v20170131-1444"/>\r
+<repository location="http://download.eclipse.org/releases/neon"/>\r
+</location>\r
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.4.0.v20160526-0606"/>\r
+<unit id="org.eclipse.emf.ecore.feature.group" version="2.12.0.v20160420-0247"/>\r
+<unit id="org.eclipse.emf.ecore.xcore.lib.feature.group" version="1.2.100.v20160526-0606"/>\r
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>\r
+<unit id="org.eclipse.emf.common.feature.group" version="2.12.0.v20160420-0247"/>\r
+<unit id="org.eclipse.emf.ecore.xcore.feature.group" version="1.4.0.v20160526-0606"/>\r
+<unit id="org.eclipse.emf.feature.group" version="2.12.0.v20160526-0356"/>\r
+<repository location="http://download.eclipse.org/releases/neon"/>\r
+</location>\r
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>\r
+<repository location="http://download.eclipse.org/releases/neon"/>\r
+</location>\r
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.5.100.v20170131-1452"/>\r
+<unit id="org.eclipse.equinox.p2.user.ui.source.feature.group" version="2.2.203.v20170131-1444"/>\r
+<unit id="org.eclipse.e4.rcp.feature.group" version="1.5.3.v20170228-0512"/>\r
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20161122-1740"/>\r
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>\r
+<unit id="org.eclipse.help.feature.group" version="2.2.2.v20170301-0400"/>\r
+<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.100.v20170131-1452"/>\r
+<unit id="org.eclipse.e4.rcp.source.feature.group" version="1.5.3.v20170228-0512"/>\r
+<unit id="org.eclipse.sdk.ide" version="4.6.3.M20170301-0400"/>\r
+<unit id="epp.package.modeling" version="4.6.3.20170314-1500"/>\r
+<unit id="org.eclipse.platform.sdk" version="4.6.3.M20170301-0400"/>\r
+<unit id="org.eclipse.jdt.feature.group" version="3.12.3.v20170301-0400"/>\r
+<unit id="org.eclipse.pde.source.feature.group" version="3.12.3.v20170301-0400"/>\r
+<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.1.203.v20170209-1843"/>\r
+<unit id="org.eclipse.pde.feature.group" version="3.12.3.v20170301-0400"/>\r
+<unit id="org.eclipse.rcp.sdk.id" version="4.6.3.M20170301-0400"/>\r
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>\r
+<unit id="org.eclipse.platform.feature.group" version="4.6.3.v20170301-0400"/>\r
+<repository location="http://download.eclipse.org/releases/neon"/>\r
+</location>\r
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.1.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.1.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.0.201703192131"/>\r
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>\r
+<repository location="http://download.eclipse.org/nattable/releases/1.5.0/repository/"/>\r
+</location>\r
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.oomph.setup.sdk.feature.group" version="1.7.0.v20170305-1123"/>\r
+<repository location="http://download.eclipse.org/releases/neon"/>\r
+</location>\r
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">\r
+<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201812241324"/>\r
+<repository location="http://download.eclipse.org/nebula/releases/latest/"/>\r
+</location>\r
+</locations>\r
+<includeBundles>\r
+<feature id="org.eclipse.core.runtime.feature"/>\r
+<feature id="org.eclipse.cvs"/>\r
+<feature id="org.eclipse.cvs.source"/>\r
+<feature id="org.eclipse.draw2d"/>\r
+<feature id="org.eclipse.draw2d.sdk"/>\r
+<feature id="org.eclipse.draw2d.source"/>\r
+<feature id="org.eclipse.e4.core.tools.feature"/>\r
+<feature id="org.eclipse.e4.core.tools.feature.source"/>\r
+<feature id="org.eclipse.e4.rcp"/>\r
+<feature id="org.eclipse.e4.rcp.source"/>\r
+<feature id="org.eclipse.ecf.core.feature"/>\r
+<feature id="org.eclipse.ecf.core.source.feature"/>\r
+<feature id="org.eclipse.ecf.core.ssl.feature"/>\r
+<feature id="org.eclipse.ecf.core.ssl.source.feature"/>\r
+<feature id="org.eclipse.ecf.filetransfer.feature"/>\r
+<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>\r
+<feature id="org.eclipse.ecf.filetransfer.httpclient4.source.feature"/>\r
+<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>\r
+<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature"/>\r
+<feature id="org.eclipse.ecf.filetransfer.source.feature"/>\r
+<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>\r
+<feature id="org.eclipse.ecf.filetransfer.ssl.source.feature"/>\r
+<feature id="org.eclipse.emf"/>\r
+<feature id="org.eclipse.emf.codegen"/>\r
+<feature id="org.eclipse.emf.codegen.ecore"/>\r
+<feature id="org.eclipse.emf.codegen.ecore.source"/>\r
+<feature id="org.eclipse.emf.codegen.ecore.ui"/>\r
+<feature id="org.eclipse.emf.codegen.ecore.ui.source"/>\r
+<feature id="org.eclipse.emf.codegen.source"/>\r
+<feature id="org.eclipse.emf.codegen.ui"/>\r
+<feature id="org.eclipse.emf.codegen.ui.source"/>\r
+<feature id="org.eclipse.emf.common"/>\r
+<feature id="org.eclipse.emf.common.source"/>\r
+<feature id="org.eclipse.emf.common.ui"/>\r
+<feature id="org.eclipse.emf.common.ui.source"/>\r
+<feature id="org.eclipse.emf.converter"/>\r
+<feature id="org.eclipse.emf.converter.source"/>\r
+<feature id="org.eclipse.emf.databinding"/>\r
+<feature id="org.eclipse.emf.databinding.edit"/>\r
+<feature id="org.eclipse.emf.databinding.edit.source"/>\r
+<feature id="org.eclipse.emf.databinding.source"/>\r
+<feature id="org.eclipse.emf.doc"/>\r
+<feature id="org.eclipse.emf.doc.source"/>\r
+<feature id="org.eclipse.emf.ecore"/>\r
+<feature id="org.eclipse.emf.ecore.edit"/>\r
+<feature id="org.eclipse.emf.ecore.edit.source"/>\r
+<feature id="org.eclipse.emf.ecore.editor"/>\r
+<feature id="org.eclipse.emf.ecore.editor.source"/>\r
+<feature id="org.eclipse.emf.ecore.source"/>\r
+<feature id="org.eclipse.emf.ecore.xcore"/>\r
+<feature id="org.eclipse.emf.ecore.xcore.lib"/>\r
+<feature id="org.eclipse.emf.ecore.xcore.lib.source"/>\r
+<feature id="org.eclipse.emf.ecore.xcore.sdk"/>\r
+<feature id="org.eclipse.emf.ecore.xcore.source"/>\r
+<feature id="org.eclipse.emf.ecore.xcore.ui"/>\r
+<feature id="org.eclipse.emf.ecore.xcore.ui.source"/>\r
+<feature id="org.eclipse.emf.edit"/>\r
+<feature id="org.eclipse.emf.edit.source"/>\r
+<feature id="org.eclipse.emf.edit.ui"/>\r
+<feature id="org.eclipse.emf.edit.ui.source"/>\r
+<feature id="org.eclipse.emf.mapping"/>\r
+<feature id="org.eclipse.emf.mapping.ecore"/>\r
+<feature id="org.eclipse.emf.mapping.ecore.editor"/>\r
+<feature id="org.eclipse.emf.mapping.ecore.editor.source"/>\r
+<feature id="org.eclipse.emf.mapping.ecore.source"/>\r
+<feature id="org.eclipse.emf.mapping.source"/>\r
+<feature id="org.eclipse.emf.mapping.ui"/>\r
+<feature id="org.eclipse.emf.mapping.ui.source"/>\r
+<feature id="org.eclipse.emf.sdk"/>\r
+<feature id="org.eclipse.emf.source"/>\r
+<feature id="org.eclipse.epp.logging.aeri.feature"/>\r
+<feature id="org.eclipse.epp.mpc"/>\r
+<feature id="org.eclipse.epp.package.common.feature"/>\r
+<feature id="org.eclipse.epp.package.modeling.feature"/>\r
+<feature id="org.eclipse.equinox.compendium.sdk"/>\r
+<feature id="org.eclipse.equinox.core.feature"/>\r
+<feature id="org.eclipse.equinox.core.sdk"/>\r
+<feature id="org.eclipse.equinox.executable"/>\r
+<feature id="org.eclipse.equinox.p2.core.feature"/>\r
+<feature id="org.eclipse.equinox.p2.core.feature.source"/>\r
+<feature id="org.eclipse.equinox.p2.discovery.feature"/>\r
+<feature id="org.eclipse.equinox.p2.extras.feature"/>\r
+<feature id="org.eclipse.equinox.p2.extras.feature.source"/>\r
+<feature id="org.eclipse.equinox.p2.rcp.feature"/>\r
+<feature id="org.eclipse.equinox.p2.rcp.feature.source"/>\r
+<feature id="org.eclipse.equinox.p2.sdk"/>\r
+<feature id="org.eclipse.equinox.p2.user.ui"/>\r
+<feature id="org.eclipse.equinox.p2.user.ui.source"/>\r
+<feature id="org.eclipse.equinox.sdk"/>\r
+<feature id="org.eclipse.equinox.server.core"/>\r
+<feature id="org.eclipse.equinox.server.jetty"/>\r
+<feature id="org.eclipse.equinox.server.p2"/>\r
+<feature id="org.eclipse.equinox.serverside.sdk"/>\r
+<feature id="org.eclipse.help"/>\r
+<feature id="org.eclipse.help.source"/>\r
+<feature id="org.eclipse.jdt"/>\r
+<feature id="org.eclipse.jdt.source"/>\r
+<feature id="org.eclipse.nebula.widgets.compositetable.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.core.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.core.source.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.extension.e4.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.extension.poi.feature"/>\r
+<feature id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature"/>\r
+<feature id="org.eclipse.objectteams.otequinox"/>\r
+<feature id="org.eclipse.oomph.p2"/>\r
+<feature id="org.eclipse.oomph.setup"/>\r
+<feature id="org.eclipse.oomph.setup.core"/>\r
+<feature id="org.eclipse.oomph.setup.git"/>\r
+<feature id="org.eclipse.oomph.setup.jdt"/>\r
+<feature id="org.eclipse.oomph.setup.launching"/>\r
+<feature id="org.eclipse.oomph.setup.maven"/>\r
+<feature id="org.eclipse.oomph.setup.mylyn"/>\r
+<feature id="org.eclipse.oomph.setup.pde"/>\r
+<feature id="org.eclipse.oomph.setup.projects"/>\r
+<feature id="org.eclipse.oomph.setup.projectset"/>\r
+<feature id="org.eclipse.oomph.setup.sdk"/>\r
+<feature id="org.eclipse.oomph.setup.targlets"/>\r
+<feature id="org.eclipse.oomph.setup.ui.ide"/>\r
+<feature id="org.eclipse.oomph.setup.workbench"/>\r
+<feature id="org.eclipse.oomph.setup.workingsets"/>\r
+<feature id="org.eclipse.pde"/>\r
+<feature id="org.eclipse.pde.source"/>\r
+<feature id="org.eclipse.platform"/>\r
+<feature id="org.eclipse.platform.source"/>\r
+<feature id="org.eclipse.rcp"/>\r
+<feature id="org.eclipse.rcp.source"/>\r
+<feature id="org.eclipse.sdk"/>\r
+<feature id="org.eclipse.swtbot"/>\r
+<feature id="org.eclipse.swtbot.eclipse"/>\r
+<feature id="org.eclipse.swtbot.forms"/>\r
+<feature id="org.eclipse.zest"/>\r
+<feature id="org.eclipse.zest.sdk"/>\r
+<feature id="org.eclipse.zest.source"/>\r
+<plugin id="com.google.gson"/>\r
+<plugin id="com.google.guava"/>\r
+<plugin id="com.google.guava.source"/>\r
+<plugin id="com.google.inject"/>\r
+<plugin id="com.google.inject.source"/>\r
+<plugin id="javaewah"/>\r
+<plugin id="org.antlr.runtime"/>\r
+<plugin id="org.antlr.runtime.source"/>\r
+<plugin id="org.apache.commons.cli"/>\r
+<plugin id="org.apache.commons.codec.source"/>\r
+<plugin id="org.apache.commons.httpclient"/>\r
+<plugin id="org.apache.commons.httpclient.source"/>\r
+<plugin id="org.apache.commons.io"/>\r
+<plugin id="org.apache.commons.lang"/>\r
+<plugin id="org.apache.commons.lang.source"/>\r
+<plugin id="org.apache.commons.lang3"/>\r
+<plugin id="org.apache.log4j"/>\r
+<plugin id="org.apache.log4j.source"/>\r
+<plugin id="org.apache.xerces"/>\r
+<plugin id="org.apache.xml.resolver"/>\r
+<plugin id="org.apache.xml.serializer"/>\r
+<plugin id="org.eclipse.egit.core"/>\r
+<plugin id="org.eclipse.egit.core.source"/>\r
+<plugin id="org.eclipse.emf.mwe.core"/>\r
+<plugin id="org.eclipse.emf.mwe.core.source"/>\r
+<plugin id="org.eclipse.emf.mwe.utils"/>\r
+<plugin id="org.eclipse.emf.mwe.utils.source"/>\r
+<plugin id="org.eclipse.emf.mwe2.lib"/>\r
+<plugin id="org.eclipse.emf.mwe2.lib.source"/>\r
+<plugin id="org.eclipse.emf.mwe2.runtime"/>\r
+<plugin id="org.eclipse.emf.mwe2.runtime.source"/>\r
+<plugin id="org.eclipse.epp.logging.aeri.core.source"/>\r
+<plugin id="org.eclipse.epp.logging.aeri.ide.source"/>\r
+<plugin id="org.eclipse.epp.mpc.core.source"/>\r
+<plugin id="org.eclipse.epp.mpc.ui.source"/>\r
+<plugin id="org.eclipse.jgit"/>\r
+<plugin id="org.eclipse.jgit.source"/>\r
+<plugin id="org.eclipse.m2e.archetype.common"/>\r
+<plugin id="org.eclipse.m2e.core"/>\r
+<plugin id="org.eclipse.m2e.core.source"/>\r
+<plugin id="org.eclipse.m2e.maven.indexer"/>\r
+<plugin id="org.eclipse.m2e.maven.runtime"/>\r
+<plugin id="org.eclipse.m2e.maven.runtime.slf4j.simple"/>\r
+<plugin id="org.eclipse.m2e.workspace.cli"/>\r
+<plugin id="org.eclipse.mylyn.builds.core"/>\r
+<plugin id="org.eclipse.mylyn.builds.core.source"/>\r
+<plugin id="org.eclipse.mylyn.builds.ui"/>\r
+<plugin id="org.eclipse.mylyn.builds.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.core"/>\r
+<plugin id="org.eclipse.mylyn.commons.core.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.identity.core"/>\r
+<plugin id="org.eclipse.mylyn.commons.identity.core.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.net"/>\r
+<plugin id="org.eclipse.mylyn.commons.net.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.notifications.core"/>\r
+<plugin id="org.eclipse.mylyn.commons.notifications.core.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.notifications.feed"/>\r
+<plugin id="org.eclipse.mylyn.commons.notifications.feed.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.notifications.ui"/>\r
+<plugin id="org.eclipse.mylyn.commons.notifications.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.repositories.core"/>\r
+<plugin id="org.eclipse.mylyn.commons.repositories.core.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.repositories.ui"/>\r
+<plugin id="org.eclipse.mylyn.commons.repositories.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.screenshots"/>\r
+<plugin id="org.eclipse.mylyn.commons.screenshots.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.ui"/>\r
+<plugin id="org.eclipse.mylyn.commons.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.commons.workbench"/>\r
+<plugin id="org.eclipse.mylyn.commons.workbench.source"/>\r
+<plugin id="org.eclipse.mylyn.context.core"/>\r
+<plugin id="org.eclipse.mylyn.context.core.source"/>\r
+<plugin id="org.eclipse.mylyn.context.ui"/>\r
+<plugin id="org.eclipse.mylyn.context.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.discovery.core"/>\r
+<plugin id="org.eclipse.mylyn.discovery.core.source"/>\r
+<plugin id="org.eclipse.mylyn.discovery.ui"/>\r
+<plugin id="org.eclipse.mylyn.discovery.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.monitor.core"/>\r
+<plugin id="org.eclipse.mylyn.monitor.core.source"/>\r
+<plugin id="org.eclipse.mylyn.monitor.ui"/>\r
+<plugin id="org.eclipse.mylyn.monitor.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.resources.ui"/>\r
+<plugin id="org.eclipse.mylyn.resources.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.tasks.core"/>\r
+<plugin id="org.eclipse.mylyn.tasks.core.source"/>\r
+<plugin id="org.eclipse.mylyn.tasks.ui"/>\r
+<plugin id="org.eclipse.mylyn.tasks.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.team.ui"/>\r
+<plugin id="org.eclipse.mylyn.team.ui.source"/>\r
+<plugin id="org.eclipse.mylyn.versions.core"/>\r
+<plugin id="org.eclipse.mylyn.versions.core.source"/>\r
+<plugin id="org.eclipse.mylyn.versions.ui"/>\r
+<plugin id="org.eclipse.mylyn.versions.ui.source"/>\r
+<plugin id="org.eclipse.oomph.base"/>\r
+<plugin id="org.eclipse.oomph.base.edit"/>\r
+<plugin id="org.eclipse.oomph.predicates"/>\r
+<plugin id="org.eclipse.oomph.predicates.edit"/>\r
+<plugin id="org.eclipse.oomph.resources"/>\r
+<plugin id="org.eclipse.oomph.resources.edit"/>\r
+<plugin id="org.eclipse.oomph.targlets"/>\r
+<plugin id="org.eclipse.oomph.targlets.core"/>\r
+<plugin id="org.eclipse.oomph.targlets.edit"/>\r
+<plugin id="org.eclipse.oomph.ui"/>\r
+<plugin id="org.eclipse.oomph.util"/>\r
+<plugin id="org.eclipse.oomph.util.pde"/>\r
+<plugin id="org.eclipse.oomph.workingsets"/>\r
+<plugin id="org.eclipse.oomph.workingsets.edit"/>\r
+<plugin id="org.eclipse.oomph.workingsets.editor"/>\r
+<plugin id="org.eclipse.xpand"/>\r
+<plugin id="org.eclipse.xpand.source"/>\r
+<plugin id="org.eclipse.xtend"/>\r
+<plugin id="org.eclipse.xtend.lib"/>\r
+<plugin id="org.eclipse.xtend.lib.macro"/>\r
+<plugin id="org.eclipse.xtend.lib.macro.source"/>\r
+<plugin id="org.eclipse.xtend.lib.source"/>\r
+<plugin id="org.eclipse.xtend.source"/>\r
+<plugin id="org.eclipse.xtend.typesystem.emf"/>\r
+<plugin id="org.eclipse.xtend.typesystem.emf.source"/>\r
+<plugin id="org.eclipse.xtext"/>\r
+<plugin id="org.eclipse.xtext.builder"/>\r
+<plugin id="org.eclipse.xtext.builder.source"/>\r
+<plugin id="org.eclipse.xtext.common.types"/>\r
+<plugin id="org.eclipse.xtext.common.types.edit"/>\r
+<plugin id="org.eclipse.xtext.common.types.edit.source"/>\r
+<plugin id="org.eclipse.xtext.common.types.source"/>\r
+<plugin id="org.eclipse.xtext.common.types.ui"/>\r
+<plugin id="org.eclipse.xtext.common.types.ui.source"/>\r
+<plugin id="org.eclipse.xtext.ecore"/>\r
+<plugin id="org.eclipse.xtext.ecore.source"/>\r
+<plugin id="org.eclipse.xtext.generator"/>\r
+<plugin id="org.eclipse.xtext.generator.source"/>\r
+<plugin id="org.eclipse.xtext.ide"/>\r
+<plugin id="org.eclipse.xtext.smap"/>\r
+<plugin id="org.eclipse.xtext.smap.source"/>\r
+<plugin id="org.eclipse.xtext.source"/>\r
+<plugin id="org.eclipse.xtext.ui"/>\r
+<plugin id="org.eclipse.xtext.ui.codetemplates"/>\r
+<plugin id="org.eclipse.xtext.ui.codetemplates.source"/>\r
+<plugin id="org.eclipse.xtext.ui.codetemplates.ui"/>\r
+<plugin id="org.eclipse.xtext.ui.codetemplates.ui.source"/>\r
+<plugin id="org.eclipse.xtext.ui.shared"/>\r
+<plugin id="org.eclipse.xtext.ui.shared.source"/>\r
+<plugin id="org.eclipse.xtext.ui.source"/>\r
+<plugin id="org.eclipse.xtext.util"/>\r
+<plugin id="org.eclipse.xtext.util.source"/>\r
+<plugin id="org.eclipse.xtext.xbase"/>\r
+<plugin id="org.eclipse.xtext.xbase.ide"/>\r
+<plugin id="org.eclipse.xtext.xbase.ide.source"/>\r
+<plugin id="org.eclipse.xtext.xbase.lib"/>\r
+<plugin id="org.eclipse.xtext.xbase.lib.source"/>\r
+<plugin id="org.eclipse.xtext.xbase.source"/>\r
+<plugin id="org.eclipse.xtext.xbase.ui"/>\r
+<plugin id="org.eclipse.xtext.xbase.ui.source"/>\r
+<plugin id="org.eclipse.xtext.xtext.generator"/>\r
+<plugin id="org.eclipse.xtext.xtext.generator.source"/>\r
+<plugin id="org.hamcrest.library"/>\r
+</includeBundles>\r
+</target>\r