Changeset 654 for org.cfeclipse.cfml/trunk/plugin.xml

Timestamp:

05/10/08 07:21:52 (8 months ago)

Author:

sed

Message:

Merged branch/1.3.2 changes r611:626 into the trunk.

Files:

• org.cfeclipse.cfml/trunk/plugin.xml (modified) (7 diffs)

org.cfeclipse.cfml/trunk/plugin.xml

@@ -135 +135 @@
    </extension>
    
-        <!-- ////////////////////////////////////////////////////////////// -->
+        <extension point="org.eclipse.core.runtime.contentTypes">
+                <content-type
+                        id="cfsource"
+                        base-type="org.eclipse.core.runtime.text"
+                        name="ColdFusion Source File"
+                        file-extensions="cfc,cfm,cfml">
+                </content-type>
+        </extension>
+
+        <!-- ////////////////////////////////////////////////////////////// -->
         <!-- Editor -->
    <extension
@@ -146 +155 @@
             class="org.cfeclipse.cfml.editors.CFMLEditor"
             id="org.cfeclipse.cfml.editors.CFMLEditor">
+            
+                        <contentTypeBinding contentTypeId="org.cfeclipse.cfml.cfsource">
+                        </contentTypeBinding>            
       </editor>
 
@@ -819 +831 @@
                 id="org.cfeclipse.cfml.mappings"
                 objectClass="org.eclipse.core.resources.IFolder">
-             <menu
+<!--         <menu
                    id="org.cfeclipse.cfml.cfeclipse.menu"
                    label="CFEclipse"
                    path="cfeclipse_additions">
                 <separator name="separator1"/>
-             </menu>
+             </menu> -->
              <action
                    class="org.cfeclipse.cfml.ui.actions.SetMappingAction"
@@ -832 +844 @@
           </objectContribution>
               
-                <objectContribution
-                        objectClass="org.eclipse.core.resources.IProject"
+        <objectContribution
+                        adaptable="true"
+                        id="org.cfeclipse.cfml.applyNature"
                         nameFilter="*"
-                        id="org.cfeclipse.cfml.applyNature"
-                >
-                        <action
-                                enablesFor="1"
-                                label="%action.label.57"
-                                class="org.cfeclipse.cfml.ui.actions.ApplyCFENatureAction"
-                                tooltip="%action.tooltip.40"
-                                menubarPath="org.cfeclipse.cfml.cfeclipse.menu/separator1"
-                                id="org.cfeclipse.cfml.ui.actions.ApplyCFENatureAction"
-                        />
-                </objectContribution>
+                        objectClass="org.eclipse.core.resources.IProject">
+                <action
+                        class="org.cfeclipse.cfml.ui.actions.ApplyCFENatureAction"
+                        enablesFor="+"
+                        icon="icons/icons/16x16.gif"
+                        id="org.cfeclipse.cfml.ui.actions.ApplyCFENatureAction"
+                        label="%action.label.57"
+                        menubarPath="additions"
+                        tooltip="%action.tooltip.40"/>
+        </objectContribution>
+        
   <objectContribution
         adaptable="false"
@@ -1553 +1566 @@
       <page
             class="org.cfeclipse.cfml.properties.ProjectPropertyPage"
-            icon="icons/icons/cfeclipse_16x16.png"
             id="org.cfeclipse.cfml.properties.samplePropertyPage"
             name="%page.name.10"
             nameFilter="*"
             objectClass="org.eclipse.core.resources.IProject">
+         <filter 
+                name="projectNature"
+            value="org.cfeclipse.cfml.CFENature">
+         </filter>
+         <enabledWhen>
+            <instanceof
+                  value="org.eclipse.core.resources.IProject">
+            </instanceof>
+         </enabledWhen>
       </page>
       <page
             class="org.cfeclipse.cfml.properties.MappingsPropertyPage"
-            icon="icons/icons/cfeclipse_16x16.png"
             id="org.cfeclipse.cfml.properties.MappingsPropertyPage"
             name="CFEMappings"
             nameFilter="*"
-            objectClass="org.eclipse.core.resources.IProject"/>
+            objectClass="org.eclipse.core.resources.IProject">
+         <filter 
+                name="projectNature"
+            value="org.cfeclipse.cfml.CFENature">
+         </filter>
+         <enabledWhen>
+            <instanceof
+                  value="org.eclipse.core.resources.IProject">
+            </instanceof>
+         </enabledWhen>
+      </page>
             <!--
       <page
@@ -1584 +1614 @@
             id="org.cfeclipse.cfml.category1">
       </category>
-      <wizard name="%wizard.name.0"
-                        icon="icons/icons/cfeclipse_16x16.png"
-
-                        class="org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard"
-                
-                        category="org.cfeclipse.cfml.category1"
-                        preferredPerspectives="org.cfeclipse.cfml.perspective.CFML"
-                        project="true" 
-                        finalPerspective="org.cfeclipse.cfml.perspective.CFML"
-                        id="org.cfeclipse.cfml.wizards.NewProject">
+      <wizard
+            category="org.cfeclipse.cfml.category1"
+            class="org.cfeclipse.cfml.wizards.NewCFEclipseProject"
+            finalPerspective="org.cfeclipse.cfml.perspective.CFML"
+            icon="icons/icons/cfeclipse_16x16.png"
+            id="org.cfeclipse.cfml.wizards.NewProject"
+            name="%wizard.name.0"
+            preferredPerspectives="org.cfeclipse.cfml.perspective.CFML"
+            project="true">
                         <description>%wizard.description.0</description>
          </wizard>
@@ -1677 +1706 @@
          <run class="org.cfeclipse.cfml.natures.CFENature"/>
       </runtime>
-      <one-of-nature id="CFEclipse-2.one-of-nature1"/>
    </extension>