X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FDefaultRepositoryRegister.java;h=bbe0f93cc875c7ccc32bf97a91c8623ffd7d6961;hb=484dcb1507e4e35cc282e50522ea7eac7e99a7f9;hp=a39ab8751af77e6bfb819b2dfccbfb4ea4f498f9;hpb=a9e4e6bdc775333bc89ca1c9a5bcb0a199c5e7ca;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java
index a39ab8751..bbe0f93cc 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java
@@ -12,7 +12,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class DefaultRepositoryRegister extends Observable implements
-		RepositoryRegister {
+		RepositoryRegister, ArgeoJcrConstants {
 	private final static Log log = LogFactory
 			.getLog(DefaultRepositoryRegister.class);
 
@@ -23,10 +23,10 @@ public class DefaultRepositoryRegister extends Observable implements
 	@SuppressWarnings("rawtypes")
 	public synchronized Repository getRepository(Map parameters)
 			throws RepositoryException {
-		if (!parameters.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS))
-			throw new RepositoryException("Parameter " + ArgeoJcrConstants.JCR_REPOSITORY_ALIAS
+		if (!parameters.containsKey(JCR_REPOSITORY_ALIAS))
+			throw new RepositoryException("Parameter " + JCR_REPOSITORY_ALIAS
 					+ " has to be defined.");
-		String alias = parameters.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString();
+		String alias = parameters.get(JCR_REPOSITORY_ALIAS).toString();
 		if (!repositories.containsKey(alias))
 			throw new RepositoryException(
 					"No repository registered with alias " + alias);
@@ -43,13 +43,13 @@ public class DefaultRepositoryRegister extends Observable implements
 	@SuppressWarnings("rawtypes")
 	public synchronized void register(Repository repository, Map properties) {
 		// TODO: also check bean name?
-		if (properties == null || !properties.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS)) {
-			log.warn("Cannot register a repository without property "
-					+ ArgeoJcrConstants.JCR_REPOSITORY_ALIAS);
+		String alias;
+		if (properties == null || !properties.containsKey(JCR_REPOSITORY_ALIAS)) {
+			log.warn("Cannot register a repository if no "
+					+ JCR_REPOSITORY_ALIAS + " property is speecified.");
 			return;
 		}
-
-		String alias = properties.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString();
+		alias = properties.get(JCR_REPOSITORY_ALIAS).toString();
 		Map<String, Repository> map = new TreeMap<String, Repository>(
 				repositories);
 		map.put(alias, repository);
@@ -62,13 +62,13 @@ public class DefaultRepositoryRegister extends Observable implements
 	@SuppressWarnings("rawtypes")
 	public synchronized void unregister(Repository repository, Map properties) {
 		// TODO: also check bean name?
-		if (properties == null || !properties.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS)) {
+		if (properties == null || !properties.containsKey(JCR_REPOSITORY_ALIAS)) {
 			log.warn("Cannot unregister a repository without property "
-					+ ArgeoJcrConstants.JCR_REPOSITORY_ALIAS);
+					+ JCR_REPOSITORY_ALIAS);
 			return;
 		}
 
-		String alias = properties.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString();
+		String alias = properties.get(JCR_REPOSITORY_ALIAS).toString();
 		Map<String, Repository> map = new TreeMap<String, Repository>(
 				repositories);
 		map.put(alias, repository);