FCL/sftools/ana/dynaanaapps: comparison crashanalysis/crashanalyser/com.nokia.s60tools.crashanalyser/src/com/nokia/s60tools/crashanalyser/ui/editors/MultiPageEditor.java

equal deleted inserted replaced

-:431bbaccaec8
+:615035072f7e
 import org.eclipse.ui.*;
 import org.eclipse.ui.ide.FileStoreEditorInput;
 import org.eclipse.ui.part.MultiPageEditorPart;
 import com.nokia.s60tools.crashanalyser.data.ErrorLibrary;
 import com.nokia.s60tools.crashanalyser.files.*;
+import com.nokia.s60tools.crashanalyser.files.SummaryFile.ContentType;
 import com.nokia.s60tools.crashanalyser.interfaces.*;
 import com.nokia.s60tools.crashanalyser.resources.ImageKeys;
 import com.nokia.s60tools.crashanalyser.resources.ImageResourceManager;
 import com.nokia.s60tools.crashanalyser.model.*;
 import java.io.*;
 /**
-* A Crash Visualiser editor. Editor contains four tab pages:
+* A Crash Visualiser editor. Editor contains seven tab pages:
-* Crash Data, Advanced, Errors & Warnings and XML.
+* General, Call Stack, Codesegments, Registers, Traces, Errors & Warnings and XML.
 *
-* Crash Data page contains summary data of the crash and crash reason
+* Summary page contains summary data of the crash and crash reason
-* and description. Crash Data page also contain stack data if available.
+* and description.
 *
-* Advanced page contains more advanced details about the crash, such as
+* Call Stack page contains call stack data if available. Codesegments page
-* registers values, code segments, event log and cpsr details.
+* contains crash time loaded codesegments. Registers page has register
+* values and CPSR details. Traces page has OST traces and event log.
 *
 * Errors & Warnings page contains all error and warning messages which
 * may have occurred during the xml file creation.
 *
 * XML tab page contains the raw xml data as an xml tree.
 */
 public class MultiPageEditor extends MultiPageEditorPart implements IResourceChangeListener,
 																	IErrorLibraryObserver {
 	// editor pages
 	private SummaryPage summaryPage;
-	private AdvancedPage advancedPage;
+	private CallStackPage callStackPage;
+	private CodesegmentsPage codesegmentsPage;
+	private RegistersPage registersPage;
+	private TracesPage tracesPage;
 	private ErrorPage errorPage;
 	private XmlPage xmlPage;
 	// editor data consists of either crashFile or summaryFile
 	private CrashFile crashFile = null;
 	private SummaryFile summaryFile = null;
 	private ErrorLibrary errorLibrary = null;
 	private String crashFilePath = "";
-	static final int ERROR_PAGE_INDEX = 2;
+	static final int ERROR_PAGE_INDEX = 5;
 	public MultiPageEditor() {
 		super();
 		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
 	}
 	/**
-	 * Creates Crash Data page
+	 * Creates General page
 	 */
 	void createSummaryPage() {
 		summaryPage = new SummaryPage();
 		// output.crashxml is opened via CrashAnalyser View
 		if (crashFile != null) {
 			int index =
 				addPage(summaryPage.createPage(new Composite(getContainer(), SWT.NONE), crashFile));
-			setPageText(index, "Crash Data");
+			setPageText(index, "General");
 		// Summary xml is opened via CrashAnalyser View
 		} else if (summaryFile != null) {
 			int index =
 				addPage(summaryPage.createPage(new Composite(getContainer(), SWT.NONE), summaryFile));
-			setPageText(index, "Crash Summary");
+			setPageText(index, "General");
 		// output.crashxml file opened from File > Open
 		} else {
 			int index =
 				addPage(summaryPage.createPage(new Composite(getContainer(), SWT.NONE)));
-			setPageText(index, "Crash Data");
+			setPageText(index, "General");
 		}
 	}
 	/**
-	 * Creates advanced page
+	 * Creates Call Stack page
 	 */
-	void createAdvancedPage() {
+	void createCallStackPage() {
-		advancedPage = new AdvancedPage();
+		callStackPage = new CallStackPage();
 		// output.crashxml is opened via CrashAnalyser View
 		if (crashFile != null) {
-			int index = addPage(advancedPage.createPage(new Composite(getContainer(), SWT.NONE), crashFile));
+			if (crashFile.getContentType() == ContentType.CRASH) {
-			setPageText(index, "Advanced");
+				int index =
-		// Summary xml is opened via CrashAnalyser View
+					addPage(callStackPage.createPage(new Composite(getContainer(), SWT.NONE), crashFile));
-		} else if (summaryFile != null) {
+				setPageText(index, "Call Stack");
-			int index = addPage(advancedPage.createPage(new Composite(getContainer(), SWT.NONE), summaryFile));
+			}
-			setPageText(index, "Advanced");
+		// Summary xml is opened via CrashAnalyser View
-		// output.crashxml file opened from File > Open
+		} else if (summaryFile != null) {
-		} else {
+			if (summaryFile.getContentType() == ContentType.CRASH) {
-			int index = addPage(advancedPage.createPage(new Composite(getContainer(), SWT.NONE)));
+				int index =
-			setPageText(index, "Advanced");
+					addPage(summaryPage.createPage(new Composite(getContainer(), SWT.NONE), summaryFile));
-		}
+				setPageText(index, "Call Stack");
-	}
+			}
+		// output.crashxml file opened from File > Open
+		} else {
+			int index =
+				addPage(summaryPage.createPage(new Composite(getContainer(), SWT.NONE)));
+			setPageText(index, "Call Stack");
+		}
+	}
+	/**
+	 * Creates Call Stack page
+	 */
+	void createCodesegmentsPage() {
+		codesegmentsPage = new CodesegmentsPage();
+		// output.crashxml is opened via CrashAnalyser View
+		if (crashFile != null) {
+			if (crashFile.getContentType() == ContentType.CRASH) {
+				int index =
+					addPage(codesegmentsPage.createPage(new Composite(getContainer(), SWT.NONE), crashFile));
+				setPageText(index, "Code Segments");
+			}
+		// Summary xml is opened via CrashAnalyser View
+		} else if (summaryFile != null) {
+			if (summaryFile.getContentType() == ContentType.CRASH) {
+				int index =
+					addPage(codesegmentsPage.createPage(new Composite(getContainer(), SWT.NONE), summaryFile));
+				setPageText(index, "Code Segments");
+			}
+		// output.crashxml file opened from File > Open
+		} else {
+			int index =
+				addPage(codesegmentsPage.createPage(new Composite(getContainer(), SWT.NONE)));
+			setPageText(index, "Code Segments");
+		}
+	}
+	/**
+	 * Creates Registers page
+	 */
+	void createRegistersPage() {
+		registersPage = new RegistersPage();
+		// output.crashxml is opened via CrashAnalyser View
+		if (crashFile != null) {
+			if (crashFile.getContentType() == ContentType.CRASH) {
+				int index =
+					addPage(registersPage.createPage(new Composite(getContainer(), SWT.NONE), crashFile));
+				setPageText(index, "Registers");
+			}
+		// Summary xml is opened via CrashAnalyser View
+		} else if (summaryFile != null) {
+			if (summaryFile.getContentType() == ContentType.CRASH) {
+				int index =
+					addPage(registersPage.createPage(new Composite(getContainer(), SWT.NONE), summaryFile));
+				setPageText(index, "Registers");
+			}
+		// output.crashxml file opened from File > Open
+		} else {
+			int index =
+				addPage(registersPage.createPage(new Composite(getContainer(), SWT.NONE)));
+			setPageText(index, "Registers");
+		}
+	}
+	/**
+	 * Creates Traces page
+	 */
+	void createTracesPage() {
+		tracesPage = new TracesPage();
+		// output.crashxml is opened via CrashAnalyser View
+		if (crashFile != null) {
+			if (crashFile.getContentType() == ContentType.CRASH) {
+				int index =
+					addPage(tracesPage.createPage(new Composite(getContainer(), SWT.NONE), crashFile));
+				setPageText(index, "Traces");
+			}
+		// Summary xml is opened via CrashAnalyser View
+		} else if (summaryFile != null) {
+			if (summaryFile.getContentType() == ContentType.CRASH) {
+				int index =
+					addPage(tracesPage.createPage(new Composite(getContainer(), SWT.NONE), summaryFile));
+				setPageText(index, "Traces");
+			}
+		// output.crashxml file opened from File > Open
+		} else {
+			int index =
+				addPage(tracesPage.createPage(new Composite(getContainer(), SWT.NONE)));
+			setPageText(index, "Traces");
+		}
+	}
 	/**
 	 * Creates Errors & Warnings page
 	 */
 	void createErrorPage() {
 		errorPage = new ErrorPage();
 		// output.crashxml is opened via CrashAnalyser View
 		if (crashFile != null) {
-			if (crashFile.containsErrorsOrWarnings()) {
+			if (crashFile.containsErrorsOrWarnings() && crashFile.getContentType() == ContentType.CRASH) {
 				int index = addPage(errorPage.createPage(new Composite(getContainer(), SWT.NONE), crashFile));
 				setPageText(index, "Errors && Warnings");
 			}
 		// Summary xml is opened via CrashAnalyser View
 		} else if (summaryFile != null) {
-			if (summaryFile.containsErrorsOrWarnings()) {
+			if (summaryFile.containsErrorsOrWarnings() && summaryFile.getContentType() == ContentType.CRASH) {
 				int index = addPage(errorPage.createPage(new Composite(getContainer(), SWT.NONE), summaryFile));
 				setPageText(index, "Errors && Warnings");
 			}
 		// output.crashxml file opened from File > Open
 		} else {
 	/**
 	 * Creates the pages of the multi-page editor.
 	 */
 	protected void createPages() {
 		createSummaryPage();
-		createAdvancedPage();
+		createCallStackPage();
+		createCodesegmentsPage();
+		createRegistersPage();
+		createTracesPage();
+		//		createAdvancedPage();
 		createErrorPage();
 		createXmlPage();
 		// output.crashxml file was opened via File > Open
 		// we need to read error library and CrashFile
 	public void errorLibraryReady() {
 		Runnable refreshRunnable = new Runnable(){
 			public void run(){
 				crashFile = CrashFile.read(new File(crashFilePath), errorLibrary);
 				summaryPage.setFile(crashFile);
-				advancedPage.setFile(crashFile);
+				callStackPage.setFile(crashFile);
+				codesegmentsPage.setFile(crashFile);
+				registersPage.setFile(crashFile);
+				tracesPage.setFile(crashFile);
 				if (crashFile.containsErrorsOrWarnings()) {
 					errorPage.setFile(crashFile);
 				} else {
 					removePage(ERROR_PAGE_INDEX);
 				}
 		} else {
 			// output.crashxml file opened from Crash Analyser Main View
 			if (editorInput instanceof CrashFile) {
 				crashFile = (CrashFile)editorInput;
-				fileName = crashFile.getFileName();
+				if (crashFile.getThread() != null) {
+					fileName = crashFile.getThread().getFullName();
+				} else {
+					fileName = crashFile.getFileName();
+				}
 				super.setTitleImage(ImageResourceManager.getImage(ImageKeys.DECODED_FILE));
 			// Summary xml file opened from Crash Analyser Main View
 			} else if (editorInput instanceof SummaryFile) {
 				summaryFile = (SummaryFile)editorInput;
-				fileName = summaryFile.getFileName();
+				if (summaryFile.getThread() != null) {
+					fileName = summaryFile.getThread().getFullName();
+				} else {
+					fileName = summaryFile.getFileName();
+				}
 				super.setTitleImage(ImageResourceManager.getImage(ImageKeys.PARTIALLY_DECODED_FILE));
 			// output.crashxml file opened from Carbide File menu
 			} else {
 				crashFilePath = ((FileStoreEditorInput)editorInput).getURI().getPath();

changeset 4	615035072f7e
parent 0	5ad7ad99af01
child 16	72f198be1c1d