X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/views/logview/EventDetailsDialog.java b/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/views/logview/EventDetailsDialog.java
index afd7581..689c7d1 100644
--- a/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/views/logview/EventDetailsDialog.java
+++ b/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/views/logview/EventDetailsDialog.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 
-import net.sourceforge.phpeclipse.xdebug.core.XDebugCorePlugin;
+//import net.sourceforge.phpeclipse.xdebug.core.XDebugCorePlugin;
 import net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPlugin;
 import net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPluginImages;
 
@@ -32,7 +32,8 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableTreeViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+//import org.eclipse.jface.viewers.TableTreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.dnd.Clipboard;
@@ -55,7 +56,7 @@ public class EventDetailsDialog extends Dialog {
 	private LogEntry entry, parentEntry;
 	private LogViewLabelProvider labelProvider;
 	private static int COPY_ID = 22;
-	private TableTreeViewer provider;
+	private /*Table*/TreeViewer provider;
 	private int elementNum, totalElementCount;
 	private LogEntry[] entryChildren;
 	private int childIndex = 0;
@@ -100,7 +101,7 @@ public class EventDetailsDialog extends Dialog {
 	protected EventDetailsDialog(Shell parentShell, IAdaptable selection, ISelectionProvider provider) {
 		super(parentShell);
 		labelProvider = new LogViewLabelProvider();
-		this.provider = (TableTreeViewer) provider;
+		this.provider = (/*Table*/TreeViewer) provider;
 		this.entry = (LogEntry)selection;
 		setShellStyle(SWT.MODELESS | SWT.MIN | SWT.MAX | SWT.RESIZE | SWT.CLOSE | SWT.BORDER | SWT.TITLE);
 		clipboard = new Clipboard(parentShell.getDisplay());
@@ -112,7 +113,7 @@ public class EventDetailsDialog extends Dialog {
 
 	private void initialize() {
 		elementNum = getParentElementNum();
-		totalElementCount = provider.getTableTree().getTable().getItemCount() - getVisibleChildrenCount();
+		totalElementCount = provider.getTree().getItemCount() - getVisibleChildrenCount();
 		parentEntry = (LogEntry) entry.getParent(entry);
 		if (isChild(entry)){
 			setEntryChildren(parentEntry);
@@ -215,7 +216,7 @@ public class EventDetailsDialog extends Dialog {
 		} else {
 			if (elementNum - 1 >= 0)
 				elementNum -= 1;
-			entry = (LogEntry) provider.getElementAt(elementNum);
+			entry = (LogEntry) provider.getTree().getItem(elementNum).getData();
 		}
 		setEntrySelectionInTable();
 	}
@@ -226,7 +227,7 @@ public class EventDetailsDialog extends Dialog {
 			entry = entryChildren[childIndex];
 		} else if (elementNum + 1 < totalElementCount){
 				elementNum += 1;
-			entry = (LogEntry) provider.getElementAt(elementNum);
+			entry = (LogEntry) provider.getTree().getItem(elementNum).getData(); //getElementAt(elementNum);
 		} else { // at end of list but can branch into child elements - bug 58083
 			setEntryChildren(entry);
 			entry = entryChildren[0];
@@ -323,7 +324,7 @@ public class EventDetailsDialog extends Dialog {
 		}
 
 
-		totalElementCount = provider.getTableTree().getTable().getItemCount() - getVisibleChildrenCount();
+		totalElementCount = provider.getTree().getItemCount() - getVisibleChildrenCount();
 		dateLabel.setText(entry.getDate());
 		severityImageLabel.setImage(labelProvider.getColumnImage(entry, 1));
 		severityLabel.setText(entry.getSeverityText());
@@ -366,9 +367,9 @@ public class EventDetailsDialog extends Dialog {
 		LogEntry itemEntry = (LogEntry)((IStructuredSelection)provider.getSelection()).getFirstElement();
 		itemEntry = getRootEntry(itemEntry);
 		
-		for (int i = 0; i<provider.getTableTree().getItemCount(); i++){
+		for (int i = 0; i<provider.getTree().getItemCount()/* getTableTree().getItemCount()*/; i++){
 			try {
-				LogEntry littleEntry = (LogEntry)provider.getElementAt(i);
+				LogEntry littleEntry = (LogEntry)provider.getTree().getItem(i).getData();// getElementAt(i);
 				if (itemEntry.equals(littleEntry)){
 					return i;
 				}
@@ -580,7 +581,8 @@ public class EventDetailsDialog extends Dialog {
 	 * @return the dialog settings to be used
 	 */
 	private IDialogSettings getDialogSettings() {
-		IDialogSettings settings= XDebugCorePlugin.getDefault().getDialogSettings();
+//		IDialogSettings settings= XDebugCorePlugin.getDefault().getDialogSettings();
+		IDialogSettings settings = getDialogSettings();
 		dialogSettings= settings.getSection(getClass().getName());
 		if (dialogSettings == null)
 			dialogSettings= settings.addNewSection(getClass().getName());