Project

General

Profile

« Previous | Next » 

Revision c41ac60d

Added by Andreas Müller almost 4 years ago

adapt TaxEditor to new package structure for persistence.permission and format.description and some cleanup

View differences:

eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
62 62
 eu.etaxonomy.cdm.filter,
63 63
 eu.etaxonomy.cdm.format,
64 64
 eu.etaxonomy.cdm.format.taxon,
65
 eu.etaxonomy.cdm.format.description,
65 66
 eu.etaxonomy.cdm.hibernate,
66 67
 eu.etaxonomy.cdm.hibernate.search,
67 68
 eu.etaxonomy.cdm.io.api.application,
......
148 149
 eu.etaxonomy.cdm.persistence.dto,
149 150
 eu.etaxonomy.cdm.persistence.fetch,
150 151
 eu.etaxonomy.cdm.persistence.hibernate,
151
 eu.etaxonomy.cdm.persistence.hibernate.permission,
152
 eu.etaxonomy.cdm.persistence.hibernate.permission.voter,
152
 eu.etaxonomy.cdm.persistence.permission,
153
 eu.etaxonomy.cdm.persistence.permission.voter,
153 154
 eu.etaxonomy.cdm.persistence.hibernate.replace,
154 155
 eu.etaxonomy.cdm.persistence.hibernate.replace.impl,
155 156
 eu.etaxonomy.cdm.persistence.query,
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
79 79
import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
80 80
import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
81 81
import eu.etaxonomy.cdm.io.service.IIOService;
82
import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmPermissionEvaluator;
83
import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;
84
import eu.etaxonomy.cdm.persistence.hibernate.permission.UnanimousBasedUnrevokable;
85
import eu.etaxonomy.cdm.persistence.hibernate.permission.voter.DescriptionBaseVoter;
86
import eu.etaxonomy.cdm.persistence.hibernate.permission.voter.DescriptionElementVoter;
87
import eu.etaxonomy.cdm.persistence.hibernate.permission.voter.GrantAlwaysVoter;
88
import eu.etaxonomy.cdm.persistence.hibernate.permission.voter.TaxonBaseVoter;
89
import eu.etaxonomy.cdm.persistence.hibernate.permission.voter.TaxonNodeVoter;
82
import eu.etaxonomy.cdm.persistence.permission.CdmPermissionEvaluator;
83
import eu.etaxonomy.cdm.persistence.permission.ICdmPermissionEvaluator;
84
import eu.etaxonomy.cdm.persistence.permission.UnanimousBasedUnrevokable;
85
import eu.etaxonomy.cdm.persistence.permission.voter.DescriptionBaseVoter;
86
import eu.etaxonomy.cdm.persistence.permission.voter.DescriptionElementVoter;
87
import eu.etaxonomy.cdm.persistence.permission.voter.GrantAlwaysVoter;
88
import eu.etaxonomy.cdm.persistence.permission.voter.TaxonBaseVoter;
89
import eu.etaxonomy.cdm.persistence.permission.voter.TaxonNodeVoter;
90 90
import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
91 91
import eu.etaxonomy.taxeditor.service.AuthenticatingHttpInvokerRequestExecutor;
92 92
import eu.etaxonomy.taxeditor.service.CachedCommonServiceImpl;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
19 19
import org.hibernate.LazyInitializationException;
20 20

  
21 21
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
22
import eu.etaxonomy.cdm.api.service.DefaultCategoricalDescriptionBuilder;
23
import eu.etaxonomy.cdm.api.service.DefaultQuantitativeDescriptionBuilder;
24
import eu.etaxonomy.cdm.api.service.DescriptionBuilder;
25 22
import eu.etaxonomy.cdm.common.CdmUtils;
23
import eu.etaxonomy.cdm.format.description.DefaultCategoricalDescriptionBuilder;
24
import eu.etaxonomy.cdm.format.description.DefaultQuantitativeDescriptionBuilder;
25
import eu.etaxonomy.cdm.format.description.DescriptionBuilder;
26 26
import eu.etaxonomy.cdm.model.agent.AgentBase;
27 27
import eu.etaxonomy.cdm.model.common.CdmBase;
28 28
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
18 18

  
19 19
import eu.etaxonomy.cdm.common.CdmUtils;
20 20
import eu.etaxonomy.cdm.config.ICdmSource;
21
import eu.etaxonomy.cdm.persistence.hibernate.permission.SecurityExceptionUtils;
21
import eu.etaxonomy.cdm.persistence.permission.SecurityExceptionUtils;
22 22
import eu.etaxonomy.taxeditor.remoting.RemoteExecutionTimestampsUtil;
23 23
import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;
24 24
import eu.etaxonomy.taxeditor.store.CdmStore;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/security/AuthenticationSourceProvider.java
13 13
import org.springframework.security.core.Authentication;
14 14
import org.springframework.security.core.GrantedAuthority;
15 15

  
16
import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
16
import eu.etaxonomy.cdm.persistence.permission.Role;
17 17
import eu.etaxonomy.taxeditor.store.CdmStore;
18 18
import eu.etaxonomy.taxeditor.store.LoginManager;
19 19

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/security/PermissionPropertyTester.java
8 8

  
9 9
import eu.etaxonomy.cdm.model.common.CdmBase;
10 10
import eu.etaxonomy.cdm.model.permission.CRUD;
11
import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
11
import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
12 12
import eu.etaxonomy.taxeditor.store.CdmStore;
13 13
import eu.etaxonomy.taxeditor.store.StoreUtil;
14 14

  
......
16 16
 * Checks if the currently authenticated user for {@link CdmAuthority} assignments.
17 17
 *
18 18
 * @author andreas
19
 *
20 19
 */
21 20
public class PermissionPropertyTester extends PropertyTester {
22 21

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/security/RequiredPermissions.java
1 1
/**
2
 * 
2
 *
3 3
 */
4 4
package eu.etaxonomy.taxeditor.security;
5 5

  
6 6
import java.util.EnumSet;
7 7

  
8 8
import eu.etaxonomy.cdm.model.permission.CRUD;
9
import eu.etaxonomy.cdm.persistence.hibernate.permission.Operation;
9
import eu.etaxonomy.cdm.persistence.permission.Operation;
10 10

  
11 11
/**
12
 * Provides the required permissions a user would need in order to view or edit a 
12
 * Provides the required permissions a user would need in order to view or edit a
13 13
 * specific cdm type.
14
 * 
15
 * @author andreas kohlbecker
16 14
 *
15
 * @author andreas kohlbecker
17 16
 */
18 17
public class RequiredPermissions {
19
	
18

  
20 19
	public static final EnumSet<CRUD> TAXONNODE_EDIT = Operation.UPDATE;
21
	
20

  
22 21
	public static final EnumSet<CRUD> TAXON_EDIT = Operation.UPDATE;
23
	
24
	public static final EnumSet<CRUD> DESCRIPTION_EDIT = Operation.UPDATE;
25
	
26 22

  
23
	public static final EnumSet<CRUD> DESCRIPTION_EDIT = Operation.UPDATE;
27 24
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
89 89
import eu.etaxonomy.cdm.model.term.TermVocabulary;
90 90
import eu.etaxonomy.cdm.model.validation.EntityConstraintViolation;
91 91
import eu.etaxonomy.cdm.model.validation.EntityValidation;
92
import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;
93
import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
92
import eu.etaxonomy.cdm.persistence.permission.ICdmPermissionEvaluator;
93
import eu.etaxonomy.cdm.persistence.permission.Role;
94 94
import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
95 95
import eu.etaxonomy.taxeditor.io.ExportManager;
96 96
import eu.etaxonomy.taxeditor.io.ImportManager;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
11 11

  
12 12
import java.lang.reflect.Constructor;
13 13
import java.lang.reflect.InvocationTargetException;
14
import java.sql.SQLException;
15 14
import java.util.concurrent.CancellationException;
16 15

  
17 16
import org.eclipse.core.runtime.IProgressMonitor;
......
30 29
import eu.etaxonomy.cdm.config.ICdmSource;
31 30
import eu.etaxonomy.cdm.database.DbSchemaValidation;
32 31
import eu.etaxonomy.cdm.database.ICdmDataSource;
33
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
34 32
import eu.etaxonomy.cdm.model.metadata.CdmMetaData;
35 33
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
36 34
import eu.etaxonomy.cdm.model.name.Rank;
35
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
37 36
import eu.etaxonomy.taxeditor.event.EventUtility;
38 37
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
39 38
import eu.etaxonomy.taxeditor.l10n.Messages;
......
44 43
import eu.etaxonomy.taxeditor.ui.dialog.LoginDialog;
45 44
import eu.etaxonomy.taxeditor.ui.dialog.RemotingLoginDialog;
46 45

  
47

  
48 46
/**
49 47
 * @author n.hoffmann
50 48
 * @created Dec 8, 2010
51
 * @version 1.0
52 49
 */
53 50
class CdmStoreConnector extends Job {
54 51
    private final Display display;
......
56 53
    private DbSchemaValidation dbSchemaValidation;
57 54
    private final Resource applicationContextBean;
58 55

  
59

  
60 56
    /**
61 57
     * @param datasource
62 58
     * @param dbSchemaValidation
......
73 69
        this.applicationContextBean = applicationContextBean;
74 70
    }
75 71

  
76

  
77

  
78 72
    @Override
79 73
    public IStatus run(final IProgressMonitor monitor) {
80 74

  
......
140 134
        loginDialog.setMessage(null);
141 135
        loginDialog.hide(true);
142 136

  
143

  
144 137
        ProgressMonitorDialog dialog = new ProgressMonitorDialog(StoreUtil.getShell());
145 138

  
146 139
        try {
......
192 185
                            CdmStore.setInstance(applicationController, cdmSource);
193 186
                            monitor.subTask(Messages.CdmStoreConnector_AUTHENTICATING_USER);
194 187
                            display.syncExec(new Runnable() {
195
                                /*
196
                                 * (non-Javadoc)
197
                                 *
198
                                 * @see java.lang.Runnable#run()
199
                                 */
188

  
200 189
                                @Override
201 190
                                public void run() {
202 191

  
......
213 202
                                    } catch(CdmAuthenticationException cae) {
214 203
                                        loginDialog.hide(false);
215 204
                                        loginDialog.setMessage(Messages.RemotingLoginDialog_MISSING_PERMISSION);
216

  
217 205
                                    }
218

  
219 206
                                }
220 207
                            });
221 208
                        } else {
......
252 239
        }
253 240
    }
254 241

  
255

  
256 242
    private ICdmRepository getApplicationController(ICdmSource cdmSource, CdmProgressMonitorAdapter subprogressMonitor) {
257 243
        if(cdmSource instanceof ICdmDataSource) {
258 244
            return  CdmApplicationController.NewInstance(applicationContextBean,
......
278 264
        CdmStore.getContextManager().notifyContextStart();
279 265
    }
280 266

  
281
    /**
282
     * @return
283
     */
284 267
    private String getConnectionMessage() {
285 268
        return cdmSource.getConnectionMessage();
286 269
    }
287 270

  
288
    /**
289
     * @return
290
     * @throws SQLException
291
     */
292 271
    private void checkDbSchemaVersionCompatibility(IProgressMonitor monitor) {
293 272
        monitor.subTask(Messages.CdmStoreConnector_CHECK_IF_EDITOR_IS_COMPATIBLE);
294 273
        String dbSchemaVersion;
......
325 304

  
326 305
            monitor.setCanceled(true);
327 306
        }
328

  
329 307
    }
330 308

  
331 309
    private void checkIsNonEmptyCdmDatabase(IProgressMonitor monitor) {
......
362 340
            monitor.setCanceled(true);
363 341
        }
364 342
    }
365

  
366

  
367 343
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java
31 31
import eu.etaxonomy.cdm.model.permission.Group;
32 32
import eu.etaxonomy.cdm.model.permission.User;
33 33
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
34
import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
34
import eu.etaxonomy.cdm.persistence.permission.Role;
35 35
import eu.etaxonomy.taxeditor.model.IContextListener;
36 36
import eu.etaxonomy.taxeditor.model.MessagingUtils;
37 37

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
61 61
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
62 62
import eu.etaxonomy.cdm.api.service.IUserService;
63 63
import eu.etaxonomy.cdm.model.metadata.CdmMetaData;
64
import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
64
import eu.etaxonomy.cdm.persistence.permission.Role;
65 65
import eu.etaxonomy.taxeditor.l10n.Messages;
66 66
import eu.etaxonomy.taxeditor.model.MessagingUtils;
67 67
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
......
98 98
    private Combo comboCdmInstance;
99 99
    private Button btnConnect;
100 100

  
101
    private final Map<String, CdmServerInfo> csiiMap = new HashMap<String, CdmServerInfo>();
101
    private final Map<String, CdmServerInfo> csiiMap = new HashMap<>();
102 102

  
103 103
    private final static String STATUS_AVAILABLE = Messages.RemotingLoginDialog_STATUS_AVAILABLE;
104 104
    private final static String STATUS_NOT_AVAILABLE = Messages.RemotingLoginDialog_STATUS_NOT_AVAILABLE;
......
189 189

  
190 190
    /**
191 191
     * Open the dialog.
192
     * @return the result
192
     * @return the dialog result
193 193
     */
194 194
    public Object open() {
195 195

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CRUDOperationChooser.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
*/
......
17 17
import org.eclipse.swt.widgets.Composite;
18 18
import org.eclipse.swt.widgets.Display;
19 19

  
20
import eu.etaxonomy.cdm.model.permission.GrantedAuthorityImpl;
21 20
import eu.etaxonomy.cdm.model.permission.CRUD;
22
import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
23
import eu.etaxonomy.cdm.persistence.hibernate.permission.Operation;
24

  
21
import eu.etaxonomy.cdm.model.permission.GrantedAuthorityImpl;
22
import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
23
import eu.etaxonomy.cdm.persistence.permission.Operation;
25 24

  
26 25
/**
27 26
 * Widget for editing {@link Operation} objects, consisting of 4 checkboxes for CREATE, UPDATE, READ, DELETE operations.
28
 * 
27
 *
29 28
 * @author cmathew
30 29
 * @created Mar 28, 2013
31
 *
32 30
 */
33 31
public class CRUDOperationChooser extends Composite {
34
	
32

  
35 33
	private Button createCheckButton;
36 34
	private Button readCheckButton;
37 35
	private Button deleteCheckButton;
38 36
	private Button updateCheckButton;
39
	
37

  
40 38
	private CdmAuthorityRow caRow;
41 39
	private GrantedAuthorityImpl grantedAuthorityI;
42 40
	private CdmAuthority cdmAuthority;
43 41
	private CdmAuthorityCompositeViewer viewer;
44
	
42

  
45 43
	/**
46 44
	 * Create the composite.
47 45
	 * @param parent
......
53 51
		RowLayout rowLayout = new RowLayout(SWT.HORIZONTAL);
54 52
		rowLayout.justify = true;
55 53
		setLayout(rowLayout);
56
		
57
		
54

  
58 55
		this.caRow = parent;
59 56
		createCheckButton = new Button(this, SWT.CHECK);
60 57
		createCheckButton.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
......
71 68
						grantedAuthorityI = viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
72 69
						parent.setDirty(true);
73 70
					}
74
					
71

  
75 72
				}
76 73
			}
77 74
		});
78 75
		createCheckButton.setText("C");
79
		
76

  
80 77
		readCheckButton = new Button(this, SWT.CHECK);
81 78
		readCheckButton.setEnabled(false);
82 79
		readCheckButton.addMouseTrackListener(new MouseTrackAdapter() {
......
97 94
						grantedAuthorityI = viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
98 95
						parent.setDirty(true);
99 96
					}
100
					
97

  
101 98
				}
102
					
99

  
103 100
			}
104 101
		});
105 102
		readCheckButton.setText("R");
106
		
103

  
107 104
		deleteCheckButton = new Button(this, SWT.CHECK);
108 105
		deleteCheckButton.addMouseListener(new MouseAdapter() {
109 106
			@Override
......
118 115
						grantedAuthorityI = viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
119 116
						parent.setDirty(true);
120 117
					}
121
					
118

  
122 119
				}
123 120
			}
124 121
		});
125 122
		deleteCheckButton.setText("D");
126
		
123

  
127 124
		updateCheckButton = new Button(this, SWT.CHECK);
128 125
		updateCheckButton.addMouseListener(new MouseAdapter() {
129 126
			@Override
......
138 135
						grantedAuthorityI = viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
139 136
						parent.setDirty(true);
140 137
					}
141
					
138

  
142 139
				}
143 140
			}
144 141
		});
......
146 143
		updateView();
147 144
	}
148 145

  
149
	
146

  
150 147
	@Override
151 148
	protected void checkSubclass() {
152 149
		// Disable the check that prevents subclassing of SWT components
153 150
	}
154
	
151

  
155 152
	/**
156 153
	 * Set viewer, CDM Authority and corresponding GrantedAuthorityImpl object
157
	 * 
154
	 *
158 155
	 * @param viewer
159 156
	 * @param grantedAuthorityI
160 157
	 * @param cdmAuthority
161 158
	 */
162
	public void setAuthority(CdmAuthorityCompositeViewer viewer, 
159
	public void setAuthority(CdmAuthorityCompositeViewer viewer,
163 160
			GrantedAuthorityImpl grantedAuthorityI,
164 161
			CdmAuthority cdmAuthority) {
165 162
		this.grantedAuthorityI = grantedAuthorityI;
......
167 164
		this.viewer = viewer;
168 165
		updateView();
169 166
	}
170
	
171 167

  
172
	
168

  
169

  
173 170
	/**
174 171
	 * Update widget state.
175 172
	 */
......
178 175
		readCheckButton.setSelection(true);
179 176
		deleteCheckButton.setSelection(false);
180 177
		updateCheckButton.setSelection(false);
181
		
182
		
178

  
179

  
183 180
		if(cdmAuthority!= null && cdmAuthority.getOperation() != null) {
184 181
			if(cdmAuthority.getOperation().contains(CRUD.CREATE)) {
185 182
				createCheckButton.setSelection(true);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityCompositeViewer.java
30 30
import eu.etaxonomy.cdm.model.permission.GrantedAuthorityImpl;
31 31
import eu.etaxonomy.cdm.model.permission.Group;
32 32
import eu.etaxonomy.cdm.model.term.TermBase;
33
import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
33
import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
34 34
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
35 35
import eu.etaxonomy.taxeditor.model.MessagingUtils;
36 36

  
37

  
38

  
39 37
/**
40 38
 * Viewer class for the {@link CdmAuthorityComposite} used in the editing of CDM Authorities.
41 39
 *
42 40
 * @author cmathew
43 41
 * @created Mar 28, 2013
44
 *
45 42
 */
46

  
47

  
48 43
//FIXME:move warning dialogs to the table class
49 44
public class CdmAuthorityCompositeViewer extends ContentViewer {
50 45

  
......
105 100
	public List<GrantedAuthorityImpl> updateAuthorities()  {
106 101
		// get all granted authorities
107 102
		Set<GrantedAuthority> grantedAuthorities = group.getGrantedAuthorities();
108
		cdmAuthorities = new ArrayList<GrantedAuthorityImpl>();
103
		cdmAuthorities = new ArrayList<>();
109 104

  
110 105
		Iterator<GrantedAuthority> itr = grantedAuthorities.iterator();
111 106
		while (itr.hasNext()) {
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityRow.java
22 22
import org.eclipse.ui.forms.widgets.FormToolkit;
23 23

  
24 24
import eu.etaxonomy.cdm.model.permission.GrantedAuthorityImpl;
25
import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
25
import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
26 26
import eu.etaxonomy.taxeditor.model.ImageResources;
27 27
import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityLabelTextProvider;
28 28

  
29

  
30 29
/**
31 30
 * Row widget for editing a single CDM Authority
32 31
 *
33 32
 * @author cmathew
34 33
 * @created Mar 28, 2013
35
 *
36 34
 */
37 35
public class CdmAuthorityRow extends Composite {
38 36

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityLabelTextProvider.java
17 17
import eu.etaxonomy.cdm.api.service.ITermService;
18 18
import eu.etaxonomy.cdm.api.service.IUserService;
19 19
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
20
import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
20
import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
21 21
import eu.etaxonomy.taxeditor.store.CdmStore;
22 22

  
23 23
public class GrantedAuthorityLabelTextProvider {
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
19 19
import eu.etaxonomy.cdm.model.taxon.SynonymType;
20 20
import eu.etaxonomy.cdm.model.taxon.Taxon;
21 21
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
22
import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
22
import eu.etaxonomy.cdm.persistence.permission.Role;
23 23
import eu.etaxonomy.taxeditor.preference.NameDetailsConfigurator;
24 24
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
25 25
import eu.etaxonomy.taxeditor.store.CdmStore;

Also available in: Unified diff