Revision 37a35ef6
Added by Andreas Müller almost 2 years ago
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF | ||
---|---|---|
531 | 531 |
lib/iiif-apis-0.3.9.jar, |
532 | 532 |
lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar, |
533 | 533 |
lib/mysql-connector-java-8.0.29.jar |
534 |
Comment: currently excluded - |
|
535 |
lib/activation-1.1.1.jar, |
|
536 |
lib/avro-1.6.3.jar, |
|
537 |
lib/hibernate-c3p0-5.1.17.Final.jar, |
|
538 |
lib/jaxen-1.2.0.jar, |
|
539 |
lib/jta-1.1.jar, |
|
540 |
lib/lsid-server-1.1.2.jar, |
|
541 |
lib/wsdl4j-1.6.3.jar, |
|
542 | 534 |
Import-Package: eu.etaxonomy.cdm.api.application |
eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java | ||
---|---|---|
1 |
/** |
|
2 |
* Copyright (C) 2007 EDIT |
|
3 |
* European Distributed Institute of Taxonomy |
|
4 |
* http://www.e-taxonomy.eu |
|
5 |
* |
|
6 |
* The contents of this file are subject to the Mozilla Public License Version 1.1 |
|
7 |
* See LICENSE.TXT at the top of this package for the full license terms. |
|
8 |
*/ |
|
1 | 9 |
package eu.etaxonomy.taxeditor.help; |
2 | 10 |
|
3 | 11 |
import org.eclipse.jface.resource.ImageDescriptor; |
... | ... | |
14 | 22 |
|
15 | 23 |
// The shared instance |
16 | 24 |
private static Activator plugin; |
17 |
|
|
25 |
|
|
18 | 26 |
/** |
19 | 27 |
* The constructor |
20 | 28 |
*/ |
21 | 29 |
public Activator() { |
22 | 30 |
} |
23 | 31 |
|
24 |
/* |
|
25 |
* (non-Javadoc) |
|
26 |
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) |
|
27 |
*/ |
|
28 |
public void start(BundleContext context) throws Exception { |
|
32 |
|
|
33 |
@Override |
|
34 |
public void start(BundleContext context) throws Exception { |
|
29 | 35 |
super.start(context); |
30 | 36 |
plugin = this; |
31 | 37 |
} |
32 | 38 |
|
33 |
/* |
|
34 |
* (non-Javadoc) |
|
35 |
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) |
|
36 |
*/ |
|
37 |
public void stop(BundleContext context) throws Exception { |
|
39 |
@Override |
|
40 |
public void stop(BundleContext context) throws Exception { |
|
38 | 41 |
plugin = null; |
39 | 42 |
super.stop(context); |
40 | 43 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java | ||
---|---|---|
164 | 164 |
filteredTerms.add(type); |
165 | 165 |
} |
166 | 166 |
} |
167 |
|
|
167 |
|
|
168 | 168 |
if(PreferencesUtil.getBooleanValue(getPrefName(term), true)){ |
169 | 169 |
filteredTerms.add(term); |
170 | 170 |
} |
... | ... | |
193 | 193 |
|
194 | 194 |
return filteredTerms; |
195 | 195 |
} |
196 |
|
|
196 |
|
|
197 | 197 |
public <T extends DefinedTermBase>List<T> createTermListFromString(String stringValue, TermType type){ |
198 | 198 |
List<String> checked = new ArrayList<>(); |
199 |
|
|
199 |
|
|
200 | 200 |
if (stringValue != null){ |
201 | 201 |
String[] listChecked = stringValue.split(";"); //$NON-NLS-1$ |
202 | 202 |
String[] listCheckedComma = stringValue.split(","); //$NON-NLS-1$ |
... | ... | |
214 | 214 |
protected <T extends DefinedTermBase>List<T> getTermsFromStringValues(List<String> listValue, TermType type) { |
215 | 215 |
Collection<DefinedTermBase> termlist = new ArrayList<>(); |
216 | 216 |
ITermService termService = CdmStore.getService(ITermService.class); |
217 |
Set<UUID> uuidList = new HashSet(); |
|
217 |
Set<UUID> uuidList = new HashSet<>();
|
|
218 | 218 |
for (String s : listValue) { |
219 | 219 |
if (!StringUtils.isBlank(s)){ |
220 | 220 |
UUID uuid = UUID.fromString(s); |
... | ... | |
225 | 225 |
termlist = termService.find(uuidList); |
226 | 226 |
} |
227 | 227 |
|
228 |
if (listValue == null || listValue.isEmpty() ){
|
|
228 |
if (listValue.isEmpty() ){ |
|
229 | 229 |
termlist = termService.listByTermType(type, null, null, null, null); |
230 | 230 |
|
231 | 231 |
} |
232 | 232 |
|
233 | 233 |
return new ArrayList(termlist); |
234 | 234 |
} |
235 |
|
|
235 |
|
|
236 | 236 |
/** |
237 | 237 |
* Generic method to get term preferences for a term vocabulary |
238 | 238 |
* |
Also available in: Unified diff
cleanup