优化

2023-03-25 16:09:40 +08:00
parent 3a35a45ff9
commit f66ee9ce31
13 changed files with 350 additions and 480 deletions
@@ -1,67 +1,54 @@
 /*
 * Decompiled with CFR 0.152.
 */
-package com.script;
+package com.script

-@SuppressWarnings("unused")
-public class ScriptException extends Exception {
-    private int columnNumber;
-    private String fileName;
-    private int lineNumber;
+class ScriptException : Exception {
+    var columnNumber: Int
+        private set
+    var fileName: String?
+        private set
+    var lineNumber: Int
+        private set

-    public ScriptException(String s) {
-        super(s);
-        this.fileName = null;
-        this.lineNumber = -1;
-        this.columnNumber = -1;
+    constructor(s: String?) : super(s) {
+        fileName = null
+        lineNumber = -1
+        columnNumber = -1
    }

-    public ScriptException(Exception e) {
-        super(e);
-        this.fileName = null;
-        this.lineNumber = -1;
-        this.columnNumber = -1;
+    constructor(e: Exception?) : super(e) {
+        fileName = null
+        lineNumber = -1
+        columnNumber = -1
    }

-    public ScriptException(String message, String fileName2, int lineNumber2) {
-        super(message);
-        this.fileName = fileName2;
-        this.lineNumber = lineNumber2;
-        this.columnNumber = -1;
+    constructor(message: String?, fileName2: String?, lineNumber2: Int) : super(message) {
+        fileName = fileName2
+        lineNumber = lineNumber2
+        columnNumber = -1
    }

-    public ScriptException(String message, String fileName2, int lineNumber2, int columnNumber2) {
-        super(message);
-        this.fileName = fileName2;
-        this.lineNumber = lineNumber2;
-        this.columnNumber = columnNumber2;
+    constructor(message: String?, fileName2: String?, lineNumber2: Int, columnNumber2: Int) : super(
+        message
+    ) {
+        fileName = fileName2
+        lineNumber = lineNumber2
+        columnNumber = columnNumber2
    }

-    @Override
-    public String getMessage() {
-        String ret = super.getMessage();
-        if (this.fileName == null) {
-            return ret;
+    override val message: String
+        get() {
+            val ret = super.message
+            if (fileName == null) {
+                return ret!!
+            }
+            var ret2 = ret + " in " + fileName
+            if (lineNumber != -1) {
+                ret2 = ret2 + " at line number " + lineNumber
+            }
+            return if (columnNumber != -1) {
+                ret2 + " at column number " + columnNumber
+            } else ret2
        }
-        String ret2 = ret + " in " + this.fileName;
-        if (this.lineNumber != -1) {
-            ret2 = ret2 + " at line number " + this.lineNumber;
-        }
-        if (this.columnNumber != -1) {
-            return ret2 + " at column number " + this.columnNumber;
-        }
-        return ret2;
-    }
-
-    public int getLineNumber() {
-        return this.lineNumber;
-    }
-
-    public int getColumnNumber() {
-        return this.columnNumber;
-    }
-
-    public String getFileName() {
-        return this.fileName;
-    }
-}
+}