Merge branch 'readonly-p4-master'

This commit is contained in:
Raphael Moll
2009-04-08 19:08:10 -07:00
committed by The Android Open Source Project

View File

@@ -245,6 +245,7 @@
label="Fix Project Properties"
menubarPath="com.android.ide.eclipse.adt.AndroidTools/group3"/>
</objectContribution>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
@@ -497,15 +498,45 @@
id="adt.actionSet.refactorings"
label="Android Refactorings"
visible="true">
<!-- This duplicates the Refactoring Menu definition from the jdt.ui plugin.xml,
which allows us to insert our contribution even if the JDT is not loaded.
We overload the definition with our new group.-->
<menu
label="Refactor"
path="edit"
id="org.eclipse.jdt.ui.refactoring.menu">
<separator name="undoRedoGroup"/>
<separator name="reorgGroup"/>
<separator name="androidGroup"/>
<separator name="codingGroup"/>
<separator name="reorgGroup2"/>
<separator name="typeGroup"/>
<separator name="typeGroup2"/>
<separator name="codingGroup2"/>
<separator name="typeGroup3"/>
<separator name="scriptGroup"/>
</menu>
<menu
label="Android"
path="org.eclipse.jdt.ui.refactoring.menu/androidGroup"
id="com.android.ide.eclipse.adt.refactoring.menu">
<separator name="android"/>
</menu>
<action
class="com.android.ide.eclipse.adt.refactorings.extractstring.ExtractStringAction"
definitionId="com.android.ide.eclipse.adt.refactoring.extract.string"
id="com.android.ide.eclipse.adt.actions.ExtractString"
label="Extract Android String..."
menubarPath="org.eclipse.jdt.ui.refactoring.menu/codingGroup"
menubarPath="org.eclipse.jdt.ui.refactoring.menu/com.android.ide.eclipse.adt.refactoring.menu/android"
style="push"
tooltip="Extracts a string into Android resource string">
</action>
<menu
id="org.eclipse.jdt.ui.refactoring.menu"
label="Refactor">
</menu>
</actionSet>
</extension>
<extension