diff options
| author | Nino Breuer | 2014-11-03 09:17:29 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-11-03 09:17:29 +0100 |
| commit | 4a078e9847b348441fdd7a36b558e107a7280ff0 (patch) | |
| tree | 8ad894376343bd00b46bceb113ace5ce1e02737c /dozentenmodul/src/main/java/util/ResourceLoader.java | |
| parent | v (diff) | |
| parent | • fixed bug which caused search guis to be closed when pressing enter in se... (diff) | |
| download | tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.tar.gz tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.tar.xz tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodulserver/src/main/java/sql/SQL.java
• Note: manual merge
Diffstat (limited to 'dozentenmodul/src/main/java/util/ResourceLoader.java')
| -rw-r--r-- | dozentenmodul/src/main/java/util/ResourceLoader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/util/ResourceLoader.java b/dozentenmodul/src/main/java/util/ResourceLoader.java index 7c3c9c62..731cedeb 100644 --- a/dozentenmodul/src/main/java/util/ResourceLoader.java +++ b/dozentenmodul/src/main/java/util/ResourceLoader.java @@ -100,9 +100,9 @@ public class ResourceLoader { } /** - * Tries to load the given resource as File + * Tries to load the given resource treating it as a text file * @param path Resource path to load - * @return the file of the loaded resource + * @return content of the loaded resource as String */ public static String getTextFile(String path) { String fileContent = null; |