1.1 --- a/php.smarty/manifest.mf	Tue Mar 01 16:03:00 2011 +0100
     1.2 +++ b/php.smarty/manifest.mf	Wed Mar 02 22:05:53 2011 +0100
     1.3 @@ -2,5 +2,5 @@
     1.4  OpenIDE-Module: org.netbeans.modules.php.smarty
     1.5  OpenIDE-Module-Layer: org/netbeans/modules/php/smarty/resources/layer.xml
     1.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/smarty/resources/Bundle.properties
     1.7 -OpenIDE-Module-Specification-Version: 1.38
     1.8 +OpenIDE-Module-Specification-Version: 1.39
     1.9  

     2.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/resources/layer.xml	Tue Mar 01 16:03:00 2011 +0100
     2.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/resources/layer.xml	Wed Mar 02 22:05:53 2011 +0100
     2.3 @@ -21,6 +21,12 @@
     2.4      <folder name="Editors">
     2.5          <folder name="text">
     2.6              <folder name="x-tpl">
     2.7 +                <folder name="RefactoringActions">
     2.8 +                    <file name="org-netbeans-modules-html-editor-refactoring-actions-ExtractInlinedStyleAction.shadow">
     2.9 +                    <attr name="originalFile" stringvalue="Actions/Refactoring/org-netbeans-modules-html-editor-refactoring-actions-ExtractInlinedStyleAction.instance"/>
    2.10 +                    <attr name="position" intvalue="430"/>
    2.11 +                    </file>
    2.12 +                </folder>
    2.13                  <file name="language.instance">
    2.14                      <attr name="instanceCreate" methodvalue="org.netbeans.modules.php.smarty.editor.lexer.TplTopTokenId.language"/>
    2.15                      <attr name="instanceOf" stringvalue="org.netbeans.api.lexer.Language"/>
    2.16 @@ -48,6 +54,18 @@
    2.17                      <attr name="instanceOf" stringvalue="org.netbeans.modules.parsing.spi.ParserFactory"/>
    2.18                      <attr name="instanceCreate" methodvalue="org.netbeans.modules.csl.core.GsfParserFactory.create"/>
    2.19                  </file>
    2.20 +
    2.21 +                <folder name="SideBar">
    2.22 +                    <file name="org-netbeans-modules-csl-editor-GsfCodeFoldingSideBarFactory.instance">
    2.23 +                        <attr name="position" intvalue="1200"/>
    2.24 +                    </file>
    2.25 +                    <file name="org-netbeans-modules-html-editor-NavigationSideBar$NavigationSideBarFactory.instance">
    2.26 +                        <attr name="position" intvalue="1300"/>
    2.27 +                        <attr name="location" stringvalue="North"/>
    2.28 +                        <attr name="scrollable" boolvalue="false"/>
    2.29 +                    </file>
    2.30 +                </folder>
    2.31 +
    2.32                  <file name="org-netbeans-modules-php-smarty-editor-embedding-TplEmbeddingProvider$Factory.instance"/>
    2.33                  <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.php.smarty.resources.Bundle"/>
    2.34                  <folder name="FontsColors">
    2.35 @@ -60,34 +78,38 @@
    2.36                      </folder>
    2.37                  </folder>
    2.38                  <folder name="Popup">
    2.39 -                    <file name="in-place-refactoring">
    2.40 -                    <attr intvalue="680" name="position"/></file>
    2.41 +                    <file name="generate-code">
    2.42 +                        <attr name="position" intvalue="1480"/>
    2.43 +                    </file>
    2.44 +                    <file name="org-netbeans-modules-refactoring-api-ui-RSMEditorAction.instance">
    2.45 +                        <attr name="instanceCreate" methodvalue="org.netbeans.modules.refactoring.api.ui.RefactoringActionsFactory.editorSubmenuAction"/>
    2.46 +                        <attr name="position" intvalue="1290"/>
    2.47 +                    </file>
    2.48  
    2.49                      <folder name="goto">
    2.50                          <attr intvalue="500" name="position"/>
    2.51                          <attr name="displayName" bundlevalue="org.netbeans.modules.csl.core.Bundle#generate-goto-popup"/>
    2.52                          <file name="goto">
    2.53 -                        <attr intvalue="600" name="position"/></file>
    2.54 +                            <attr intvalue="600" name="position"/>
    2.55 +                        </file>
    2.56                      </folder>
    2.57  
    2.58                      <file name="SeparatorBeforeCut.instance">
    2.59                          <attr intvalue="1200" name="position"/>
    2.60 -                    <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/></file>
    2.61 +                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
    2.62 +                    </file>
    2.63  
    2.64                      <file name="SeparatorAfterFormat.instance">
    2.65                          <attr intvalue="780" name="position"/>
    2.66 -                    <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/></file>
    2.67 +                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
    2.68 +                    </file>
    2.69 +                    <file name="generate-fold-popup">
    2.70 +                        <attr name="position" intvalue="4200"/>
    2.71 +                    </file>
    2.72                  </folder>
    2.73  
    2.74                  <folder name="UpToDateStatusProvider">
    2.75                      <file name="org-netbeans-modules-csl-hints-GsfUpToDateStateProviderFactory.instance"/>
    2.76 -
    2.77 -                    <file name="org-netbeans-modules-csl-editor-semantic-OccurrencesMarkProviderCreator.instance"/>
    2.78 -                </folder>
    2.79 -
    2.80 -                <folder name="SideBar">
    2.81 -                    <file name="org-netbeans-modules-csl-editor-GsfCodeFoldingSideBarFactory.instance">
    2.82 -                    <attr intvalue="1200" name="position"/></file>
    2.83                  </folder>
    2.84  
    2.85                  <folder name="HyperlinkProviders">
    2.86 @@ -133,53 +155,45 @@
    2.87                  <attr name="iconBase" stringvalue="org/netbeans/modules/php/smarty/resources/tpl-icon.png"/>
    2.88                  <!-- eof GSF -->
    2.89                  <folder name="Actions">
    2.90 -                    <file name="org-openide-actions-CopyAction.shadow">
    2.91 +                    <file name="CopyAction.shadow">
    2.92                          <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CopyAction.instance"/>
    2.93 -                        <attr name="position" intvalue="500"/>
    2.94 +                        <attr name="position" intvalue="120"/>
    2.95                      </file>
    2.96 -                    <file name="org-openide-actions-CutAction.shadow">
    2.97 +                    <file name="CutAction.shadow">
    2.98                          <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CutAction.instance"/>
    2.99 -                        <attr name="position" intvalue="400"/>
   2.100 +                        <attr name="position" intvalue="110"/>
   2.101                      </file>
   2.102 -                    <file name="org-openide-actions-DeleteAction.shadow">
   2.103 +                    <file name="DeleteAction.shadow">
   2.104                          <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-DeleteAction.instance"/>
   2.105 -                        <attr name="position" intvalue="700"/>
   2.106 +                        <attr name="position" intvalue="140"/>
   2.107                      </file>
   2.108 -                    <file name="org-openide-actions-OpenAction.shadow">
   2.109 +                    <file name="OpenAction.shadow">
   2.110                          <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-OpenAction.instance"/>
   2.111                          <attr name="position" intvalue="100"/>
   2.112                      </file>
   2.113 -                    <file name="org-openide-actions-PasteAction.shadow">
   2.114 +                    <file name="PasteAction.shadow">
   2.115                          <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-PasteAction.instance"/>
   2.116 -                        <attr name="position" intvalue="550"/>
   2.117 +                        <attr name="position" intvalue="130"/>
   2.118                      </file>
   2.119 -                    <file name="org-openide-actions-PropertiesAction.shadow">
   2.120 +                    <file name="PropertiesAction.shadow">
   2.121                          <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-PropertiesAction.instance"/>
   2.122 -                        <attr name="position" intvalue="1300"/>
   2.123 +                        <attr name="position" intvalue="190"/>
   2.124                      </file>
   2.125 -                    <file name="RefactoringAll.shadow">
   2.126 -                        <attr name="originalFile" stringvalue="Actions/Refactoring/RefactoringAll.instance"/>
   2.127 -                        <attr name="position" intvalue="850"/>
   2.128 +                    <file name="RenameAction.shadow">
   2.129 +                        <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-RenameAction.instance"/>
   2.130 +                        <attr name="position" intvalue="150"/>
   2.131                      </file>
   2.132 -                    <file name="org-openide-actions-ToolsAction.shadow">
   2.133 +                    <file name="FileSystemAction.shadow">
   2.134 +                        <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-FileSystemAction.instance"/>
   2.135 +                        <attr name="position" intvalue="170"/>
   2.136 +                    </file>
   2.137 +                    <file name="SaveAsTemplateAction.shadow">
   2.138 +                        <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-SaveAsTemplateAction.instance"/>
   2.139 +                        <attr name="position" intvalue="160"/>
   2.140 +                    </file>
   2.141 +                    <file name="ToolsAction.shadow">
   2.142                          <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
   2.143 -                        <attr name="position" intvalue="1200"/>
   2.144 -                    </file>
   2.145 -                    <file name="sep-1.instance">
   2.146 -                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
   2.147 -                        <attr name="position" intvalue="300"/>
   2.148 -                    </file>
   2.149 -                    <file name="sep-2.instance">
   2.150 -                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
   2.151 -                        <attr name="position" intvalue="600"/>
   2.152 -                    </file>
   2.153 -                    <file name="sep-3.instance">
   2.154 -                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
   2.155 -                        <attr name="position" intvalue="900"/>
   2.156 -                    </file>
   2.157 -                    <file name="sep-4.instance">
   2.158 -                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
   2.159 -                        <attr name="position" intvalue="1100"/>
   2.160 +                        <attr name="position" intvalue="250"/>
   2.161                      </file>
   2.162                  </folder>
   2.163                  <folder name="Factories">
   2.164 @@ -237,4 +251,12 @@
   2.165          </folder>
   2.166      </folder>
   2.167  
   2.168 +     <folder name="Actions">
   2.169 +        <folder name="Refactoring">
   2.170 +            <file name="org-netbeans-modules-html-editor-refactoring-actions-ExtractInlinedStyleAction.instance">
   2.171 +                <attr name="instanceCreate" methodvalue="org.netbeans.modules.html.editor.refactoring.actions.HtmlRefactoringActionsFactory.extractInlinedStyleAction"/>
   2.172 +            </file>
   2.173 +        </folder>
   2.174 +    </folder>
   2.175 +
   2.176  </filesystem>