diff options
| author | kmoore | 2012-03-07 16:44:28 +0000 |
|---|---|---|
| committer | kmoore | 2012-03-07 16:44:28 +0000 |
| commit | 65638650a93346b4e9a09fac1b2a8be9a1465349 (patch) | |
| tree | 3c7df4f7a9f4768e264e6ae2edce2892175686dd /jpa | |
| parent | c84bd607922f64fa790291fc34215bf55420d536 (diff) | |
| download | webtools.dali-65638650a93346b4e9a09fac1b2a8be9a1465349.tar.gz webtools.dali-65638650a93346b4e9a09fac1b2a8be9a1465349.tar.xz webtools.dali-65638650a93346b4e9a09fac1b2a8be9a1465349.zip | |
combine the JPQL and orm.xml file completion proposal extension points so that we only have one 'JPA Proposal' category
Diffstat (limited to 'jpa')
| -rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml index 0101e9c6d0..83e7e3d67d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml @@ -161,46 +161,34 @@ <extension point="org.eclipse.wst.sse.ui.completionProposal" - id="org.eclipse.jpt.jpa.ui.xml.jpqlCompletionProposal"> + id="org.eclipse.jpt.jpa.ui.xml.jpaCompletionProposal"> - <proposalCategory + <proposalCategory icon="$nl$/icons/full/eview16/jpa_perspective.gif" - id="org.eclipse.jpt.jpa.ui.xml.jpqlProposalCategory" + id="org.eclipse.jpt.jpa.ui.xml.jpaProposalCategory" name="%JpaProposalCategory"> </proposalCategory> <proposalComputer activate="true" - categoryId="org.eclipse.jpt.jpa.ui.xml.jpqlProposalCategory" + categoryId="org.eclipse.jpt.jpa.ui.xml.jpaProposalCategory" class="org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlSseCompletionProposalComputer" id="org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlSseCompletionProposalComputer"> <contentType id="org.eclipse.core.runtime.xml"> </contentType> </proposalComputer> - - </extension> - - <extension - id="org.eclipse.jpt.jpa.ui.xml.xmlCompletionProposal" - point="org.eclipse.wst.sse.ui.completionProposal"> - - <proposalCategory - icon="$nl$/icons/full/eview16/jpa_perspective.gif" - id="org.eclipse.jpt.jpa.ui.xml.xmlProposalCategory" - name="%JpaProposalCategory"> - </proposalCategory> - - <proposalComputer + + <!-- Use xml instead of more specific mappingFile content type so JPA Proposals appears in the XMl preferences --> + <proposalComputer activate="true" - categoryId="org.eclipse.jpt.jpa.ui.xml.xmlProposalCategory" + categoryId="org.eclipse.jpt.jpa.ui.xml.jpaProposalCategory" class="org.eclipse.jpt.jpa.ui.internal.JpaXmlCompletionProposalComputer" id="org.eclipse.jpt.jpa.ui.internal.JpaXmlCompletionProposalComputer"> <contentType id="org.eclipse.core.runtime.xml"> </contentType> </proposalComputer> - </extension> <!-- ***** Dali extensions (eat our own dogfood) ***** --> @@ -269,13 +257,7 @@ name="%addPersistentClass" categoryId="org.eclipse.jpt.jpa.ui.jpaStructureViewCommands"> </command> - - <command - id="org.eclipse.jpt.jpa.ui.persistentTypeRemovePersistentClass" - name="%removePersistentClass" - categoryId="org.eclipse.jpt.jpa.ui.jpaStructureViewCommands"> - </command> - + <command id="org.eclipse.jpt.jpa.ui.persistentAttributeAddToXml" name="%addPersistentAttributeToXml" @@ -383,7 +365,7 @@ </handler> <handler - commandId="org.eclipse.jpt.jpa.ui.persistentTypeRemovePersistentClass" + commandId="org.eclipse.ui.edit.delete" class="org.eclipse.jpt.jpa.ui.internal.commands.RemovePersistentClassHandler"> <activeWhen> <reference @@ -602,7 +584,7 @@ </visibleWhen> </command> <command - commandId="org.eclipse.jpt.jpa.ui.persistentTypeRemovePersistentClass"> + commandId="org.eclipse.ui.edit.delete"> <visibleWhen> <with variable="selection"> |