Revision e6469973
Added by Andreas Müller over 1 year ago
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java | ||
---|---|---|
34 | 34 |
@Component |
35 | 35 |
public class CdmEntitySessionManager implements ICdmEntitySessionManager { |
36 | 36 |
|
37 |
private static final Logger logger = LogManager.getLogger(CdmEntitySessionManager.class);
|
|
37 |
private static final Logger logger = LogManager.getLogger(); |
|
38 | 38 |
|
39 | 39 |
private final Map<ICdmEntitySessionEnabled, ICdmEntitySession> ownerSessionMap = new HashMap<>(); |
40 | 40 |
|
... | ... | |
94 | 94 |
} |
95 | 95 |
|
96 | 96 |
@Override |
97 |
public void bind(ICdmEntitySessionEnabled sessionOwner) { |
|
97 |
public void bind(ICdmEntitySessionEnabled<?> sessionOwner) {
|
|
98 | 98 |
if(sessionOwner == null) { |
99 | 99 |
setActiveSession(null); |
100 | 100 |
return; |
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java | ||
---|---|---|
48 | 48 |
* |
49 | 49 |
* @param sessionOwner |
50 | 50 |
*/ |
51 |
public abstract void bind(ICdmEntitySessionEnabled sessionOwner); |
|
51 |
public abstract void bind(ICdmEntitySessionEnabled<?> sessionOwner);
|
|
52 | 52 |
|
53 | 53 |
/** |
54 | 54 |
* Loads an object intto the active session and returns the cached object |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java | ||
---|---|---|
183 | 183 |
|
184 | 184 |
public static void openTaxonNodeE4(UUID taxonNodeUuid, EModelService modelService, EPartService partService, MApplication application) { |
185 | 185 |
TaxonEditorInput input = TaxonEditorInput.NewInstance(taxonNodeUuid); |
186 |
openNameEditor_internal(input, modelService, partService, application);
|
|
186 |
openTaxonEditor_internal(input, modelService, partService, application);
|
|
187 | 187 |
} |
188 | 188 |
|
189 | 189 |
public static void openTaxonBaseE4(UUID taxonBaseUuid, EModelService modelService, EPartService partService, MApplication application) { |
190 | 190 |
TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(taxonBaseUuid); |
191 |
openNameEditor_internal(input, modelService, partService, application);
|
|
191 |
openTaxonEditor_internal(input, modelService, partService, application);
|
|
192 | 192 |
} |
193 | 193 |
|
194 | 194 |
// public static void openTaxonBaseE4(UUID taxonBaseUuid) { |
... | ... | |
200 | 200 |
// openNameEditor_internal(input, modelService, partService, null); |
201 | 201 |
// } |
202 | 202 |
|
203 |
private static void openNameEditor_internal(TaxonEditorInput input, EModelService modelService, EPartService partService, MApplication application) {
|
|
203 |
private static void openTaxonEditor_internal(TaxonEditorInput input, EModelService modelService, EPartService partService, MApplication application) {
|
|
204 | 204 |
TaxonBase<?> taxonBase = input.getTaxon(); |
205 | 205 |
TaxonNode node = input.getTaxonNode(); |
206 | 206 |
if(taxonBase==null){ |
eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/operation/TaxonEditorTest.xml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?><!-- |
|
2 |
generated by Jailer 4.3, Wed Mar 04 16:11:14 CET 2015 from cmathew@cmbgbm-t530 |
|
3 |
|
|
4 |
Extraction Model: all rows from Classification (extractionmodel/by-example/SbE-Classification-16-11-06-737.csv) |
|
5 |
Database URL: jdbc:mysql://127.0.0.1:3306/local-cyprus |
|
6 |
Database User: root |
|
7 |
|
|
8 |
Exported Rows: 31 |
|
9 |
Classification 1 |
|
10 |
HomotypicalGroup 2 |
|
11 |
TaxonBase 5 |
|
12 |
TaxonNameBase 3 |
|
13 |
TaxonNode 19 |
|
14 |
|
|
15 |
--> |
|
16 |
<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../cdm/database/schema/dataset.dtd"> |
|
17 |
|
|
18 |
<TaxonNode id="347" uuid="d425a971-1abe-4895-9e1f-1e5c8ff1c84c" countchildren="0" classification_id="10" taxon_id="387" treeIndex="#t10#4032#49#346#345#347#" sortIndex="1" /> |
|
19 |
<TaxonNode id="351" uuid="ce54c396-3694-47f2-abb0-1d7b7e057985" countchildren="0" classification_id="10" taxon_id="394" treeIndex="#t10#4032#49#346#345#351#" sortIndex="4" /> |
|
20 |
|
|
21 |
<HomotypicalGroup id="368" uuid="d7eaa174-4efd-4d09-a427-dce4ed6513f7" /> |
|
22 |
<HomotypicalGroup id="375" uuid="62ed57d6-2c69-4404-bb95-248a1c9bb24c" /> |
|
23 |
|
|
24 |
<TAXONNAME NAMETYPE="ICNAFP" id="387" uuid="d25985c7-6fb4-4b31-8a94-5d7c5ba6ad16" protectedtitlecache="false" titleCache="Asplenium ceterach L." fullTitleCache="Asplenium ceterach L." parsingproblem="0" problemends="-1" problemstarts="-1" protectedfulltitlecache="false" authorshipcache="L." binomhybrid="false" genusoruninomial="Asplenium" hybridformula="false" monomhybrid="false" namecache="Asplenium ceterach" protectedauthorshipcache="false" protectednamecache="false" specificepithet="ceterach" trinomhybrid="false" anamorphic="false" homotypicalgroup_id="368" rank_id="778" /> |
|
25 |
<TAXONNAME NAMETYPE="ICNAFP" id="388" uuid="747021f1-cf5f-4249-a825-228da3368399" protectedtitlecache="true" titleCache="Asplenium cyprium Viane & Van den heede" fullTitleCache="Asplenium cyprium Viane & Van den heede" parsingproblem="16" problemends="-1" problemstarts="-1" protectedfulltitlecache="false" authorshipcache="" binomhybrid="false" hybridformula="false" monomhybrid="false" namecache="Asplenium cyprium Viane & Van den heede" protectedauthorshipcache="false" protectednamecache="true" trinomhybrid="false" anamorphic="false" /> |
|
26 |
<TAXONNAME NAMETYPE="ICNAFP" id="394" uuid="08f8f376-c9a4-4ea9-950d-3ac30b7fa689" protectedtitlecache="false" titleCache="Asplenium viride Huds." fullTitleCache="Asplenium viride Huds." parsingproblem="0" problemends="-1" problemstarts="-1" protectedfulltitlecache="false" authorshipcache="Huds." binomhybrid="false" genusoruninomial="Asplenium" hybridformula="false" monomhybrid="false" namecache="Asplenium viride" protectedauthorshipcache="false" protectednamecache="false" specificepithet="viride" trinomhybrid="false" anamorphic="false" homotypicalgroup_id="375" rank_id="778" /> |
|
27 |
|
|
28 |
<Classification id="10" uuid="0c2b5d25-7b15-4401-8b51-dd4be0ee5cab" protectedtitlecache="false" titleCache="Cyprus" name_id="10" source_id="4"/> |
|
29 |
|
|
30 |
<TaxonBase DTYPE="Taxon" id="387" uuid="9763e5f0-6cd4-4d96-b8a4-4420854f7727" protectedtitlecache="false" titleCache="Asplenium ceterach L. sec. Cyprus" doubtful="false" usenamecache="false" taxonstatusunknown="false" name_id="387" publish="true"/> |
|
31 |
<TaxonBase DTYPE="Synonym" id="388" uuid="1eb173bd-b174-4162-8ff5-5136d8f1e746" protectedtitlecache="false" titleCache="Asplenium cyprium Viane & Van den heede sec. Cyprus" doubtful="false" usenamecache="false" name_id="388" publish="true" acceptedtaxon_id="387"/> |
|
32 |
<TaxonBase DTYPE="Taxon" id="394" uuid="aff4fa6f-9aa8-463d-ac07-ec8a1925eb57" protectedtitlecache="false" titleCache="Asplenium viride Huds. sec. Cyprus" doubtful="false" usenamecache="false" taxonstatusunknown="false" name_id="394" publish="true"/> |
|
33 |
<ORIGINALSOURCEBASE DTYPE="SecundumSource" ID="1" SOURCEDTAXON_ID="387" UUID="5ff76440-c9ab-4f13-8f1a-c39d57d3c714" SOURCETYPE="PTS" CITATION_ID="10" /> |
|
34 |
<ORIGINALSOURCEBASE DTYPE="SecundumSource" ID="2" SOURCEDTAXON_ID="388" UUID="3914b660-3cb3-4a5b-8fc7-264c7ac17a19" SOURCETYPE="PTS" CITATION_ID="10" /> |
|
35 |
<ORIGINALSOURCEBASE DTYPE="SecundumSource" ID="3" SOURCEDTAXON_ID="394" UUID="7cbe8fd0-1329-4421-8bb5-05b57f2048d1" SOURCETYPE="PTS" CITATION_ID="10" /> |
|
36 |
<ORIGINALSOURCEBASE DTYPE="NamedSource" ID="4" UUID="53dfd49b-f15b-4ce9-a52a-615d41634a4a" SOURCETYPE="PTS" CITATION_ID="10" /> |
|
37 |
|
|
38 |
<LanguageString id="10"/> |
|
39 |
<DescriptionBase/> |
|
40 |
<DescriptionElementBase/> |
|
41 |
</dataset> |
eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.xml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?><!-- |
|
2 |
generated by Jailer 4.3, Wed Mar 04 16:11:14 CET 2015 from cmathew@cmbgbm-t530 |
|
3 |
|
|
4 |
Extraction Model: all rows from Classification (extractionmodel/by-example/SbE-Classification-16-11-06-737.csv) |
|
5 |
Database URL: jdbc:mysql://127.0.0.1:3306/local-cyprus |
|
6 |
Database User: root |
|
7 |
|
|
8 |
Exported Rows: 31 |
|
9 |
Classification 1 |
|
10 |
HomotypicalGroup 2 |
|
11 |
TaxonBase 5 |
|
12 |
TaxonNameBase 3 |
|
13 |
TaxonNode 19 |
|
14 |
|
|
15 |
--> |
|
16 |
<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../cdm/database/schema/dataset.dtd"> |
|
17 |
|
|
18 |
<TaxonNode id="347" uuid="d425a971-1abe-4895-9e1f-1e5c8ff1c84c" countchildren="0" classification_id="10" taxon_id="387" treeIndex="#t10#4032#49#346#345#347#" sortIndex="1" /> |
|
19 |
<TaxonNode id="351" uuid="ce54c396-3694-47f2-abb0-1d7b7e057985" countchildren="0" classification_id="10" taxon_id="394" treeIndex="#t10#4032#49#346#345#351#" sortIndex="4" /> |
|
20 |
|
|
21 |
<HomotypicalGroup id="368" uuid="d7eaa174-4efd-4d09-a427-dce4ed6513f7" /> |
|
22 |
<HomotypicalGroup id="375" uuid="62ed57d6-2c69-4404-bb95-248a1c9bb24c" /> |
|
23 |
|
|
24 |
<TAXONNAME NAMETYPE="ICNAFP" id="387" uuid="d25985c7-6fb4-4b31-8a94-5d7c5ba6ad16" protectedtitlecache="false" titleCache="Asplenium ceterach L." fullTitleCache="Asplenium ceterach L." parsingproblem="0" problemends="-1" problemstarts="-1" protectedfulltitlecache="false" authorshipcache="L." binomhybrid="false" genusoruninomial="Asplenium" hybridformula="false" monomhybrid="false" namecache="Asplenium ceterach" protectedauthorshipcache="false" protectednamecache="false" specificepithet="ceterach" trinomhybrid="false" anamorphic="false" homotypicalgroup_id="368" rank_id="778" /> |
|
25 |
<TAXONNAME NAMETYPE="ICNAFP" id="388" uuid="747021f1-cf5f-4249-a825-228da3368399" protectedtitlecache="true" titleCache="Asplenium cyprium Viane & Van den heede" fullTitleCache="Asplenium cyprium Viane & Van den heede" parsingproblem="16" problemends="-1" problemstarts="-1" protectedfulltitlecache="false" authorshipcache="" binomhybrid="false" hybridformula="false" monomhybrid="false" namecache="Asplenium cyprium Viane & Van den heede" protectedauthorshipcache="false" protectednamecache="true" trinomhybrid="false" anamorphic="false" /> |
|
26 |
<TAXONNAME NAMETYPE="ICNAFP" id="394" uuid="08f8f376-c9a4-4ea9-950d-3ac30b7fa689" protectedtitlecache="false" titleCache="Asplenium viride Huds." fullTitleCache="Asplenium viride Huds." parsingproblem="0" problemends="-1" problemstarts="-1" protectedfulltitlecache="false" authorshipcache="Huds." binomhybrid="false" genusoruninomial="Asplenium" hybridformula="false" monomhybrid="false" namecache="Asplenium viride" protectedauthorshipcache="false" protectednamecache="false" specificepithet="viride" trinomhybrid="false" anamorphic="false" homotypicalgroup_id="375" rank_id="778" /> |
|
27 |
|
|
28 |
<Classification id="10" uuid="0c2b5d25-7b15-4401-8b51-dd4be0ee5cab" protectedtitlecache="false" titleCache="Cyprus" name_id="10" source_id="4"/> |
|
29 |
|
|
30 |
<TaxonBase DTYPE="Taxon" id="387" uuid="9763e5f0-6cd4-4d96-b8a4-4420854f7727" protectedtitlecache="false" titleCache="Asplenium ceterach L. sec. Cyprus" doubtful="false" usenamecache="false" taxonstatusunknown="false" name_id="387" publish="true"/> |
|
31 |
<TaxonBase DTYPE="Synonym" id="388" uuid="1eb173bd-b174-4162-8ff5-5136d8f1e746" protectedtitlecache="false" titleCache="Asplenium cyprium Viane & Van den heede sec. Cyprus" doubtful="false" usenamecache="false" name_id="388" publish="true" acceptedtaxon_id="387"/> |
|
32 |
<TaxonBase DTYPE="Taxon" id="394" uuid="aff4fa6f-9aa8-463d-ac07-ec8a1925eb57" protectedtitlecache="false" titleCache="Asplenium viride Huds. sec. Cyprus" doubtful="false" usenamecache="false" taxonstatusunknown="false" name_id="394" publish="true"/> |
|
33 |
<ORIGINALSOURCEBASE DTYPE="SecundumSource" ID="1" SOURCEDTAXON_ID="387" UUID="5ff76440-c9ab-4f13-8f1a-c39d57d3c714" SOURCETYPE="PTS" CITATION_ID="10" /> |
|
34 |
<ORIGINALSOURCEBASE DTYPE="SecundumSource" ID="2" SOURCEDTAXON_ID="388" UUID="3914b660-3cb3-4a5b-8fc7-264c7ac17a19" SOURCETYPE="PTS" CITATION_ID="10" /> |
|
35 |
<ORIGINALSOURCEBASE DTYPE="SecundumSource" ID="3" SOURCEDTAXON_ID="394" UUID="7cbe8fd0-1329-4421-8bb5-05b57f2048d1" SOURCETYPE="PTS" CITATION_ID="10" /> |
|
36 |
<ORIGINALSOURCEBASE DTYPE="NamedSource" ID="4" UUID="53dfd49b-f15b-4ce9-a52a-615d41634a4a" SOURCETYPE="PTS" CITATION_ID="10" /> |
|
37 |
|
|
38 |
<LanguageString id="10"/> |
|
39 |
<DescriptionBase/> |
|
40 |
<DescriptionElementBase/> |
|
41 |
</dataset> |
Also available in: Unified diff
cleanup and fix test