From: heeyoung Date: Thu, 6 Mar 2014 09:53:37 +0000 (+0900) Subject: Merge branch 'da' of ssh://172.21.17.55:29419/sdk/dynamic-analyzer/dynamic-analyzer... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11b066eccffce67f5d2ad1cbc963157cbe253d1b;p=sdk%2Ftools%2Fdynamic-analyzer.git Merge branch 'da' of ssh://172.21.17.55:29419/sdk/dynamic-analyzer/dynamic-analyzer into da Conflicts: org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java Change-Id: If97c2d8d72880f9380a3e5e7cd05d9f4665fec08 Signed-off-by: heeyoung --- 11b066eccffce67f5d2ad1cbc963157cbe253d1b diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java index 40bc018,0739af1..32bc0b5 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java @@@ -5,14 -4,12 +5,14 @@@ import org.eclipse.swt.widgets.Display import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; - import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; -import org.tizen.dynamicanalyzer.ui.widgets.ProgressDialog; + import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; +import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; public class StartProcessManager implements Runnable { - private static ProgressDialog dialog = null; + private static StartProgressDialog dialog = null; private static int count = 1; + private static boolean canceled = false; private static StartProcessManager instance = new StartProcessManager(); @@@ -21,23 -18,12 +21,23 @@@ } public void startProcessStart(String waitMessage) { - Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell(); + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); - dialog = new ProgressDialog(shell); + dialog = new StartProgressDialog(shell, SWT.ON_TOP); if (null != dialog) { dialog.open(); +// AnalyzerManager.setExit(false); + canceled = false; dialog.setProgressMessage(waitMessage); dialog.setProgressInfo(AnalyzerLabels.STOP_PROCESS_DLG_PLEASE_WAIT); + dialog.setCancelListener(new DACustomButtonClickEventListener() { + + @Override + public void handleClickEvent(DACustomButton button) { +// AnalyzerManager.setExit(true); + canceled = true; + ToolbarArea.getInstance().stopTrace(); + } + }); } Thread thread = new Thread(new StartProcessManager()); diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProgressDialog.java index 6deeca7,0000000..1ceef54 mode 100644,000000..100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProgressDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProgressDialog.java @@@ -1,153 -1,0 +1,154 @@@ +package org.tizen.dynamicanalyzer.ui.toolbar; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; +import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; +import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; +import org.tizen.dynamicanalyzer.widgets.helper.FontResources; +import org.tizen.dynamicanalyzer.widgets.helper.WidgetUtils; +import org.tizen.dynamicanalyzer.widgets.progress.Progress; ++import org.tizen.dynamicanalyzer.workbench.LayoutManager; + +public class StartProgressDialog { + private Shell shell = null; + private Progress progress = null; + + private Listener shellMouseListener = new Listener() { + boolean down = false; + Point downPoint = new Point(0, 0); + + @Override + public void handleEvent(Event event) { + int id = event.type; + if (event.widget instanceof Progress) { + + Shell shell = (Shell) ((Progress) event.widget).getParent(); + switch (id) { + case SWT.MouseDown: + downPoint.x = event.x; + downPoint.y = event.y; + down = true; + break; + case SWT.MouseUp: + down = false; + break; + case SWT.MouseMove: + if (down) { + Point p = shell.getLocation(); + p.x = p.x + (event.x - downPoint.x); + p.y = p.y + (event.y - downPoint.y); + shell.setLocation(p); + } + break; + default: + break; + } + } else { + down = false; + } + } + }; + + public StartProgressDialog(Shell parent, int style) { + shell = new Shell(parent, style); + shell.setSize(300, 110); + shell.setLayout(new FillLayout()); + + progress = new Progress(shell, SWT.NONE, Progress.PROGRESS_STYLE_CANCEL); + + progress.setBarStartColor(ColorResources.STOP_PROGRESS_BAR_START_COLOR); + progress.setBarEndColor(ColorResources.STOP_PROGRESS_BAR_END_COLOR); + progress.setBarStartBackgroundColor(ColorResources.STOP_PROGRESS_BAR_BG_START_COLOR); + progress.setBarEndBackgroundColor(ColorResources.STOP_PROGRESS_BAR_BG_END_COLOR); + progress.setBarOutlineColor(ColorResources.STOP_PROGRESS_BAR_OUTLINE_COLOR); + progress.setDialogOutlineColor1(ColorResources.STOP_PROGRESS_LINE1_COLOR); + progress.setDialogOutlineColor2(ColorResources.STOP_PROGRESS_LINE2_COLOR); + progress.setProgressUpperFont(FontResources.STOP_PROGRESS_FONT); + progress.setProgressLowerFont(FontResources.PROGRESS_FONT); + progress.setProgressUpperFontColor(ColorResources.BLACK); + progress.setProgressLowerFontColor(ColorResources.STOP_PROGRESS_INFO_FONT_COLOR); + progress.setBarBackgroundColor(ColorResources.STOP_PROGRESS_BACKGROUND_COLOR); + + WidgetUtils.setCenter(shell); + + shell.getDisplay().addFilter(SWT.MouseDown, shellMouseListener); + shell.getDisplay().addFilter(SWT.MouseUp, shellMouseListener); + shell.getDisplay().addFilter(SWT.MouseMove, shellMouseListener); + + shell.addListener(SWT.Traverse, new Listener() { + + @Override + public void handleEvent(Event event) { + if (event.detail == SWT.TRAVERSE_ESCAPE) { + event.doit = false; + } + } + }); + } + + public void open() { + shell.open(); - ToolbarArea.getInstance().setEnabled(false); ++ LayoutManager.setEnabled(false); + } + + public void close() { + if (null != progress) { + if (!progress.isDisposed()) { + progress.close(); + progress.dispose(); + } + progress = null; + } + if (null != shell) { + if (!shell.isDisposed()) { + shell.dispose(); + } + shell = null; + } + - ToolbarArea.getInstance().setEnabled(true); ++ LayoutManager.setEnabled(true); + } + + public void setProgressMessage(String message) { + progress.setUpperText(message); + } + + public void setProgressInfo(String infoMessage) { + progress.setBottomText(infoMessage); + } + + public void setValue(int value) { + progress.setValue(value); + } + + public void setValues(String progressMessage, int value) { + progress.setUpperText(progressMessage); + progress.setValue(value); + } + + public void errorOccurred(String message, String bottomMessage) { + progress.errorOccured(message, bottomMessage); + } + + public void setCancelListener(DACustomButtonClickEventListener listener) { + if (progress != null) { + progress.setCancelButtonListener(listener); + } + } + + public void setCancelEnabled(final boolean enable) { + Display.getDefault().syncExec(new Runnable() { + @Override + public void run() { + if (null != progress) { + progress.getCancelButton().setButtonEnabled(enable); + } + } + }); + } +} diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java index 320a4b5,0d28bc3..fbe3967 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java @@@ -90,30 -104,6 +90,30 @@@ public class TraceStartStopThread imple count--; } + private void traceCancel(String message) { + AnalyzerManager.setRunningState(false); + final String msg = message; + Display.getDefault().syncExec(new Runnable() { + @Override + public void run() { - final Shell shell = AnalyzerUtil.getWorkbenchWindow() ++ final Shell shell = WorkbenchUtil.getWorkbenchWindow() + .getShell(); + DADialog dialog = new DADialog(shell, SWT.NONE); + dialog.setIcon(ImageResources.DIALOG_WARNING_ICON); + dialog.setMessage(msg); + dialog.open(); + + ToolbarArea.getInstance().setToolbarState( + ToolbarArea.TOOLBAR_STATE_READY); + ToolbarArea.getInstance() + .setStartButtonEnablement(true); + ToolbarArea.getInstance().setSettingsButtonEnablement( + true); + ShortCutManager.getInstance().setEnabled(true); + } + }); + } + private HostResult traceStart() { Display.getDefault().syncExec(new Runnable() { @Override