From a9d0eb036b607b23adcd5ab28682c6e476c6f715 Mon Sep 17 00:00:00 2001
From: "daeryong.park" <bdragon.park@samsung.com>
Date: Mon, 27 Feb 2017 18:54:38 +0900
Subject: [PATCH] RTSDK : Default navigator changed ProjectExplorer to
 CommonNavigator

Change-Id: Ie0d2c47b809c31d03a461946a35798b51e6f998b
Signed-off-by: daeryong.park <bdragon.park@samsung.com>
---
 rt-ide/tizen.rt.product.plugin/icons/view_pv.png   | Bin 0 -> 1075 bytes
 .../tizen.rt.product.plugin/icons/view_pv_sel.png  | Bin 0 -> 268 bytes
 rt-ide/tizen.rt.product.plugin/plugin.xml          |  97 +++++----------------
 .../rt/ide/perspectives/TizenRTPerspective.java    |   4 +-
 4 files changed, 26 insertions(+), 75 deletions(-)
 create mode 100644 rt-ide/tizen.rt.product.plugin/icons/view_pv.png
 create mode 100644 rt-ide/tizen.rt.product.plugin/icons/view_pv_sel.png

diff --git a/rt-ide/tizen.rt.product.plugin/icons/view_pv.png b/rt-ide/tizen.rt.product.plugin/icons/view_pv.png
new file mode 100644
index 0000000000000000000000000000000000000000..efd2a3ea6496b4b0dd3dc03885e334c677693b4c
GIT binary patch
literal 1075
zcmaJ=U2D@&7!D3ZH;V|$HbIFIzirZ_ZQ6!bZJW*&O|4yZLqtrIvo+M@#N^awQxOzJ
zhr;H^jX%H-P;X>l*@cM6oEK9sR1guo@Z&;o3~#14p47H_VGT*n2ha1o?|I+nT*zj2
zdfHdE69nN&_lh|@E_c603-SNbg;gFrbfeS&>Vt!*B3pontFQpbv@Q>U9FW!FqthTt
z5N(u}A3y`rZb5-MExQ=n(M`-Ii0F35l$8=dWC09mMvVG4`H&(tHAeLZC7)y_K~d`+
zu|VHQCa;W?l!!`g-$q6q0So8=$)uwnF>Jw!Q8irw&)sc?B5M#-ic!Cl8j!MN5?X)^
z(tfYvV_A~tX*Lk#d3Gzw`B;we;g|Qa0U^i>T!^ec6pm)8gF;U1smH>r7*#~b6d0yb
zsn8Wa4Xq)DjYJ}@2FH0Z!fOv3NOru2y|$qs0$Z^(6KT*OT}8P7%P2<SOn)CiH=DAC
zT`v<Z7~{w$!_q$YNDZJQ{U569O|*@2;7`8)6t?rjCSY>FhGk2^jT>C+hBAeu1!M%R
zJcLIYRm>J4f_4#_WU`MZH}-3W3M=-e8eWowv|%IJP(WIYQCNZ2G*t*Cdg9>}7vNH&
z$g(Lu5%Gt@fnbPDgj0b?!r$PEP$}!cKn<??hZ}6kb*-SAII;*V?HEvdEU1&UBMVyV
zT)38cb*|bv7k^7GgOg$0#{Sjl#uj#uJ8jw)FPg>&26nrJZEbYDDdQ_~GcCsR&f9m_
zr1rKoOU_<-bm{ZUyHm@emp51+PaeFnx!iT&<<;rJm$p+cW@mSa<L7teiWfhG3p3R{
zcP4zF{I_4<U2r|V;?=VLqsghIf$w~$|LcuOVxr?g!OGlPKY#t%@uia|PIVvJ(wzvu
z*|ljbxAHjZsHRJvnd<xfqwL&xRoFHjsYr8gpYEG~KDI8q=ke(IE1l<7pSgIy^XJUs
dy+1mf#Xe$G-;sH;X!eYIjnk=&crS7I^e^4IVXOcE

literal 0
HcmV?d00001

diff --git a/rt-ide/tizen.rt.product.plugin/icons/view_pv_sel.png b/rt-ide/tizen.rt.product.plugin/icons/view_pv_sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..1769800620eb8b6053a0a60f51a3f51f9e2c8c6d
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2!h8b)GJcAr-fhaxyX!4zNq@_+)T&pYNfS^H^6rv}aB{aKb?)
zfl=_kH*4YSD}UwIv_v@1l;~jpzcN=Lux*oo38SWk!@c9;iW+QAhq<&fwmwZ+vFU-r
zDefMg*!TYy?_P9|YvIq!>;Ln#&;OHX@%fSd$BjMwA2u2qRcLQ)GE}@!@rJ!HPL0(-
zk=<_J7mrPiSD2Kqp1$%)Z^@5eW}Sj-|NOSMNS3rc8hqB_i-LkE1B(QMF{7pV?lXbK
QK$kOky85}Sb4q9e02hO2L;wH)

literal 0
HcmV?d00001

diff --git a/rt-ide/tizen.rt.product.plugin/plugin.xml b/rt-ide/tizen.rt.product.plugin/plugin.xml
index efb9799..5541e8b 100644
--- a/rt-ide/tizen.rt.product.plugin/plugin.xml
+++ b/rt-ide/tizen.rt.product.plugin/plugin.xml
@@ -225,7 +225,7 @@
             category="org.tizen.rt.TizenRT"
             class="org.tizen.rt.ide.wizards.NewArtikProjectWizard"
             finalPerspective="org.tizen.rt.ide.perspectives.TizenRT"
-            icon="icons/tools/tool_build_nor.png"
+            icon="icons/branding/icon_ide_rt_16.png"
             id="org.tizen.rt.LocalProject"
             name="TizenRT Project"
             project="true">
@@ -234,7 +234,7 @@
             category="org.tizen.rt.TizenRT"
             class="org.eclipse.egit.ui.internal.clone.RtGitImportWizard"
             finalPerspective="org.tizen.rt.ide.perspectives.TizenRT"
-            icon="icons/tools/tool_build_nor.png"
+            icon="icons/branding/icon_ide_rt_16.png"
             id="org.tizen.rt.GitProject"
             name="TizenRT Project from Git"
             project="true">
@@ -258,7 +258,7 @@
    <extension
          point="org.eclipse.ui.navigator.viewer">
       <viewerActionBinding
-            viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+            viewerId="org.tizen.rt.product.RtProjectExplorer">
          <includes>
             <actionExtension
                   pattern="org.eclipse.ui.navigator.resources.*">
@@ -266,7 +266,7 @@
          </includes>
       </viewerActionBinding>
       <viewerContentBinding
-            viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+            viewerId="org.tizen.rt.product.RtProjectExplorer">
          <includes>
             <contentExtension
                   pattern="org.eclipse.ui.navigator.resourceContent">
@@ -357,8 +357,11 @@
          <hiddenMenuItem
                id="org.tizen.common.ui.perspective.menu.specific">
          </hiddenMenuItem>
+         <actionSet
+               id="org.eclipse.debug.ui.launchActionSet">
+         </actionSet>
       </perspectiveExtension>
- 
+
       <perspectiveExtension
             targetID="org.eclipse.debug.ui.DebugPerspective">
          <hiddenToolBarItem
@@ -370,6 +373,17 @@
       </perspectiveExtension>
    </extension>
    <extension
+         point="org.eclipse.ui.views">
+      <view
+            allowMultiple="false"
+            class="org.eclipse.ui.navigator.CommonNavigator"
+            icon="icons/view_pv.png"
+            id="org.tizen.rt.product.RtProjectExplorer"
+            name="Project Explorer"
+            restorable="true">
+      </view>
+   </extension>
+   <extension
          point="org.eclipse.ui.activities">
       <activity
             id="org.tizen.rt.activity.common"
@@ -392,73 +406,10 @@
             </with>
          </enabledWhen>
       </activity>
+      <activityPatternBinding
+            activityId="org.tizen.rt.activity.common"
+            isEqualityPattern="true"
+            pattern="org.tizen.common.ui.tizenprojectwizard">
+      </activityPatternBinding>
    </extension>
-
-   <!--Hide Common Toolbar Item-->
-   <extension
-         point="org.eclipse.ui.activities">
-    <activityPatternBinding
-          activityId="org.tizen.rt.activity.common"
-          pattern="org.eclipse.ui.editors/org.eclipse.ui.edit.text.gotoNextAnnotation"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" pattern="org.eclipse.ui.editors/org.eclipse.ui.edit.text.gotoPreviousAnnotation"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.mylyn.tasks.ui.command.openTask"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" pattern="org.eclipse.ui.file.save"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" pattern="org.eclipse.search/org.eclipse.search.OpenSearchDialogPage"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" pattern="org.eclipse.ui/org.eclipse.ui.window.pinEditor"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" pattern="org.eclipse.debug.ui.commands.ToggleStepFilters"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" pattern="org.eclipse.debug.ui.commands.DropToFrame"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.ui.navigate.opentype"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.buildConfigToolbarAction"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.buildActiveConfigToolbarAction"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.ui.edit.text.c.toggleMarkOccurrences"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.egit.ui.team.OpenCommit"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.mylyn.cdt.ui.editor.folding.auto"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.ui.edit.text.toggleBlockSelectionMode"/>
-   </extension>
-   
-  <!--Hide New Wizard -->
-  <extension point="org.eclipse.ui.activities">
-    <!-- New Wizard Delete-->
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewProjectWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewLibraryPluginProjectWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewFragmentWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewSchemaFileWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewFeatureProjectWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewFeaturePatchWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewSiteProjectWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewProductConfigurationWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewProfileWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ui/org.eclipse.pde.ui.NewCategoryWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ds.ui/org.eclipse.pde.ds.ui.wizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.datatools.connectivity.ui/org.eclipse.datatools.connectivity.ui.wizard.newrepositorywizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.datatools.connectivity.ui/org.eclipse.datatools.connectivity.internal.ui.wizards.newconnectionprofile"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard1"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard2"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.wizards.NewMakeFromExisting"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.wst.web.ui/org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ua.ui/org.eclipse.pde.ua.ui.NewCheatSheetWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ua.ui/org.eclipse.pde.ua.ui.NewTOCWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.pde.ua.ui/org.eclipse.pde.ua.ui.NewContextHelpWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.mylyn.tasks.ui/org.eclipse.mylyn.tasks.ui.wizards.new.category"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.mylyn.tasks.ui/org.eclipse.mylyn.tasks.ui.wizards.new.repository.task"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.mylyn.tasks.ui/org.eclipse.mylyn.tasks.ui.wizards.new.query"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.datatools.sqltools.sqlscrapbook/org.eclipse.datatools.sqltools.internal.sqlscrapbook.wizards.NewSQLScrapbookFileCreationWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewFolderCreationWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewFileCreationWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.wizards.ConvertToMakeWizard"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.wst.ui/org.eclipse.wst.html.commonWizard.newHTML"/>
-    <activityPatternBinding activityId="org.tizen.rt.activity.common" isEqualityPattern="true" pattern="org.eclipse.wst.common.project.facet.ui/org.eclipse.wst.common.project.facet.ui.BasicFacetedProjectWizard"/>
-  </extension>
-  
-    <!-- Hide Project Explorer Popup Menu -->
-  <extension point="org.eclipse.ui.activities">
-    <!-- Popup > New > List -->
-    <activityPatternBinding activityId="org.tizen.activity.common" isEqualityPattern="true" pattern="org.tizen.web.project/org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard"/>
-    <activityPatternBinding activityId="org.tizen.activity.common" isEqualityPattern="true" pattern="org.tizen.web.project/org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard"/>
-    <activityPatternBinding activityId="org.tizen.activity.common" isEqualityPattern="true" pattern="json.editor.plugin/Json.newFileWizard"/>
-  </extension>
-   
 </plugin>
diff --git a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/perspectives/TizenRTPerspective.java b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/perspectives/TizenRTPerspective.java
index 93cbf2d..41ca6f6 100644
--- a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/perspectives/TizenRTPerspective.java
+++ b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/perspectives/TizenRTPerspective.java
@@ -38,7 +38,7 @@ public class TizenRTPerspective implements IPerspectiveFactory {
 
         IFolderLayout left = factory.createFolder("left", // NON-NLS-1
                 IPageLayout.LEFT, 0.20f, factory.getEditorArea());
-        left.addView(IPageLayout.ID_PROJECT_EXPLORER);
+        left.addView("org.tizen.rt.product.RtProjectExplorer"); // NON-NLS-1
 
         IFolderLayout bottom = factory.createFolder("bottomRight", // NON-NLS-1
                 IPageLayout.BOTTOM, 0.75f, factory.getEditorArea());
@@ -68,7 +68,7 @@ public class TizenRTPerspective implements IPerspectiveFactory {
     }
 
     private void addViewShortcuts() {
-        factory.addShowViewShortcut(IPageLayout.ID_PROJECT_EXPLORER);
+        factory.addShowViewShortcut("org.tizen.rt.product.RtProjectExplorer"); // NON-NLS-1
         factory.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
         factory.addShowViewShortcut(IUIConstants.ID); // TM Terminal View ID
         factory.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-- 
2.7.4