Fixed compile errors

eclipse-emfstore · Feb 12, 2015 · 807fd42 · 807fd42
1 parent b60aec4
commit 807fd42
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/...mon/src/org/eclipse/emf/emfstore/client/test/common/mocks/AdminConnectionManagerMock.java b/...mon/src/org/eclipse/emf/emfstore/client/test/common/mocks/AdminConnectionManagerMock.java
@@ -39,7 +39,7 @@ public class AdminConnectionManagerMock extends AbstractConnectionManager<Object
 
 	public AdminConnectionManagerMock(ACDAOFacade daoFacade, AccessControl accessControl,
 		ServerSpace serverSpace)
-		throws FatalESException {
+			throws FatalESException {
 
 		adminEmfStore = new AdminEmfStoreImpl(daoFacade, serverSpace, accessControl);
 	}
@@ -87,7 +87,8 @@ public List<ACUser> getUsers(SessionId sessionId) throws ESException {
 	 *
 	 * @see org.eclipse.emf.emfstore.internal.server.AdminEmfStore#getOrgUnits(org.eclipse.emf.emfstore.internal.server.model.SessionId)
 	 */
-	public List<ACOrgUnit<?>> getOrgUnits(SessionId sessionId) throws ESException {
+	@SuppressWarnings("rawtypes")
+	public List<ACOrgUnit> getOrgUnits(SessionId sessionId) throws ESException {
 		getConnectionProxy(sessionId);
 		return adminEmfStore.getOrgUnits(sessionId);
 	}
@@ -154,7 +155,8 @@ public void removeGroup(SessionId sessionId, ACOrgUnitId user, ACOrgUnitId group
 	 * @see org.eclipse.emf.emfstore.internal.server.AdminEmfStore#getMembers(org.eclipse.emf.emfstore.internal.server.model.SessionId,
 	 *      org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnitId)
 	 */
-	public List<ACOrgUnit<?>> getMembers(SessionId sessionId, ACOrgUnitId groupId) throws ESException {
+	@SuppressWarnings("rawtypes")
+	public List<ACOrgUnit> getMembers(SessionId sessionId, ACOrgUnitId groupId) throws ESException {
 		getConnectionProxy(sessionId);
 		return adminEmfStore.getMembers(sessionId, groupId);
 	}
@@ -237,7 +239,8 @@ public void changeUser(SessionId sessionId, ACOrgUnitId userId, String name, Str
 	 * @see org.eclipse.emf.emfstore.internal.server.AdminEmfStore#getParticipants(org.eclipse.emf.emfstore.internal.server.model.SessionId,
 	 *      org.eclipse.emf.emfstore.internal.server.model.ProjectId)
 	 */
-	public List<ACOrgUnit<?>> getParticipants(SessionId sessionId, ProjectId projectId) throws ESException {
+	@SuppressWarnings("rawtypes")
+	public List<ACOrgUnit> getParticipants(SessionId sessionId, ProjectId projectId) throws ESException {
 		getConnectionProxy(sessionId);
 		return adminEmfStore.getParticipants(sessionId, projectId);
 	}

diff --git a/...emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java b/...emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java
@@ -11,6 +11,7 @@
  ******************************************************************************/
 package org.eclipse.emf.emfstore.client.test.common.util;
 
+// import java.io.File;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -49,7 +50,6 @@
 import org.eclipse.emf.emfstore.internal.server.core.EMFStoreImpl;
 import org.eclipse.emf.emfstore.internal.server.exceptions.ConnectionException;
 import org.eclipse.emf.emfstore.internal.server.exceptions.FatalESException;
-import org.eclipse.emf.emfstore.internal.server.impl.api.ESOrgUnitProviderImpl;
 import org.eclipse.emf.emfstore.internal.server.model.ModelFactory;
 import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
 import org.eclipse.emf.emfstore.internal.server.model.ServerSpace;
@@ -161,8 +161,7 @@ public static ServerMock startMockServer(Map<String, String> properties) throws
 
 		ServerConfiguration.setProperties(initProperties(properties));
 		setSuperUser(daoFacadeMock);
-		final ESOrgUnitProviderImpl orgUnitProvider = new ESOrgUnitProviderImpl(serverSpace);
-		final AccessControl accessControl = new AccessControl(orgUnitProvider);
+		final AccessControl accessControl = new AccessControl(serverSpace);
 
 		// accessControl.setAuthenticationControl(ESUserVerifierFactory.INSTANCE
 		// .createAuthenticationControl(ESAuthenticationControlType.model, orgUnitProviderImpl));