Project

General

Profile

Revision 1faab189

ID1faab1895fe9eea4f444e9add7428920bf87d320
Parent 80379c19
Child 11847891

Added by Katja Luther over 2 years ago

Revert "mend"

This reverts commit 80379c19934c880a3631e83ffec07ef9215b2378.

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
48 48

  
49 49
        if (groupList.isEmpty()){
50 50
            Group group = Group.NewInstance(text);
51
//            UUID groupUuid = CdmStore.getService(IGroupService.class).saveGroup(group);
52
//            group = CdmStore.getService(IGroupService.class).loadWithUpdate(groupUuid);
51 53
            return group;
52 54
        } else{
53 55
            MessagingUtils.messageDialog(Messages.GROUP_CREATOR_group_exists_title, text, Messages.GROUP_CREATOR_group_exists);
eu.etaxonomy.taxeditor.cdmlib/.classpath.template
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry kind="src" path="src/main/resources"/>
6 6
	<classpathentry kind="src" path="src/main/java"/>
7
<<<<<<< Updated upstream
8
=======
9
	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
10
	<classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
11
	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
12
	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
13
	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
14
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-5.5.0-SNAPSHOT.jar"/>
15
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-5.5.0-SNAPSHOT.jar"/>
16
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-5.5.0-SNAPSHOT.jar"/>
17
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-5.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/5.5.0-SNAPSHOT/cdmlib-model-5.5.0-SNAPSHOT-sources.jar"/>
18
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-5.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-persistence/5.5.0-SNAPSHOT/cdmlib-persistence-5.5.0-SNAPSHOT-sources.jar"/>
19
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-5.5.0-SNAPSHOT.jar"/>
20
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-5.5.0-SNAPSHOT.jar"/>
21
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-cache-5.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-cache/5.5.0-SNAPSHOT/cdmlib-cache-5.5.0-SNAPSHOT-sources.jar"/>
22
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-5.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/5.5.0-SNAPSHOT/cdmlib-services-5.5.0-SNAPSHOT-sources.jar"/>
23
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-test-5.5.0-SNAPSHOT.jar"/>
24
	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
25
	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
26
	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
27
	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
28
	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
29
	<classpathentry exported="true" kind="lib" path="lib/commons-csv-1.0.jar"/>
30
	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
31
	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
32
	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
33
	<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
34
	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
35
	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
36
	<classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
37
	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
38
	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
39
	<classpathentry exported="true" kind="lib" path="lib/dtd-parser-1.1.jar"/>
40
	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.11.jar"/>
41
	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
42
	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
43
	<classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>
44
	<classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
45
	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
46
	<classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-5.0.7.Final.jar"/>
47
	<classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
48
	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-5.0.1.Final.jar"/>
49
	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-5.0.7.Final.jar"/>
50
	<classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-5.0.7.Final.jar"/>
51
	<classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-5.0.7.Final.jar"/>
52
	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-5.0.7.Final.jar"/>
53
	<classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>
54
	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
55
	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
56
	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-5.5.2.Final.jar"/>
57
	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-5.5.2.Final.jar"/>
58
	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-5.2.2.Final.jar"/>
59
	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-cdi-5.2.2.Final.jar"/>
60
	<classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.3.jar"/>
61
	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.1.jar"/>
62
	<classpathentry exported="true" kind="lib" path="lib/httpclient-cache-4.2.6.jar"/>
63
	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.4.jar"/>
64
	<classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.1.jar"/>
65
	<classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
66
	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0.jar"/>
67
	<classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.8.jar"/>
68
	<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.6.5.jar"/>
69
	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.5.jar"/>
70
	<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.3.0.Final.jar"/>
71
	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
72
	<classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.6.jar"/>
73
	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.9.1.jar"/>
74
	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
75
	<classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
76
	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
77
	<classpathentry exported="true" kind="lib" path="lib/spring-aop-4.2.4.RELEASE.jar"/>
78
	<classpathentry exported="true" kind="lib" path="lib/spring-aspects-4.2.4.RELEASE.jar"/>
79
	<classpathentry exported="true" kind="lib" path="lib/spring-beans-4.2.4.RELEASE.jar"/>
80
	<classpathentry exported="true" kind="lib" path="lib/spring-context-4.2.4.RELEASE.jar"/>
81
	<classpathentry exported="true" kind="lib" path="lib/spring-context-support-4.2.4.RELEASE.jar"/>
82
	<classpathentry exported="true" kind="lib" path="lib/spring-core-4.2.4.RELEASE.jar"/>
83
	<classpathentry exported="true" kind="lib" path="lib/spring-expression-4.2.4.RELEASE.jar"/>
84
	<classpathentry exported="true" kind="lib" path="lib/spring-jdbc-4.2.4.RELEASE.jar"/>
85
	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
86
	<classpathentry exported="true" kind="lib" path="lib/spring-orm-4.2.4.RELEASE.jar"/>
87
	<classpathentry exported="true" kind="lib" path="lib/spring-oxm-4.2.4.RELEASE.jar"/>
88
	<classpathentry exported="true" kind="lib" path="lib/spring-plugin-core-1.2.0.RELEASE.jar"/>
89
	<classpathentry exported="true" kind="lib" path="lib/spring-plugin-metadata-1.2.0.RELEASE.jar"/>
90
	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-4.0.3.RELEASE.jar"/>
91
	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-4.0.3.RELEASE.jar" sourcepath="lib/spring-security-core-4.0.3.RELEASE.jar"/>
92
	<classpathentry exported="true" kind="lib" path="lib/spring-security-web-4.0.3.RELEASE.jar"/>
93
	<classpathentry exported="true" kind="lib" path="lib/spring-test-4.2.4.RELEASE.jar"/>
94
	<classpathentry exported="true" kind="lib" path="lib/spring-tx-4.2.4.RELEASE.jar"/>
95
	<classpathentry exported="true" kind="lib" path="lib/spring-web-4.2.4.RELEASE.jar"/>
96
	<classpathentry exported="true" kind="lib" path="lib/spring-webmvc-4.2.4.RELEASE.jar"/>
97
	<classpathentry exported="true" kind="lib" path="lib/springfox-core-2.3.1.jar"/>
98
	<classpathentry exported="true" kind="lib" path="lib/springfox-schema-2.3.1.jar"/>
99
	<classpathentry exported="true" kind="lib" path="lib/springfox-spi-2.3.1.jar"/>
100
	<classpathentry exported="true" kind="lib" path="lib/springfox-spring-web-2.3.1.jar"/>
101
	<classpathentry exported="true" kind="lib" path="lib/springfox-swagger-common-2.3.1.jar"/>
102
	<classpathentry exported="true" kind="lib" path="lib/springfox-swagger2-2.3.1.jar"/>
103
	<classpathentry exported="true" kind="lib" path="lib/standard-1.1.2.jar"/>
104
	<classpathentry exported="true" kind="lib" path="lib/tools.jar"/>
105
	<classpathentry exported="true" kind="lib" path="lib/txw2-2.2.11.jar"/>
106
	<classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
107
	<classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
108
	<classpathentry exported="true" kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
109
	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>
110
	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
111
	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
112
	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
113
	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
114
	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
115
	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.6.0.jar"/>
116
	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
117
	<classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
118
	<classpathentry exported="true" kind="lib" path="lib/xmlunit-1.6.jar"/>
119
	<classpathentry exported="true" kind="lib" path="lib/xom-1.2.5.jar"/>
120
	<classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
121
	<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
122
	<classpathentry exported="true" kind="lib" path="lib/xsom-20140925.jar"/>
123
	<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.8.jar"/>
124
	<classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
125
	<classpathentry exported="true" kind="lib" path="lib/spring-security-oauth2-2.0.11.RELEASE.jar"/>
126
	<classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
127
	<classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
128
	<classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>
129
	<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.6.5.jar"/>
130
	<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
131
	<classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
132
	<classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
133
	<classpathentry exported="true" kind="lib" path="lib/jandex-2.0.0.Final.jar"/>
134
	<classpathentry exported="true" kind="lib" path="lib/javassist-3.20.0-GA.jar"/>
135
	<classpathentry exported="true" kind="lib" path="lib/javax.el-2.2.6.jar"/>
136
	<classpathentry exported="true" kind="lib" path="lib/javax.el-api-2.2.5.jar"/>
137
	<classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
138
	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.12.jar"/>
139
	<classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>
140
	<classpathentry exported="true" kind="lib" path="lib/jaxb-jxc-2.2.11.jar"/>
141
	<classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.2.11.jar"/>
142
	<classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2.11.jar"/>
143
	<classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
144
	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
145
	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
146
	<classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
147
	<classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.7.6.jar"/>
148
	<classpathentry exported="true" kind="lib" path="lib/jena-arq-2.13.0.jar"/>
149
	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.13.0.jar"/>
150
	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.2.jar"/>
151
	<classpathentry exported="true" kind="lib" path="lib/jena-tdb-1.1.2.jar"/>
152
	<classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>
153
	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
154
	<classpathentry exported="true" kind="lib" path="lib/jsonld-java-0.5.1.jar"/>
155
	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
156
	<classpathentry exported="true" kind="lib" path="lib/jta-1.1.jar"/>
157
	<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
158
	<classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.7.2.jar"/>
159
	<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
160
	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
161
	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
162
	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
163
	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
164
	<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
165
	<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
166
	<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
167
	<classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
168
	<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
169
	<classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
170
	<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
171
	<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
172
	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
173
	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
174
	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
175
	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
176
	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>
177
	<classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>
178
	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
179
	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
180
	<classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
181
	<classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>
182
	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>
183
	<classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>
184
	<classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.jar"/>
185
	<classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
186
	<classpathentry exported="true" kind="lib" path="lib/easymock-2.3.jar"/>
187
	<classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
188
	<classpathentry exported="true" kind="lib" path="lib/FastInfoset-1.2.13.jar"/>
189
	<classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
190
	<classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar"/>
191
	<classpathentry exported="true" kind="lib" path="lib/libthrift-0.9.2.jar"/>
192
	<classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
193
	<classpathentry exported="true" kind="lib" path="lib/mapstruct-1.0.0.Final.jar"/>
194
	<classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
195
	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>
196
	<classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
197
	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
198
	<classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
199
	<classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
200
	<classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
201
	<classpathentry exported="true" kind="lib" path="lib/poi-3.13.jar"/>
202
	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.13.jar"/>
203
	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.13.jar"/>
204
	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1206-jdbc4.jar"/>
205
	<classpathentry exported="true" kind="lib" path="lib/relaxngDatatype-20020414.jar"/>
206
	<classpathentry exported="true" kind="lib" path="lib/rngom-2.2.11.jar"/>
207
	<classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.7.0-2.jar"/>
208
	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
209
	<classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
210
	<classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
211
	<classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
212
	<classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
213
	<classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/>
214
	<classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/>
215
	<classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.4.2.jar"/>
216
	<classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.4.2.jar"/>
217
	<classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.4.2.jar"/>
218
	<classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.4.2.jar"/>
219
	<classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.4.2.jar"/>
220
	<classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.4.2.jar"/>
221
	<classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.jar"/>
222
	<classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.1.jar"/>
223
	<classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-2.21.jar"/>
224
	<classpathentry exported="true" kind="lib" path="lib/istack-commons-tools-2.21.jar"/>
225
	<classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.1.jar"/>
226
	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
227
	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.1.jar"/>
228
	<classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>
229
	<classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.jar"/>
230
	<classpathentry exported="true" kind="lib" path="lib/redmine-java-api-3.1.0.jar"/>
231
	<classpathentry exported="true" kind="lib" path="lib/org.swtchart_0.10.0.v20160212.jar"/>
232
	<classpathentry exported="true" kind="lib" path="lib/commons-math3-3.6.1.jar"/>
233
	<classpathentry exported="true" kind="lib" path="lib/docx4j-6.0.1.jar"/>
234
>>>>>>> Stashed changes
235 7
	<classpathentry kind="output" path="target/classes"/>
236 8
</classpath>
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListenerE4.java
75 75
		   dropTargetEvent.detail = DND.DROP_NONE;
76 76
	       return;
77 77
		}
78
		if (getEditor()== null){
79
		    return;
80
		}
78

  
81 79
		// Execute operations at end of drag event
82 80
		AbstractPostOperation operation = createOperation(taxonBase);
83 81

  
......
99 97
	}
100 98

  
101 99
	private AbstractPostOperation createOperation(TaxonBase taxonBase) {
102
	    Assert.isNotNull(getEditor());
100

  
103 101
		if(taxonBase instanceof Synonym){
104 102
			Synonym synonym = (Synonym) taxonBase;
105 103

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
87 87
            service.set(pref);
88 88
        }
89 89

  
90
        if (displayStatusCombo == null){
91
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfStatusInCombo));
90
        if (ownDescriptionForDistributionEditor == null){
91
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.OwnDescriptionForDistributionEditor));
92 92
        }else{
93
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatusInCombo, displayStatusCombo);
94
            if (prefStatusDisplayInCombo == null){
95
                prefStatusDisplayInCombo = pref;
96
            }
97
            pref.setAllowOverride(prefStatusDisplayInCombo.isAllowOverride());
93
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.OwnDescriptionForDistributionEditor, Boolean.toString(ownDescriptionForDistributionEditor));
94
            pref.setAllowOverride(prefOwnDescription.isAllowOverride());
98 95
            service.set(pref);
99 96
        }
100 97
//        if (statusPref != null){
......
132 129
            this.displayStatus = Messages.Preference_Use_Default;
133 130
        }
134 131

  
135
        if (prefStatusDisplayInCombo != null){
136
            this.displayStatusCombo = prefStatusDisplayInCombo.getValue();
137
        }else{
138
            this.displayStatusCombo = Messages.Preference_Use_Default;
139
        }
140

  
141

  
142 132
        if (prefAreaSort != null){
143 133
            if (prefAreaSort.getValue() != null){
144 134
                this.orderAreas = prefAreaSort.getValue().toString();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
581 581
    public static String ChecklistEditorGeneralPreference_show_title;
582 582
    public static String ChecklistEditorGeneralPreference_Configure_display_of_Areas;
583 583
    public static String ChecklistEditorGeneralPreference_Configure_display_of_Status;
584
    public static String ChecklistEditorGeneralPreference_Configure_display_of_Status_in_Combo;
585 584
    public static String ChecklistEditorGeneralPreference_STATUS_DISPLAY_TEXT;
586 585
    public static String ChecklistEditorGeneralPreference_own_Description;
587 586
    public static String GeneralPreference_override;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
408 408
GeneralPreference_override=Override
409 409
ChecklistEditorGeneralPreference_Configure_display_of_Areas=Display of areas in the header
410 410
ChecklistEditorGeneralPreference_Configure_display_of_Status=Display of distribution status in the table
411
ChecklistEditorGeneralPreference_Configure_display_of_Status_in_Combo=Display of distribution status in drop-down
411

  
412 412

  
413 413
GfBioTerminologyImportPresenter_NO_CONNECTION_MESSAGE=Could not retrieve data from web service
414 414
GfBioTerminologyImportPresenter_NO_CONNECTION_TITLE=Web service unavailable
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
408 408
GeneralPreference_override=?berschreiben
409 409
ChecklistEditorGeneralPreference_Configure_display_of_Areas=Darstellung der Areale in der Kopfzeile
410 410
ChecklistEditorGeneralPreference_Configure_display_of_Status=Darstellung der Verbreitung-Status in Tabelle
411
ChecklistEditorGeneralPreference_Configure_display_of_Status_in_Combo=Darstellung der Verbreitung-Status in Drop-Down
412 411

  
413 412

  
414 413
GfBioTerminologyImportPresenter_NO_CONNECTION_MESSAGE=Konnte keine Verbindung zum Webservice herstellen.
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
25 25

  
26 26
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
27 27
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
28
import eu.etaxonomy.cdm.model.metadata.TermComboEnum;
29 28
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
30 29
import eu.etaxonomy.cdm.model.metadata.TermOrder;
31 30
import eu.etaxonomy.taxeditor.l10n.Messages;
......
48 47
    protected Boolean isShowRank;
49 48
    protected String orderAreas;
50 49
    protected String displayStatus;
51
    protected String displayStatusCombo;
52 50
    protected String displayArea;
53 51
    protected Boolean ownDescriptionForDistributionEditor;
54 52

  
......
58 56
    protected boolean overrideOrderAreas;
59 57
    protected boolean overrideAreaDisplay;
60 58
    protected boolean overrideStatusDisplay;
61
    protected boolean overrideStatusDisplayCombo;
62 59

  
63 60
    protected Combo areaOrderSelectionCombo;
64 61
    protected Button allowOverrideOrderAreasButton;
65 62
    protected Combo statusDisplaySelectionCombo;
66 63
    protected Button allowOverrideStatusDisplayButton;
67
    protected Combo statusDisplayInComboSelectionCombo;
68
    protected Button allowOverrideStatusDisplayInComboButton;
69 64
    protected Combo areaDisplaySelectionCombo;
70 65
    protected Button allowOverrideAreaDisplayButton;
71 66
    protected String commandHandlerString;
......
76 71
    protected CdmPreference prefAreaVoc;
77 72
    protected CdmPreference prefAreaDisplay;
78 73
    protected CdmPreference prefStatusDisplay;
79
    protected CdmPreference prefStatusDisplayInCombo;
80 74
    protected CdmPreference prefAreaSort;
81 75
    protected CdmPreference prefRank;
82 76
    protected CdmPreference prefOwnDescription;
......
193 187
                    @Override
194 188
                    public void widgetSelected(SelectionEvent e) {
195 189
                        setApply(true);
196
                        if (prefRank == null){
197
                            prefRank = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowRankInDistributionEditor, PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString(): null);
198
                        }
199 190
                        prefRank.setAllowOverride(allowOverrideRankButton.getSelection());
200 191
                    }
201 192
                });
......
239 230
                    @Override
240 231
                    public void widgetSelected(SelectionEvent e) {
241 232
                        setApply(true);
242
                        if (prefAreaSort == null){
243
                            prefAreaSort = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AreasSortedInDistributionEditor, PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString(): null);
244
                        }
245 233
                        prefAreaSort.setAllowOverride(allowOverrideOrderAreasButton.getSelection());
246 234
                    }
247 235
                });
......
284 272
                    @Override
285 273
                    public void widgetSelected(SelectionEvent e) {
286 274
                        setApply(true);
287
                        if (prefAreaDisplay == null){
288
                            prefAreaDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfAreasInDistributionEditor, PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue() != null ?  PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString(): null);
289
                        }
290 275
                        prefAreaDisplay.setAllowOverride(allowOverrideOrderAreasButton.getSelection());
291 276
                    }
292 277
                });
......
327 312
                    @Override
328 313
                    public void widgetSelected(SelectionEvent e) {
329 314
                        setApply(true);
330
                        if (prefStatusDisplay == null){
331
                            prefStatusDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfStatus, PreferencePredicate.DisplayOfStatus.getDefaultValue() != null ?  PreferencePredicate.DisplayOfStatus.getDefaultValue().toString(): null);
332
                        }
333 315
                        prefStatusDisplay.setAllowOverride(allowOverrideStatusDisplayButton.getSelection());
334 316
                    }
335 317
                });
336 318
            }
337 319

  
338
            statusDisplayInComboSelectionCombo = createCombo(child, TermComboEnum.values(), PreferencePredicate.DisplayOfStatusInCombo, Messages.ChecklistEditorGeneralPreference_Configure_display_of_Status_in_Combo, isAdminPreference);
339

  
340
            index = 0;
341
            TermComboEnum statusComboDisplay;
342
            try {
343
                if (displayStatusCombo != null) {
344
                    statusComboDisplay = TermComboEnum.byKey(displayStatusCombo);
345
                } else {
346
                    statusComboDisplay = TermComboEnum.Title;
347
                }
348
            } catch (IllegalArgumentException e) {
349
                statusComboDisplay = TermComboEnum.Title;
350
            }
351
            for (String itemLabel : statusDisplayInComboSelectionCombo.getItems()) {
352
                if (itemLabel.equals(Messages.Preference_Use_Default) && displayStatusCombo.equals(Messages.Preference_Use_Default)){
353
                    statusDisplayInComboSelectionCombo.select(index);
354
                    break;
355
                }
356
                if (itemLabel.startsWith(statusComboDisplay.getLabel())) {
357
                    statusDisplayInComboSelectionCombo.select(index);
358
                    break;
359
                }
360

  
361
                index++;
362
            }
363

  
364
            statusDisplayInComboSelectionCombo.addSelectionListener(this);
365

  
366
            if (isAdminPreference) {
367
                allowOverrideStatusDisplayInComboButton = createAllowOverrideButton(child);
368
                allowOverrideStatusDisplayInComboButton.setSelection(prefStatusDisplayInCombo != null ? prefStatusDisplayInCombo.isAllowOverride(): true);
369
                allowOverrideStatusDisplayInComboButton.addSelectionListener(new SelectionAdapter() {
370
                    @Override
371
                    public void widgetSelected(SelectionEvent e) {
372
                        setApply(true);
373
                        if (prefStatusDisplayInCombo == null){
374
                            prefStatusDisplayInCombo = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfStatusInCombo, PreferencePredicate.DisplayOfStatusInCombo.getDefaultValue() != null ?  PreferencePredicate.DisplayOfStatusInCombo.getDefaultValue().toString(): null);
375
                        }
376
                        prefStatusDisplayInCombo.setAllowOverride(allowOverrideStatusDisplayInComboButton.getSelection());
377
                    }
378
                });
379
            }
380

  
381

  
382 320
            final CLabel labelStatus = new CLabel(child, SWT.NULL);
383 321
            labelStatus.setText(Messages.DistributionAdminPreferences_SELECT_STATUS);
384 322
            labelStatus.setLayoutData(textGrid);
......
431 369
                if (prefStatusDisplay != null && !prefStatusDisplay.isAllowOverride()) {
432 370
                    statusDisplaySelectionCombo.setEnabled(false);
433 371
                }
434
                if (prefStatusDisplayInCombo != null && !prefStatusDisplayInCombo.isAllowOverride()) {
435
                    statusDisplayInComboSelectionCombo.setEnabled(false);
436
                }
437 372
            }
438 373

  
439 374
        }
......
488 423
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()),
489 424
                    override);
490 425

  
491
            override = false;
492
            if (!displayStatusCombo.equals(Messages.Preference_Use_Default)) {
493
               override = true;
494
               PreferencesUtil.setStringValue(PreferencePredicate.DisplayOfStatusInCombo.getKey(), displayStatusCombo);
495
            }
496
            PreferencesUtil.setBooleanValue(
497
                    PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatusInCombo.getKey()),
498
                    override);
499 426

  
500 427

  
501 428

  
......
545 472

  
546 473
            }
547 474
        }
548
        if (e.getSource().equals(statusDisplayInComboSelectionCombo)) {
549
            String text = statusDisplayInComboSelectionCombo.getText();
550
            if(text.equals(Messages.Preference_Use_Default)){
551
                displayStatusCombo = Messages.Preference_Use_Default;
552
                if(isAdminPreference){
553
                    prefStatusDisplayInCombo.setAllowOverride(true);
554
                    allowOverrideStatusDisplayInComboButton.setSelection(true);
555
                }
556

  
557
                return;
558
            }
559
            for (TermComboEnum display : TermComboEnum.values()) {
560
                if (text.startsWith(display.getLabel())) {
561
                    displayStatusCombo = display.getKey();
562
                    break;
563
                }
564

  
565
            }
566
        }
567 475
        if (e.getSource().equals(areaDisplaySelectionCombo)) {
568 476
            String text = areaDisplaySelectionCombo.getText();
569 477
            if(text.equals(Messages.Preference_Use_Default)){
......
734 642
            //prefStatusDisplay = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DisplayOfStatus, PreferencePredicate.DisplayOfStatus.getDefaultValue() != null ?  PreferencePredicate.DisplayOfStatus.getDefaultValue().toString(): null);
735 643
        }
736 644

  
737
        prefStatusDisplayInCombo = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfStatusInCombo);
738
        overrideStatusDisplayCombo = PreferencesUtil
739
                .getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatusInCombo.getKey()), true);
740
        if (prefStatusDisplayInCombo != null) {
741
            if (prefStatusDisplayInCombo.isAllowOverride()){
742
                if (overrideStatusDisplayCombo) {
743
                    displayStatusCombo = PreferencesUtil.getStringValue(PreferencePredicate.DisplayOfStatusInCombo.getKey());
744
                }else{
745
                    displayStatusCombo = Messages.Preference_Use_Default;
746
                }
747
            } else {
748
                this.displayStatusCombo = prefStatusDisplayInCombo.getValue();
749
            }
750
        } else {
751
            if (overrideStatusDisplayCombo){
752
                displayStatusCombo = PreferencesUtil.getStringValue(PreferencePredicate.DisplayOfStatusInCombo.getKey());
753
            } else{
754
                displayStatusCombo = Messages.Preference_Use_Default;
755
            }
756

  
757
        }
758

  
759

  
760 645
        prefAreaSort = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AreasSortedInDistributionEditor);
761 646
        overrideOrderAreas = PreferencesUtil.getBooleanValue(
762 647
                PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), true);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java
128 128

  
129 129
	@Override
130 130
	public boolean performOk() {
131

  
132
		PreferencesUtil.setBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability);
131
		getPreferenceStore().setValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability);
133 132
		PreferencesUtil.setGlobalLanguage(globalLanguage);
134 133

  
135 134
		return super.performOk();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
27 27

  
28 28
import org.apache.commons.lang.StringUtils;
29 29
import org.apache.log4j.Logger;
30
import org.eclipse.core.runtime.preferences.ConfigurationScope;
31
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
32 30
import org.eclipse.equinox.internal.p2.ui.model.MetadataRepositoryElement;
33 31
import org.eclipse.jface.preference.IPreferenceStore;
34 32
import org.eclipse.jface.window.Window;
......
36 34
import org.eclipse.swt.widgets.Control;
37 35
import org.eclipse.swt.widgets.Shell;
38 36
import org.eclipse.ui.PlatformUI;
39
import org.osgi.service.prefs.BackingStoreException;
40
import org.osgi.service.prefs.Preferences;
41 37

  
42 38
import eu.etaxonomy.cdm.api.application.ICdmRepository;
43 39
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator;
......
85 81
 * @created 05.12.2008
86 82
 */
87 83
public class PreferencesUtil implements IPreferenceKeys {
88
    private final static String EDITOR_PREFERENCES_NODE = "eu.etaxonomy.taxeditor";
89 84

  
90 85
	public static final String PREFERRED_TERMS_CHANGE = "preferred_terms";
91 86

  
92 87
	public static final String P2_REPOSITORIES_DELIM = ",";
93 88
	public static final String P2_REPOSITORY_FIELDS_DELIM = ";";
94
	public static final String SUBJECT_DELIM = "/";
89

  
95 90
	private final static Logger logger = Logger.getLogger(PreferencesUtil.class);
96 91

  
97 92
	public static IPreferenceStore getPreferenceStore() {
98
	   return TaxeditorStorePlugin.getDefault().getPreferenceStore();
99
	}
100

  
101
	public static String[] extractSubjectParts(String subject){
102
	   String[] result = subject.split("/");
103
	   return result;
104
	}
105

  
106
	public static IEclipsePreferences getEditorPreferences(){
107
	    return ConfigurationScope.INSTANCE.getNode(EDITOR_PREFERENCES_NODE);
93
		return TaxeditorStorePlugin.getDefault().getPreferenceStore();
108 94
	}
109 95

  
110
	public static String getPreferenceValue(PrefKey prefKey){
111
	    try {
112
            if(getEditorPreferences().nodeExists(prefKey.getPredicate())){
113
                Preferences predicateNode = getEditorPreferences().node(prefKey.getPredicate());
114
                String[] splittedSubject = extractSubjectParts(prefKey.getSubject());
115
                String value = predicateNode.get(splittedSubject[splittedSubject.length-1], PreferencePredicate.getByKey(prefKey.getPredicate()).getDefaultValue() != null? PreferencePredicate.getByKey(prefKey.getPredicate()).getDefaultValue().toString(): "");
116
                int index = splittedSubject.length -2;
117
                while (value != null && index >= 0){
118
                   value = predicateNode.get(splittedSubject[index], prefKey.getPredicate());
119
                   index--;
120
                }
121
                return value;
122
            }
123

  
124
        } catch (BackingStoreException e) {
125
            // TODO Auto-generated catch block
126
            e.printStackTrace();
127
        }
128
	    return null;
129
	}
130

  
131
	public static List<CdmPreference> getPreference(PreferencePredicate prefPredicate){
132
        try {
133
            List<CdmPreference> prefs = new ArrayList();
134
            CdmPreference pref;
135
            PreferenceSubject subject;
136
            if(getEditorPreferences().nodeExists(prefPredicate.getKey())){
137
                Preferences predicateNode = getEditorPreferences().node(prefPredicate.getKey());
138
                for (String childName: predicateNode.childrenNames()){
139
                    Preferences child = predicateNode.node(childName);
140
                    String subjectString = "";
141
                    subjectString = createSubjectStringForChildNodes(childName, child);
142
                    String value = child.get(subjectString, "");
143
                    subject = PreferenceSubject.NewInstance(subjectString);
144
                    pref = CdmPreference.NewInstance(subject, prefPredicate, value);
145
                    prefs.add(pref);
146
                }
147

  
148
            }
149

  
150
        } catch (BackingStoreException e) {
151
            // TODO Auto-generated catch block
152
            e.printStackTrace();
153
        }
154
        return null;
155
    }
156

  
157
	/**
158
     * @param childName
159
     * @param child
160
     */
161
    private static String createSubjectStringForChildNodes(String subject, Preferences parent) {
162
        try {
163
            for (String childName: parent.childrenNames()){
164
                subject = childName+SUBJECT_DELIM+subject;
165
                Preferences child = parent.node(childName);
166
                createSubjectStringForChildNodes(subject, child);
167
            }
168
        } catch (BackingStoreException e) {
169
            // TODO Auto-generated catch block
170
            e.printStackTrace();
171
        }
172
        return subject;
173

  
174
    }
175

  
176
    private static String prefKey(String name) {
96
	private static String prefKey(String name) {
177 97
	    return name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString();
178 98
	}
179 99

  
......
1678 1598
    }
1679 1599

  
1680 1600
    public static void updateDBPreferences() {
1681

  
1682

  
1601
        CdmPreference preference = null;
1683 1602
        CdmPreferenceCache cache = CdmPreferenceCache.instance();
1684 1603
        cache.getAllTaxEditorDBPreferences();
1685 1604

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
91 91

  
92 92
        boolean isEditingAllowed = true;
93 93
        if(!isAdminPreference){
94
           // CdmPreferenceCache cache = CdmPreferenceCache.instance();
94
            CdmPreferenceCache cache = CdmPreferenceCache.instance();
95 95

  
96 96
            if (showSpecimenPref != null){
97 97
                if (!showSpecimenPref.isAllowOverride() ){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
9 9
import java.util.Comparator;
10 10
import java.util.List;
11 11

  
12
import org.apache.commons.lang.StringUtils;
13 12
import org.eclipse.jface.util.PropertyChangeEvent;
14 13
import org.eclipse.swt.SWT;
15 14
import org.eclipse.swt.events.SelectionEvent;
......
258 257
		}else{
259 258
			String termLabel = null;
260 259
			if (useAbbrevLabel){
261
			    if (!StringUtils.isBlank(term.getIdInVocabulary())){
262
			        termLabel = term.getIdInVocabulary();
263
			    }
264
			}
265
			if (termLabel == null){
260
				termLabel = term.getIdInVocabulary();
261
			}else{
266 262
				termLabel = term.getLabel(CdmStore.getDefaultLanguage());
267 263
			}
268 264
			if (termLabel == null){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredIdentifierSelectionDialog.java
52 52
		@Override
53 53
        void callService(String pattern){
54 54

  
55
		    model = CdmStore.getService(IIdentifiableEntityService.class).listByIdentifier(type, pattern, identifierType, matchMode, true, null, null);
55
		    model = CdmStore.getService(IIdentifiableEntityService.class).listByIdentifier(type, pattern, identifierType, matchMode, true, null, limitOfInitialElements);
56 56
		}
57 57

  
58 58

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CommonNameNamedAreaSelectionDialog.java
16 16
import org.eclipse.swt.widgets.Shell;
17 17

  
18 18
import eu.etaxonomy.cdm.api.service.IVocabularyService;
19
import eu.etaxonomy.cdm.model.term.TermType;
20
import eu.etaxonomy.cdm.model.term.TermVocabulary;
19 21
import eu.etaxonomy.cdm.model.location.NamedArea;
20 22
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
21
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
22 23
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
23
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
24
import eu.etaxonomy.cdm.model.term.TermType;
25
import eu.etaxonomy.cdm.model.term.TermVocabulary;
26 24
import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
27 25
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
28 26
import eu.etaxonomy.taxeditor.store.CdmStore;
......
50 48
    }
51 49

  
52 50
    private static UUID[] createVocabularyUuidList() {
53
        String preselectedVocString = PreferencesUtil.getStringValue(PreferencePredicate.CommonNameAreaVocabularies.getKey(), false);
51
        String preselectedVocString = PreferencesUtil.getStringValue(PreferencePredicate.CommonNameAreaVocabularies.getKey());
54 52
        if (StringUtils.isBlank(preselectedVocString)){
55 53
            return null;
56 54
        }
......
74 72

  
75 73
        UUID[] preselectedVocabularyUuids = createVocabularyUuidList();
76 74
        CdmPreferenceCache cache = CdmPreferenceCache.instance();
77
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.CommonNameAreaVocabularies);
78
        CdmPreference pref = cache.findBestMatching(key);
79
        if (preselectedVocabularyUuids != null){
80
            for(int i=0;i<preselectedVocabularyUuids.length;i++){
81
                TermVocabulary preselectedVocabulary = CdmStore.getService(IVocabularyService.class).find(preselectedVocabularyUuids[i]);
82
                vocabularies.add(preselectedVocabulary);
83
            }
84
        }
75
        CdmPreference pref = cache.get(PreferencePredicate.CommonNameAreaVocabularies.getKey());
85 76
        if ((pref != null && !pref.isAllowOverride()) && preselectedVocabularyUuids!=null) {
86
             return vocabularies;
77
                for(int i=0;i<preselectedVocabularyUuids.length;i++){
78
                    TermVocabulary preselectedVocabulary = CdmStore.getService(IVocabularyService.class).find(preselectedVocabularyUuids[i]);
79
                    vocabularies.add(preselectedVocabulary);
80
                }
87 81
        }else{
88
            selectedVocabularies = vocabularies;
89

  
90
            return CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
82
            vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
91 83
        }
92 84

  
93

  
85
        return vocabularies;
94 86
    }
95 87

  
96 88
    /**
......
112 104
                "Choose an area", false, namedArea, preferenceId);
113 105
        return getSelectionFromDialog(dialog);
114 106
    }
115

  
116

  
117 107
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
163 163
	private List<TermVocabulary> getAvailableVocabularies(){
164 164
	    vocabularies = new ArrayList();
165 165
	    CdmPreferenceCache cache = CdmPreferenceCache.instance();
166
	    vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
167
	    return vocabularies;
166
//        CdmPreference pref = cache.get(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());
167
//	    if (pref != null && !pref.isAllowOverride()){
168
//            UUID[] preselectedVocabularyUuids = createVocabularyUuidList();
169
//
170
//            for(int i=0;i<preselectedVocabularyUuids.length;i++){
171
//                TermVocabulary preselectedVocabulary = CdmStore.getService(IVocabularyService.class).find(preselectedVocabularyUuids[i]);
172
//                vocabularies.add(preselectedVocabulary);
173
//            }
174
//        }else{
175
            vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
176
//        }
177
		//List<TermVocabulary> vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);
178
		return vocabularies;
168 179
	}
169 180

  
181
//	/** {@inheritDoc} */
182
//	@Override
183
//	protected void search() {
184
//	    Control control =getSearchField();
185
//        String pattern = null;
186
//        if (control != null){
187
//            pattern = ((Text)control).getText();
188
//        }
189
//
190
//        if (pattern == null || pattern.equals("?")){
191
//            model = CdmStore.getService(ITermService.class).getUuidAndTitleCache(selectedVocabularies, limitOfInitialElements, null, PreferencesUtil.getGlobalLanguage());
192
//        }else{
193
//            model = CdmStore.getService(ITermService.class).getUuidAndTitleCache(selectedVocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage());
194
//        }
195
//	}
170 196

  
197
//	/** {@inheritDoc} */
198
//	@Override
199
//	protected Control createExtendedContentArea(Composite parent) {
200
//		return null;
201
//	}
171 202

  
172 203
	/** {@inheritDoc} */
173 204
	@Override
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SearchDialog.java
408 408
                this.items.add(item);
409 409
            }
410 410

  
411
//            /**
412
//             * Refresh dialog.
413
//             */
414
//            public void refresh() {
415
//                scheduleRefresh();
416
//            }
417
//
418
//            /**
419
//             * Schedule refresh job.
420
//             */
421
//            public void scheduleRefresh() {
422
//                refreshCacheJob.cancelAll();
423
//                refreshCacheJob.schedule();
424
//            }
411
            /**
412
             * Refresh dialog.
413
             */
414
            public void refresh() {
415
                scheduleRefresh();
416
            }
417

  
418
            /**
419
             * Schedule refresh job.
420
             */
421
            public void scheduleRefresh() {
422
                refreshCacheJob.cancelAll();
423
                refreshCacheJob.schedule();
424
            }
425 425

  
426 426
            /*
427 427
             * (non-Javadoc)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
8 8
*/
9 9
package eu.etaxonomy.taxeditor.ui.dialog.selection;
10 10

  
11
import java.util.List;
12
import java.util.UUID;
13

  
14 11
import org.eclipse.swt.widgets.Shell;
15 12

  
16 13
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
......
30 27
import eu.etaxonomy.cdm.model.location.NamedArea;
31 28
import eu.etaxonomy.cdm.model.media.Media;
32 29
import eu.etaxonomy.cdm.model.media.Rights;
33
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
34 30
import eu.etaxonomy.cdm.model.molecular.Amplification;
35 31
import eu.etaxonomy.cdm.model.molecular.Primer;
36 32
import eu.etaxonomy.cdm.model.name.TaxonName;
......
174 170
                        (NamedArea) currentSelection, parentElement.getClass().getCanonicalName());
175 171
            }
176 172
		    else{
177
		        if (parentElement == null){
178
		            List<UUID> uuidList = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());
179
		            UUID[] uuidArray = new UUID[uuidList.size()];
180
		            uuidList.toArray(uuidArray);
181
		            return (T)NamedAreaSelectionDialog.select(shell, (NamedArea) currentSelection, null, uuidArray);
182
		        }
183 173
		        return (T) NamedAreaSelectionDialog.select(shell, //conversation,
184 174
		                (NamedArea) currentSelection, parentElement.getClass().getCanonicalName());
185 175
		    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmFormElement.java
13 13
import org.eclipse.jface.util.IPropertyChangeListener;
14 14
import org.eclipse.jface.util.PropertyChangeEvent;
15 15
import org.eclipse.swt.graphics.Color;
16
import org.eclipse.swt.layout.GridData;
17 16
import org.eclipse.swt.widgets.Composite;
18 17
import org.eclipse.swt.widgets.Control;
19 18
import org.eclipse.ui.forms.widgets.Section;
20
import org.eclipse.ui.forms.widgets.TableWrapData;
21 19

  
22 20
import eu.etaxonomy.taxeditor.model.AbstractUtility;
23 21
import eu.etaxonomy.taxeditor.model.MessagingUtils;
......
214 212
		this.layoutComposite = layoutComposite;
215 213
	}
216 214

  
217
	public void addIndent(int indent)
218
	{  this.layoutComposite = formFactory.createComposite(layoutComposite);
219

  
220
	    if (this.layoutComposite.getParent().getLayoutData() instanceof TableWrapData){
221
	        TableWrapData tableWrap = (TableWrapData)this.layoutComposite.getParent().getLayoutData();
222
	        tableWrap.indent = indent;
223

  
224
	        this.layoutComposite.setLayoutData(tableWrap);
225
	    }
226
	    if (this.layoutComposite.getLayoutData() instanceof GridData){
227
	        GridData gridData = new GridData();
228
	        gridData.verticalIndent = indent;
229
            this.layoutComposite.setLayoutData(gridData);
230

  
231
        }
232
	}
233 215
	/**
234 216
	 * <p>Getter for the field <code>propertyChangeListeners</code>.</p>
235 217
	 *
......
326 308
	@Override
327 309
	public void setBackground(Color color) {
328 310
		for(ICdmFormElement element : getElements()){
329
		    element.setBackground(color);
311
			element.setBackground(color);
330 312
		}
331 313
	}
332 314

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
9 9
import org.eclipse.swt.events.ModifyEvent;
10 10
import org.eclipse.swt.events.ModifyListener;
11 11
import org.eclipse.swt.graphics.Color;
12
import org.eclipse.swt.layout.GridData;
12 13
import org.eclipse.swt.widgets.Composite;
13 14
import org.eclipse.swt.widgets.Control;
14 15
import org.eclipse.swt.widgets.Label;
......
122 123
    protected void initLabel(CdmFormFactory formFactory, String labelString, boolean isMultiLine, Composite layoutComposite) {
123 124
        if (labelString != null) {
124 125
            label = formFactory.createLabel(layoutComposite, CdmUtils.Nz(labelString), SWT.NULL);
125

  
126
           
126 127
            addControl(label);
127 128
            if(isMultiLine){
128 129
                label.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
......
236 237
        text.setTextLimit(limit);
237 238
    }
238 239

  
239
    /**
240
     *
241
     */
242
    public String getLabel() {
243
        return label.getText();
244

  
245
    }
246

  
247 240
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityRow.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy
3
* European Distributed Institute of Taxonomy 
4 4
* http://www.e-taxonomy.eu
5
*
5
* 
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
......
29 29

  
30 30
/**
31 31
 * Row widget for editing a single CDM Authority
32
 *
32
 * 
33 33
 * @author cmathew
34 34
 * @created Mar 28, 2013
35 35
 *
......
41 41
	private Label lblUuid;
42 42
	private CRUDOperationChooser operationChooser;
43 43
	private Button btnDelete;
44

  
44
	
45 45
	private GrantedAuthorityImpl grantedAuthorityI;
46 46
	private Label lblDirtyFlag;
47

  
47
	
48 48
	private CdmAuthorityCompositeViewer cdmaModel;
49 49
	private Label lblType;
50

  
50
	
51 51
	/**
52 52
	 * Create the composite, made up of 5 elements :
53
	 * 1. '*' or depending on whether the row is being edited
54
	 * 2. Classname of entity (e.g. TAXONNODE)
55
	 * 3. Uuid of entity
56
	 * 4. CRUD operations edit widget (this is essentially 4 checkboxes to select the 4 possible operations)
57
	 * 5. Delete button (to delete the row)
58
	 *
53
	 * 1. '*' or depending on whether the row is being edited 
54
	 * 2. Classname of entity (e.g. TAXONNODE) 
55
	 * 3. Uuid of entity 
56
	 * 4. CRUD operations edit widget (this is essentially 4 checkboxes to select the 4 possible operations) 
57
	 * 5. Delete button (to delete the row) 
58
	 * 
59 59
	 * @param parent
60 60
	 * @param style
61 61
	 */
62 62
	public CdmAuthorityRow(Composite parent, int style) {
63 63
		super(parent, SWT.NONE);
64 64
		addDisposeListener(new DisposeListener() {
65
			@Override
66
            public void widgetDisposed(DisposeEvent e) {
65
			public void widgetDisposed(DisposeEvent e) {
67 66
				toolkit.dispose();
68 67
			}
69 68
		});
70 69
		toolkit.adapt(this);
71 70
		toolkit.paintBordersFor(this);
72 71
		setLayout(new GridLayout(6, false));
72
		
73 73

  
74

  
75

  
74
		
76 75
		lblDirtyFlag = new Label(this, SWT.NONE);
77 76
		lblDirtyFlag.setAlignment(SWT.CENTER);
78 77
		GridData gd_lblDirtyFlag = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
......
80 79
		lblDirtyFlag.setLayoutData(gd_lblDirtyFlag);
81 80
		toolkit.adapt(lblDirtyFlag, true, true);
82 81
		lblDirtyFlag.setText("*");
83

  
82
		
84 83
		lblType = new Label(this, SWT.BORDER);
85 84
		GridData gd_lblType = new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1);
86 85
		gd_lblType.heightHint = 30;
......
89 88
		lblType.setText("Type");
90 89
		lblType.setAlignment(SWT.CENTER);
91 90
		toolkit.adapt(lblType, true, true);
92

  
91
		
93 92
		lblEntity = new Label(this, SWT.BORDER | SWT.WRAP | SWT.CENTER);
94 93
		GridData gd_lblEntity = new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1);
95 94
		gd_lblEntity.heightHint = 30;
......
98 97
		lblEntity.setAlignment(SWT.CENTER);
99 98
		toolkit.adapt(lblEntity, true, true);
100 99
		lblEntity.setText("Entity");
101

  
102

  
100
		
101
		
103 102
		operationChooser = new CRUDOperationChooser(this, SWT.BORDER);
104 103
		operationChooser.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
105 104
		toolkit.adapt(operationChooser);
106 105
		toolkit.paintBordersFor(operationChooser);
107

  
106
		
108 107
		btnDelete = new Button(this, SWT.NONE);
109 108

  
110 109
		btnDelete.setImage(ImageResources.getImage(ImageResources.TRASH_ICON));
......
116 115
					cdmaModel.removeCdmAuthority(grantedAuthorityI);
117 116
				}
118 117
			}
119
		});
120

  
118
		});		
119
		
121 120
		toolkit.adapt(btnDelete, true, true);
122 121

  
123 122
	}
124 123

  
125 124
	/**
126 125
	 * Sets the dirty flag for this row
127
	 *
126
	 * 
128 127
	 * @param isDirty
129 128
	 */
130 129
	public void setDirty(boolean isDirty) {
......
134 133
			lblDirtyFlag.setText(" ");
135 134
		}
136 135
	}
137

  
136
	
138 137
	/**
139 138
	 * Create a {@link CdmAuthority} from a {@link GrantedAuthorityImpl} and create a row from it.
140
	 *
139
	 * 
141 140
	 * @param cdmaModel
142 141
	 * @param grantedAuthorityI
143 142
	 * @param isDirty
144 143
	 */
145 144
	public void setRowCdmAuthority(CdmAuthorityCompositeViewer cdmaModel, GrantedAuthorityImpl grantedAuthorityI, boolean isDirty, boolean showUuid) {
146
		this.grantedAuthorityI = grantedAuthorityI;
145
		this.grantedAuthorityI = grantedAuthorityI;		
147 146
		this.cdmaModel = cdmaModel;
148

  
147
		
149 148
		try {
150 149
			CdmAuthority cdmAuthority = CdmAuthority.fromGrantedAuthority(grantedAuthorityI);
151 150

  
......
155 154
			lblType.setText(entityStr);
156 155
			String targetLabelText = GrantedAuthorityLabelTextProvider.getTargetText(cdmAuthority);
157 156
			lblEntity.setText(targetLabelText);
158

  
157
						
159 158
			setUuidCellVisible(showUuid);
160 159
			if(lblUuid != null) {
161
			    if (cdmAuthority.getTargetUUID() != null){
162
    				String targetUuid = cdmAuthority.getTargetUUID().toString();
163
    				lblUuid.setText(targetUuid);
164
			    }
165
			    else{
166
			        lblUuid.setText("Uuid");
167
			    }
168

  
160
				String targetUuid = cdmAuthority.getTargetUUID().toString();
161
				lblUuid.setText(targetUuid);
169 162
			}
170

  
171
			operationChooser.setAuthority(cdmaModel, grantedAuthorityI, cdmAuthority);
172

  
163
			
164
			operationChooser.setAuthority(cdmaModel, grantedAuthorityI, cdmAuthority);				
165
			
173 166
		} catch (Exception e) {
174 167
			// TODO Auto-generated catch block
175 168
			e.printStackTrace();
176 169
		}
177 170

  
178 171
	}
179

  
172
	
180 173
	public void setUuidCellVisible(boolean visible) {
181 174
		if(visible) {
182 175
			if(lblUuid == null) {
183 176
				createUuidCell();
184 177
			}
185 178
			lblUuid.moveAbove(operationChooser);
186

  
179
			
187 180
		} else {
188 181
			if(lblUuid != null) {
189 182
				lblUuid.dispose();
......
192 185
		}
193 186
		layout();
194 187
	}
195

  
188
	
196 189
	private void createUuidCell() {
197 190
		lblUuid = new Label(this, SWT.BORDER | SWT.CENTER);
198 191
		GridData gd_lblUuid = new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
78 78
		    for (TermVocabulary<DefinedTerm> termVocabulary : recommendedModifierEnumeration) {
79 79
		        modifierTerms.addAll(termVocabulary.getTerms());
80 80
		    }
81

  
82 81
		    combo_modifier.setTerms(modifierTerms);
83

  
84 82
		}
85 83
        if(entity!=null && entity.getId()>0){
86 84
            combo_modifier.setSelection(entity);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailElement.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy
3
* European Distributed Institute of Taxonomy 
4 4
* http://www.e-taxonomy.eu
5
*
5
* 
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
......
23 23
public class GroupDetailElement extends AbstractCdmDetailElement<Group> {
24 24

  
25 25
	private TextWithLabelElement text_name;
26

  
26
	
27 27
	/**
28 28
	 * @param formFactory
29 29
	 * @param formElement
......
50 50
		if(eventSource == text_name){
51 51
			getEntity().setName(text_name.getText());
52 52
		}
53

  
54 53
	}
55 54

  
56 55
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AbstractTypeDesignationElement.java
78 78

  
79 79
                text_referenceDetail = formFactory.createTextWithLabelElement(
80 80
                    formElement, "Reference Detail", entity.getCitationMicroReference(), style);
81
                //text_referenceDetail.addIndent(10);
82 81
                checkbox_notDesignated = formFactory.createCheckbox(formElement, "Not Designated", entity.isNotDesignated(), style);
83 82
	        }
84 83
        }else{
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
96 96
	    addControl(section_name);
97 97
	    addElement(section_name);
98 98
//	    if (isAdvancedView || PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP)){
99

  
100 99
    	    section_author = formFactory.createAuthorshipDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
101 100
    	    section_author.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
102 101
    	    addControl(section_author);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
64 64

  
65 65
    @Override
66 66
    protected void createControls(ICdmFormElement formElement, MediaSpecimen entity, int style) {
67

  
68 67
        Media media = entity.getMediaSpecimen();
69 68
        if(media==null){
70 69
            formFactory.createLabel(formElement, "No media attached to this MediaSpecimen!");
71 70
        }
72 71
        else{
73
            setWarnForReferencingObjects(formElement);
74 72
            comboKindOfUnit = formFactory.createDefinedTermComboElement(mediaSpecimenVocabulary, formElement, "Kind of Media", entity.getKindOfUnit(), style);
75 73
            textTitleLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Motif", media.getTitle(), style);
76 74
            selectionArtist = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractSourcedEntityBaseElement.java
26 26

  
27 27
    private SelectionArbitrator selectionArbitrator;
28 28

  
29
  //  protected SourceSection sources;
30

  
29 31

  
30 32
    /**
31 33
     * @param formFactory
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
7 7
import java.util.Comparator;
8 8

  
9 9
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
10
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
11
import eu.etaxonomy.cdm.model.media.Media;
12 10
import eu.etaxonomy.cdm.model.reference.ISourceable;
11
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
13 12
import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
13
import eu.etaxonomy.cdm.model.media.Media;
14 14
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
15 15
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
16 16
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
......
55 55
	/** {@inheritDoc} */
56 56
	@Override
57 57
	public Collection<IdentifiableSource> getCollection(
58
	        ISourceable entity) {
58
			ISourceable entity) {
59 59
		return entity.getSources();
60 60
	}
61 61

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
150 150
                   taxon.getSec(), EntitySelectionElement.ALL,
151 151
                   style);
152 152

  
153
            text_sensu_microreference = formFactory.createTextWithLabelElement(
153
               text_sensu_microreference = formFactory.createTextWithLabelElement(
154 154
                       formElement, "Detail",
155 155
                       taxon.getSecMicroReference(),null,
156 156
                       SWT.WRAP);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
479 479
	/** {@inheritDoc} */
480 480
	@Override
481 481
	public void setBackground(Color color) {
482

  
483
	    if(label != null && !label.isDisposed()){
482
	    if(!label.isDisposed()){
484 483
	        label.setBackground(color);
485 484
	    }
486 485
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
203 203
	protected void expansionStateChanged(boolean expanded) {
204 204
	    super.expansionStateChanged(expanded);
205 205
	    PreferencesUtil.setStringValue(StoreUtil.getPrefKey(formSection.getClass(), rootInput), expanded?EXPANDED:COLLAPSED);
206

  
207 206
	}
208 207

  
209 208
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmDataViewerE4.java
179 179

  
180 180
    protected int getSectionStyle(Class<? extends AbstractFormSection> clazz, boolean initiallyExpanded){
181 181
        int style = ExpandableComposite.TWISTIE;
182

  
183 182
        String prefKey = StoreUtil.getPrefKey(clazz, getInput());
184 183
        if(PreferencesUtil.contains(prefKey)){
185 184
            style = PreferencesUtil.getStringValue(prefKey)==CdmSectionPart.EXPANDED?style |= ExpandableComposite.EXPANDED:style;
186 185
        }
187 186
        else{
188 187
            style = initiallyExpanded?style |= ExpandableComposite.EXPANDED:style;
189

  
190 188
        }
191 189
        return style;
192 190
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
229 229
                }
230 230

  
231 231
                selectionProvidingPart = activePart;
232

  
233 232
                if (viewer instanceof DetailsViewerE4){
234 233
                    ((DetailsViewerE4)viewer).setInput(element, part);
235 234
                    if (!selectionProvidingPart.getElementId().equals("eu.etaxonomy.taxeditor.editor.view.checklist.e4.DistributionEditorPart")){
......
239 238
                }
240 239

  
241 240
                else{
242
                    if (activePart.getObject() instanceof DetailsPartE4 && element instanceof TaxonName ){
241
                    if (activePart.getObject() instanceof DetailsPartE4 && element instanceof TaxonName){
243 242
                        selectionProvidingPart = ((DetailsPartE4)activePart.getObject()).getSelectionProvidingPart();
244 243
                    }
245 244
                    viewer.setInput(element);
246 245
                }
247

  
248 246
            }
249 247
        }
250 248
    }
eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
9 9

  
10 10
  <!-- Local application context and term initializer -->
11 11
  <import resource="classpath:/eu/etaxonomy/cdm/localApplicationContext.xml"/>
12
   
12
  
13 13
  <!-- Remote application context and term initializer -->
14 14
  <!--  <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
15 15
  
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
33 33
import eu.etaxonomy.cdm.model.description.TextData;
34 34
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
35 35
import eu.etaxonomy.cdm.model.name.INonViralName;
36
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
37 36
import eu.etaxonomy.cdm.model.name.TaxonName;
38 37
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
39 38
import eu.etaxonomy.cdm.model.taxon.Synonym;
......
205 204
    public void addTaxon() {
206 205
        INonViralName taxonName = TaxonNameFactory.NewNonViralInstance(null);
207 206
        Taxon taxon = Taxon.NewInstance(taxonName, null);
208
        taxon = (Taxon)taxonService.merge(taxon);
209
        taxon.getName().addTypeDesignation(NameTypeDesignation.NewInstance(), true);
207
        taxonService.merge(taxon);
210 208
    }
211 209

  
212 210
    @Ignore
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/CdmServerInfoTest.java
39 39
                //no need to test ping localhost
40 40
                continue;
41 41
            }
42
            System.err.println(server.getName());
43
            try{
44
                server.pingServer();
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)