From e331c323f0156499d69e27a2d1d8d234ea63e260 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 18 Apr 2012 17:28:38 +0200
Subject: [PATCH] OO-224: load javascripts/css from source code in debug mode
(olat.debug=true + source path set)
---
.../core/gui/media/ClasspathMediaResource.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/media/ClasspathMediaResource.java b/src/main/java/org/olat/core/gui/media/ClasspathMediaResource.java
index 135d80c8b78..afa9f3265b7 100644
--- a/src/main/java/org/olat/core/gui/media/ClasspathMediaResource.java
+++ b/src/main/java/org/olat/core/gui/media/ClasspathMediaResource.java
@@ -41,8 +41,7 @@ import javax.servlet.http.HttpServletResponse;
import org.olat.core.helpers.Settings;
import org.olat.core.logging.LogDelegator;
-import org.olat.core.logging.OLog;
-import org.olat.core.logging.Tracing;
+import org.olat.core.util.StringHelper;
import org.olat.core.util.WebappHelper;
/**
@@ -74,7 +73,16 @@ public class ClasspathMediaResource extends LogDelegator implements MediaResourc
sb.append('/').append(pakkage.getName().replace(".", "/"));
if(!location.startsWith("/")) sb.append('/');
sb.append(location);
- this.url = getClass().getResource(sb.toString());
+
+ if(Settings.isDebuging() && StringHelper.containsNonWhitespace(WebappHelper.getSourcePath())) {
+ try {
+ this.url = new File(WebappHelper.getSourcePath(), sb.toString()).toURI().toURL();
+ } catch (MalformedURLException e) {
+ this.url = getClass().getResource(sb.toString());
+ }
+ } else {
+ this.url = getClass().getResource(sb.toString());
+ }
init(pakkage.getName());
}
--
GitLab