2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-03 00:37:55 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge branch 'development' into task/improved-script-loader

Browse Source
This commit is contained in:
Jeroen Ketelaar
2019-05-22 07:14:54 -05:00
committed by GitHub
parent ff5f020919 73704da6a4
commit 610f1ef40a
2 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/parabot/core/asm/redirect/SystemRedirect.java
+15 -3
View File
@@ -23,11 +23,23 @@ public class SystemRedirect {
System.exit(i);
}
private static String getClassPath(){
String classPath = System.getProperty("java.class.path");
StringBuilder finalClassPath = new StringBuilder();
for (String path : classPath.split(":")) {
if (!path.toLowerCase().contains("parabot")) {
finalClassPath.append(path).append(":");
}
}
return finalClassPath.toString();
}
public static String getProperty(String s) {
String value;
switch (s) {
case "java.class.path":
value = ".";
value = getClassPath();
break;
default:
value = System.getProperty(s);
@@ -42,14 +54,14 @@ public class SystemRedirect {
String value = null;
switch (s2) {
case "java.class.path":
value = ".";
value = getClassPath();
break;
}
if (value == null) {
switch (s) {
case "java.class.path":
value = ".";
value = getClassPath();
break;
default:
value = System.getProperty(s);
src/main/java/org/parabot/core/ui/ReflectUI.java
+13 -1
View File
@@ -240,12 +240,24 @@ public class ReflectUI extends JFrame {
builder.append("<b>Static: </b>").append(refField.isStatic() ? "yes" : "no").append("<br/>");
builder.append("<b>Array: </b>").append(refField.isArray() ? refField.getArrayDimensions() + " dimension(s)" : "no").append("<br/>");
if (refField.isArray() && refField.getASMType().getClassName().contains("String") && refField.getArrayDimensions() == 1) {
if (refField.isArray()) {
if (refField.getArrayDimensions() == 1) {
if (refField.getASMType().getClassName().contains("int")) {
int[] ints = (int[]) refField.asObject();
String values = "";
for (int i = 0; i < ints.length; i++) {
values += (ints[i] + (i < ints.length - 1 ? ", " : ""));
}
builder.append("<b>Values: </b>").append(values).append("<br/>");
} else if (refField.getASMType().getClassName().contains("String")) {
String[] strings = (String[]) refField.asObject();
String values = StringUtils.implode(", ", strings);
builder.append("<b>Values: </b>").append(values).append("<br/>");
}
}
}
selectionInfoPane.setText(builder.toString());
fillBasicInfoPane();