1.1 --- a/src/main/java/xelfi/compiler/XelfiCompilerMain.java Tue Jan 17 21:11:58 2017 +0100
1.2 +++ b/src/main/java/xelfi/compiler/XelfiCompilerMain.java Tue Jan 17 21:12:37 2017 +0100
1.3 @@ -5,19 +5,16 @@
1.4
1.5 package xelfi.compiler;
1.6
1.7 -import sun.tools.javac.*;
1.8 -import sun.tools.java.*;
1.9 import java.io.*;
1.10
1.11
1.12 -class XelfiCompilerMain extends Main implements MainCompiler
1.13 +class XelfiCompilerMain extends Object implements MainCompiler
1.14 {
1.15 /** Output from compiler is send here. */
1.16 protected XelfiCompilerOutput out;
1.17
1.18 XelfiCompilerMain(XelfiCompilerOutput o)
1.19 {
1.20 - super(o, "javac");
1.21 out = o;
1.22 }
1.23
1.24 @@ -37,7 +34,7 @@
1.25 args[0] = file.toString();
1.26 output("Compiling: " + args[0]);
1.27 }
1.28 - compile(args);
1.29 +// compile(args);
1.30 output("\n");
1.31 }
1.32
2.1 --- a/src/main/java/xelfi/debugger/CallStackView.java Tue Jan 17 21:11:58 2017 +0100
2.2 +++ b/src/main/java/xelfi/debugger/CallStackView.java Tue Jan 17 21:12:37 2017 +0100
2.3 @@ -11,14 +11,6 @@
2.4 import xelfi.top.TopLevel;
2.5 import xelfi.top.TopDialog;
2.6
2.7 -import sun.tools.debug.*; // needs TCP/IP
2.8 -//import symantec.tools.debug.*; // doesn't need TCP/IP
2.9 -
2.10 -/**
2.11 - * This is a view on the data given by the Debugger.
2.12 - * It is a view on a stack of method calls in the actually traced thread.
2.13 - */
2.14 -
2.15 public class CallStackView extends TopDialog
2.16 {
2.17 private Debugger document;
3.1 --- a/src/main/java/xelfi/debugger/Debugger.java Tue Jan 17 21:11:58 2017 +0100
3.2 +++ b/src/main/java/xelfi/debugger/Debugger.java Tue Jan 17 21:12:37 2017 +0100
3.3 @@ -18,7 +18,6 @@
3.4 import xelfi.compiler.Output;
3.5 import xelfi.execution.RunOptions;
3.6
3.7 -import sun.tools.debug.*; // needs TCP/IP
3.8 //import symantec.tools.debug.*; // doesn't need TCP/IP
3.9
3.10 /**
3.11 @@ -840,7 +839,7 @@
3.12
3.13 try
3.14 {
3.15 - RemoteClass rc = rsf.getRemoteClass();
3.16 + RemoteStackFrame.Name rc = rsf.getRemoteClass();
3.17
3.18 if (rc == null)
3.19 System.out.println("invalid stack frame");
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/src/main/java/xelfi/debugger/DebuggerCallback.java Tue Jan 17 21:12:37 2017 +0100
4.3 @@ -0,0 +1,14 @@
4.4 +/*
4.5 + * To change this license header, choose License Headers in Project Properties.
4.6 + * To change this template file, choose Tools | Templates
4.7 + * and open the template in the editor.
4.8 + */
4.9 +package xelfi.debugger;
4.10 +
4.11 +/**
4.12 + *
4.13 + * @author devel
4.14 + */
4.15 +interface DebuggerCallback {
4.16 +
4.17 +}
5.1 --- a/src/main/java/xelfi/debugger/LocalsView.java Tue Jan 17 21:11:58 2017 +0100
5.2 +++ b/src/main/java/xelfi/debugger/LocalsView.java Tue Jan 17 21:12:37 2017 +0100
5.3 @@ -11,7 +11,6 @@
5.4 import xelfi.top.TopLevel;
5.5 import xelfi.top.TopDialog;
5.6
5.7 -import sun.tools.debug.*; // needs TCP/IP
5.8 //import symantec.tools.debug.*; // doesn't need TCP/IP
5.9
5.10 /**
5.11 @@ -61,33 +60,6 @@
5.12 return;
5.13 }
5.14
5.15 - RemoteStackVariable rsv[] = document.getStackVariables();
5.16 -
5.17 - if (rsv == null)
5.18 - {
5.19 - list.clear();
5.20 - return;
5.21 - }
5.22 -
5.23 - int indexOfSelected = list.getSelectedIndex();
5.24 - if (indexOfSelected != -1)
5.25 - list.deselect(indexOfSelected);
5.26 -
5.27 - for(int i = 0; i < rsv.length; i++)
5.28 - {
5.29 - String line = rsv[i].getName();
5.30 -
5.31 - line += ": "+document.getCurrentValue(rsv[i].getName());
5.32 -
5.33 - if (i > list.countItems()-1)
5.34 - list.addItem(line);
5.35 - else
5.36 - if (!list.getItem(i).equals(line))
5.37 - list.replaceItem(line, i);
5.38 - }
5.39 -
5.40 - if (rsv.length < list.countItems())
5.41 - list.delItems(rsv.length, list.countItems()-1);
5.42 }
5.43
5.44 /**
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/src/main/java/xelfi/debugger/RemoteArray.java Tue Jan 17 21:12:37 2017 +0100
6.3 @@ -0,0 +1,21 @@
6.4 +/*
6.5 + * To change this license header, choose License Headers in Project Properties.
6.6 + * To change this template file, choose Tools | Templates
6.7 + * and open the template in the editor.
6.8 + */
6.9 +package xelfi.debugger;
6.10 +
6.11 +/**
6.12 + *
6.13 + * @author devel
6.14 + */
6.15 +class RemoteArray extends RemoteValue {
6.16 +
6.17 + RemoteValue getElement(int index) {
6.18 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
6.19 + }
6.20 +
6.21 + RemoteValue[] getElements() {
6.22 + throw new UnsupportedOperationException();
6.23 + }
6.24 +}
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/src/main/java/xelfi/debugger/RemoteChar.java Tue Jan 17 21:12:37 2017 +0100
7.3 @@ -0,0 +1,5 @@
7.4 +package xelfi.debugger;
7.5 +
7.6 +class RemoteChar extends RemoteValue {
7.7 +
7.8 +}
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/src/main/java/xelfi/debugger/RemoteClass.java Tue Jan 17 21:12:37 2017 +0100
8.3 @@ -0,0 +1,30 @@
8.4 +/*
8.5 + * To change this license header, choose License Headers in Project Properties.
8.6 + * To change this template file, choose Tools | Templates
8.7 + * and open the template in the editor.
8.8 + */
8.9 +package xelfi.debugger;
8.10 +
8.11 +/**
8.12 + *
8.13 + * @author devel
8.14 + */
8.15 +class RemoteClass {
8.16 +
8.17 + String clearBreakpointLine(int lineNumber) {
8.18 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
8.19 + }
8.20 +
8.21 + RemoteField getMethod(String main) {
8.22 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
8.23 + }
8.24 +
8.25 + String setBreakpointLine(int lineNumber) {
8.26 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
8.27 + }
8.28 +
8.29 + String setBreakpointMethod(RemoteField rf) {
8.30 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
8.31 + }
8.32 +
8.33 +}
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/src/main/java/xelfi/debugger/RemoteDebugger.java Tue Jan 17 21:12:37 2017 +0100
9.3 @@ -0,0 +1,37 @@
9.4 +/*
9.5 + * To change this license header, choose License Headers in Project Properties.
9.6 + * To change this template file, choose Tools | Templates
9.7 + * and open the template in the editor.
9.8 + */
9.9 +package xelfi.debugger;
9.10 +
9.11 +/**
9.12 + *
9.13 + * @author devel
9.14 + */
9.15 +public class RemoteDebugger {
9.16 +
9.17 + public RemoteDebugger(String string, Debugger aThis, boolean b) {
9.18 + }
9.19 +
9.20 + RemoteClass findClass(String className) {
9.21 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
9.22 + }
9.23 +
9.24 + Object[] listBreakpoints() {
9.25 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
9.26 + }
9.27 +
9.28 + RemoteThreadGroup run(int i, String[] args) {
9.29 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
9.30 + }
9.31 +
9.32 + void close() {
9.33 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
9.34 + }
9.35 +
9.36 + RemoteThreadGroup[] listThreadGroups(Object object) {
9.37 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
9.38 + }
9.39 +
9.40 +}
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
10.2 +++ b/src/main/java/xelfi/debugger/RemoteField.java Tue Jan 17 21:12:37 2017 +0100
10.3 @@ -0,0 +1,9 @@
10.4 +package xelfi.debugger;
10.5 +
10.6 +class RemoteField extends RemoteValue {
10.7 +
10.8 + String getName() {
10.9 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
10.10 + }
10.11 +
10.12 +}
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/src/main/java/xelfi/debugger/RemoteObject.java Tue Jan 17 21:12:37 2017 +0100
11.3 @@ -0,0 +1,13 @@
11.4 +package xelfi.debugger;
11.5 +
11.6 +class RemoteObject extends RemoteValue {
11.7 +
11.8 + RemoteValue getFieldValue(String token) {
11.9 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
11.10 + }
11.11 +
11.12 + RemoteField[] getFields() {
11.13 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
11.14 + }
11.15 +
11.16 +}
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
12.2 +++ b/src/main/java/xelfi/debugger/RemoteStackFrame.java Tue Jan 17 21:12:37 2017 +0100
12.3 @@ -0,0 +1,40 @@
12.4 +/*
12.5 + * To change this license header, choose License Headers in Project Properties.
12.6 + * To change this template file, choose Tools | Templates
12.7 + * and open the template in the editor.
12.8 + */
12.9 +package xelfi.debugger;
12.10 +
12.11 +/**
12.12 + *
12.13 + * @author devel
12.14 + */
12.15 +class RemoteStackFrame {
12.16 +
12.17 + RemoteStackVariable[] getLocalVariables() {
12.18 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
12.19 + }
12.20 +
12.21 + String getMethodName() {
12.22 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
12.23 + }
12.24 +
12.25 + Name getRemoteClass() {
12.26 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
12.27 + }
12.28 +
12.29 + int getLineNumber() {
12.30 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
12.31 + }
12.32 +
12.33 + static class Name {
12.34 +
12.35 + public Name() {
12.36 + }
12.37 +
12.38 + public String getName() {
12.39 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
12.40 + }
12.41 + }
12.42 +
12.43 +}
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
13.2 +++ b/src/main/java/xelfi/debugger/RemoteStackVariable.java Tue Jan 17 21:12:37 2017 +0100
13.3 @@ -0,0 +1,30 @@
13.4 +/*
13.5 + * To change this license header, choose License Headers in Project Properties.
13.6 + * To change this template file, choose Tools | Templates
13.7 + * and open the template in the editor.
13.8 + */
13.9 +package xelfi.debugger;
13.10 +
13.11 +/**
13.12 + *
13.13 + * @author devel
13.14 + */
13.15 +class RemoteStackVariable {
13.16 +
13.17 + boolean methodArgument() {
13.18 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
13.19 + }
13.20 +
13.21 + String getName() {
13.22 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
13.23 + }
13.24 +
13.25 + boolean inScope() {
13.26 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
13.27 + }
13.28 +
13.29 + RemoteValue getValue() {
13.30 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
13.31 + }
13.32 +
13.33 +}
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14.2 +++ b/src/main/java/xelfi/debugger/RemoteString.java Tue Jan 17 21:12:37 2017 +0100
14.3 @@ -0,0 +1,5 @@
14.4 +package xelfi.debugger;
14.5 +
14.6 +class RemoteString extends RemoteValue {
14.7 +
14.8 +}
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
15.2 +++ b/src/main/java/xelfi/debugger/RemoteThread.java Tue Jan 17 21:12:37 2017 +0100
15.3 @@ -0,0 +1,48 @@
15.4 +package xelfi.debugger;
15.5 +
15.6 +class RemoteThread extends RemoteValue {
15.7 + RemoteStackVariable[] getStackVariables() {
15.8 + return new RemoteStackVariable[0];
15.9 + }
15.10 +
15.11 + int getCurrentFrameIndex() {
15.12 + return 1;
15.13 + }
15.14 +
15.15 + String getName() {
15.16 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.17 + }
15.18 +
15.19 + void cont() {
15.20 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.21 + }
15.22 +
15.23 + void resetCurrentFrameIndex() {
15.24 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.25 + }
15.26 +
15.27 + void next() {
15.28 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.29 + }
15.30 +
15.31 + void stop() {
15.32 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.33 + }
15.34 +
15.35 + RemoteStackFrame[] dumpStack() {
15.36 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.37 + }
15.38 +
15.39 + void step(boolean b) {
15.40 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.41 + }
15.42 +
15.43 + RemoteStackVariable getStackVariable(String token) {
15.44 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.45 + }
15.46 +
15.47 + RemoteStackFrame getCurrentFrame() {
15.48 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
15.49 + }
15.50 +
15.51 +}
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
16.2 +++ b/src/main/java/xelfi/debugger/RemoteThreadGroup.java Tue Jan 17 21:12:37 2017 +0100
16.3 @@ -0,0 +1,22 @@
16.4 +/*
16.5 + * To change this license header, choose License Headers in Project Properties.
16.6 + * To change this template file, choose Tools | Templates
16.7 + * and open the template in the editor.
16.8 + */
16.9 +package xelfi.debugger;
16.10 +
16.11 +/**
16.12 + *
16.13 + * @author devel
16.14 + */
16.15 +class RemoteThreadGroup {
16.16 +
16.17 + Object getName() {
16.18 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
16.19 + }
16.20 +
16.21 + RemoteThread[] listThreads(boolean b) {
16.22 + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
16.23 + }
16.24 +
16.25 +}
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
17.2 +++ b/src/main/java/xelfi/debugger/RemoteValue.java Tue Jan 17 21:12:37 2017 +0100
17.3 @@ -0,0 +1,14 @@
17.4 +/*
17.5 + * To change this license header, choose License Headers in Project Properties.
17.6 + * To change this template file, choose Tools | Templates
17.7 + * and open the template in the editor.
17.8 + */
17.9 +package xelfi.debugger;
17.10 +
17.11 +/**
17.12 + *
17.13 + * @author devel
17.14 + */
17.15 +class RemoteValue {
17.16 +
17.17 +}
18.1 --- a/src/main/java/xelfi/debugger/ThreadsView.java Tue Jan 17 21:11:58 2017 +0100
18.2 +++ b/src/main/java/xelfi/debugger/ThreadsView.java Tue Jan 17 21:12:37 2017 +0100
18.3 @@ -10,10 +10,6 @@
18.4 import java.awt.*;
18.5 import xelfi.top.TopDialog;
18.6 import xelfi.top.TopLevel;
18.7 -import xelfi.compiler.Output;
18.8 -
18.9 -import sun.tools.debug.*; // needs TCP/IP
18.10 -//import symantec.tools.debug.*; // doesn't need TCP/IP
18.11
18.12 /*
18.13 * This is a view on the data given by the Debugger.
18.14 @@ -184,62 +180,8 @@
18.15 return;
18.16 }
18.17
18.18 - RemoteThreadGroup[] rtg = document.getThreadGroups();
18.19 -
18.20 - if (rtg == null)
18.21 - {
18.22 - list.clear();
18.23 - return;
18.24 - }
18.25 -
18.26 - int indexOfSelected = list.getSelectedIndex();
18.27 - if (indexOfSelected != -1)
18.28 - list.deselect(indexOfSelected);
18.29 -
18.30 - int threadGroupIndex = 1;
18.31 - int lineIndex = 0;
18.32 -
18.33 - for(int i = 0; i < rtg.length; i++)
18.34 - try
18.35 - {
18.36 - // without "system" thread groups (system and main groups)
18.37 - if (rtg[i].getName().compareTo("system") == 0 ||
18.38 - rtg[i].getName().compareTo("main") == 0)
18.39 - continue;
18.40 -
18.41 - RemoteThread rt[] = rtg[i].listThreads(true);
18.42 - String string = " ["+(threadGroupIndex)+"] "+rtg[i].getName();
18.43 -
18.44 - // add line for a thread group into the list
18.45 - if (lineIndex > list.countItems()-1)
18.46 - list.addItem(string);
18.47 - else
18.48 - if (!list.getItem(lineIndex).equals(string))
18.49 - list.replaceItem(string, lineIndex);
18.50 -
18.51 - threadGroupIndex++;
18.52 - lineIndex++;
18.53 -
18.54 - for(int j = 0; j < rt.length; j++)
18.55 - {
18.56 - string = " "+rt[j].getName()+" : "+rt[j].getStatus();
18.57 -
18.58 - if (lineIndex > list.countItems()-1)
18.59 - list.addItem(string);
18.60 - else
18.61 - if (!list.getItem(lineIndex).equals(string))
18.62 - list.replaceItem(string, lineIndex);
18.63 -
18.64 - lineIndex++;
18.65 - }
18.66 - }
18.67 - catch(Exception e)
18.68 - {
18.69 - e.printStackTrace();
18.70 - }
18.71 -
18.72 - if (lineIndex < list.countItems()-1)
18.73 - list.delItems(lineIndex+1, list.countItems()-1);
18.74 + return;
18.75 +
18.76 }
18.77
18.78 /**
18.79 @@ -248,7 +190,5 @@
18.80 public void show()
18.81 {
18.82 super.show();
18.83 - list.requestFocus();
18.84 - document.threadsViewShown();
18.85 }
18.86 }