natas_hw
/
intrace
mirror of https://github.com/mchr3k/org.intrace
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add filter enable/disable toggle

This commit is contained in:
mchr3k 2011-04-28 10:02:58 +01:00
parent a227929c04
commit 67f429c8da
4 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/jars/latest_development/intrace-agent.jar
View File

Binary file not shown.

BIN
binaries/jars/latest_development/intrace-ui.jar
View File

Binary file not shown.

1
org.intrace/src/org/intrace/client/gui/ClientStrings.java
View File

@ -22,6 +22,7 @@ public class ClientStrings
public static final String ENABLE_STDOUT_OUTPUT = "StdOut";
public static final String ENABLE_FILE_OUTPUT = "File";
public static final String ENABLE_NETWORK_OUTPUT = "Collect Trace";
public static final String ENABLE_FILTER = "Enable Filter";
public static final String CONNECT = "Connect";
public static final String CONNECTING = "Connect...";

67
org.intrace/src/org/intrace/client/gui/TraceWindow.java
View File

@ -590,7 +590,13 @@ public class TraceWindow
networkOutput = new Button(composite, SWT.CHECK);
networkOutput.setText(ClientStrings.ENABLE_NETWORK_OUTPUT);
networkOutput.setAlignment(SWT.CENTER);
networkOutput.setLayoutData("grow,wrap");
networkOutput.setLayoutData("grow");
final Button enableFilter = new Button(composite, SWT.CHECK);
enableFilter.setText(ClientStrings.ENABLE_FILTER);
enableFilter.setAlignment(SWT.CENTER);
enableFilter.setLayoutData("grow,wrap");
enableFilter.setSelection(true);
textOutput = new StyledText(composite, SWT.MULTI | SWT.V_SCROLL
| SWT.H_SCROLL | SWT.BORDER);
@ -699,7 +705,12 @@ public class TraceWindow
{
if ((includePattern != null) && (excludePattern != null))
{
applyPatterns(includePattern, excludePattern);
lastEnteredIncludeFilterPattern = getPattern(includePattern);
lastEnteredExcludeFilterPattern = getPattern(excludePattern);
if (enableFilter.getSelection())
{
applyPatterns(includePattern, excludePattern);
}
}
}
};
@ -712,12 +723,31 @@ public class TraceWindow
{
PatternInputWindow regexInput;
regexInput = new PatternInputWindow("Set Text Filter", helpText,
patternCallback, includeFilterPattern.pattern(),
excludeFilterPattern.pattern());
patternCallback, activeIncludeFilterPattern.pattern(),
activeExcludeFilterPattern.pattern());
placeDialogInCenter(sWindow.getBounds(), regexInput.sWindow);
}
});
enableFilter
.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter()
{
@Override
public void widgetSelected(SelectionEvent arg0)
{
if (enableFilter.getSelection())
{
applyPatterns(lastEnteredIncludeFilterPattern.pattern(),
lastEnteredExcludeFilterPattern.pattern());
}
else
{
applyPatterns(TraceFilterThread.MATCH_ALL.pattern(),
TraceFilterThread.MATCH_NONE.pattern());
}
}
});
filterThread = new TraceFilterThread(new TraceTextHandler()
{
@Override
@ -786,20 +816,19 @@ public class TraceWindow
}
private void applyPatterns(String newIncludePattern,
String newExcludePattern)
String newExcludePattern)
{
if (newIncludePattern.equals(includeFilterPattern.pattern())
&& newExcludePattern.equals(excludeFilterPattern.pattern()))
if (newIncludePattern.equals(activeIncludeFilterPattern.pattern())
&& newExcludePattern.equals(activeExcludeFilterPattern.pattern()))
{
return;
} else
{
oldIncludeFilterPattern = includeFilterPattern;
oldExcludeFilterPattern = excludeFilterPattern;
includeFilterPattern = getPattern(newIncludePattern);
excludeFilterPattern = getPattern(newExcludePattern);
oldIncludeFilterPattern = activeIncludeFilterPattern;
oldExcludeFilterPattern = activeExcludeFilterPattern;
activeIncludeFilterPattern = getPattern(newIncludePattern);
activeExcludeFilterPattern = getPattern(newExcludePattern);
}
if (sWindow.isDisposed())
return;
@ -825,8 +854,8 @@ public class TraceWindow
cancelButton.addSelectionListener(cancelListener);
final Pattern newIncludePattern = includeFilterPattern;
final Pattern newExcludePattern = excludeFilterPattern;
final Pattern newIncludePattern = activeIncludeFilterPattern;
final Pattern newExcludePattern = activeExcludeFilterPattern;
final TraceFilterProgressHandler progressHandler = new TraceFilterProgressHandler()
{
@ -851,8 +880,8 @@ public class TraceWindow
textFilter.setEnabled(true);
if (filterCancelled[0])
{
includeFilterPattern = oldIncludeFilterPattern;
excludeFilterPattern = oldExcludeFilterPattern;
activeIncludeFilterPattern = oldIncludeFilterPattern;
activeExcludeFilterPattern = oldExcludeFilterPattern;
}
}
}
@ -900,9 +929,11 @@ public class TraceWindow
// Settings
private ParsedSettingsData settingsData = new ParsedSettingsData(
new HashMap<String, String>());
private Pattern includeFilterPattern = TraceFilterThread.MATCH_ALL;
private Pattern lastEnteredIncludeFilterPattern = TraceFilterThread.MATCH_ALL;
private Pattern lastEnteredExcludeFilterPattern = TraceFilterThread.MATCH_NONE;
private Pattern activeIncludeFilterPattern = TraceFilterThread.MATCH_ALL;
private Pattern oldIncludeFilterPattern = TraceFilterThread.MATCH_ALL;
private Pattern excludeFilterPattern = TraceFilterThread.MATCH_NONE;
private Pattern activeExcludeFilterPattern = TraceFilterThread.MATCH_NONE;
private Pattern oldExcludeFilterPattern = TraceFilterThread.MATCH_NONE;
private boolean autoScroll = true;