Revision 71477484
Added by Andreas Müller 5 months ago
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCachingProxy.java | ||
---|---|---|
28 | 28 |
import eu.etaxonomy.taxeditor.session.ICdmEntitySession; |
29 | 29 |
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager; |
30 | 30 |
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManagerObserver; |
31 |
import net.sf.ehcache.CacheManager; |
|
31 | 32 |
import net.sf.ehcache.config.CacheConfiguration; |
32 | 33 |
import net.sf.ehcache.config.DiskStoreConfiguration; |
33 | 34 |
import net.sf.ehcache.config.SizeOfPolicyConfiguration; |
... | ... | |
70 | 71 |
|
71 | 72 |
private void setUpCacheManager() { |
72 | 73 |
|
73 |
EhCacheConfiguration cacheConfig = new EhCacheConfiguration(); |
|
74 |
|
|
75 | 74 |
DiskStoreConfiguration diskStoreConfiguration = new DiskStoreConfiguration(); |
76 | 75 |
File ehcacheFolder = null; |
77 | 76 |
if(configFileUtil != null){ |
... | ... | |
85 | 84 |
ehcacheFolder = ConfigFileUtil.getCdmHomeSubDirFallback("taxeditor-ehcache"); |
86 | 85 |
} |
87 | 86 |
|
88 |
// FIXME use subfolder per taxeditor version to allow running multiple installations in parallel |
|
87 |
// FIXME use subfolder per taxeditor version to allow running multiple |
|
88 |
// installations in parallel |
|
89 | 89 |
// String taxEditorVersion = ..; |
90 | 90 |
// File ehcacheFolder = new File(ehcacheFolder, taxEditorVersion); |
91 | 91 |
diskStoreConfiguration.setPath(ehcacheFolder.getAbsolutePath()); |
92 | 92 |
|
93 |
EhCacheConfiguration cacheConfig = new EhCacheConfiguration(); |
|
93 | 94 |
cacheConfig.setDiskStoreConfiguration(diskStoreConfiguration); |
94 |
setCacheManager(cacheConfig.cacheManager()); |
|
95 |
CacheManager cacheManager = cacheConfig.cacheManager(); |
|
96 |
setCacheManager(cacheManager); |
|
95 | 97 |
} |
96 | 98 |
|
97 | 99 |
@Override |
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java | ||
---|---|---|
36 | 36 |
|
37 | 37 |
private static CdmServiceCachingProxy cdmServiceCacher; |
38 | 38 |
|
39 |
public static void setDefaultCacher(CdmServiceCachingProxy csc) {
|
|
40 |
cdmServiceCacher = csc;
|
|
39 |
public static void setDefaultCacher(CdmServiceCachingProxy termCache) {
|
|
40 |
cdmServiceCacher = termCache;
|
|
41 | 41 |
} |
42 | 42 |
|
43 | 43 |
@Override |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainer.java | ||
---|---|---|
85 | 85 |
* in its own <code>getData()</code>. |
86 | 86 |
* </p> |
87 | 87 |
* <p> |
88 |
* The <code>IManagedForm</code> can also used for drawing borders by calling |
|
88 |
* The <code>IManagedForm</code> can also be used for drawing borders by calling
|
|
89 | 89 |
* the method <code>createBorderSupport()</code>. |
90 | 90 |
* </p> |
91 | 91 |
* @author pplitzner |
... | ... | |
579 | 579 |
private Delay(Display display) { |
580 | 580 |
this.display = display; |
581 | 581 |
} |
582 |
|
|
582 | 583 |
@Override |
583 | 584 |
public void run() { |
584 | 585 |
|
Also available in: Unified diff
cleanup