From 71ad6292ae91ca98558f198b1103892ac67863c1 Mon Sep 17 00:00:00 2001 From: "jy.exe.lee" Date: Fri, 13 Jul 2012 17:26:43 +0900 Subject: [PATCH] [Title] auto start added [Type] new feature [Module] Dynamic Analyzer [Priority] major [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../widgets/graph/bar/FourBarGraph.java | 1 - .../widgets/graph/bar/SingleBar.java | 1 - .../feature.xml | 9 ++--- .../dynamicanalyzer.product | 3 -- .../dynamicanalyzer/workbench/Application.java | 13 ++++++++ .../ApplicationWorkbenchWindowAdvisor.java | 5 +-- org.tizen.dynamicanalyzer/.classpath | 4 +-- org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF | 3 +- org.tizen.dynamicanalyzer/build.properties | 11 ++++++- .../org/tizen/dynamicanalyzer/AnalyzerManager.java | 19 +++++++++++ .../org/tizen/dynamicanalyzer/AnalyzerPlugin.java | 2 ++ .../dynamicanalyzer/ui/views/CoolbarArea.java | 38 ++++++++++++++++++---- 12 files changed, 84 insertions(+), 25 deletions(-) diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/graph/bar/FourBarGraph.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/graph/bar/FourBarGraph.java index ac6fadc..0bc70c2 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/graph/bar/FourBarGraph.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/graph/bar/FourBarGraph.java @@ -103,7 +103,6 @@ public class FourBarGraph extends Composite { if (graphType == TYPE_BYTE) { long value = currentValues.get(i); measure = Formatter.toByteFormatMeasure(value); - System.out.println(value + " " + measure); setText(labelText); } graphs.get(i).setCurrentSize(currentValues.get(i)); diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/graph/bar/SingleBar.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/graph/bar/SingleBar.java index a848ce4..d2c8abf 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/graph/bar/SingleBar.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/graph/bar/SingleBar.java @@ -91,7 +91,6 @@ public class SingleBar extends Canvas { String value = null; if (graphType == TYPE_BYTE) { value = Formatter.toByteFormatValue(currentSize); - System.out.println(value); } else { value = Long.toString(currentSize); } diff --git a/org.tizen.dynamicanalyzer.workbench.feature/feature.xml b/org.tizen.dynamicanalyzer.workbench.feature/feature.xml index 32a8536..7a27f5e 100644 --- a/org.tizen.dynamicanalyzer.workbench.feature/feature.xml +++ b/org.tizen.dynamicanalyzer.workbench.feature/feature.xml @@ -21,10 +21,6 @@ id="org.eclipse.rcp" version="0.0.0"/> - - + version="0.0.0" + unpack="false"/> diff --git a/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product b/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product index 353f3dd..66f23d1 100644 --- a/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product +++ b/org.tizen.dynamicanalyzer.workbench/dynamicanalyzer.product @@ -3,7 +3,6 @@ - @@ -29,12 +28,10 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 - diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java index 294552b..e4f70dd 100644 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java @@ -5,6 +5,7 @@ import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; +import org.tizen.dynamicanalyzer.AnalyzerManager; public class Application implements IApplication { @@ -12,8 +13,20 @@ public class Application implements IApplication { public Object start(IApplicationContext context) throws Exception { Display display = PlatformUI.createDisplay(); try { + String[] args = (String[]) context.getArguments().get( + IApplicationContext.APPLICATION_ARGS); + + for (int i = 0; i < args.length; i++) { + System.out.println(args[i]); + } + if (args.length > 1) { + AnalyzerManager.setAutoStartDeviceName(args[0]); // device + AnalyzerManager.setAutoStartApplicationName(args[1]); // app + } + int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor()); + if (returnCode == PlatformUI.RETURN_RESTART) { return IApplication.EXIT_RESTART; } else { diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java index 823fd03..f1e1ffc 100644 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java @@ -58,9 +58,6 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { } public void postWindowOpen() { -// if (AnalyzerUtil.isWin()) { -// BaseView baseView = (BaseView) AnalyzerUtil.getView(BaseView.ID); -// baseView.createCaptures(); -// } + CoolbarArea.getInstance().autoStart(); } } diff --git a/org.tizen.dynamicanalyzer/.classpath b/org.tizen.dynamicanalyzer/.classpath index 5914b67..f60d568 100644 --- a/org.tizen.dynamicanalyzer/.classpath +++ b/org.tizen.dynamicanalyzer/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF b/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF index 6c98b36..c71471b 100644 --- a/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF +++ b/org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF @@ -23,4 +23,5 @@ Bundle-ClassPath: ., lib/jfreechart-1.0.14-experimental.jar, lib/jfreechart-1.0.14-swt.jar, lib/jfreechart-1.0.14.jar -Export-Package: org.tizen.dynamicanalyzer.ui.views +Export-Package: org.tizen.dynamicanalyzer, + org.tizen.dynamicanalyzer.ui.views diff --git a/org.tizen.dynamicanalyzer/build.properties b/org.tizen.dynamicanalyzer/build.properties index c6b1a72..4ce5df6 100644 --- a/org.tizen.dynamicanalyzer/build.properties +++ b/org.tizen.dynamicanalyzer/build.properties @@ -4,5 +4,14 @@ bin.includes = .,\ bin/,\ META-INF/,\ plugin.properties,\ - plugin.xml + plugin.xml,\ + lib/,\ + theme/,\ + build.properties,\ + Link/,\ + .settings/,\ + .project,\ + .classpath,\ + schema/,\ + src/ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java index 512424c..d51677c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java @@ -80,6 +80,9 @@ public class AnalyzerManager { private static String startBinaryAddr = null; private static String endBinaryAddr = null; + private static String autoStartDeviceName = null; + private static String autoStartApplicationName = null; + private static List projectList = null; public static List getProjectList() { @@ -605,4 +608,20 @@ public class AnalyzerManager { } return false; } + + public static void setAutoStartDeviceName(String device) { + autoStartDeviceName = device; + } + + public static String getAutoStartDeviceName() { + return autoStartDeviceName; + } + + public static void setAutoStartApplicationName(String app) { + autoStartApplicationName = app; + } + + public static String getAutoStartApplicationName() { + return autoStartApplicationName; + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerPlugin.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerPlugin.java index a163e72..18575f2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerPlugin.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerPlugin.java @@ -158,6 +158,7 @@ public class AnalyzerPlugin extends AbstractUIPlugin { AnalyzerPartListener partListener = new AnalyzerPartListener(); partService.addPartListener(partListener); + } @Override @@ -167,4 +168,5 @@ public class AnalyzerPlugin extends AbstractUIPlugin { super.stop(context); } + } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java index 101cda5..07dfe3b 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java @@ -182,7 +182,7 @@ public class CoolbarArea { // Trim image private final Image windowTopFrameImage = ImageResources.WINDOW_TOP; - private final Image topImage2 = ImageResources.WINDOW_TOP2; +// private final Image topImage2 = ImageResources.WINDOW_TOP2; private final Image windowLeftFrameImage = ImageResources.WINDOW_LEFT; private final Image topLeftNormalImage = ImageResources.WINDOW_TOP_LEFT; private final Image topLeftNormalImage2 = ImageResources.WINDOW_TOP_LEFT2; @@ -885,11 +885,11 @@ public class CoolbarArea { toggle.isToggled()); // theme test -// if (toggle.isToggled()) { -// AnalyzerManager.setTheme(DAThemeBlack.getInstance()); -// } else { -// AnalyzerManager.setTheme(DAThemeWhite.getInstance()); -// } + // if (toggle.isToggled()) { + // AnalyzerManager.setTheme(DAThemeBlack.getInstance()); + // } else { + // AnalyzerManager.setTheme(DAThemeWhite.getInstance()); + // } } }); @@ -1601,6 +1601,11 @@ public class CoolbarArea { appCombo.setText(text); } + public void setDeviceComboText(String text) { + DACommunicator.setSelectedDeviceBySerial(text); + deviceCombo.setText(text); + } + // TODO Remove or modify. // private void setCoolbarLayout(int categoryIndex) { // boolean visibility = true; @@ -1783,4 +1788,25 @@ public class CoolbarArea { } }); } + + public void autoStart() { + String deviceName = AnalyzerManager.getAutoStartDeviceName(); + String appName = AnalyzerManager.getAutoStartApplicationName(); +// String deviceName = " emulator-26100"; +// String appName = "testapp"; + if (null != deviceName && null != appName && !deviceName.isEmpty() + && !appName.isEmpty()) { + CoolbarArea.getInstance().setAppComboText(appName); + CoolbarArea.getInstance().setDeviceComboText(deviceName); + + AnalyzerUtil + .setRecordState(RecordStateSourceProvider.RECORD_RECORDING); + startButton.setImage(DACustomButton.STATE_HOVER, stopHoverImage); + setStartToolbarState(true); + setToolbarEnablement(false); + + startButton.setEnabled(false); + AnalyzerUtil.executeCommand(StartStopTraceHandler.ID); + } + } } -- 2.7.4