diff options
| author | minenash <enderbros.minenash@gmail.com> | 2018-03-11 17:29:31 -0400 |
|---|---|---|
| committer | minenash <enderbros.minenash@gmail.com> | 2018-03-11 17:29:31 -0400 |
| commit | 6179b901b6ce880611fd10a0f7620425dcda3766 (patch) | |
| tree | 49766d8b921d9d742c0c8a8851ea53e79f1dcc93 | |
| parent | 6c4b9f357318f6032a4afe703cb1e3d0ec8c21b4 (diff) | |
Fixed bug where module name would have a $# at the end. Made getCaller
slightly more efficient.
| -rw-r--r-- | src/com/redstoner/misc/Utils.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/redstoner/misc/Utils.java b/src/com/redstoner/misc/Utils.java index 7102e2f..8186bcb 100644 --- a/src/com/redstoner/misc/Utils.java +++ b/src/com/redstoner/misc/Utils.java @@ -23,6 +23,8 @@ public final class Utils /** The Pattern for a UUID*/ private static final Pattern UUID_pattern = Pattern.compile("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"); + private static final Pattern Class_pattern = Pattern.compile(".*\\."); + private static final Pattern NoDolarSign_pattern = Pattern.compile("\\$\\d*"); /** Hidden constructor. Do not instantiate UTILS classes! :) */ private Utils() @@ -76,7 +78,7 @@ public final class Utils String classname = "Utils"; for (int i = 0; classname.equals("Utils"); i++) { - classname = stackTrace[i].getClassName().replaceAll(".*\\.", ""); + classname = Class_pattern.matcher(stackTrace[i].getClassName()).replaceAll(""); } return classname; } @@ -94,8 +96,9 @@ public final class Utils List<String> callers = Arrays.asList(directCaller); for (int i = 0; callers.contains(classname) || classname.equals("Utils"); i++) { - classname = stackTrace[i].getClassName().replaceAll(".*\\.", ""); + classname = Class_pattern.matcher(stackTrace[i].getClassName()).replaceAll(""); } + classname = NoDolarSign_pattern.matcher(classname).replaceAll(""); return classname; } |