Skip to content

Commit

Permalink
ongoing refactoring and clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@ceki
ceki committed Jun 26, 2012
1 parent c1ca9f2 commit 2d7ad1e
Show file tree
Hide file tree
Showing 18 changed files with 232 additions and 196 deletions.
2 changes: 1 addition & 1 deletion ch.qos.logback.beagle/src/ch/qos/logback/beagle/Constants.java
View file
Expand Up @@ -13,7 +13,7 @@ public class Constants {

final public static int ICON_SIZE = 16;

public static int MAX = 1500;
public static int MAX = 20*1000;

public static int CLEAN_COUNT = MAX / 10;
}
2 changes: 1 addition & 1 deletion ch.qos.logback.beagle/src/ch/qos/logback/beagle/LoggingEventBuilder.java
View file
Expand Up @@ -36,7 +36,7 @@ public LoggingEventBuilder() throws IOException {
corpusModel = new CorpusModel(112340, wordList);
}

public ILoggingEvent getLoggingEvent() {
public ILoggingEvent buildLoggingEvent() {
if (lastServedIndex >= internalBuffer.length) {
internalBuffer = Corpus.make(corpusModel, BUFFER_SIZE, true);
shape();
Expand Down
26 changes: 13 additions & 13 deletions ch.qos.logback.beagle/src/ch/qos/logback/beagle/menu/DynamicMenuEnabler.java
View file
Expand Up @@ -16,17 +16,17 @@

import ch.qos.logback.beagle.Constants;
import ch.qos.logback.beagle.util.SelectionUtil;
import ch.qos.logback.beagle.vista.VisualElementBuffer;
import ch.qos.logback.beagle.visual.CallerDataVisualElement;
import ch.qos.logback.beagle.visual.IVisualElement;
import ch.qos.logback.beagle.visual.LoggingEventVisualElement;
import ch.qos.logback.beagle.vista.ClassicTISBuffer;
import ch.qos.logback.beagle.visual.CallerDataTIS;
import ch.qos.logback.beagle.visual.ITableItemStub;
import ch.qos.logback.beagle.visual.LoggingEventTIS;

public class DynamicMenuEnabler implements MenuListener {

final Table table;
final VisualElementBuffer visualElementBuffer;
final ClassicTISBuffer visualElementBuffer;

public DynamicMenuEnabler(VisualElementBuffer visualElementBuffer) {
public DynamicMenuEnabler(ClassicTISBuffer visualElementBuffer) {
this.visualElementBuffer = visualElementBuffer;
this.table = visualElementBuffer.getTable();
}
Expand Down Expand Up @@ -75,23 +75,23 @@ public void menuShown(MenuEvent e) {
if (selectionIndex == Constants.NA) {
return;
}
IVisualElement iVisualElement = visualElementBuffer.get(selectionIndex);
ITableItemStub iVisualElement = visualElementBuffer.get(selectionIndex);

if (iVisualElement.supportsJump()) {
enableMenuItem(menu, MenuBuilder.JUMP_TO_CALLER_MENU_INDEX);
}

MenuItem callersMenuItem = findMenuItemByIndex(menu,
MenuBuilder.SHOW_CALLERS_MENU_INDEX);
if (iVisualElement instanceof LoggingEventVisualElement) {
LoggingEventVisualElement leve = (LoggingEventVisualElement) iVisualElement;
if (iVisualElement instanceof LoggingEventTIS) {
LoggingEventTIS leve = (LoggingEventTIS) iVisualElement;
if (alreadyCallerExpanded(selectionIndex)) {
callersMenuItem.setText(MenuBuilder.COLLAPSE_CALLERS_MENU_TEXT);
callersMenuItem.setEnabled(true);
} else if (leve.supportsJump()) {
callersMenuItem.setEnabled(true);
}
} else if (iVisualElement instanceof CallerDataVisualElement) {
} else if (iVisualElement instanceof CallerDataTIS) {
callersMenuItem.setEnabled(true);
callersMenuItem.setText(MenuBuilder.COLLAPSE_CALLERS_MENU_TEXT);
}
Expand All @@ -104,12 +104,12 @@ boolean alreadyCallerExpanded(int index) {
return false;
}

IVisualElement visualElem = visualElementBuffer.get(next);
return (visualElem instanceof CallerDataVisualElement);
ITableItemStub visualElem = visualElementBuffer.get(next);
return (visualElem instanceof CallerDataTIS);

}

boolean isCallerDataVisualElement(int selectionIndex) {
return (visualElementBuffer.get(selectionIndex) instanceof CallerDataVisualElement);
return (visualElementBuffer.get(selectionIndex) instanceof CallerDataTIS);
}
}
6 changes: 3 additions & 3 deletions ch.qos.logback.beagle/src/ch/qos/logback/beagle/menu/MenuBuilder.java
View file
Expand Up @@ -17,7 +17,7 @@
import org.eclipse.swt.widgets.MenuItem;

import ch.qos.logback.beagle.util.ResourceUtil;
import ch.qos.logback.beagle.vista.VisualElementBuffer;
import ch.qos.logback.beagle.vista.ClassicTISBuffer;

public class MenuBuilder {

Expand All @@ -30,7 +30,7 @@ public class MenuBuilder {
final public static int SHOW_CALLERS_MENU_INDEX = 1;
final public static int COPY_TO_CLIPBOARD_MENU_INDEX = 2;

static public Menu buildMenu(VisualElementBuffer visualElementBuffer) {
static public Menu buildMenu(ClassicTISBuffer visualElementBuffer) {
Menu menu = new Menu(visualElementBuffer.getTable());

MenuItem jumpToCaller = new MenuItem(menu, SWT.PUSH);
Expand All @@ -54,7 +54,7 @@ static public Menu buildMenu(VisualElementBuffer visualElementBuffer) {
}

static public void addOnMenuSelectionAction(Menu menu,
VisualElementBuffer visualElementBuffer) {
ClassicTISBuffer visualElementBuffer) {
OnMenuSelectionAction onMenuSelectionAction = new OnMenuSelectionAction(
visualElementBuffer);
for (MenuItem menuItem : menu.getItems()) {
Expand Down
34 changes: 17 additions & 17 deletions ch.qos.logback.beagle/src/ch/qos/logback/beagle/menu/OnMenuSelectionAction.java
View file
Expand Up @@ -22,18 +22,18 @@

import ch.qos.logback.beagle.Constants;
import ch.qos.logback.beagle.util.SelectionUtil;
import ch.qos.logback.beagle.vista.VisualElementBuffer;
import ch.qos.logback.beagle.visual.CallerDataVisualElement;
import ch.qos.logback.beagle.visual.IVisualElement;
import ch.qos.logback.beagle.visual.LoggingEventVisualElement;
import ch.qos.logback.beagle.vista.ClassicTISBuffer;
import ch.qos.logback.beagle.visual.CallerDataTIS;
import ch.qos.logback.beagle.visual.ITableItemStub;
import ch.qos.logback.beagle.visual.LoggingEventTIS;
import ch.qos.logback.core.CoreConstants;

public class OnMenuSelectionAction implements SelectionListener {

final Table table;
final VisualElementBuffer visualElementBuffer;
final ClassicTISBuffer visualElementBuffer;

public OnMenuSelectionAction(VisualElementBuffer visualElementBuffer) {
public OnMenuSelectionAction(ClassicTISBuffer visualElementBuffer) {
this.visualElementBuffer = visualElementBuffer;
this.table = visualElementBuffer.getTable();
}
Expand All @@ -54,15 +54,15 @@ int menuItemToIndex(MenuItem menuItem) {
return Constants.NA;
}

private void handleMenuJump(IVisualElement iVisualElement) {
private void handleMenuJump(ITableItemStub iVisualElement) {
StackTraceElement ste = iVisualElement.getJumpData();
if (ste != null) {
System.out.println("Jump to " + ste.getClassName());
}
}

private void handleCallerMenu(String menuItemText, int index,
IVisualElement iVisualElement) {
ITableItemStub iVisualElement) {
if (MenuBuilder.EXPLAND_CALLERS_MENU_TEXT.equals(menuItemText)) {
StackTraceElement[] callerDataArray = getCallerDataFromVisualElement(iVisualElement);

Expand All @@ -73,14 +73,14 @@ private void handleCallerMenu(String menuItemText, int index,
}

for (int i = 0; i < callerDataArray.length; i++) {
CallerDataVisualElement cdVisualElement = new CallerDataVisualElement(
CallerDataTIS cdVisualElement = new CallerDataTIS(
callerDataArray[i], i);
visualElementBuffer.add(cdVisualElement, index + 1 + i);
}
}
} else {
int target = index;
if (iVisualElement instanceof LoggingEventVisualElement) {
if (iVisualElement instanceof LoggingEventTIS) {
// the next entry is a CallerDataVisualElement
target++;
}
Expand All @@ -102,7 +102,7 @@ public void widgetSelected(SelectionEvent e) {

int index = SelectionUtil.getUniqueSelection(table);

IVisualElement iVisualElement = null;
ITableItemStub iVisualElement = null;
if (index != Constants.NA) {
iVisualElement = visualElementBuffer.get(index);
}
Expand All @@ -129,17 +129,17 @@ String selectionToText(Table t) {
int[] selIndices = table.getSelectionIndices();
Arrays.sort(selIndices);
for (int index : selIndices) {
IVisualElement ve = visualElementBuffer.get(index);
ITableItemStub ve = visualElementBuffer.get(index);
buf.append(ve.getText());
buf.append(CoreConstants.LINE_SEPARATOR);
}
return buf.toString();
}

StackTraceElement[] getCallerDataFromVisualElement(
IVisualElement iVisualElement) {
if (iVisualElement instanceof LoggingEventVisualElement) {
LoggingEventVisualElement loggingEventVisualElement = (LoggingEventVisualElement) iVisualElement;
ITableItemStub iVisualElement) {
if (iVisualElement instanceof LoggingEventTIS) {
LoggingEventTIS loggingEventVisualElement = (LoggingEventTIS) iVisualElement;
return loggingEventVisualElement.getILoggingEvent().getCallerData();
} else {
return null;
Expand All @@ -152,8 +152,8 @@ boolean checkForDoubleExpansion(int index) {
return false;
}

IVisualElement visualElem = visualElementBuffer.get(next);
return (visualElem instanceof CallerDataVisualElement);
ITableItemStub visualElem = visualElementBuffer.get(next);
return (visualElem instanceof CallerDataTIS);

}

Expand Down

0 comments on commit 2d7ad1e

Please sign in to comment.