Project

General

Profile

« Previous | Next » 

Revision c7d830cc

Added by Cherian Mathew about 9 years ago

CdmModelCacher : added recursive search in super classes
CdmTransientEntityCacher : corrected caching
EntityCacherDebugResult : new debug result object
CdmEntitySession, ICdmEntitySession, MockCdmEntitySession : added debug method
CdmEntitySessionInput : new super class for editor input objects
TaxonEditorInput : refactored and made sub class of CdmEntitySessionInput
DeleteNodeOperation : using new uuid service methods
TaxonNameEditor : removed unnecessary service call to retrieve taxon
TaxonLinkHelper : removed unnecessary second call to initialise input
AbstractCdmViewPart : now implements ISessionEnabled

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
10 10
package eu.etaxonomy.taxeditor.session.mock;
11 11

  
12 12
import java.util.Collection;
13
import java.util.List;
14
import java.util.Set;
15
import java.util.UUID;
13 16

  
17
import eu.etaxonomy.cdm.api.service.IService;
14 18
import eu.etaxonomy.cdm.model.common.CdmBase;
15 19
import eu.etaxonomy.cdm.model.common.ICdmBase;
16 20
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;
21
import eu.etaxonomy.taxeditor.remoting.cache.EntityCacherDebugResult;
17 22
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
18 23
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
19 24

  
......
22 27
 * @date 29 Jan 2015
23 28
 *
24 29
 */
25
public class MockCdmEntitySession implements ICdmEntitySession {
30
public class MockCdmEntitySession implements ICdmEntitySession  {
26 31

  
27 32
    /* (non-Javadoc)
28 33
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.lang.Object)
29 34
     */
30 35
    @Override
31
    public <T> T load(T obj) {
36
    public <O extends Object> O load(O obj) {
32 37
        return obj;
33 38
    }
34 39

  
......
36 41
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.model.common.CdmBase)
37 42
     */
38 43
    @Override
39
    public <T extends CdmBase> T load(T cdmBase) {
44
    public  <T extends CdmBase> T load(T cdmBase) {
40 45
        return cdmBase;
41 46
    }
42 47

  
......
44 49
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.util.Collection)
45 50
     */
46 51
    @Override
47
    public <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList) {
52
    public  <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList) {
48 53
        return cdmBaseList;
49 54
    }
50 55

  
......
90 95

  
91 96
    }
92 97

  
98

  
99

  
93 100
    /* (non-Javadoc)
94
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#notify(eu.etaxonomy.cdm.model.common.ICdmBase, eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType)
101
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#commit()
95 102
     */
96 103
    @Override
97
    public void addEvent(ICdmBase cdmBase, EventType eventType) {
104
    public void fireNotifications() {
98 105

  
99 106

  
100 107
    }
101 108

  
102 109
    /* (non-Javadoc)
103
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#notify(java.util.Collection, eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType)
110
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug(eu.etaxonomy.cdm.model.common.CdmBase)
104 111
     */
105 112
    @Override
106
    public <T extends ICdmBase> void addEvent(Collection<T> cdmBases, EventType eventType) {
113
    public  <T extends CdmBase> EntityCacherDebugResult debug(T cdmBase) {
107 114

  
115
        return new EntityCacherDebugResult();
116
    }
117

  
118
    /* (non-Javadoc)
119
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#addEvent(eu.etaxonomy.cdm.model.common.ICdmBase, eu.etaxonomy.cdm.model.common.CdmBase[], eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType)
120
     */
121
    @Override
122
    public void addEvent(ICdmBase cdmBase, Set<CdmBase> affectedObjects, EventType eventType) {
123
        // TODO Auto-generated method stub
108 124

  
109 125
    }
110 126

  
111 127
    /* (non-Javadoc)
112
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#commit()
128
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#addEvent(java.util.Collection, eu.etaxonomy.cdm.model.common.CdmBase[], eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType)
113 129
     */
114 130
    @Override
115
    public void commit() {
131
    public  <T extends ICdmBase> void addEvent(Collection<T> cdmBases, Set<CdmBase> affectedObjects, EventType eventType) {
132
        // TODO Auto-generated method stub
116 133

  
134
    }
117 135

  
136
    /* (non-Javadoc)
137
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.util.UUID, eu.etaxonomy.cdm.api.service.IService)
138
     */
139
    @Override
140
    public <T extends CdmBase> T remoteLoad(IService<T> service, UUID uuid) {
141
        return service.load(uuid);
118 142
    }
119 143

  
120 144

  
145
    /* (non-Javadoc)
146
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.api.service.IService, java.util.UUID, java.util.List)
147
     */
148
    @Override
149
    public <T extends CdmBase> T remoteLoad(IService<T> service, UUID uuid, List<String> propertyPaths) {
150
        return service.load(uuid, propertyPaths);
151
    }
121 152

  
153
    /* (non-Javadoc)
154
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#save(eu.etaxonomy.cdm.api.service.IService, eu.etaxonomy.cdm.model.common.CdmBase)
155
     */
156
    @Override
157
    public <T extends CdmBase> UUID remoteSave(IService<T> service, T cdmBase) {
158
        return service.save(cdmBase);
159
    }
160

  
161
    /* (non-Javadoc)
162
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#update(eu.etaxonomy.cdm.api.service.IService, eu.etaxonomy.cdm.model.common.CdmBase)
163
     */
164
    @Override
165
    public <T extends CdmBase> void remoteUpdate(IService<T> service, T cdmBase) {
166

  
167
    }
168

  
169

  
170
    /* (non-Javadoc)
171
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#update(eu.etaxonomy.cdm.model.common.ICdmBase, java.util.Set)
172
     */
173
    @Override
174
    public void update(CdmBase cdmBase, Set<CdmBase> affectedObjects) {
175
        // TODO Auto-generated method stub
122 176

  
177
    }
123 178

  
179
    /* (non-Javadoc)
180
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#delete(eu.etaxonomy.cdm.model.common.ICdmBase, java.util.Set)
181
     */
182
    @Override
183
    public void delete(ICdmBase cdmBase, Set<CdmBase> affectedObjects) {
184
        // TODO Auto-generated method stub
124 185

  
186
    }
125 187

  
126 188
}

Also available in: Unified diff