SRADA-406: Introduced new setUIElements() method in UIAction interface.

Use the new method where it's applicable instead of setPages()+setCharts()
methods invocations. Removed unneeded methods from UIAction interface.
The setPageBySetting() method is left in interface as it is called in
IDECommunicator.autoStartApplication() without following charts updating.
Fixed comments in UIAction and GUIAction classes.

* UIAction.setUIElements(), setUIElementsBySetting() - new methods.
* UIAction.setChartBySetting() - method removed.
* GUIAction.setPages(), setCharts(), setChartBySetting() - methods changed
to be private.
* OpenTraceHandler.execute() - call setUIElements() instead of
setPages()+setChart().
* SettingDialog.doApply(), WelcomeDialog.doApply()- call
setUIElementsBySetting() instead of setPagesBySetting()+setChartBySetting().

Updated:
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java

Change-Id: I95a7d6cfed53c9b3b46a81c7b4d9afcd33020128

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java
index cf09b67..f451cc2 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java
@@ -188,8 +188,7 @@ public class StartTraceManager implements Runnable {
 
                        // reset UI
                        if (UILayoutDataManager.INSTANCE.isDirty()) {
-                               UIActionHolder.getUIAction().setPageBySetting();
-                               UIActionHolder.getUIAction().setChartBySetting();
+                               UIActionHolder.getUIAction().setUIElementsBySetting();
                        }
                        UIActionHolder.getUIAction().applyStartTraceUI();
                        UIActionHolder.getUIAction().applyWebProfilingUI(project.isWebApplication());

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CLIAction.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CLIAction.java
index 7620621..664056a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CLIAction.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CLIAction.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.eclipse.swt.widgets.Shell;
 import org.tizen.dynamicanalyzer.common.DAResult;
+import org.tizen.dynamicanalyzer.project.Project;
 
 public class CLIAction implements UIAction {
 
@@ -80,15 +81,13 @@ public class CLIAction implements UIAction {
        }
 
        @Override
-       public void setPages(String[] pageNames) {
+       public void setUIElements(Project project) {
                // TODO Auto-generated method stub
-
        }
 
        @Override
-       public void setCharts(String[] chartNames) {
+       public void setUIElementsBySetting() {
                // TODO Auto-generated method stub
-
        }
 
        @Override
@@ -97,10 +96,4 @@ public class CLIAction implements UIAction {
 
        }
 
-       @Override
-       public void setChartBySetting() {
-               // TODO Auto-generated method stub
-
-       }
-
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/GUIAction.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/GUIAction.java
index 1e1586b..a16c4d8 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/GUIAction.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/GUIAction.java
@@ -39,6 +39,7 @@ import org.tizen.dynamicanalyzer.common.DALogExport;
 import org.tizen.dynamicanalyzer.common.DAResult;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
 import org.tizen.dynamicanalyzer.nl.SummaryLabels;
+import org.tizen.dynamicanalyzer.project.Project;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.setting.SettingConstants;
 import org.tizen.dynamicanalyzer.setting.SettingDataManager;
@@ -87,9 +88,6 @@ public class GUIAction implements UIAction {
                });
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#applyStopTraceUI()
-        */
        @Override
        public void applyStopTraceUI() {
                Display.getDefault().syncExec(new Runnable() {
@@ -100,9 +98,6 @@ public class GUIAction implements UIAction {
                });
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#applyWebProfilingUI(boolean)
-        */
        @Override
        public void applyWebProfilingUI(final boolean isWeb) {
                Display.getDefault().syncExec(new Runnable() {
@@ -130,9 +125,6 @@ public class GUIAction implements UIAction {
                });
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#showWarning(java.lang.String, int, int)
-        */
        @Override
        public void showWarning(final String message, final int width,
                        final int height) {
@@ -150,18 +142,12 @@ public class GUIAction implements UIAction {
                });
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#showWarning(org.tizen.dynamicanalyzer.common.DAResult, int, int)
-        */
        @Override
        public void showWarning(final DAResult result, final int width,
                        final int height) {
                showWarning(result.getMessage() + " (" + result.getErrorNumber() + ")", width, height);
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#showWarning(java.lang.String)
-        */
        @Override
        public void showWarning(final String message) {
                Display.getDefault().asyncExec(new Runnable() {
@@ -170,7 +156,7 @@ public class GUIAction implements UIAction {
                                Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
                                DADialog dialog = new DADialog(shell, SWT.NONE);
                                dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                               dialog.setMessage(message);                             
+                               dialog.setMessage(message);
                                dialog.setDialog(true);
                                dialog.getExportButton().addClickListener(exportListener);
                                dialog.open();
@@ -178,9 +164,6 @@ public class GUIAction implements UIAction {
                });
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#showWarning(java.lang.String, java.lang.String)
-        */
        @Override
        public void showWarning(final String title, final String message) {
                Display.getDefault().asyncExec(new Runnable() {
@@ -196,18 +179,12 @@ public class GUIAction implements UIAction {
                });
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#showWarning(org.tizen.dynamicanalyzer.common.DAResult)
-        */
        @Override
        public void showWarning(final DAResult result) {
                showWarning(result.getMessage() + CommonConstants.SPACE + CommonConstants.OPEN_BRACKET
                                + result.getErrorNumber() + CommonConstants.CLOSE_BRACKET);
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#showWarning(org.eclipse.swt.widgets.Shell, java.lang.String)
-        */
        @Override
        public void showWarning(final Shell shell, final String message) {
                Display.getDefault().asyncExec(new Runnable() {
@@ -223,9 +200,6 @@ public class GUIAction implements UIAction {
                });
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#showWarning(org.eclipse.swt.widgets.Shell, org.tizen.dynamicanalyzer.common.DAResult)
-        */
        @Override
        public void showWarning(final Shell shell, final DAResult result) {
                showWarning(shell, result.getMessage() + CommonConstants.SPACE
@@ -233,9 +207,6 @@ public class GUIAction implements UIAction {
                                + CommonConstants.CLOSE_BRACKET);
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#getPageNames()
-        */
        @Override
        public List<String> getPageNames() {
                BaseView bv = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID);
@@ -245,9 +216,6 @@ public class GUIAction implements UIAction {
                return nameList;
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#convertPageIDtoPageName(java.util.List)
-        */
        @Override
        public List<String> convertPageIDtoPageName(List<String> pageIDs) {
                List<String> pageNameList = new ArrayList<String>();
@@ -283,11 +251,18 @@ public class GUIAction implements UIAction {
                return pageNameList;
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#setPages(java.lang.String[])
-        */
        @Override
-       public void setPages(String[] pageNames) {
+       public void setUIElements(Project project) {
+               setPages(project.getPageTabList());
+               setCharts(project.getTimelineChartList());
+       }
+
+       /**
+        * Set tab pages to be shown on UI.
+        *
+        * @param pageNames list of page names.
+        */
+       private void setPages(String[] pageNames) {
                if (pageNames != null) {
                        final Set<String> pageNameSet = new HashSet<String>(Arrays.asList(pageNames));
 
@@ -301,11 +276,12 @@ public class GUIAction implements UIAction {
                }
        }
 
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#setCharts(java.lang.String[])
+       /**
+        * Set charts to be shown on UI.
+        *
+        * @param chartNames list of chart names.
         */
-       @Override
-       public void setCharts(String[] chartNames) {
+       private void setCharts(String[] chartNames) {
                if (chartNames != null) {
                        final List<String> chartNameList = Arrays.asList(chartNames);
 
@@ -318,10 +294,12 @@ public class GUIAction implements UIAction {
                }
        }
 
-       // update tab pages
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#setPageBySetting()
-        */
+       @Override
+       public void setUIElementsBySetting() {
+               setPageBySetting();
+               setChartBySetting();
+       }
+
        @Override
        public void setPageBySetting() {
                TargetData target = SettingDataManager.INSTANCE.getConnectedTarget();
@@ -339,12 +317,10 @@ public class GUIAction implements UIAction {
                UILayoutDataManager.INSTANCE.setDirty(false);
        }
 
-       // update chart list
-       /* (non-Javadoc)
-        * @see org.tizen.dynamicanalyzer.handlers.UIAction#setChartBySetting()
+       /**
+        * Update charts to be shown on UI based on current settings.
         */
-       @Override
-       public void setChartBySetting() {
+       private void setChartBySetting() {
                final Set<String> selectedChartSet = new HashSet<String>();
 
                // set selected chart list
@@ -364,7 +340,7 @@ public class GUIAction implements UIAction {
                        }
                });
        }
-       
+
        private static DACustomButtonClickEventListener exportListener = new DACustomButtonClickEventListener() {
                @Override
                public void handleClickEvent(DACustomButton button) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
index 3c3d009..dfa318e 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
@@ -148,11 +148,8 @@ public class OpenTraceHandler extends AbstractHandler {
                OpenTraceProgressManager.getInstance().setProgressPercent(
                                AnalyzerLabels.OPEN_TRACE_PROGRESS_LOADING, percent += 3);
 
-               // change tab list and page to be shown
-               UIActionHolder.getUIAction().setPages(project.getPageTabList());
-
-               // change chart list in timeline page
-               UIActionHolder.getUIAction().setCharts(project.getTimelineChartList());
+               // change tab list and page to be shown and chart list in timeline page
+               UIActionHolder.getUIAction().setUIElements(project);
 
                // change page
                if (RangeDataManager.getInstance().isBeingAnalyzed()) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
index e84667d..bfdd1c1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.eclipse.swt.widgets.Shell;
 import org.tizen.dynamicanalyzer.common.DAResult;
+import org.tizen.dynamicanalyzer.project.Project;
 
 /**
  * Methods for common interactive actions in user interface.
@@ -28,12 +29,9 @@ public interface UIAction {
        /**
         * Show warning to user.
         *
-        * @param message
-        *            warning message to be shown.
-        * @param width
-        *            width of UI object to show warning in.
-        * @param height
-        *            height of UI object to show warning in.
+        * @param message warning message to be shown.
+        * @param width width of UI object to show warning in.
+        * @param height height of UI object to show warning in.
         */
        void showWarning(final String message, final int width,
                        final int height);
@@ -41,12 +39,10 @@ public interface UIAction {
        /**
         * Show warning to user.
         *
-        * @param result
-        *            instance of {@link DAResult} defining the message to be shown.
-        * @param width
-        *            width of UI object to show warning in.
-        * @param height
-        *            height of UI object to show warning in.
+        * @param result instance of {@link DAResult} defining the message to be
+        *            shown.
+        * @param width width of UI object to show warning in.
+        * @param height height of UI object to show warning in.
         */
        void showWarning(final DAResult result, final int width,
                        final int height);
@@ -54,46 +50,40 @@ public interface UIAction {
        /**
         * Show warning to user.
         *
-        * @param message
-        *            warning message to be shown.
+        * @param message warning message to be shown.
         */
        void showWarning(final String message);
 
        /**
         * Show warning to user.
         *
-        * @param title
-        *            title of the warning message to be shown.
-        * @param message
-        *            warning message to be shown.
+        * @param title title of the warning message to be shown.
+        * @param message warning message to be shown.
         */
        void showWarning(final String title, final String message);
 
        /**
         * Show warning to user.
         *
-        * @param result
-        *            instance of {@link DAResult} defining the message to be shown.
+        * @param result instance of {@link DAResult} defining the message to be
+        *            shown.
         */
        void showWarning(final DAResult result);
 
        /**
         * Show warning to user.
         *
-        * @param shell
-        *            parent shell where to output warning.
-        * @param message
-        *            warning message to be shown.
+        * @param shell parent shell where to output warning.
+        * @param message warning message to be shown.
         */
        void showWarning(final Shell shell, final String message);
 
        /**
         * Show warning to user.
         *
-        * @param shell
-        *            parent {@link Shell} where to output warning.
-        * @param result
-        *            instance of {@link DAResult} defining the message to be shown.
+        * @param shell parent {@link Shell} where to output warning.
+        * @param result instance of {@link DAResult} defining the message to be
+        *            shown.
         */
        void showWarning(final Shell shell, final DAResult result);
 
@@ -107,42 +97,29 @@ public interface UIAction {
        /**
         * Convert ids of tab pages to corresponding tab pages names.
         *
-        * @param pageIDs
-        *            list of page ids.
+        * @param pageIDs list of page ids.
         * @return list of page names.
         */
        List<String> convertPageIDtoPageName(List<String> pageIDs);
 
        /**
-        * Set tab pages to be shown on UI.
+        * Set UI elements to be shown to user.
         *
-        * @param pageNames
-        *            list of page names.
+        * @param project {@link Project} where to load list of UI elements from
         */
-       // FIXME replace setPages+setCharts with setUIElements methods
-       void setPages(String[] pageNames);
+       void setUIElements(Project project);
 
        /**
-        * Set charts to be shown on UI.
-        *
-        * @param chartNames
-        *            list of chart names.
+        * Update UI elements to be shown on UI based on current settings.
         */
-       // FIXME replace setPages+setCharts with setUIElements method
-       void setCharts(String[] chartNames);
+       void setUIElementsBySetting();
 
        /**
         * Update tab pages to be shown on UI based on current settings.
+        *
+        * It was made a part of public API as it is called without other UI
+        * elements updates in IDECommunicator.autoStartApplication() method.
         */
-       // FIXME replace setPageBySetting+setChartBySetting with
-       // setUIElementsBySetting methods
        void setPageBySetting();
 
-       /**
-        * Update charts to be shown on UI based on current settings.
-        */
-       // FIXME replace setPageBySetting+setChartBySetting with
-       // setUIElementsBySetting methods
-       void setChartBySetting();
-
 }
\ No newline at end of file

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java
index 19be010..a120bd8 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java
@@ -115,11 +115,9 @@ public class FlatFeatureDialog extends DAMessageBox {
        };
        private void doApply() {
                if (DAState.isStartable()) {
-                       // add & remove tab view page
-                       UIActionHolder.getUIAction().setPageBySetting();
 
-                       // add & remove (timeline) chart
-                       UIActionHolder.getUIAction().setChartBySetting();
+                       // add & remove tab view page and (timeline) chart
+                       UIActionHolder.getUIAction().setUIElementsBySetting();
 
                        // write setting data
                        SettingDataManager.INSTANCE.applySettingData();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
index 79e2ae1..86241d3 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
@@ -112,11 +112,8 @@ public class SettingDialog extends DAMessageBox {
                Composite selectedComposite = tabView.getTopComposite();
                if (!(selectedComposite instanceof SettingDialogBinarySettingsPage)) {
                        if (DAState.isStartable()) {
-                               // add & remove tab view page
-                               UIActionHolder.getUIAction().setPageBySetting();
-
-                               // add & remove (timeline) chart
-                               UIActionHolder.getUIAction().setChartBySetting();
+                               // add & remove tab view page and (timeline) chart
+                               UIActionHolder.getUIAction().setUIElementsBySetting();
 
                                // write setting data
                                SettingDataManager.INSTANCE.applySettingData();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java
index cd0c61d..aa6b963 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/WelcomeDialog.java
@@ -88,11 +88,8 @@ public class WelcomeDialog extends DAMessageBox {
 
        private void doApply() {
                if (DAState.isStartable()) {
-                       // add & remove tab view page
-                       UIActionHolder.getUIAction().setPageBySetting();
-
-                       // add & remove (timeline) chart
-                       UIActionHolder.getUIAction().setChartBySetting();
+                       // add & remove tab view page and (timeline) chart
+                       UIActionHolder.getUIAction().setUIElementsBySetting();
 
                        // write setting data
                        SettingDataManager.INSTANCE.applySettingData();