X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernelUtils.java;h=cb22e2790c055f7e021cd9a3dbdfd419e5dd095e;hb=3400a80f88b418c598bf30f27b13ce1360902376;hp=49f8c20a50be2580e8751683224a9fea25d367cb;hpb=ee5aea67d92a71fc4cbb0ed1c11fe5f2c0280196;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
index 49f8c20a5..cb22e2790 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
@@ -30,8 +30,8 @@ import org.osgi.framework.FrameworkUtil;
 
 /** Package utilities */
 class KernelUtils implements KernelConstants {
-	private final static String OSGI_INSTANCE_AREA = "osgi.instance.area";
-	private final static String OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
+	final static String OSGI_INSTANCE_AREA = "osgi.instance.area";
+	final static String OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
 
 	static Dictionary<String, ?> asDictionary(Properties props) {
 		Hashtable<String, Object> hashtable = new Hashtable<String, Object>();
@@ -73,19 +73,20 @@ class KernelUtils implements KernelConstants {
 
 	static URI getOsgiInstanceUri(String relativePath) {
 		String osgiInstanceBaseUri = getFrameworkProp(OSGI_INSTANCE_AREA);
-			return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
+		return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
 	}
 
-//	static String getOsgiInstancePath(String relativePath) {
-//		try {
-//			if (relativePath == null)
-//				return getOsgiInstanceDir().getCanonicalPath();
-//			else
-//				return new File(getOsgiInstanceDir(), relativePath).getCanonicalPath();
-//		} catch (IOException e) {
-//			throw new CmsException("Cannot get instance path for " + relativePath, e);
-//		}
-//	}
+	// static String getOsgiInstancePath(String relativePath) {
+	// try {
+	// if (relativePath == null)
+	// return getOsgiInstanceDir().getCanonicalPath();
+	// else
+	// return new File(getOsgiInstanceDir(), relativePath).getCanonicalPath();
+	// } catch (IOException e) {
+	// throw new CmsException("Cannot get instance path for " + relativePath,
+	// e);
+	// }
+	// }
 
 	static File getOsgiConfigurationFile(String relativePath) {
 		try {
@@ -195,14 +196,14 @@ class KernelUtils implements KernelConstants {
 	private static BundleContext getBundleContext() {
 		return getBundleContext(KernelUtils.class);
 	}
-	
-	private static URI safeUri(String uri){
-		if(uri==null)
+
+	private static URI safeUri(String uri) {
+		if (uri == null)
 			throw new CmsException("URI cannot be null");
 		try {
 			return new URI(uri);
 		} catch (URISyntaxException e) {
-			throw new CmsException("Dadly formatted URI "+uri, e);
+			throw new CmsException("Dadly formatted URI " + uri, e);
 		}
 	}