diff --git a/binaries/jars/guitraceclient.jar b/binaries/jars/guitraceclient.jar
index 0c20644..0034771 100644
Binary files a/binaries/jars/guitraceclient.jar and b/binaries/jars/guitraceclient.jar differ
diff --git a/binaries/jars/traceagent.jar b/binaries/jars/traceagent.jar
index a252486..1f52f18 100644
Binary files a/binaries/jars/traceagent.jar and b/binaries/jars/traceagent.jar differ
diff --git a/org.intrace.agentloader/.classpath b/org.intrace.agentloader/.classpath
index f479401..4a7c370 100644
--- a/org.intrace.agentloader/.classpath
+++ b/org.intrace.agentloader/.classpath
@@ -2,6 +2,6 @@
-
+
diff --git a/org.intrace.agentloader/lib/tools.jar b/org.intrace.agentloader/lib/tools.jar
new file mode 100644
index 0000000..fb01848
Binary files /dev/null and b/org.intrace.agentloader/lib/tools.jar differ
diff --git a/org.intrace.test/.classpath b/org.intrace.test/.classpath
index bb100b5..da88b37 100644
--- a/org.intrace.test/.classpath
+++ b/org.intrace.test/.classpath
@@ -4,6 +4,6 @@
-
+
diff --git a/org.intrace.test/lib/tools.jar b/org.intrace.test/lib/tools.jar
new file mode 100644
index 0000000..fb01848
Binary files /dev/null and b/org.intrace.test/lib/tools.jar differ
diff --git a/org.intrace.test/lib/traceagent.jar b/org.intrace.test/lib/traceagent.jar
index 22df251..b257b68 100644
Binary files a/org.intrace.test/lib/traceagent.jar and b/org.intrace.test/lib/traceagent.jar differ
diff --git a/org.intrace/conf/findbugs_exclude.xml b/org.intrace/conf/findbugs_exclude.xml
index f7b3020..4603bb1 100644
--- a/org.intrace/conf/findbugs_exclude.xml
+++ b/org.intrace/conf/findbugs_exclude.xml
@@ -1,27 +1,27 @@
// Ignore infinite loop
-
+
-
- // Ignore infinite loop
-
+
+ // Ignore infinite loop
+
-
- // Ignore return value warnings in this method
+
+ // Ignore return value warnings in this method
-
+
diff --git a/org.intrace/src/org/intrace/client/gui/TraceWindow.java b/org.intrace/src/org/intrace/client/gui/TraceWindow.java
index 46dcaf6..eaf3dda 100644
--- a/org.intrace/src/org/intrace/client/gui/TraceWindow.java
+++ b/org.intrace/src/org/intrace/client/gui/TraceWindow.java
@@ -77,43 +77,17 @@ public class TraceWindow
private Button callersStateButton = null;
private Label generalLabel = null;
private Button dumpSettingsButton = null;
+ private Button clearTextButton = null;
/**
* This method initializes sShell
*/
private void createSShell()
{
- GridData gridData23 = new GridData();
- gridData23.widthHint = 150;
- GridData gridData12 = new GridData();
- gridData12.widthHint = 150;
- GridData gridData22 = new GridData();
- gridData22.widthHint = 150;
- GridData gridData11 = new GridData();
- gridData11.widthHint = 150;
- GridData gridData7 = new GridData();
- gridData7.widthHint = 150;
- GridData gridData6 = new GridData();
- gridData6.widthHint = 150;
- GridData gridData5 = new GridData();
- gridData5.widthHint = 150;
- GridData gridData41 = new GridData();
- gridData41.widthHint = 150;
- GridData gridData31 = new GridData();
- gridData31.widthHint = 150;
- GridData gridData21 = new GridData();
- gridData21.widthHint = 150;
- GridData gridData1 = new GridData();
- gridData1.widthHint = 150;
- GridData gridData4 = new GridData();
- gridData4.widthHint = 150;
GridLayout gridLayout = new GridLayout();
gridLayout.numColumns = 2;
- GridData gridData2 = new GridData();
- gridData2.widthHint = 150;
GridData gridData = new GridData();
gridData.widthHint = 150;
- gridData.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
sShell = new Shell();
sShell.setText("Trace Window");
sShell.setLayout(gridLayout);
@@ -124,7 +98,7 @@ public class TraceWindow
createComposite();
toggleInstrumentEnabled = new Button(sShell, SWT.LEFT);
toggleInstrumentEnabled.setText(ClientStrings.ENABLE_INSTR);
- toggleInstrumentEnabled.setLayoutData(gridData31);
+ toggleInstrumentEnabled.setLayoutData(gridData);
toggleInstrumentEnabled
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{
@@ -138,7 +112,7 @@ public class TraceWindow
});
setClassRegexButton = new Button(sShell, SWT.LEFT);
setClassRegexButton.setText(ClientStrings.SET_CLASSREGEX);
- setClassRegexButton.setLayoutData(gridData41);
+ setClassRegexButton.setLayoutData(gridData);
setClassRegexButton
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{
@@ -153,7 +127,7 @@ public class TraceWindow
});
toggleAllowJarInstru = new Button(sShell, SWT.LEFT);
toggleAllowJarInstru.setText(ClientStrings.ENABLE_ALLOWJARS);
- toggleAllowJarInstru.setLayoutData(gridData5);
+ toggleAllowJarInstru.setLayoutData(gridData);
toggleAllowJarInstru
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{
@@ -168,7 +142,7 @@ public class TraceWindow
});
toggleSaveClassFiles = new Button(sShell, SWT.LEFT);
toggleSaveClassFiles.setText(ClientStrings.ENABLE_SAVECLASSES);
- toggleSaveClassFiles.setLayoutData(gridData6);
+ toggleSaveClassFiles.setLayoutData(gridData);
toggleSaveClassFiles
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{
@@ -183,7 +157,7 @@ public class TraceWindow
});
toggleVerboseMode = new Button(sShell, SWT.LEFT);
toggleVerboseMode.setText(ClientStrings.ENABLE_VERBOSEMODE);
- toggleVerboseMode.setLayoutData(gridData7);
+ toggleVerboseMode.setLayoutData(gridData);
toggleVerboseMode
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{
@@ -207,7 +181,7 @@ public class TraceWindow
});
toggleEntryExitButton = new Button(sShell, SWT.LEFT);
toggleEntryExitButton.setText(ClientStrings.ENABLE_EE_TRACE);
- toggleEntryExitButton.setLayoutData(gridData2);
+ toggleEntryExitButton.setLayoutData(gridData);
toggleEntryExitButton
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{
@@ -221,7 +195,7 @@ public class TraceWindow
});
toggleBranchButton = new Button(sShell, SWT.LEFT);
toggleBranchButton.setText(ClientStrings.ENABLE_BRANCH_TRACE);
- toggleBranchButton.setLayoutData(gridData1);
+ toggleBranchButton.setLayoutData(gridData);
toggleBranchButton
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{
@@ -235,11 +209,11 @@ public class TraceWindow
});
toggleArgsButton = new Button(sShell, SWT.LEFT);
toggleArgsButton.setText(ClientStrings.ENABLE_ARGS_TRACE);
- toggleArgsButton.setLayoutData(gridData21);
+ toggleArgsButton.setLayoutData(gridData);
callersLabel = new Label(sShell, SWT.NONE);
callersLabel.setText("Callers Settings:");
callersStateButton = new Button(sShell, SWT.NONE);
- callersStateButton.setLayoutData(gridData12);
+ callersStateButton.setLayoutData(gridData);
callersStateButton.setText(ClientStrings.BEGIN_CAPTURE_CALLERS);
callersStateButton
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
@@ -276,18 +250,18 @@ public class TraceWindow
});
toggleStdOutButton = new Button(sShell, SWT.LEFT);
toggleStdOutButton.setText(ClientStrings.ENABLE_STDOUT_OUTPUT);
- toggleStdOutButton.setLayoutData(gridData4);
+ toggleStdOutButton.setLayoutData(gridData);
toggleFileOutputButton = new Button(sShell, SWT.LEFT);
toggleFileOutputButton.setText(ClientStrings.ENABLE_FILE_OUTPUT);
- toggleFileOutputButton.setLayoutData(gridData11);
+ toggleFileOutputButton.setLayoutData(gridData);
toggleNetworkTraceButton = new Button(sShell, SWT.LEFT);
toggleNetworkTraceButton.setText(ClientStrings.ENABLE_NETWORK_OUTPUT);
- toggleNetworkTraceButton.setLayoutData(gridData22);
+ toggleNetworkTraceButton.setLayoutData(gridData);
generalLabel = new Label(sShell, SWT.NONE);
generalLabel.setText("General:");
dumpSettingsButton = new Button(sShell, SWT.LEFT);
dumpSettingsButton.setText("Dump Settings");
- dumpSettingsButton.setLayoutData(gridData23);
+ dumpSettingsButton.setLayoutData(gridData);
dumpSettingsButton
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{
@@ -297,6 +271,23 @@ public class TraceWindow
addMessage("Settings:" + settingsData.dumpSettings());
}
});
+ clearTextButton = new Button(sShell, SWT.LEFT);
+ clearTextButton.setText("Clear Text");
+ clearTextButton.setLayoutData(gridData);
+ clearTextButton
+ .addMouseListener(new org.eclipse.swt.events.MouseAdapter()
+ {
+ @Override
+ public void mouseUp(org.eclipse.swt.events.MouseEvent e)
+ {
+ sShell.getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ statusTextArea.setText("");
+ }
+ });
+ }
+ });
toggleNetworkTraceButton
.addMouseListener(new org.eclipse.swt.events.MouseAdapter()
{