Project

General

Profile

« Previous | Next » 

Revision 23783f7a

Added by Niels Hoffmann about 12 years ago

Refactoring of selection elements. Additional minor refactoring. Fixed a bug with Translation Editor (#2752)

View differences:

.gitattributes
1221 1221
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PersonSelectionDialog.java -text
1222 1222
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PolytomousKeySelectionDialog.java -text
1223 1223
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java -text
1224
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java -text
1224 1225
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java -text
1225 1226
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java -text
1226 1227
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java -text
......
1249 1250
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/KeyValueViewerElement.java -text
1250 1251
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LabelElement.java -text
1251 1252
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LanguageStringWithLabelElement.java -text
1253
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LayoutConstants.java -text
1252 1254
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java -text
1253 1255
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java -text
1254 1256
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java -text
......
1447 1449
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java -text
1448 1450
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java -text
1449 1451
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java -text
1450
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElement.java -text
1451
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AgentSelectionElement.java -text
1452
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java -text
1453
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/CollectionSelectionElement.java -text
1454
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/DerivedUnitBaseSelectionElement.java -text
1455 1452
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java -text
1456
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureSelectionElement.java -text
1457
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureTreeSelectionElement.java -text
1458
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FieldObservationSelectionElement.java -text
1459
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/GroupSelectionElement.java -text
1460
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/InstitutionSelectionElement.java -text
1461
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElement.java -text
1462
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NamedAreaSelectionElement.java -text
1453
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java -text
1463 1454
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java -text
1464
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PersonSelectionElement.java -text
1465
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeyNodeSelectionElement.java -text
1466
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeySelectionElement.java -text
1467
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java -text
1468
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/SynonymSelectionElement.java -text
1469
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonBaseSelectionElement.java -text
1470 1455
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java -text
1471
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElement.java -text
1472
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TeamSelectionElement.java -text
1473
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/UserSelectionElement.java -text
1474 1456
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java -text
1475 1457
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/ITranslationServiceWrapper.java -text
1476 1458
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/LanguageNotSupportedException.java -text
eu.etaxonomy.taxeditor.cdmlib/.classpath
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
6
	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
7
	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
8
	<classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
9
	<classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
10
	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>
11
	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>
12
	<classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>
13
	<classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>
14
	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar" sourcepath="lib/c3p0-0.9.1src.zip"/>
15
	<classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>
16
	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="lib/commons-beanutils-1.7.0src.zip"/>
17
	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>
18
	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar" sourcepath="lib/commons-dbcp-1.2.2src.zip"/>
19
	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>
20
	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4src.zip"/>
21
	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
22
	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
23
	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar" sourcepath="lib/commons-pool-1.3src.zip"/>
24
	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
25
	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar" sourcepath="lib/dozer-5.3.0src.zip"/>
26
	<classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar" sourcepath="lib/ehcache-1.2.3src.zip"/>
27
	<classpathentry exported="true" kind="lib" path="lib/ejb3-persistence.jar"/>
28
	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.4.jar" sourcepath="lib/ezmorph-1.0.4src.zip"/>
29
	<classpathentry exported="true" kind="lib" path="lib/fop.jar"/>
30
	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
31
	<classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>
32
	<classpathentry exported="true" kind="lib" path="lib/hibernate-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip"/>
33
	<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"/>
34
	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-core-3.4.0-SNAPSHOTsrc.zip"/>
35
	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-3.1.0.GA.jar" sourcepath="lib/hibernate-search-3.1.0.GAsrc.zip"/>
36
	<classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>
37
	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.0.0.CR1.jar" sourcepath="lib/hibernate-validator-4.0.0.CR1src.zip"/>
38
	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
39
	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib/httpclient-4.0.1src.zip"/>
40
	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib/httpcore-4.0.1src.zip"/>
41
	<classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>
42
	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>
43
	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar" sourcepath="lib/jaxb-impl-2.1.6src.zip"/>
44
	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.2.jar"/>
45
	<classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>
46
	<classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>
47
	<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
48
	<classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar" sourcepath="lib/joda-time-1.5src.zip"/>
49
	<classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>
50
	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar" sourcepath="lib/json-lib-2.2.3-jdk15src.zip"/>
51
	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar" sourcepath="lib/jsr250-api-1.0src.zip"/>
52
	<classpathentry exported="true" kind="lib" path="lib/jta.jar"/>
53
	<classpathentry exported="true" kind="lib" path="lib/jtds-1.2.2.jar"/>
54
	<classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar" sourcepath="lib/junit-4.8.1src.zip"/>
55
	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar" sourcepath="lib/log4j-1.2.14src.zip"/>
56
	<classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
57
	<classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
58
	<classpathentry exported="true" kind="lib" path="lib/lucene-core-2.4.0.jar" sourcepath="lib/lucene-core-2.4.0src.zip"/>
59
	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-2.4.0.jar" sourcepath="lib/lucene-spellchecker-2.4.0src.zip"/>
60
	<classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar" sourcepath="lib/mail-1.4src.zip"/>
61
	<classpathentry exported="true" kind="lib" path="lib/msbase-2000.3.jar"/>
62
	<classpathentry exported="true" kind="lib" path="lib/mssqlserver-2000.3.jar"/>
63
	<classpathentry exported="true" kind="lib" path="lib/msutil-2000.3.jar"/>
64
	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>
65
	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
66
	<classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar"/>
67
	<classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>
68
	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>
69
	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar"/>
70
	<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"/>
71
	<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"/>
72
	<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"/>
73
	<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"/>
74
	<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"/>
75
	<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"/>
76
	<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"/>
77
	<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"/>
78
	<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"/>
79
	<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"/>
80
	<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"/>
81
	<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"/>
82
	<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"/>
83
	<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"/>
84
	<classpathentry exported="true" kind="lib" path="lib/poi-3.6.jar"/>
85
	<classpathentry exported="true" kind="lib" path="lib/postgresql-8.2-504.jdbc4.jar"/>
86
	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
87
	<classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
88
	<classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>
89
	<classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>
90
	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib/servlet-api-2.5src.zip"/>
91
	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar" sourcepath="lib/slf4j-api-1.5.2src.zip"/>
92
	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar" sourcepath="lib/slf4j-log4j12-1.5.2src.zip"/>
93
	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar" sourcepath="lib/spring-modules-cache-0.7src.zip"/>
94
	<classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar" sourcepath="lib/spring-modules-lucene-0.8asrc.zip"/>
95
	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.0.5.RELEASE.jar"/>
96
	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.0.5.RELEASE.jar"/>
97
	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar" sourcepath="lib/wsdl4j-1.6.1src.zip"/>
98
	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
99
	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
100
	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
101
	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
102
	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
103
	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
104
	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar" sourcepath="lib/xml-resolver-1.2src.zip"/>
105
	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
106
	<classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
107
	<classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>
108
	<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
109
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.9-SNAPSHOT.jar"/>
110
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.9-SNAPSHOT.jar"/>
111
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.9-SNAPSHOT.jar"/>
112
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.9-SNAPSHOT.jar" sourcepath="C:/Users/l.morris/.m2/repository/eu/etaxonomy/cdmlib-model/3.0.9-SNAPSHOT/cdmlib-model-3.0.9-SNAPSHOT-sources.jar"/>
113
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar" sourcepath="C:/Users/l.morris/.m2/repository/eu/etaxonomy/cdmlib-persistence/3.0.9-SNAPSHOT/cdmlib-persistence-3.0.9-SNAPSHOT-sources.jar"/>
114
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.9-SNAPSHOT.jar"/>
115
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.9-SNAPSHOT.jar"/>
116
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.9-SNAPSHOT.jar" sourcepath="/cdmlib-services"/>
117
	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
118
	<classpathentry kind="output" path="target/classes"/>
119
</classpath>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
6
	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
7
	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
8
	<classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
9
	<classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
10
	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>
11
	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>
12
	<classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>
13
	<classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>
14
	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar" sourcepath="lib/c3p0-0.9.1src.zip"/>
15
	<classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>
16
	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="lib/commons-beanutils-1.7.0src.zip"/>
17
	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>
18
	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar" sourcepath="lib/commons-dbcp-1.2.2src.zip"/>
19
	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>
20
	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4src.zip"/>
21
	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
22
	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
23
	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar" sourcepath="lib/commons-pool-1.3src.zip"/>
24
	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
25
	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar" sourcepath="lib/dozer-5.3.0src.zip"/>
26
	<classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar" sourcepath="lib/ehcache-1.2.3src.zip"/>
27
	<classpathentry exported="true" kind="lib" path="lib/ejb3-persistence.jar"/>
28
	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.4.jar" sourcepath="lib/ezmorph-1.0.4src.zip"/>
29
	<classpathentry exported="true" kind="lib" path="lib/fop.jar"/>
30
	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
31
	<classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>
32
	<classpathentry exported="true" kind="lib" path="lib/hibernate-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip"/>
33
	<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"/>
34
	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-core-3.4.0-SNAPSHOTsrc.zip"/>
35
	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-3.1.0.GA.jar" sourcepath="lib/hibernate-search-3.1.0.GAsrc.zip"/>
36
	<classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>
37
	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.0.0.CR1.jar" sourcepath="lib/hibernate-validator-4.0.0.CR1src.zip"/>
38
	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
39
	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib/httpclient-4.0.1src.zip"/>
40
	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib/httpcore-4.0.1src.zip"/>
41
	<classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>
42
	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>
43
	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar" sourcepath="lib/jaxb-impl-2.1.6src.zip"/>
44
	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.2.jar"/>
45
	<classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>
46
	<classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>
47
	<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
48
	<classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar" sourcepath="lib/joda-time-1.5src.zip"/>
49
	<classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>
50
	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar" sourcepath="lib/json-lib-2.2.3-jdk15src.zip"/>
51
	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar" sourcepath="lib/jsr250-api-1.0src.zip"/>
52
	<classpathentry exported="true" kind="lib" path="lib/jta.jar"/>
53
	<classpathentry exported="true" kind="lib" path="lib/jtds-1.2.2.jar"/>
54
	<classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar" sourcepath="lib/junit-4.8.1src.zip"/>
55
	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar" sourcepath="lib/log4j-1.2.14src.zip"/>
56
	<classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
57
	<classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
58
	<classpathentry exported="true" kind="lib" path="lib/lucene-core-2.4.0.jar" sourcepath="lib/lucene-core-2.4.0src.zip"/>
59
	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-2.4.0.jar" sourcepath="lib/lucene-spellchecker-2.4.0src.zip"/>
60
	<classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar" sourcepath="lib/mail-1.4src.zip"/>
61
	<classpathentry exported="true" kind="lib" path="lib/msbase-2000.3.jar"/>
62
	<classpathentry exported="true" kind="lib" path="lib/mssqlserver-2000.3.jar"/>
63
	<classpathentry exported="true" kind="lib" path="lib/msutil-2000.3.jar"/>
64
	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>
65
	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
66
	<classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar"/>
67
	<classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>
68
	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>
69
	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar"/>
70
	<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"/>
71
	<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"/>
72
	<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"/>
73
	<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"/>
74
	<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"/>
75
	<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"/>
76
	<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"/>
77
	<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"/>
78
	<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"/>
79
	<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"/>
80
	<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"/>
81
	<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"/>
82
	<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"/>
83
	<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"/>
84
	<classpathentry exported="true" kind="lib" path="lib/poi-3.6.jar"/>
85
	<classpathentry exported="true" kind="lib" path="lib/postgresql-8.2-504.jdbc4.jar"/>
86
	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
87
	<classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
88
	<classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>
89
	<classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>
90
	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib/servlet-api-2.5src.zip"/>
91
	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar" sourcepath="lib/slf4j-api-1.5.2src.zip"/>
92
	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar" sourcepath="lib/slf4j-log4j12-1.5.2src.zip"/>
93
	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar" sourcepath="lib/spring-modules-cache-0.7src.zip"/>
94
	<classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar" sourcepath="lib/spring-modules-lucene-0.8asrc.zip"/>
95
	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.0.5.RELEASE.jar"/>
96
	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.0.5.RELEASE.jar"/>
97
	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar" sourcepath="lib/wsdl4j-1.6.1src.zip"/>
98
	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
99
	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
100
	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
101
	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
102
	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
103
	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
104
	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar" sourcepath="lib/xml-resolver-1.2src.zip"/>
105
	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
106
	<classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
107
	<classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>
108
	<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
109
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.9-SNAPSHOT.jar"/>
110
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.9-SNAPSHOT.jar"/>
111
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.9-SNAPSHOT.jar"/>
112
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.9-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.0.9-SNAPSHOT-sources.jar"/>
113
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.0.9-SNAPSHOT-sources.jar"/>
114
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.9-SNAPSHOT.jar"/>
115
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.9-SNAPSHOT.jar"/>
116
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.9-SNAPSHOT.jar" sourcepath="/cdmlib-services"/>
117
	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
118
	<classpathentry kind="output" path="target/classes"/>
119
</classpath>
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListItem.java
31 31
import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
32 32
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
33 33
import eu.etaxonomy.taxeditor.ui.element.ISelectable;
34
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
34 35

  
35 36
/**
36 37
 * @author n.hoffmann
......
66 67

  
67 68
		Label label_statement = new Label(getLayoutComposite(), SWT.NULL);
68 69
		label_statement.setText(getItemStatement());
69
		label_statement.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
70
		label_statement.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
70 71

  
71 72
		Link link = new Link(getLayoutComposite(), SWT.NONE);
72 73
		link.setText("<a>" + getItemLink() + "</a>");
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
47 47
import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;
48 48
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
49 49
import eu.etaxonomy.taxeditor.store.CdmStore;
50
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
50
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
51 51

  
52 52
/**
53 53
 * @author l.morris
......
87 87
			
88 88
			parent.setLayout(layout);
89 89
			viewer = new TreeViewer(parent);
90
			viewer.getControl().setLayoutData(CdmFormFactory.FILL());
90
			viewer.getControl().setLayoutData(LayoutConstants.FILL());
91 91
			viewer.setContentProvider(new TermContentProvider());
92 92
			viewer.setLabelProvider(new TermLabelProvider());
93 93
			viewer.setSorter(new ViewerSorter());
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
12 12
import java.util.Arrays;
13 13
import java.util.List;
14 14

  
15
import org.eclipse.ui.IEditorInput;
16

  
17
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
18 15
import eu.etaxonomy.cdm.model.location.Continent;
19 16
import eu.etaxonomy.cdm.model.location.NamedArea;
20 17
import eu.etaxonomy.cdm.model.location.TdwgArea;
......
57 54
	public NamedArea createTermInstance() {
58 55
		 return NamedArea.NewInstance();
59 56
	}
60
	
61
		
62

  
63 57
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
34 34
import eu.etaxonomy.cdm.model.reference.Reference;
35 35
import eu.etaxonomy.taxeditor.store.CdmStore;
36 36
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
37
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
37 38

  
38 39
/**
39 40
 * <p>ExternalReferenceServiceWizardPage class.</p>
......
79 80
	public void createControl(Composite parent) {
80 81
		control = formFactory.createComposite(parent);
81 82
		
82
		control.setLayout(CdmFormFactory.LAYOUT(2, false));
83
		control.setLayout(LayoutConstants.LAYOUT(2, false));
83 84
		
84 85
		text_query = new Text(control, SWT.SINGLE | SWT.BORDER);
85
		text_query.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
86
		text_query.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
86 87
		
87 88
		button_search = new Button(control, SWT.PUSH);
88
		button_search.setLayoutData(CdmFormFactory.RIGHT());
89
		button_search.setLayoutData(LayoutConstants.RIGHT());
89 90
		button_search.setText("Search");
90 91
		
91 92
		button_search.addSelectionListener(this);
92 93
		
93 94
		viewer = new ListViewer(control);
94
		viewer.getControl().setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2,1));
95
		viewer.getControl().setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2,1));
95 96
		
96 97
		viewer.setContentProvider(new IStructuredContentProvider(){
97 98

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
33 33
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
34 34
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
35 35
import eu.etaxonomy.taxeditor.ui.element.ISelectable;
36
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
36 37

  
37 38
/**
38 39
 * <p>
......
123 124
		// create combo
124 125
		combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY);
125 126
		addControl(combo);
126
		combo.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
127
		combo.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
127 128
		setVisibleItemCount(DEFAULT_VISIBLE_ITEMS);
128 129

  
129 130
		populateTypes();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
31 31
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
32 32
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
33 33
import eu.etaxonomy.taxeditor.ui.element.ISelectable;
34
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
34 35

  
35 36
/**
36 37
 * <p>
......
100 101
		// create combo
101 102
		combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY);
102 103
		addControl(combo);
103
		combo.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
104
		combo.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
104 105
		combo.setVisibleItemCount(DEFAULT_VISIBLE_ITEMS);
105 106

  
106 107
		populateTerms(getPreferredTerms());
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ClassificationSelectionDialog.java
44 44
	 * @param conversation
45 45
	 *            a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
46 46
	 *            object.
47
	 * @param curentSelection 
47 48
	 * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonomicTree} object.
48 49
	 */
49 50
	public static Classification select(Shell shell,
50
			ConversationHolder conversation) {
51
			ConversationHolder conversation, Classification curentSelection) {
51 52
		ClassificationSelectionDialog dialog = new ClassificationSelectionDialog(
52 53
				shell, conversation, "Choose a Classification", false, "", null);
53 54
		return getSelectionFromDialog(dialog);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
1
// $Id$
2
/**
3
* Copyright (C) 2009 EDIT
4
* European Distributed Institute of Taxonomy 
5
* http://www.e-taxonomy.eu
6
* 
7
* The contents of this file are subject to the Mozilla Public License Version 1.1
8
* See LICENSE.TXT at the top of this package for the full license terms.
9
*/
10
package eu.etaxonomy.taxeditor.ui.dialog.selection;
11

  
12
import org.eclipse.swt.widgets.Shell;
13

  
14
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
15
import eu.etaxonomy.cdm.model.agent.AgentBase;
16
import eu.etaxonomy.cdm.model.agent.Institution;
17
import eu.etaxonomy.cdm.model.agent.Person;
18
import eu.etaxonomy.cdm.model.agent.Team;
19
import eu.etaxonomy.cdm.model.common.Group;
20
import eu.etaxonomy.cdm.model.common.ICdmBase;
21
import eu.etaxonomy.cdm.model.common.User;
22
import eu.etaxonomy.cdm.model.description.Feature;
23
import eu.etaxonomy.cdm.model.description.FeatureTree;
24
import eu.etaxonomy.cdm.model.description.PolytomousKey;
25
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
26
import eu.etaxonomy.cdm.model.location.NamedArea;
27
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
28
import eu.etaxonomy.cdm.model.occurrence.Collection;
29
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
30
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
31
import eu.etaxonomy.cdm.model.reference.Reference;
32
import eu.etaxonomy.cdm.model.taxon.Classification;
33
import eu.etaxonomy.cdm.model.taxon.Synonym;
34
import eu.etaxonomy.cdm.model.taxon.Taxon;
35
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
36
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
37
import eu.etaxonomy.taxeditor.store.StoreUtil;
38

  
39
/**
40
 * @author n.hoffmann
41
 * @date Jan 25, 2012
42
 *
43
 */
44
public class SelectionDialogFactory {
45

  
46
	public static <T extends ICdmBase> T getSelectionFromDialog(Class<T> clazz, Shell shell, ConversationHolder conversation, T curentSelection){
47
		
48
		if(clazz.equals(Taxon.class)){
49
			return (T) TaxonBaseSelectionDialog.selectTaxon(shell, conversation, (Taxon) curentSelection);
50
		}
51
		if(clazz.equals(Synonym.class)){
52
			return (T) TaxonBaseSelectionDialog.selectSynonym(shell, conversation);
53
		}
54
		if(clazz.equals(TaxonBase.class)){
55
			return (T) TaxonBaseSelectionDialog.selectTaxonBase(shell, conversation);
56
		}
57
		if(clazz.equals(Classification.class)){
58
			return (T) ClassificationSelectionDialog.select(shell, conversation, (Classification) curentSelection);
59
		}
60
		if(clazz.equals(TaxonNode.class)){
61
			return (T) TaxonNodeSelectionDialog.select(shell, conversation, null, null, (TaxonNode) curentSelection, null);
62
		}
63
		if(clazz.equals(Reference.class)){
64
			return (T) ReferenceSelectionDialog.select(shell, conversation, (Reference) curentSelection);
65
		}
66
		if(clazz.equals(TaxonNameBase.class)){
67
			return (T) NameSelectionDialog.select(shell, conversation, (TaxonNameBase) curentSelection);
68
		}
69
		if(clazz.equals(Team.class)){
70
			return (T) TeamSelectionDialog.select(shell, conversation, (Team) curentSelection);
71
		}
72
		if(clazz.equals(AgentBase.class)){
73
			return (T) AgentSelectionDialog.select(shell, conversation, (AgentBase) curentSelection);
74
		}
75
		if(clazz.equals(Feature.class)){
76
			return (T) FeatureSelectionDialog.select(shell, conversation, (Feature) curentSelection);
77
		}
78
		if(clazz.equals(FeatureTree.class)){
79
			return (T) FeatureTreeSelectionDialog.select(shell, conversation, (FeatureTree) curentSelection);
80
		}
81
		if(clazz.equals(PolytomousKey.class)){
82
			return (T) PolytomousKeySelectionDialog.select(shell, conversation, (PolytomousKey) curentSelection);
83
		}
84
		if(clazz.equals(PolytomousKeyNode.class)){
85
			StoreUtil.warningDialog("Not implemented yet", SelectionDialogFactory.class,
86
					"This functionality is not implemented yet.");
87
			return null;
88
		}
89
		if(clazz.equals(DerivedUnitBase.class)){
90
			return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnitBase) curentSelection);
91
		}
92
		if(clazz.equals(FieldObservation.class)){
93
			return (T) FieldObservationSelectionDialog.select(shell, conversation, (FieldObservation) curentSelection);
94
		}
95
		if(clazz.equals(NamedArea.class)){
96
			return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) curentSelection);
97
		}
98
		if(clazz.equals(Collection.class)){
99
			return (T) CollectionSelectionDialog.select(shell, conversation, (Collection) curentSelection);
100
		}
101
		if(clazz.equals(User.class)){
102
			return (T) UserSelectionDialog.select(shell, conversation, (User) curentSelection);
103
		}
104
		if (clazz.equals(Person.class)){
105
			return (T) PersonSelectionDialog.select(shell, conversation, (Person) curentSelection);
106
		}
107
		if(clazz.equals(Group.class)){
108
			return (T) GroupSelectionDialog.select(shell, conversation, (Group) curentSelection);
109
		}
110
		if(clazz.equals(Institution.class)){
111
			return (T) InstitutionSelectionDialog.select(shell, conversation, (Institution) curentSelection);
112
		}
113
				
114
		return null;
115
	}
116
	
117
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
58 58

  
59 59
	private List<Classification> classifications;
60 60
	
61
	private Classification selectedClassification;
62

  
63
	private final Classification defaultClassification;
64
	
61
	private Classification selectedClassification;	
65 62

  
66 63
	/**
67 64
	 * <p>Constructor for FilteredTaxonNodeSelectionDialog.</p>
......
84 81
		if(classification != null){
85 82
			selectedClassification = classification;
86 83
		}
87
		defaultClassification = classification;
88 84
	}
89 85

  
90 86

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmEntityWizardPage.java
91 91
	@Override
92 92
	public void createControl(Composite parent) {
93 93
		ScrolledForm scrolledForm = formFactory.createScrolledForm(parent);
94
		scrolledForm.getBody().setLayout(CdmFormFactory.LAYOUT());
94
		scrolledForm.getBody().setLayout(LayoutConstants.LAYOUT());
95 95

  
96 96
		Composite control = formFactory.createComposite(scrolledForm.getBody());
97
		control.setLayoutData(CdmFormFactory.FILL());
97
		control.setLayoutData(LayoutConstants.FILL());
98 98

  
99
		control.setLayout(CdmFormFactory.LAYOUT(2, false));
99
		control.setLayout(LayoutConstants.LAYOUT(2, false));
100 100
		WizardPageRootElement rootElement = new WizardPageRootElement(
101 101
				formFactory, control, getConversationHolder());
102 102

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
89 89

  
90 90
		this.formFactory = formFactory;
91 91

  
92
		this.setLayoutData(CdmFormFactory.FILL());
92
		this.setLayoutData(LayoutConstants.FILL());
93 93

  
94 94
		Composite client = formFactory.createComposite(this, SWT.WRAP);
95 95
		client.setBackgroundMode(SWT.INHERIT_DEFAULT);
96 96

  
97
		TableWrapLayout layout = CdmFormFactory.LAYOUT();
97
		TableWrapLayout layout = LayoutConstants.LAYOUT();
98 98
		layout.bottomMargin = 10;
99 99
		layout.rightMargin = 5;
100 100

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java
40 40
		browser = new Browser(getLayoutComposite(), SWT.NONE);
41 41
		addControl(browser);
42 42
		
43
		getLayoutComposite().setLayoutData(CdmFormFactory.FILL());
43
		getLayoutComposite().setLayoutData(LayoutConstants.FILL());
44 44
		
45 45

  
46 46
		layoutBrowser();
......
55 55
	 * 
56 56
	 */
57 57
	private void layoutBrowser() {
58
		TableWrapData layoutData = CdmFormFactory.FILL();
58
		TableWrapData layoutData = LayoutConstants.FILL();
59 59
		layoutData.heightHint = 1000;
60 60
		
61 61
		browser.setLayoutData(layoutData);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
35 35
import org.eclipse.ui.forms.IFormColors;
36 36
import org.eclipse.ui.forms.widgets.FormToolkit;
37 37
import org.eclipse.ui.forms.widgets.Section;
38
import org.eclipse.ui.forms.widgets.TableWrapData;
39
import org.eclipse.ui.forms.widgets.TableWrapLayout;
40 38
import org.eclipse.ui.internal.forms.widgets.FormFonts;
41 39
import org.joda.time.Partial;
42 40
import org.springframework.security.core.GrantedAuthority;
43 41

  
44 42
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
45 43
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
46
import eu.etaxonomy.cdm.model.agent.Institution;
47 44
import eu.etaxonomy.cdm.model.agent.Person;
48 45
import eu.etaxonomy.cdm.model.agent.Team;
49
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
50 46
import eu.etaxonomy.cdm.model.common.Annotation;
51 47
import eu.etaxonomy.cdm.model.common.CdmBase;
52 48
import eu.etaxonomy.cdm.model.common.Credit;
......
54 50
import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
55 51
import eu.etaxonomy.cdm.model.common.Extension;
56 52
import eu.etaxonomy.cdm.model.common.Group;
57
import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
58 53
import eu.etaxonomy.cdm.model.common.ICdmBase;
59 54
import eu.etaxonomy.cdm.model.common.IDefinedTerm;
60 55
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
......
69 64
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
70 65
import eu.etaxonomy.cdm.model.description.Distribution;
71 66
import eu.etaxonomy.cdm.model.description.Feature;
72
import eu.etaxonomy.cdm.model.description.FeatureTree;
73 67
import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
74 68
import eu.etaxonomy.cdm.model.description.KeyStatement;
75 69
import eu.etaxonomy.cdm.model.description.Modifier;
76
import eu.etaxonomy.cdm.model.description.PolytomousKey;
77
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
78 70
import eu.etaxonomy.cdm.model.description.QuantitativeData;
79 71
import eu.etaxonomy.cdm.model.description.Scope;
80 72
import eu.etaxonomy.cdm.model.description.StateData;
......
93 85
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
94 86
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
95 87
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
96
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
97
import eu.etaxonomy.cdm.model.occurrence.Collection;
98 88
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
99
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
100 89
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
101
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
102 90
import eu.etaxonomy.cdm.model.occurrence.Specimen;
103 91
import eu.etaxonomy.cdm.model.reference.Reference;
104
import eu.etaxonomy.cdm.model.taxon.Classification;
105
import eu.etaxonomy.cdm.model.taxon.Synonym;
106 92
import eu.etaxonomy.cdm.model.taxon.Taxon;
107
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
108 93
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
109 94
import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
110 95
import eu.etaxonomy.taxeditor.store.StoreUtil;
......
258 243
import eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailSection;
259 244
import eu.etaxonomy.taxeditor.ui.section.vocabulary.TermVocabularyDetailElement;
260 245
import eu.etaxonomy.taxeditor.ui.section.vocabulary.TermVocabularyDetailSection;
261
import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
262
import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
263
import eu.etaxonomy.taxeditor.ui.selection.ClassificationSelectionElement;
264
import eu.etaxonomy.taxeditor.ui.selection.CollectionSelectionElement;
265
import eu.etaxonomy.taxeditor.ui.selection.DerivedUnitBaseSelectionElement;
266
import eu.etaxonomy.taxeditor.ui.selection.FeatureSelectionElement;
267
import eu.etaxonomy.taxeditor.ui.selection.FeatureTreeSelectionElement;
268
import eu.etaxonomy.taxeditor.ui.selection.FieldObservationSelectionElement;
269
import eu.etaxonomy.taxeditor.ui.selection.GroupSelectionElement;
270
import eu.etaxonomy.taxeditor.ui.selection.InstitutionSelectionElement;
271
import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
272
import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
246
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
273 247
import eu.etaxonomy.taxeditor.ui.selection.NomenclaturalAuthorTeamSelectionElement;
274
import eu.etaxonomy.taxeditor.ui.selection.PersonSelectionElement;
275
import eu.etaxonomy.taxeditor.ui.selection.PolytomousKeyNodeSelectionElement;
276
import eu.etaxonomy.taxeditor.ui.selection.PolytomousKeySelectionElement;
277
import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
278
import eu.etaxonomy.taxeditor.ui.selection.SynonymSelectionElement;
279
import eu.etaxonomy.taxeditor.ui.selection.TaxonBaseSelectionElement;
280 248
import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
281
import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
282
import eu.etaxonomy.taxeditor.ui.selection.TeamSelectionElement;
283
import eu.etaxonomy.taxeditor.ui.selection.UserSelectionElement;
284 249

  
285 250
/**
286 251
 * <p>
......
304 269
	private final int orientation = Window.getDefaultOrientation();
305 270
	private ISelectionProvider selectionProvider;
306 271

  
307
	/**
308
	 * <p>
309
	 * LAYOUT
310
	 * </p>
311
	 * 
312
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapLayout} object.
313
	 */
314
	public static final TableWrapLayout LAYOUT() {
315
		return LAYOUT(1, false);
316
	}
317

  
318
	/**
319
	 * <p>
320
	 * LAYOUT
321
	 * </p>
322
	 * 
323
	 * @param columns
324
	 *            a int.
325
	 * @param equalWidth
326
	 *            a boolean.
327
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapLayout} object.
328
	 */
329
	public static final TableWrapLayout LAYOUT(int columns, boolean equalWidth) {
330
		TableWrapLayout layout = new TableWrapLayout();
331
		layout.topMargin = 0;
332
		layout.rightMargin = 0;
333
		layout.bottomMargin = 0;
334
		layout.leftMargin = 0;
335
		layout.numColumns = columns;
336
		layout.makeColumnsEqualWidth = equalWidth;
337
		layout.verticalSpacing = 0;
338
		layout.horizontalSpacing = 0;
339
		return layout;
340
	}
341

  
342
	/**
343
	 * <p>
344
	 * FILL
345
	 * </p>
346
	 * 
347
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
348
	 */
349
	public static final TableWrapData FILL() {
350
		return FILL(1, 1);
351
	}
352

  
353
	/**
354
	 * <p>
355
	 * FILL
356
	 * </p>
357
	 * 
358
	 * @param horizontalSpan
359
	 *            a int.
360
	 * @param verticalSpan
361
	 *            a int.
362
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
363
	 */
364
	public static final TableWrapData FILL(int horizontalSpan, int verticalSpan) {
365
		TableWrapData layoutData = new TableWrapData(TableWrapData.FILL_GRAB,
366
				TableWrapData.FILL_GRAB);
367
		layoutData.colspan = horizontalSpan;
368
		layoutData.rowspan = verticalSpan;
369
		return layoutData;
370
	}
371

  
372
	/**
373
	 * <p>
374
	 * LEFT
375
	 * </p>
376
	 * 
377
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
378
	 */
379
	public static final TableWrapData LEFT() {
380
		return new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP);
381
	}
382

  
383
	/**
384
	 * <p>
385
	 * RIGHT
386
	 * </p>
387
	 * 
388
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
389
	 */
390
	public static final TableWrapData RIGHT() {
391
		return new TableWrapData(TableWrapData.RIGHT, TableWrapData.TOP);
392
	}
393

  
394
	/**
395
	 * <p>
396
	 * FILL_HORIZONTALLY
397
	 * </p>
398
	 * 
399
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
400
	 */
401
	public static final TableWrapData FILL_HORIZONTALLY() {
402
		return FILL_HORIZONTALLY(1, 1);
403
	}
404

  
405
	/**
406
	 * <p>
407
	 * FILL_HORIZONTALLY
408
	 * </p>
409
	 * 
410
	 * @param horizontalSpan
411
	 *            a int.
412
	 * @param verticalSpan
413
	 *            a int.
414
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
415
	 */
416
	public static final TableWrapData FILL_HORIZONTALLY(int horizontalSpan,
417
			int verticalSpan) {
418
		TableWrapData layoutData = new TableWrapData(TableWrapData.FILL_GRAB,
419
				TableWrapData.TOP);
420
		layoutData.colspan = horizontalSpan;
421
		layoutData.rowspan = verticalSpan;
422
		return layoutData;
423
	}
424

  
425 272
	/** Constant <code>EMPTY_SELECTION</code> */
426 273
	public static ISelection EMPTY_SELECTION = new ISelection() {
427 274
		@Override
......
430 277
		}
431 278
	};
432 279
	
280
	/**
281
	 * 
282
	 * @author n.hoffmann
283
	 * @date Jan 25, 2010
284
	 *
285
	 */
433 286
	private class SelectionMouseHandler extends MouseAdapter {
434 287
		@Override
435 288
		public void mouseDown(MouseEvent e) {
......
437 290
		}
438 291
	}
439 292

  
293
	/**
294
	 * 
295
	 * @author n.hoffmann
296
	 * @date Jan 25, 2010
297
	 *
298
	 */
440 299
	private class SelectionFocusHandler extends FocusAdapter {
441 300
		@Override
442 301
		public void focusGained(FocusEvent e) {
......
1060 919
		return element;
1061 920
	}
1062 921

  
1063
	/**
1064
	 * 
1065
	 * @author n.hoffmann
1066
	 * @created Mar 5, 2010
1067
	 * @version 1.0
1068
	 */
1069
	public static enum SelectionType {
1070
		AGENT, INSTITUTION, NAME, REFERENCE, TAXON_BASE, TAXON, SYNONYM, TEAM, AUTHOR_TEAM, PERSON, DERIVED_UNIT, FIELD_OBSERVATION, FEATURE_TREE, CLASSIFICATION, TAXON_NODE, COLLECTION, FEATURE, POLYTOMOUS_KEY, POLYTOMOUS_KEY_NODE, USER, GROUP
1071
	}
1072

  
1073 922
	/**
1074 923
	 * <p>
1075 924
	 * createCheckbox
......
1371 1220
			int style) {
1372 1221
		Label separator = this.createSeparator(
1373 1222
				parentElement.getLayoutComposite(), SWT.HORIZONTAL | style);
1374
		separator.setLayoutData(FILL_HORIZONTALLY());
1223
		separator.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
1375 1224
		return separator;
1376 1225
	}
1377 1226

  
......
2262 2111

  
2263 2112
	/**
2264 2113
	 * <p>
2265
	 * createSelectionElement
2114
	 * Creates a selection element for the given type T.
2115
	 * </p>
2116
	 * <p>
2117
	 * 	<strong>Selection elements not handled by this method:</strong>
2118
	 * 	<ul>
2119
	 * 		<li>{@link TaxonNodeSelectionElement} see {@link #createTaxonNodeSelectionElement(ConversationHolder, ICdmFormElement, String, TaxonNode, int, int)}</li>
2120
	 * 		<li>{@link NomenclaturalAuthorTeamSelectionElement} see {@link #createNomenclaturalAuthorTeamSelectionElement(ConversationHolder, ICdmFormElement, String, Team, int, int)}</li>
2121
	 * 	</ul>	
2266 2122
	 * </p>
2267 2123
	 * 
2268
	 * @param selectionType
2269
	 *            a
2270
	 *            {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.SelectionType}
2271
	 *            object.
2124
	 * @param clazz
2125
	 * 			  a {@link Class} object of the type that you want the selection element to handle
2272 2126
	 * @param parentElement
2273
	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
2127
	 *            a {@link ICdmFormElement}
2274 2128
	 *            object.
2275 2129
	 * @param labelString
2276
	 *            a {@link java.lang.String} object.
2130
	 *            a {@link String} object.
2277 2131
	 * @param selectionType
2278 2132
	 * @param selection
2279
	 *            a {@link eu.etaxonomy.cdm.model.common.IAnnotatableEntity}
2280
	 *            object.
2133
	 *            a {@link ICdmBase} object.
2281 2134
	 * @param style
2282 2135
	 *            a int.
2283 2136
	 * @param conversation
2284
	 *            a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
2285
	 *            object.
2137
	 *            a {@link ConversationHolder} object.
2286 2138
	 * @return a
2287
	 *         {@link eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement}
2139
	 *         {@link EntitySelectionElement}
2288 2140
	 *         object.
2289 2141
	 */
2290
	public AbstractSelectionElement createSelectionElement(
2291
			SelectionType selectionType, ConversationHolder conversation,
2142
	public <T extends ICdmBase> EntitySelectionElement<T> createSelectionElement(
2143
			Class<T> clazz, ConversationHolder conversation,
2292 2144
			ICdmFormElement parentElement, String labelString,
2293
			ICdmBase selection, int mode, int style) {
2294
		AbstractSelectionElement element = null;
2295

  
2296
		IAnnotatableEntity entity = (IAnnotatableEntity) HibernateProxyHelper
2297
				.deproxy(selection);
2298

  
2299
		switch (selectionType) {
2300
		case AGENT:
2301
			element = new AgentSelectionElement(this, conversation,
2302
					parentElement, labelString, (TeamOrPersonBase) entity,
2303
					mode, style);
2304
			break;
2305
		case PERSON:
2306
			element = new PersonSelectionElement(this, conversation,
2307
					parentElement, labelString, (Person) entity, mode, style);
2308
			break;
2309
		case TEAM:
2310
			element = new TeamSelectionElement(this, conversation,
2311
					parentElement, labelString, (Team) entity, mode, style);
2312
			break;
2313
		case AUTHOR_TEAM:
2314
			element = new NomenclaturalAuthorTeamSelectionElement(this,
2315
					conversation, parentElement, labelString, (Team) entity,
2316
					mode, style);
2317
			break;
2318
		case INSTITUTION:
2319
			element = new InstitutionSelectionElement(this, conversation,
2320
					parentElement, labelString, (Institution) entity, mode,
2321
					style);
2322
			break;
2323
		case NAME:
2324
			element = new NameSelectionElement(this, conversation,
2325
					parentElement, labelString, (TaxonNameBase) entity, mode,
2326
					style);
2327
			break;
2328
		case REFERENCE:
2329
			element = new ReferenceSelectionElement(this, conversation,
2330
					parentElement, labelString, (Reference) entity, mode, style);
2331
			break;
2332
		case TAXON_BASE:
2333
			element = new TaxonBaseSelectionElement(this, conversation,
2334
					parentElement, labelString, (TaxonBase) entity, mode, style);
2335
			break;
2336
		case TAXON:
2337
			element = new TaxonSelectionElement(this, conversation,
2338
					parentElement, labelString, (Taxon) entity, mode, style);
2339
			break;
2340
		case SYNONYM:
2341
			element = new SynonymSelectionElement(this, conversation,
2342
					parentElement, labelString, (Synonym) entity, mode, style);
2343
			break;
2344
		case DERIVED_UNIT:
2345
			element = new DerivedUnitBaseSelectionElement(this, conversation,
2346
					parentElement, labelString, (DerivedUnitBase) entity, mode,
2347
					style);
2348
			break;
2349
		case FIELD_OBSERVATION:
2350
			element = new FieldObservationSelectionElement(this, conversation,
2351
					parentElement, labelString, (FieldObservation) entity,
2352
					mode, style);
2353
			break;
2354
		case FEATURE_TREE:
2355
			element = new FeatureTreeSelectionElement(this, conversation,
2356
					parentElement, labelString, (FeatureTree) entity, mode,
2357
					style);
2358
			break;
2359
		case CLASSIFICATION:
2360
			element = new ClassificationSelectionElement(this, conversation,
2361
					parentElement, labelString, (Classification) entity, mode,
2362
					style);
2363
			break;
2364
		case TAXON_NODE:
2365
			element = new TaxonNodeSelectionElement(this, conversation,
2366
					parentElement, labelString, (TaxonNode) entity, mode, style);
2367
			break;
2368
		case COLLECTION:
2369
			element = new CollectionSelectionElement(this, conversation,
2370
					parentElement, labelString, (Collection) entity, mode,
2371
					style);
2372
			break;
2373
		case FEATURE:
2374
			element = new FeatureSelectionElement(this, conversation,
2375
					parentElement, labelString, (Feature) entity, mode, style);
2376
			break;
2377
		case POLYTOMOUS_KEY:
2378
			element = new PolytomousKeySelectionElement(this, conversation,
2379
					parentElement, labelString, (PolytomousKey) entity, mode,
2380
					style);
2381
			break;
2382
		case POLYTOMOUS_KEY_NODE:
2383
			element = new PolytomousKeyNodeSelectionElement(this, conversation,
2384
					parentElement, labelString, (PolytomousKeyNode) entity,
2385
					mode, style);
2386
			break;
2387
		case USER:
2388
			element = new UserSelectionElement(this, conversation,
2389
					parentElement, labelString, (User) entity, mode, style);
2390
			break;
2391
		case GROUP:
2392
			element = new GroupSelectionElement(this, conversation,
2393
					parentElement, labelString, (Group) entity, mode, style);
2394
			break;
2395
		default:
2396
			new RuntimeException(
2397
					"There is no selection composite for the desired selection type.");
2398
			break;
2399
		}
2400

  
2145
			T selection, int mode, int style) {
2146
		EntitySelectionElement<T> element = new EntitySelectionElement<T>(this, conversation, parentElement, clazz, labelString, selection, mode, style);
2401 2147
		adapt(element);
2402 2148
		parentElement.addElement(element);
2403 2149
		return element;
2404 2150
	}
2405

  
2406
	/**
2407
	 * <p>
2408
	 * createNamedAreaSelectionElement
2409
	 * </p>
2410
	 * 
2411
	 * @param parentElement
2412
	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
2413
	 *            object.
2414
	 * @param conversation
2415
	 *            a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
2416
	 *            object.
2417
	 * @param labelString
2418
	 *            a {@link java.lang.String} object.
2419
	 * @param selection
2420
	 *            a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.
2421
	 * @param style
2422
	 *            a int.
2423
	 * @return a
2424
	 *         {@link eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement}
2425
	 *         object.
2426
	 */
2427
	public NamedAreaSelectionElement createNamedAreaSelectionElement(
2428
			ICdmFormElement parentElement, ConversationHolder conversation,
2429
			String labelString, NamedArea selection, int style) {
2430
		NamedAreaSelectionElement element = new NamedAreaSelectionElement(this,
2431
				conversation, parentElement, labelString, selection,
2432
				AbstractSelectionElement.NOTHING, style);
2151
	
2152
	public TaxonNodeSelectionElement createTaxonNodeSelectionElement(
2153
			ConversationHolder conversation,
2154
			ICdmFormElement parentElement, String labelString,
2155
			TaxonNode selection, int mode, int style) {
2156
		TaxonNodeSelectionElement element = new TaxonNodeSelectionElement(this, conversation, parentElement, labelString, selection, mode, style);
2433 2157
		adapt(element);
2434 2158
		parentElement.addElement(element);
2435 2159
		return element;
2436 2160
	}
2437

  
2161
	
2162
	public NomenclaturalAuthorTeamSelectionElement createNomenclaturalAuthorTeamSelectionElement(
2163
			ConversationHolder conversation,
2164
			ICdmFormElement parentElement, String labelString,
2165
			Team selection, int mode, int style) {
2166
		NomenclaturalAuthorTeamSelectionElement element = new NomenclaturalAuthorTeamSelectionElement(this, conversation, parentElement, labelString, selection, mode, style);
2167
		adapt(element);
2168
		parentElement.addElement(element);
2169
		return element;
2170
	}
2171
	
2172
	
2438 2173
	/** {@inheritDoc} */
2439 2174
	public LabelElement createLabel(ICdmFormElement parentElement, String text) {
2440 2175
		LabelElement labelElement = new LabelElement(this, parentElement, text);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java
51 51
		}
52 52
		
53 53
		checkbox = formFactory.createButton(getLayoutComposite(), null, SWT.CHECK | style);
54
		checkbox.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
54
		checkbox.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
55 55
		
56 56
		checkbox.setSelection(initialState);
57 57
		
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java
60 60
		text_parseText = formFactory.createTextWithLabelElement(this, "Parse",
61 61
				null, style);
62 62
		text_parseText.getMainControl().setLayoutData(
63
				CdmFormFactory.FILL_HORIZONTALLY(6, 1));
63
				LayoutConstants.FILL_HORIZONTALLY(6, 1));
64 64

  
65 65
		text_freeText = formFactory.createTextWithLabelElement(this,
66 66
				"Freetext", null, style);
67 67
		text_freeText.getMainControl().setLayoutData(
68
				CdmFormFactory.FILL_HORIZONTALLY(6, 1));
68
				LayoutConstants.FILL_HORIZONTALLY(6, 1));
69 69

  
70 70
		formFactory.addPropertyChangeListener(this);
71 71
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java
60 60
		super(formFactory, parentElement);
61 61
				
62 62
		container = new Composite(getLayoutComposite(), style);
63
		container.setLayoutData(CdmFormFactory.FILL(2, 1));
63
		container.setLayoutData(LayoutConstants.FILL(2, 1));
64 64
		
65 65
		container.addPaintListener(this);
66 66
	}
......
193 193
	/** {@inheritDoc} */
194 194
	@Override
195 195
	public void paintControl(PaintEvent e) {
196
		TableWrapData layoutData = CdmFormFactory.FILL(2, 1);
196
		TableWrapData layoutData = LayoutConstants.FILL(2, 1);
197 197
		Control control = (Control) e.widget;
198 198
		if(image != null){
199 199
			Rectangle imageMaxBounds = calculateImageBounds(image, control);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/KeyValueViewerElement.java
43 43
		super(formFactory, formElement);
44 44
		
45 45
		label = formFactory.createLabel(getLayoutComposite(), "Meta Data");
46
		label.setLayoutData(CdmFormFactory.FILL(2, 1));
46
		label.setLayoutData(LayoutConstants.FILL(2, 1));
47 47
		addControl(label);
48 48
		
49 49
		tableViewer = new TableViewer(formElement.getLayoutComposite(), SWT.MULTI | SWT.H_SCROLL
......
52 52
		
53 53
		createColumns(tableViewer, keyHeading, valueHeading);
54 54
		
55
		TableWrapData layoutData = CdmFormFactory.FILL(2, 1);
55
		TableWrapData layoutData = LayoutConstants.FILL(2, 1);
56 56
		layoutData.heightHint = 100;
57 57
		
58 58
		tableViewer.getControl().setLayoutData(layoutData);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LabelElement.java
37 37
		super(formFactory, formElement);
38 38
		
39 39
		label = formFactory.createLabel(getLayoutComposite(), text, SWT.WRAP);
40
		label.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
40
		label.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
41 41
		addControl(label);
42 42
	}
43 43

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LayoutConstants.java
1
// $Id$
2
/**
3
* Copyright (C) 2009 EDIT
4
* European Distributed Institute of Taxonomy 
5
* http://www.e-taxonomy.eu
6
* 
7
* The contents of this file are subject to the Mozilla Public License Version 1.1
8
* See LICENSE.TXT at the top of this package for the full license terms.
9
*/
10
package eu.etaxonomy.taxeditor.ui.element;
11

  
12
import org.eclipse.ui.forms.widgets.TableWrapData;
13
import org.eclipse.ui.forms.widgets.TableWrapLayout;
14

  
15
/**
16
 * @author n.hoffmann
17
 * @date Jan 25, 2012
18
 *
19
 */
20
public class LayoutConstants {
21

  
22
	/**
23
	 * <p>
24
	 * LAYOUT
25
	 * </p>
26
	 * 
27
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapLayout} object.
28
	 */
29
	public static final TableWrapLayout LAYOUT() {
30
		return LayoutConstants.LAYOUT(1, false);
31
	}
32

  
33
	/**
34
	 * <p>
35
	 * LAYOUT
36
	 * </p>
37
	 * 
38
	 * @param columns
39
	 *            a int.
40
	 * @param equalWidth
41
	 *            a boolean.
42
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapLayout} object.
43
	 */
44
	public static final TableWrapLayout LAYOUT(int columns, boolean equalWidth) {
45
		TableWrapLayout layout = new TableWrapLayout();
46
		layout.topMargin = 0;
47
		layout.rightMargin = 0;
48
		layout.bottomMargin = 0;
49
		layout.leftMargin = 0;
50
		layout.numColumns = columns;
51
		layout.makeColumnsEqualWidth = equalWidth;
52
		layout.verticalSpacing = 0;
53
		layout.horizontalSpacing = 0;
54
		return layout;
55
	}
56

  
57
	/**
58
	 * <p>
59
	 * FILL
60
	 * </p>
61
	 * 
62
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
63
	 */
64
	public static final TableWrapData FILL() {
65
		return LayoutConstants.FILL(1, 1);
66
	}
67

  
68
	/**
69
	 * <p>
70
	 * FILL
71
	 * </p>
72
	 * 
73
	 * @param horizontalSpan
74
	 *            a int.
75
	 * @param verticalSpan
76
	 *            a int.
77
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
78
	 */
79
	public static final TableWrapData FILL(int horizontalSpan, int verticalSpan) {
80
		TableWrapData layoutData = new TableWrapData(TableWrapData.FILL_GRAB,
81
				TableWrapData.FILL_GRAB);
82
		layoutData.colspan = horizontalSpan;
83
		layoutData.rowspan = verticalSpan;
84
		return layoutData;
85
	}
86

  
87
	/**
88
	 * <p>
89
	 * LEFT
90
	 * </p>
91
	 * 
92
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
93
	 */
94
	public static final TableWrapData LEFT() {
95
		return new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP);
96
	}
97

  
98
	/**
99
	 * <p>
100
	 * RIGHT
101
	 * </p>
102
	 * 
103
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
104
	 */
105
	public static final TableWrapData RIGHT() {
106
		return new TableWrapData(TableWrapData.RIGHT, TableWrapData.TOP);
107
	}
108

  
109
	/**
110
	 * <p>
111
	 * FILL_HORIZONTALLY
112
	 * </p>
113
	 * 
114
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
115
	 */
116
	public static final TableWrapData FILL_HORIZONTALLY() {
117
		return LayoutConstants.FILL_HORIZONTALLY(1, 1);
118
	}
119

  
120
	/**
121
	 * <p>
122
	 * FILL_HORIZONTALLY
123
	 * </p>
124
	 * 
125
	 * @param horizontalSpan
126
	 *            a int.
127
	 * @param verticalSpan
128
	 *            a int.
129
	 * @return a {@link org.eclipse.ui.forms.widgets.TableWrapData} object.
130
	 */
131
	public static final TableWrapData FILL_HORIZONTALLY(int horizontalSpan,
132
			int verticalSpan) {
133
		TableWrapData layoutData = new TableWrapData(TableWrapData.FILL_GRAB,
134
				TableWrapData.TOP);
135
		layoutData.colspan = horizontalSpan;
136
		layoutData.rowspan = verticalSpan;
137
		return layoutData;
138
	}
139

  
140
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
31 31
import eu.etaxonomy.taxeditor.model.DefaultTermComparator;
32 32
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
33 33
import eu.etaxonomy.taxeditor.store.CdmStore;
34
import eu.etaxonomy.taxeditor.store.StoreUtil;
34 35
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
35 36
import eu.etaxonomy.taxeditor.ui.translation.TranslationWizard;
36 37

  
......
47 48
		SelectionListener {
48 49

  
49 50
	private class OpenTranslationWizard extends SelectionAdapter {
50
		private final Map<Language, LanguageString> multilanguageText;
51

  
52
		public OpenTranslationWizard(
53
				Map<Language, LanguageString> multilanguageText) {
51
		
52
		public OpenTranslationWizard() {
54 53
			super();
55
			this.multilanguageText = multilanguageText;
56 54
		}
57 55

  
58 56
		/*
......
64 62
		 */
65 63
		@Override
66 64
		public void widgetSelected(SelectionEvent e) {
65
			Map<Language, LanguageString> multilanguageText = getMultilanguageText();
66
			
67
			if (multilanguageText == null){
68
				StoreUtil.warningDialog("No text to transalte", getClass(), "The text is empty and therefore can not be translated");
69
			}
70
			
67 71
			TranslationWizard wizard = new TranslationWizard(multilanguageText);
68 72
			WizardDialog dialog = new WizardDialog(getLayoutComposite()
69 73
					.getShell(), wizard);
......
134 138
		button = formFactory.createButton(getLayoutComposite(),
135 139
				"Open In Translation Editor", SWT.PUSH);
136 140
		addControl(button);
137
		button.setLayoutData(CdmFormFactory.RIGHT());
138
		button.addSelectionListener(new OpenTranslationWizard(
139
				multilanguageText));
141
		button.setLayoutData(LayoutConstants.RIGHT());
142
		button.addSelectionListener(new OpenTranslationWizard());
140 143
	}
141 144

  
142 145
	private List<Language> getLanguages() {
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
44 44
			ICdmFormElement formElement, String labelString, int style) {
45 45
		super(formFactory, formElement);
46 46
		
47
		formElement.getLayoutComposite().setLayout(CdmFormFactory.LAYOUT(7, false));
47
		formElement.getLayoutComposite().setLayout(LayoutConstants.LAYOUT(7, false));
48 48
		
49 49
		label = formFactory.createLabel(getLayoutComposite(), labelString);
50 50
		addControl(label);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextActionElement.java
45 45
		addControl(label);
46 46
		
47 47
		box = formFactory.createComposite(getLayoutComposite());
48
		box.setLayout(CdmFormFactory.LAYOUT(2, false));
49
		box.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
48
		box.setLayout(LayoutConstants.LAYOUT(2, false));
49
		box.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
50 50
		addControl(box);
51 51
		
52 52
		text = toolkit.createText(box, "", style);
53 53
		addControl(text);
54
		text.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
54
		text.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
55 55
		
56 56
		setText(CdmUtils.Nz(initialText));
57 57
		
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
66 66
			label = formFactory.createLabel(getLayoutComposite(),
67 67
					CdmUtils.Nz(labelString), SWT.NULL);
68 68
			addControl(label);
69
			label.setLayoutData(CdmFormFactory.LEFT());
69
			label.setLayoutData(LayoutConstants.LEFT());
70 70
		}
71 71

  
72 72
		int scrollStyle = textHeight == null ? SWT.NULL
......
104 104
			});
105 105
		}
106 106

  
107
		TableWrapData layoutData = CdmFormFactory.FILL();
107
		TableWrapData layoutData = LayoutConstants.FILL();
108 108
		if (textHeight != null && textHeight > 0) {
109 109
			(layoutData).heightHint = textHeight;
110 110
		}
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff