diff options
| author | cletavernie | 2013-04-29 10:04:59 +0000 |
|---|---|---|
| committer | cletavernie | 2013-04-29 10:04:59 +0000 |
| commit | 1d8497de25ab5d60fd6c93ea308608a9b765e6d7 (patch) | |
| tree | b2c6003b990d5604e0de4aba4233a6a4ee6b92bf | |
| parent | c15d8989233ba9a1187c63f0064121089649fe9b (diff) | |
| download | org.eclipse.papyrus-1d8497de25ab5d60fd6c93ea308608a9b765e6d7.tar.gz org.eclipse.papyrus-1d8497de25ab5d60fd6c93ea308608a9b765e6d7.tar.xz org.eclipse.papyrus-1d8497de25ab5d60fd6c93ea308608a9b765e6d7.zip | |
406779: [ModelExplorer] Rename Papyrus customizations for clarity
https://bugs.eclipse.org/bugs/show_bug.cgi?id=406779
Various model-explorer related label changes
3 files changed, 7 insertions, 3 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.xml index be7050ae4fb..a32c674fa72 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.xml @@ -46,7 +46,7 @@ </extension>
<extension point="org.eclipse.ui.commands">
<command id="org.eclipse.papyrus.views.modelexplorer.diagramviewcommand"
- name="DiagramView" description="go to the diagram view"
+ name="Show diagrams" description="go to the diagram view"
categoryId="org.eclipse.papyrus.editor.category"
defaultHandler="org.eclipse.papyrus.uml.diagram.modelexplorer.handler.DiagramViewHandler">
</command>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/src/org/eclipse/papyrus/uml/diagram/modelexplorer/handler/DiagramViewHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/src/org/eclipse/papyrus/uml/diagram/modelexplorer/handler/DiagramViewHandler.java index 0961a8c35d4..7d561d52aa7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/src/org/eclipse/papyrus/uml/diagram/modelexplorer/handler/DiagramViewHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/src/org/eclipse/papyrus/uml/diagram/modelexplorer/handler/DiagramViewHandler.java @@ -56,6 +56,10 @@ public class DiagramViewHandler extends AbstractHandler { * {@inheritDoc}
*/
public Object execute(ExecutionEvent event) throws ExecutionException {
+ if(getCommonNavigator() == null || getCommonNavigator().getCommonViewer() == null) {
+ return null; //The model explorer is not displayed (The editor is closed?)
+ }
+
CommonViewer viewer = getCommonNavigator().getCommonViewer();
String[] newContents = null;
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml index 09300e3f415..72c65b94121 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml @@ -195,11 +195,11 @@ </command>
<!-- Command declaration : Search element command -->
- <command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.SearchElementHandler" description="Search an element in the model explorer" id="org.eclipse.papyrus.views.modelexplorer.searchelement" name="searchelement">
+ <command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.SearchElementHandler" description="Search an element in the model explorer" id="org.eclipse.papyrus.views.modelexplorer.searchelement" name="Quick Search">
</command>
<!-- Command declaration : Sort elements command -->
- <command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.SortElementHandler" description="Sort elements" id="org.eclipse.papyrus.views.modelexplorer.sortelement" name="SortElement">
+ <command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.SortElementHandler" description="Sort elements" id="org.eclipse.papyrus.views.modelexplorer.sortelement" name="Sort elements">
</command>
<!-- Command declaration : Delete element command -->
|