AT: commiting latest changes to the Palm Use data extension
authora.theys <a.theys@localhost>
Mon, 23 Jan 2012 14:43:20 +0000 (14:43 +0000)
committera.theys <a.theys@localhost>
Mon, 23 Jan 2012 14:43:20 +0000 (14:43 +0000)
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/CreateUseRecordHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DeleteUseHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteUseRecordOperation.java [new file with mode: 0644]

index cf048df2a8ef1ca154a1377e12b9e4951a689bf4..dd91b184a62e9c847fba73ba37ad16b2ab17f386 100644 (file)
@@ -485,6 +485,7 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/u
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteTaxonUseOperation.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteUseRecordOperation.java -text
 eu.etaxonomy.taxeditor.editor/src/main/resources/TaonDescriptionEditor.screen -text
 eu.etaxonomy.taxeditor.editor/src/main/resources/log4j.properties -text
 eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/Application.java -text
index 99aacc09ed91d4ce2907d309f2b9fc9aff46bf05..1270f8c7e5f83115ded0e9ab56a489e43128fbb6 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar" sourcepath="lib/c3p0-0.9.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="lib/commons-beanutils-1.7.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar" sourcepath="lib/commons-dbcp-1.2.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar" sourcepath="lib/commons-pool-1.3src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar" sourcepath="lib/dozer-5.3.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar" sourcepath="lib/ehcache-1.2.3src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/ejb3-persistence.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.4.jar" sourcepath="lib/ezmorph-1.0.4src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/fop.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-core-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-search-3.1.0.GA.jar" sourcepath="lib/hibernate-search-3.1.0.GAsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.0.0.CR1.jar" sourcepath="lib/hibernate-validator-4.0.0.CR1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib/httpclient-4.0.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib/httpcore-4.0.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar" sourcepath="lib/jaxb-impl-2.1.6src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar" sourcepath="lib/joda-time-1.5src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar" sourcepath="lib/json-lib-2.2.3-jdk15src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar" sourcepath="lib/jsr250-api-1.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/jta.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jtds-1.2.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar" sourcepath="lib/junit-4.8.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar" sourcepath="lib/log4j-1.2.14src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-core-2.4.0.jar" sourcepath="lib/lucene-core-2.4.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-2.4.0.jar" sourcepath="lib/lucene-spellchecker-2.4.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar" sourcepath="lib/mail-1.4src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/msbase-2000.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/mssqlserver-2000.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/msutil-2000.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aop-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.asm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.asm-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aspects-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.beans-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context.support-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.core-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.expression-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.oxm-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/poi-3.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/postgresql-8.2-504.jdbc4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib/servlet-api-2.5src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar" sourcepath="lib/slf4j-api-1.5.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar" sourcepath="lib/slf4j-log4j12-1.5.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar" sourcepath="lib/spring-modules-cache-0.7src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar" sourcepath="lib/spring-modules-lucene-0.8asrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.0.5.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.0.5.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar" sourcepath="lib/wsdl4j-1.6.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar" sourcepath="lib/xml-resolver-1.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/asm.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar" sourcepath="lib/c3p0-0.9.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="lib/commons-beanutils-1.7.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar" sourcepath="lib/commons-dbcp-1.2.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar" sourcepath="lib/commons-pool-1.3src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar" sourcepath="lib/dozer-5.3.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar" sourcepath="lib/ehcache-1.2.3src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/ejb3-persistence.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.4.jar" sourcepath="lib/ezmorph-1.0.4src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/fop.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-core-3.4.0-SNAPSHOTsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-search-3.1.0.GA.jar" sourcepath="lib/hibernate-search-3.1.0.GAsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.0.0.CR1.jar" sourcepath="lib/hibernate-validator-4.0.0.CR1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib/httpclient-4.0.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib/httpcore-4.0.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar" sourcepath="lib/jaxb-impl-2.1.6src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar" sourcepath="lib/joda-time-1.5src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar" sourcepath="lib/json-lib-2.2.3-jdk15src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar" sourcepath="lib/jsr250-api-1.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jta.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jtds-1.2.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar" sourcepath="lib/junit-4.8.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar" sourcepath="lib/log4j-1.2.14src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/lucene-core-2.4.0.jar" sourcepath="lib/lucene-core-2.4.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-2.4.0.jar" sourcepath="lib/lucene-spellchecker-2.4.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar" sourcepath="lib/mail-1.4src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/msbase-2000.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/mssqlserver-2000.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/msutil-2000.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aop-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.asm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.asm-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aspects-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.beans-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context.support-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.core-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.expression-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.oxm-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/poi-3.6.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/postgresql-8.2-504.jdbc4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib/servlet-api-2.5src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar" sourcepath="lib/slf4j-api-1.5.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar" sourcepath="lib/slf4j-log4j12-1.5.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar" sourcepath="lib/spring-modules-cache-0.7src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar" sourcepath="lib/spring-modules-lucene-0.8asrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.0.5.RELEASE.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.0.5.RELEASE.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar" sourcepath="lib/wsdl4j-1.6.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar" sourcepath="lib/xml-resolver-1.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.9-SNAPSHOT.jar" sourcepath="/cdmlib-model"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.9-SNAPSHOT.jar" sourcepath="/cdmlib-services"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
index ba88dd48a0e44d9279f17b21ed386c921d8005dd..37968d9a7cd2473b39d92f018619e522006acf22 100644 (file)
@@ -1,39 +1,80 @@
-\r
 package eu.etaxonomy.taxeditor.editor.view.uses;\r
 \r
+import java.util.Arrays;\r
+import java.util.List;\r
+import java.util.Map;\r
+\r
+import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction;\r
+\r
 import org.eclipse.jface.viewers.ColumnLabelProvider;\r
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;\r
 import org.eclipse.jface.viewers.StyledString;\r
 \r
+import eu.etaxonomy.cdm.api.service.DefaultCategoricalDescriptionBuilder;\r
+import eu.etaxonomy.cdm.api.service.DescriptionBuilder;\r
+import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.common.LanguageString;\r
+import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
+import eu.etaxonomy.cdm.model.description.TextData;\r
+import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r
-\r
-\r
-\r
-\r
-\r
-\r
-public class UsesLabelProvider extends ColumnLabelProvider implements IStyledLabelProvider  {\r
-\r
+public class UsesLabelProvider extends ColumnLabelProvider implements\r
+               IStyledLabelProvider {\r
+       \r
+       private static DescriptionBuilder<CategoricalData> categoricalDescriptionBuilder = new DefaultCategoricalDescriptionBuilder();\r
        public String getText(Object element) {\r
-               /*return DescriptionHelper.getLabel(element);\r
-               \r
-               for (Marker marker : element.getMarkers()) {\r
-                       if (marker.getMarkerType().getTitleCache().equals("use")) {\r
-                               return "Use: " + text;\r
+               String text = "";\r
+               /*\r
+                * return DescriptionHelper.getLabel(element);\r
+                * \r
+                * for (Marker marker : element.getMarkers()) { if\r
+                * (marker.getMarkerType().getTitleCache().equals("use")) { return\r
+                * "Use: " + text; } }\r
+                */\r
+               if (element instanceof DescriptionBase) {\r
+                       text = ((DescriptionBase) element).getTitleCache();\r
+                       if (text == null || text.length() == 0) {\r
+                               text = "Use: No label provided";\r
                        }\r
+                       else {\r
+                               text = "Use: " + text;\r
+                       }\r
+               }\r
+               else if (element instanceof CategoricalData) {\r
+                       TextData textData = categoricalDescriptionBuilder.build((CategoricalData) element, getLanguageList());\r
+                       text = textData.getText(CdmStore.getDefaultLanguage());\r
+                       if (text == null || text.length() == 0) {\r
+                               text = "No data provided";\r
+                       }\r
+                       return text;\r
+               }\r
+               /*else  if (element instanceof DescriptionElementBase) {\r
+                       Map useRecordText = ((DescriptionElementBase) element).getModifyingText();\r
+                       \r
+                       \r
+                       if (text == null || text.length() == 0) {\r
+                               text = "Use Record: No label provided";\r
+                       }\r
+                       text = useRecordText.toString();\r
+                       //text = "Something else";\r
                }*/\r
-               String text = ((DescriptionBase)element).getTitleCache();\r
-               if (text == null || text.length() == 0) {\r
-                       text = "No label provided";\r
+               else{\r
+                       text = "Use Record";\r
                }\r
-               \r
-               return "Use: " + text;\r
-       }               \r
-       \r
+\r
+               return  text;\r
+       }\r
+\r
        @Override\r
        public StyledString getStyledText(Object element) {\r
-               return new StyledString(this.getText(element), StyledString.QUALIFIER_STYLER);\r
+               return new StyledString(this.getText(element),\r
+                               StyledString.QUALIFIER_STYLER);\r
+       }\r
+       \r
+       private static List<Language> getLanguageList(){\r
+               return Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()});\r
        }\r
 \r
 }\r
index 2e24fb0c10b519bf2f1992580be1bddfa3eb8690..390cb7673566a4adbef7e0b8db41fbde282f8e6c 100644 (file)
@@ -1,5 +1,8 @@
 package eu.etaxonomy.taxeditor.editor.view.uses.handler;
 
+import java.util.List;
+import java.util.Set;
+
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -15,14 +18,19 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.forms.editor.FormEditor;
 import org.eclipse.ui.handlers.HandlerUtil;
 
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
+import eu.etaxonomy.cdm.model.description.CategoricalData;
+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
+import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.view.uses.operation.CreateUseRecordOperation;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 
 public class CreateUseRecordHandler extends AbstractHandler {
        public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -56,16 +64,31 @@ public class CreateUseRecordHandler extends AbstractHandler {
                        } 
 
                        if (description != null) {
-
-                               Feature feature = (Feature) ((Event) event.getTrigger()).data;
-
+                               //CategoricalData element = CategoricalData.NewInstance();
                                AbstractPostOperation operation = null;
                                try {
+                                       List<Feature> features = CdmStore.getTermManager().getPreferredTerms(Feature.class);
+                                       //TextData element = TextData.NewInstance();
+                                       /*TextData feature  = TextData.NewInstance();
+                                       *Feature feature = (Feature) HibernateProxyHelper.deproxy(feature);*/
+                                       for (Feature feature : features) {
+                                               if(feature.getTitleCache().equals("Use Record")) {
+                                                       feature.setSupportsCategoricalData(true);
+                                                       //CategoricalData element = CategoricalData.NewInstance();
+                                                       //element.setFeature(feature);
+                                                       /*operation = new CreateUseRecordOperation(event
+                                                                       .getCommand().getName(),
+                                                                       EditorUtil.getUndoContext(), taxon,
+                                                                       description, feature, postOperationEnabled);*/
+                                                       operation = new CreateUseRecordOperation(event
+                                                                       .getCommand().getName(),
+                                                                       EditorUtil.getUndoContext(), taxon,
+                                                                       description, feature, postOperationEnabled);
+                                                                       
+                                               }
+                                       }
                                        // TODO use undo context specific to editor
-                                       operation = new CreateUseRecordOperation(event
-                                                       .getCommand().getName(),
-                                                       EditorUtil.getUndoContext(), taxon,
-                                                       description, element, postOperationEnabled);
+                                       
                                        EditorUtil.executeOperation(operation);
                                } catch (NotDefinedException e) {
                                        EditorUtil.warn(getClass(), "Command name not set");
index 167b4f59f204374b0ecadcb65d021eee2931e095..0028fc3a1735b136b2b9b172c3dd58d9eae5c86c 100644 (file)
@@ -21,6 +21,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptionElementOperation;\r
 import eu.etaxonomy.taxeditor.editor.view.media.operation.DeleteMediaOperation;\r
 import eu.etaxonomy.taxeditor.editor.view.uses.operation.DeleteTaxonUseOperation;\r
+import eu.etaxonomy.taxeditor.editor.view.uses.operation.DeleteUseRecordOperation;\r
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;\r
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
@@ -62,7 +63,7 @@ public class DeleteUseHandler extends AbstractHandler {
                                }\r
                                // DescriptionElementBase\r
                                else if (object instanceof DescriptionElementBase) {\r
-                                       operations.add(new DeleteDescriptionElementOperation(label,\r
+                                       operations.add(new DeleteUseRecordOperation(label,\r
                                                        undoContext, (DescriptionElementBase) object,\r
                                                        postOperationEnabled));\r
                                } else if (object instanceof FeatureNodeContainer) {\r
@@ -70,7 +71,7 @@ public class DeleteUseHandler extends AbstractHandler {
                                                        .getDescriptionElementsForEntireBranch();\r
 \r
                                        for (DescriptionElementBase description : descriptions) {\r
-                                               operations.add(new DeleteDescriptionElementOperation(\r
+                                               operations.add(new DeleteUseRecordOperation(\r
                                                                label, undoContext, description,\r
                                                                postOperationEnabled));\r
                                        }\r
index 6ea72b38a8d8630413d448b1f760a05a0831006a..90fd7e60422ef790c7ec2f200c854a3d2d1004a5 100644 (file)
@@ -29,19 +29,27 @@ public class CreateUseRecordOperation extends AbstractPostOperation {
        private DescriptionElementBase element;
 
        
+       /*public CreateUseRecordOperation(String label, IUndoContext undoContext,
+                       Taxon taxon, TaxonDescription description, Feature feature, IPostOperationEnabled postOperationEnabled) {*/
        public CreateUseRecordOperation(String label, IUndoContext undoContext,
-                       Taxon taxon, TaxonDescription description, DescriptionElementBase element, IPostOperationEnabled postOperationEnabled) {
-               super(label, undoContext, taxon, postOperationEnabled);
+               Taxon taxon, TaxonDescription description, Feature feature, IPostOperationEnabled postOperationEnabled) {
+                       super(label, undoContext, taxon, postOperationEnabled);
                
-               this.description = description;
-               this.element = element;
+                       this.description = description;
+                       this.feature = feature;
        }
 
        public CreateUseRecordOperation(String label,
                        IUndoContext undoContext, Taxon taxon,
                        TaxonDescription description, Feature feature,
                        DescriptionElementBase element, IPostOperationEnabled postOperationEnabled) {
-               this(label, undoContext, taxon, description, element, postOperationEnabled);
+                       /*public CreateUseRecordOperation(String label,
+                                       IUndoContext undoContext, Taxon taxon,
+                                       TaxonDescription description, Feature feature,
+                                       DescriptionElementBase element, IPostOperationEnabled postOperationEnabled) {*/
+                       
+                               this(label, undoContext, taxon, description, feature, postOperationEnabled);
+                               //this(label, undoContext, taxon, description, (CategoricalData) element, postOperationEnabled);
                
                this.element = element;
        }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteUseRecordOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/DeleteUseRecordOperation.java
new file mode 100644 (file)
index 0000000..b50e4bd
--- /dev/null
@@ -0,0 +1,64 @@
+package eu.etaxonomy.taxeditor.editor.view.uses.operation;\r
+\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.operations.IUndoContext;\r
+import org.eclipse.core.runtime.IAdaptable;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+\r
+import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
+\r
+public class DeleteUseRecordOperation extends AbstractPostOperation {\r
+       private DescriptionElementBase element;\r
+       private DescriptionBase description = null;\r
+       \r
+       \r
+       public DeleteUseRecordOperation(String label, IUndoContext undoContext,\r
+                       DescriptionElementBase element, IPostOperationEnabled postOperationEnabled) {\r
+               super(label, undoContext, postOperationEnabled);\r
+               \r
+               this.element = element;\r
+       }\r
+\r
+\r
+       @Override\r
+       public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               description = element.getInDescription();\r
+               \r
+               monitor.worked(20);\r
+               \r
+               // Remove element from description\r
+               if (description == null) {\r
+                       StoreUtil.error(this.getClass(), "Couldn't find element's description!", null);\r
+               } else {\r
+                       description.removeElement(element);\r
+               }\r
+               monitor.worked(40);\r
+\r
+        // Redraw editor if exists\r
+               return postExecute(null);\r
+       }\r
+\r
+\r
+       @Override\r
+       public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               return execute(monitor, info);\r
+       }\r
+\r
+\r
+       @Override\r
+       public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+\r
+               description.addElement(element);\r
+               \r
+               return postExecute(element);\r
+       }\r
+       \r
+}\r