Merge remote-tracking branch 'remotes/origin/da-interactive' into tizen

Conflicts:
	org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java

Change-Id: I121a5b88cd125320042765617ae69cc0233fadc2
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>

diff --cc org.tizen.dynamicanalysis.ide.native.eplugin/icon/mark_interactive_profiling.png
index 0000000,0000000..22d6ba6
new file mode 100644 (file)
Binary files differ

diff --cc org.tizen.dynamicanalysis.ide.native.eplugin/icon/view_icon_interactive_profiling.png
index 0000000,0000000..92457b1
new file mode 100644 (file)
Binary files differ

diff --cc org.tizen.dynamicanalysis.ide.native.eplugin/plugin.xml
index f61e3eb,1ad5369..f1609a6
--- 1/org.tizen.dynamicanalysis.ide.native.eplugin/plugin.xml
--- 2/org.tizen.dynamicanalysis.ide.native.eplugin/plugin.xml
+++ b/org.tizen.dynamicanalysis.ide.native.eplugin/plugin.xml
@@@ -120,5 -111,105 +120,107 @@@
               sourcepath="/on-demand">
         </tools>
      </extension>
 -           name="Interactive Profiling"
 -           icon="icon/alt_window_16.png">
+     
+     <extension
+           point="org.eclipse.ui.popupMenus">
+        <viewerContribution
+              id="org.tizen.dynamicanalysis.ide.eplugin.contribution"
+              targetID="#CEditorContext">
+           <action
+                 class="org.tizen.dynamicanalysis.ide.eplugin.popup.actions.AddProfileVariableActionDelegate"
+                 id="org.tizen.dynamicanalysis.ide.eplugin.contribution.editor.action"
+                 label="Add to Checkpoint of Dynamic Analyzer"
+                 menubarPath="additions">
+           </action>
+        </viewerContribution>
+     </extension>
+       <extension id="org.tizen.dynamicanalysis.ide.eplugin.interactivemarker" point="org.eclipse.core.resources.markers">
+       <super type="org.eclipse.core.resources.marker"/>
+       <attribute name="variableName" />
+       <attribute name="sourcePath_" />
+       <attribute name="arrayCount" />
+       <persistent value="true" /> 
+    </extension>
+       <extension
+        point="org.eclipse.ui.ide.markerSupport">
+        <markerContentGenerator
+                       id="org.tizen.dynamicanalysis.ide.eplugin.markerEventContentGenerator" name="My Marker Generator">
+               <markerTypeReference id="org.tizen.dynamicanalysis.ide.eplugin.interactivemarker"/>
+               <markerFieldReference id="org.eclipse.ui.ide.completionField"/>
+               <markerFieldReference id="variableName"/>
+               <markerFieldReference id="org.eclipse.ui.ide.resourceField"/>
+               <markerFieldReference id="org.eclipse.ui.ide.locationField"/>
+               </markerContentGenerator>
+               <markerField
+                       class="org.tizen.dynamicanalysis.ide.eplugin.views.CheckBoxField"
+                       id="checkBox"
+                       name="check">
+               </markerField>
+               <markerField
+                       class="org.tizen.dynamicanalysis.ide.eplugin.views.VariableNameField"
+                       id="variableName"
+                       name="Variable Name">
+               </markerField>
+       </extension>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            category="org.tizen.nativeapp.viewCategory"
+            class="org.tizen.dynamicanalysis.ide.eplugin.views.InteractiveProfileView"
+            id="org.tizen.dynamicanalysis.ide.eplugin.views.InteractiveProfileView"
++           name="CheckPoint"
++           icon="icon/view_icon_interactive_profiling.png">
+      </view>
+   </extension>
  
 -           icon="icon/alt_window_16.png"
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="org.eclipse.jdt.ui.JavaPerspective">
+         <view
+               id="org.tizen.dynamicanalysis.ide.eplugin.views.SampleView"
+               ratio="0.5"
+               relationship="right"
+               relative="org.eclipse.ui.views.ProblemView">
+         </view>
+      </perspectiveExtension>
+   </extension>
+   <extension
+         point="org.eclipse.help.contexts">
+      <contexts
+            file="contexts.xml">
+      </contexts>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.markerAnnotationSpecification"
+         id="interactiveannotationspecification">
+      <specification
+            annotationType="interactiveannotation"
+            colorPreferenceKey="clcolor"
+            colorPreferenceValue="255,255,0"
+            highlightPreferenceKey="clhighlight"
+            highlightPreferenceValue="false"
 -           textPreferenceKey="cltext"           
++           icon="icon/mark_interactive_profiling.png"
+            label="CheckPoint of Dynamic Analyzer"
+            overviewRulerPreferenceKey="clruler"
+            overviewRulerPreferenceValue="true"
 -           textStylePreferenceValue="NONE"           
++           presentationLayer="0"
++           textPreferenceKey="cltext"
+            textPreferenceValue="false"
+            textStylePreferenceKey="clstyle"
++           textStylePreferenceValue="NONE"
+            verticalRulerPreferenceKey="clvertical"
+            verticalRulerPreferenceValue="true">
+      </specification>
+   </extension>
++ 
+   <extension
+         point="org.eclipse.ui.editors.annotationTypes">
+      <type
+            markerSeverity="0"
+            markerType="org.tizen.dynamicanalysis.ide.eplugin.interactivemarker"
+            name="interactiveannotation"
+            super="org.eclipse.ui.workbench.texteditor.info">
+      </type>
+   </extension>
  </plugin>

diff --cc org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java
index d8fbb33,4f97a90..c024f5f
--- 1/org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java
--- 2/org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java
+++ b/org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java
@@@ -63,9 -67,9 +66,11 @@@ public class DAServerManager extends Th
        private String reservedBinaryOfTarget; //$NON-NLS-1$
        private String reservedExecutablePath; //$NON-NLS-1$
        private List<String> reservedLocalPackagePathList; //$NON-NLS-1$
 -      private String reservedDebugBinaryPath; //$NON-NLS-1$
 -
 +      
 +      private String LOCAL_HOST = "127.0.0.1"; 
+       private Set<CheckPointInfo> reservedInteractiveInfoSet; //$NON-NLS-1$
++      private String reservedDebugBinaryPath; //$NON-NLS-1$   
 +      
        private final String IDE_DA_COMMUNICATION_TYPE_1 = "STATUS"; //$NON-NLS-1$
        private final String IDE_DA_COMMUNICATION_TYPE_2 = "RUN"; //$NON-NLS-1$
        private final String IDE_DA_COMMUNICATION_TYPE_3 = "SOURCE"; //$NON-NLS-1$

diff --cc org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/nl/Labels.properties
index feec3f8,6e69506..4de5131
--- 1/org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/nl/Labels.properties
--- 2/org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/nl/Labels.properties
+++ b/org.tizen.dynamicanalysis.ide.native.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/nl/Labels.properties
@@@ -10,4 -10,16 +10,16 @@@ MESSAGE_DYNAMIC_ANALYZER_IS_NOT_INSTALL
  
  MESSAGE_NOT_SUPPORT_UNIT_TEST_PROJECT=DA does not support tizen unit test project.
  MESSAGE_NOT_SUPPORT_IME_PROJECT=Certain application categories, such as "ime", cannot be launched by "Profile As".
- MESSAGE_ANOTHER_IDE_CONNECTED= Dynamic Analyzer has been connected to another IDE\n You need to close the prior Dynamic Analyzer first.
+ MESSAGE_ANOTHER_IDE_CONNECTED= Dynamic Analyzer has been connected to another IDE\n You need to close the prior Dynamic Analyzer first.
+ 
+ INTERACTIVE_DIALOG_TITLE_SUCCESS=Checkpoint is added successfully
+ INTERACTIVE_DIALOG_MSG_SUCCESS=Variable is added to Checkpoint successfully.
+ INTERACTIVE_DIALOG_TITLE_ERROR=Checkpoint is failed to be added
+ INTERACTIVE_DIALOG_MSG_INVALID_VARIABLE=Invalid variable. The word you selected is not variable.\nYou should select a variable.
+ INTERACTIVE_DIALOG_MSG_INVALID_LINE=Invalid line. This line is not in function.\nYou should select line which belongs to function body.
+       
+ INTERACTIVE_CHECKPOINT_LOCATION_DIALOG_TITLE=Select location of CheckPoint
 -INTERACTIVE_CHECKPOINT_LOCATION_DIALOG_DESCRITPION=To use interactive profiling, you should select at least one location of CheckPoint.\nTo get value before execution of the line you selected, you should check "Before line execution".\nOr if you want to get value after execution of the line, check "After line execution".
++INTERACTIVE_CHECKPOINT_LOCATION_DIALOG_DESCRITPION=To use CheckPoint analysis, you should select at least one location of CheckPoint.\nTo get value before execution of the line you selected, you should check "Before line execution".\nOr if you want to get value after execution of the line, check "After line execution".
+ 
+ INTERACTIVE_CHECKPOINT_LOCATION_BEFORE_DESCRIPTION=Before line execution 
+ INTERACTIVE_CHECKPOINT_LOCATION_AFTER_DESCRIPTION=After line execution