diff options
| author | Belqassim Djafer | 2015-03-05 16:20:10 +0000 |
|---|---|---|
| committer | Laurent Redor | 2015-03-12 13:05:19 +0000 |
| commit | 687a082c604c66d1433c90d25734bec75a061f2d (patch) | |
| tree | 5993147220bb057f42637710de8c71f10a9ecbf1 | |
| parent | daee88ab7a8c76396ba035c65fdcd2612a721208 (diff) | |
| download | org.eclipse.sirius-687a082c604c66d1433c90d25734bec75a061f2d.tar.gz org.eclipse.sirius-687a082c604c66d1433c90d25734bec75a061f2d.tar.xz org.eclipse.sirius-687a082c604c66d1433c90d25734bec75a061f2d.zip | |
[460603] Change decorators in the Viewpoint Selection Dialog
In the Viewpoint Selection Dialog and in ViewpointsSelectionWizardPage,
remove the "plug-in" decorator for
viewpoints loaded from plug-ins, and add a "Folder" decorator for
viewpoints loaded from the current workspace.
Bug: 460603
Change-Id: Ib103650e82c1112e47ab7992094f403a6be48656
Signed-off-by: Belqassim Djafer <belqassim.djafer@obeo.fr>
9 files changed, 62 insertions, 52 deletions
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html index 8ad42b6e55..0aba221426 100644 --- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html +++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html @@ -41,6 +41,10 @@ </ol> <p>This document contains the release notes for all major releases of Sirius.</p> <h2 id="sirius3.0.0">Changes in Sirius 3.0.0 (from Sirius 2.0.0)</h2> + <h3 id="UserVisibleChanges">User-Visible Changes</h3> + <ul> + <li>In the Viewpoint Selection Dialog and ViewpointsSelectionWizardPage, the «plug-in» decorator for viewpoints loaded from plug-ins is removed, and a «Folder» decorator for viewpoints loaded from the current workspace has been added on the top of the default viewpoint icon.</li> + </ul> <h3 id="SpecifierVisibleChanges">Specifier-Visible Changes</h3> <ul> <li>In Open menu, the menu is computed from the navigation tool label instead of its name/id.</li> @@ -75,7 +79,7 @@ <code>org.eclipse.sirius.business.api.helper.SiriusUtil.ENVIRONMENT_URI_SCHEME</code> declares environment URI scheme. </li> <li>Constant - <code>org.eclipse.sirius.business.api.helper.SiriusUtil.VIEWPOINT_ENVIRONMENT_RESOURCE_URI</code> declares “environment:/viewpoint” resource uri. + <code>org.eclipse.sirius.business.api.helper.SiriusUtil.VIEWPOINT_ENVIRONMENT_RESOURCE_URI</code> declares «environment:/viewpoint» resource uri. </li> <li>Constant <code>org.eclipse.sirius.viewpoint.description.util.DescriptionResourceImpl.OPTION_SIRIUS_USE_URI_FRAGMENT_AS_ID</code> added to define a option to enable the use of a id map for odesign resource, id being uri’s fragment. @@ -89,14 +93,6 @@ <code>org.eclipse.sirius.business.api.session.Session.createSemanticResource()</code> method has been removed. Use <code>Session.addSemanticResource()</code> instead. </li> - </ul> - <h4 id="Changesinorg.eclipse.sirius.ui">Changes in - <code>org.eclipse.sirius.ui</code> - </h4> - <ul> - <li>The method - <code>org.eclipse.sirius.ui.business.api.session.IEditingSession.detachEditor(DialectEditor, boolean)</code> has been added to choose whether we should revert the user changes when detaching the editor. - </li> <li> <code>org.eclipse.sirius.viewpoint.RGBValues</code> has been changed from an <code>EClass</code> to an @@ -129,6 +125,14 @@ <code>org.eclipse.sirius.ui.siriuspropertiescelleditor</code>. </li> </ul> + <h4 id="Changesinorg.eclipse.sirius.ui2">Changes in + <code>org.eclipse.sirius.ui</code> + </h4> + <ul> + <li>The method + <code>org.eclipse.sirius.ui.business.api.session.IEditingSession.detachEditor(DialectEditor, boolean)</code> has been added to choose whether we should revert the user changes when detaching the editor. + </li> + </ul> <h4 id="Changesinorg.eclipse.sirius.common">Changes in <code>org.eclipse.sirius.common</code> </h4> @@ -303,7 +307,7 @@ <code>org.eclipse.sirius.diagram.tools.api.command.ChangeLayerActivationCommand</code> has been added. This command was previously internal. </li> <li>Constant - <code>org.eclipse.sirius.diagram.business.api.helper.SiriusDiagramUtil.DIAGRAM_ENVIRONMENT_RESOURCE_URI</code> declares “environment:/diagram” resource uri. + <code>org.eclipse.sirius.diagram.business.api.helper.SiriusDiagramUtil.DIAGRAM_ENVIRONMENT_RESOURCE_URI</code> declares «environment:/diagram» resource uri. </li> <li>The method <code>org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider.completeToolTipText(String, EObject, EStructuralFeature)</code> has been added to customize the tooltip displayed in the VSM editor by using the feature of the current object. The old method @@ -460,7 +464,7 @@ </li> </ul> <h2 id="sirius2.0.0">Changes in Sirius 2.0.0 (from Sirius 1.0.0)</h2> - <h3 id="UserVisibleChanges">User-Visible Changes</h3> + <h3 id="UserVisibleChanges2">User-Visible Changes</h3> <ul> <li>It is now possible to select element that intersects the selection rectangle and not that is completely contained by the selection rectangle. This new behavior is enabled when user selects elements from right to left. The normal mode (previous mode) remains when the user selects elements from left to right.</li> <li>The edges appearance is now kept, as much as possible, when one of its extremity is moved. A move of an extremity should move only the closest segment of the edge.</li> @@ -476,13 +480,13 @@ <img border="0" src="images/containerResize-changedBehavior.gif"/> </p> <ul> - <li>The “snap to shapes” is now enabled by default (see + <li>The «snap to shapes» is now enabled by default (see <em>Sirius > Sirius Diagram > Rulers and Grid</em> preference page). This is true only for new diagrams. The existing diagrams are not impacted. </li> - <li>The “Navigate” top-level contextual menu entry with mixed actions for creating new representations and opening existing ones has been changed by two top-level menus: + <li>The «Navigate» top-level contextual menu entry with mixed actions for creating new representations and opening existing ones has been changed by two top-level menus: <ul> - <li>One named “New”, which lists only the available actions to create new representations on the selected element.</li> - <li>One named “Open”, which lists only the existing representations on the selected element. </li> + <li>One named «New», which lists only the available actions to create new representations on the selected element.</li> + <li>One named «Open», which lists only the existing representations on the selected element. </li> </ul> </li> <li>When a shape is resized (no matter the direction), the edge(s) connection location (toward or from this one) is kept. Before that, edges connections moved according to the ratio of the resizing.</li> @@ -507,19 +511,19 @@ <li>Distribute centers vertically</li> </ul> </li> - <li>The end user can now remove all bend-points between the two edge ends. This action is available on edge context menu “Remove Bend-points” or by using the shortcut “Ctrl” + “Shift” + “-”.</li> + <li>The end user can now remove all bend-points between the two edge ends. This action is available on edge context menu «Remove Bend-points» or by using the shortcut «Ctrl» + «Shift» + «-».</li> <li>Reconnection of an edge will only now move the minimum necessary bendpoints instead of reseting it to default.</li> <li>A new action has been added to reset the diagram (or container) origin: the diagram (or container) bounds (the rectangle formed by the highest, the leftmost, the lowest and the rightmost children elements) can have a negative origin or can be shifted toward the bottom-right with a blank zone at the top-left. This action aims to move all diagram (or container) elements so that the it retrieves its origin while keeping elements layout.</li> </ul> <h3 id="SpecifierVisibleChanges2">Specifier-Visible Changes</h3> <ul> - <li>The specifier can now choose to hold the edge ends toward the center of the source, target or both. New fields within the “advance” tab of EdgeStyle description have been added to choose for which source or target mappings an edge should be centered. See + <li>The specifier can now choose to hold the edge ends toward the center of the source, target or both. New fields within the «advance» tab of EdgeStyle description have been added to choose for which source or target mappings an edge should be centered. See <a href="specifier/diagrams/Diagrams.html#edges_styles">Edges Styles > Edge Centering</a> in the specifier manual for more details. </li> <li>When creating a new Viewpoint Specification Project using the supplied wizard: - <em>New > Viewpoint Specification Project</em>, the VSM name is now given according to the project name. If the project name is suffixed with “design”, the VSM name is provided by the last word before this suffix. Otherwise, the VSM name is given by the last word of the project name. + <em>New > Viewpoint Specification Project</em>, the VSM name is now given according to the project name. If the project name is suffixed with «design», the VSM name is provided by the last word before this suffix. Otherwise, the VSM name is given by the last word of the project name. </li> - <li>“Lozenge” is replaced by “Diamond” in diagram style.</li> + <li>«Lozenge» is replaced by «Diamond» in diagram style.</li> </ul> <h3 id="APIChanges2">API Changes</h3> <h4 id="Changesinorg.eclipse.sirius2">Changes in @@ -597,7 +601,7 @@ <code>org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter</code>. However considering the way Sirius uses GMF, this adapter is not needed. </li> </ul> - <h4 id="Changesinorg.eclipse.sirius.ui2">Changes in + <h4 id="Changesinorg.eclipse.sirius.ui3">Changes in <code>org.eclipse.sirius.ui</code> </h4> <ul> @@ -885,7 +889,7 @@ </li> </ul> <h2 id="sirius1.0.0">Changes in Sirius 1.0.0 (from Sirius 1.0.0M7)</h2> - <h3 id="UserVisibleChanges2">User-Visible Changes</h3> + <h3 id="UserVisibleChanges3">User-Visible Changes</h3> <ul> <li>The ability to print table representations has been disabled for the 1.0.0 release due to an external dependency issue (see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=435204" target="_blank">bug #435204</a> for the details).</li> </ul> @@ -952,7 +956,7 @@ <h3 id="SpecifierVisibleChanges4">Specifier-Visible Changes</h3> <ul> <li>The default value of the - <em>Semantic Candidates Expression</em> for Tree Items has changed from an empty string (meaning “any compatible element in the session”) to + <em>Semantic Candidates Expression</em> for Tree Items has changed from an empty string (meaning «any compatible element in the session») to <code>feature:eAllContents</code> which only looks for compatible candidates inside the current element (recursively). The new behavior is more efficient on large models and consistent with what happens for diagrams. The change does not affect existing VSMs which continue to work as before whatever was the expression they used. Users who want the old behavior on specific mappings can simply remove the expression in the properties view. </li> <li>In the @@ -985,7 +989,7 @@ <code>org.eclipse.diagram</code> again. </p> <p>Unlike, the - <a href="#separationOfDiagramSpecificConcept-step1">Step1</a>, a simple “Organize Imports” operation is not enough. First, you will probably need to add dependencies to + <a href="#separationOfDiagramSpecificConcept-step1">Step1</a>, a simple «Organize Imports» operation is not enough. First, you will probably need to add dependencies to <code>org.eclipse.sirius.diagram</code>, <code>org.eclipse.sirius.diagram.ui</code> or <code>org.eclipse.sirius.editor.diagram</code> in the MANIFEST.MF of your projects that depend on Sirius diagram classes. The dependencies to add depend on what you really use. @@ -1396,7 +1400,7 @@ <code>org.eclipse.sirius.diagram.sequence.template.Transformer</code> interface instead, which is functionally equivalent. </li> </ul> - <h4 id="Changesinorg.eclipse.sirius.ui3">Changes in + <h4 id="Changesinorg.eclipse.sirius.ui4">Changes in <code>org.eclipse.sirius.ui</code> </h4> <ul> @@ -1412,7 +1416,7 @@ <code>Multimap</code>. </li> <li> - <code>org.eclipse.sirius.ui.tools.api.project.ModelingProjectManager.initializeAfterLoad()</code> method has been removed. There is no replacement for this method documented as “Not intended to be used by client”. + <code>org.eclipse.sirius.ui.tools.api.project.ModelingProjectManager.initializeAfterLoad()</code> method has been removed. There is no replacement for this method documented as «Not intended to be used by client». </li> </ul> <h4 id="Changesinorg.eclipse.sirius.ecore.extender3">Changes in @@ -1612,7 +1616,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. <code>new org.eclipse.sirius.business.api.query.EObjectQuery(element).getParentDiagram()</code> instead. </li> </ul> - <h4 id="Changesinorg.eclipse.sirius.ui4">Changes in + <h4 id="Changesinorg.eclipse.sirius.ui5">Changes in <code>org.eclipse.sirius.ui</code> </h4> <ul> @@ -1654,29 +1658,29 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. </li> </ul> <h2 id="sirius1.0M5">Changes in Sirius 1.0.0M5 (from Sirius 1.0M4)</h2> - <h3 id="UserVisibleChanges3">User-Visible Changes</h3> + <h3 id="UserVisibleChanges4">User-Visible Changes</h3> <ul> - <li>The table csv export has been improved to handle cropped label. In some specific cases, the cell label is automatically cropped and ‘...’ is concatenated to the resulting value. This cropped displayed label was previously exported, now the complete semantic value is exported.</li> + <li>The table csv export has been improved to handle cropped label. In some specific cases, the cell label is automatically cropped and ‹...› is concatenated to the resulting value. This cropped displayed label was previously exported, now the complete semantic value is exported.</li> </ul> <h3 id="APIChanges6">API Changes</h3> <h4 id="LibraryExtensions">Library Extensions</h4> - <p>This milestone (Sirius 1.0M5) introduces several new plug-ins, collectively called “library extensions”. They are all named + <p>This milestone (Sirius 1.0M5) introduces several new plug-ins, collectively called «library extensions». They are all named <code>org.eclipse.sirius.ext.LIB</code>, where - <code>LIB</code> is the name of a library or component Sirius depends on. These plug-ins are used to isolate generic code which extends existing libraries with features and helpers needed for Sirius, but which do not depend on Sirius themselves. A relatively large part of the code in Sirius is of this kind: things that could/should be in EMF, GMF, Eclipse itself, etc. and which are not Sirius-specific but which make it easier to build Sirius itself. Sirius 1.0M5 introduces several of these library extensions and starts to fill them with existing classes which were “hidden” inside Sirius and are now exposed in library extensions. Most of the time, existing code which used the Sirius API will only need to: + <code>LIB</code> is the name of a library or component Sirius depends on. These plug-ins are used to isolate generic code which extends existing libraries with features and helpers needed for Sirius, but which do not depend on Sirius themselves. A relatively large part of the code in Sirius is of this kind: things that could/should be in EMF, GMF, Eclipse itself, etc. and which are not Sirius-specific but which make it easier to build Sirius itself. Sirius 1.0M5 introduces several of these library extensions and starts to fill them with existing classes which were «hidden» inside Sirius and are now exposed in library extensions. Most of the time, existing code which used the Sirius API will only need to: </p> <ol> <li>Add the necessary <code>Import-Package</code> (recommended) or <code>Require-Bundle</code> to depend on the library extension(s) where the code they use now lives; </li> - <li>Perform a simple “Organize Imports” operation, which should find the classes and interfaces in their new locations.</li> + <li>Perform a simple «Organize Imports» operation, which should find the classes and interfaces in their new locations.</li> </ol> <h4 id="separationOfDiagramSpecificConcept-step1">Move diagram-specific EClasses into a separate EPackage</h4> <p>For historical reasons, the core Sirius metamodels defined in viewpoint.ecore contain both generic (dialect-independant like Viewpoint, RepresentationDescription, DAnalysis...) concepts and diagram-specific ones (e.g. DNode, EdgeStyle, ContainerCreationDescription...). The table and tree metamodels are more cleanly separated. <br/>This milestone (Sirius 1.0M5) includes the first step towards a full separation of the diagram-specific stuff out of the core of Sirius. So many EClasses have been moved. </p> - <p>Most of the time, existing code which used these Sirius EClasses will only need to perform a simple “Organize Imports” operation, which should find the classes and interfaces in their new locations. - <br/>The “Organize imports” is not sufficient in case of imported classes existing several time in different packages ( + <p>Most of the time, existing code which used these Sirius EClasses will only need to perform a simple «Organize Imports» operation, which should find the classes and interfaces in their new locations. + <br/>The «Organize imports» is not sufficient in case of imported classes existing several time in different packages ( <code>EFactory</code> classes for example with <code>DescriptionFactory</code>, or <code>EPackage</code> classes for example with @@ -1780,7 +1784,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. <code>DCellQuery.getExportableLabel()</code> to compute the cell labels used in HTML export. </li> </ul> - <h4 id="Changesinorg.eclipse.sirius.ui5">Changes in + <h4 id="Changesinorg.eclipse.sirius.ui6">Changes in <code>org.eclipse.sirius.ui</code> </h4> <ul> @@ -1790,7 +1794,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. </li> </ul> <h2 id="sirius1.0M4">Changes in Sirius 1.0.0M4 (from Sirius 0.9)</h2> - <h3 id="UserVisibleChanges4">User-Visible Changes</h3> + <h3 id="UserVisibleChanges5">User-Visible Changes</h3> <ul> <li>The ability to print table representations, which had been disabled for the 0.9 release, has been re-enabled.</li> </ul> @@ -2030,7 +2034,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. <code>ECrossReferenceAdapter</code> can be null. </li> </ul> - <h4 id="Changesinorg.eclipse.sirius.ui6">Changes in + <h4 id="Changesinorg.eclipse.sirius.ui7">Changes in <code>org.eclipse.sirius.ui</code> </h4> <ul> @@ -2091,7 +2095,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. </li> </ul> <h2 id="sirius0.9">Changes in Sirius 0.9.0</h2> - <p>Version 0.9.0 is the first release under the Sirius name and under the Eclipse Foundation umbrella. Except for the few cases mentioned below (in the “Other API Changes”, “Specifier-Visible Changes” and “User-Visible Changes” sections), Sirius 0.9.0 is functionally equivalent to the latest version of Viewpoint (version 6.10), which was the name of the project before it was open sourced at Eclipse. See the rest of the documentation for the complete list of feature of the Sirius platform.</p> + <p>Version 0.9.0 is the first release under the Sirius name and under the Eclipse Foundation umbrella. Except for the few cases mentioned below (in the «Other API Changes», «Specifier-Visible Changes» and «User-Visible Changes» sections), Sirius 0.9.0 is functionally equivalent to the latest version of Viewpoint (version 6.10), which was the name of the project before it was open sourced at Eclipse. See the rest of the documentation for the complete list of feature of the Sirius platform.</p> <h3 id="MigratingfromObeoDesignerorViewpointtoSirius">Migrating from Obeo Designer or Viewpoint to Sirius</h3> <p>If you have existing projects which used this technology before it became Eclipse Sirius and want to migrate to Sirius, you must:</p> <ol> @@ -2115,9 +2119,9 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. <code>org.eclipse.sirius.componentization</code> extension point id. The identifier changes for the other extension points follow the same rules as the name changes of the plug-ins they are defined in. </li> <li>The migration of your VSMs ( - <code>*.odesign</code> files) is automatic: simply open your files once in the VSM editor, perform some no-op change to make the editor “dirty” and save it. The saved version will have been migrated to Sirius. + <code>*.odesign</code> files) is automatic: simply open your files once in the VSM editor, perform some no-op change to make the editor «dirty» and save it. The saved version will have been migrated to Sirius. </li> - <li>If you had Java code which used the Viewpoint APIs, you will need to update it to use the Sirius APIs. A simple “Source > Organize Imports” on your source folders should find most classes you used in their new namespace. The Viewpoint code base and APIs used the term “Viewpoint” both for the name of the product and for the name of the concept. When it refered to the name of the product, the names were changed to use “Sirius” instead, so you may need to adjust some names in your code beyond just updating the imports (for example, + <li>If you had Java code which used the Viewpoint APIs, you will need to update it to use the Sirius APIs. A simple «Source > Organize Imports» on your source folders should find most classes you used in their new namespace. The Viewpoint code base and APIs used the term «Viewpoint» both for the name of the product and for the name of the concept. When it refered to the name of the product, the names were changed to use «Sirius» instead, so you may need to adjust some names in your code beyond just updating the imports (for example, <code>ViewpointControlCommand</code> is now <code>SiriusControlCommand</code>). </li> @@ -2132,7 +2136,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. <h4 id="MigratingModelingProjectsandRepresentationFiles">Migrating Modeling Projects and Representation Files</h4> <ul> <li>First migrate any modeler definitions used by your modeling projects and representation files (see the section above).</li> - <li>Modeling projects created using Viewpoint will not be recognized directly by Sirius, because the nature identfier has changed. You must use the “Configure/Convert to Modeling Project” action in the project’s context menu to make it a Sirius-compatible modeling project (see the section below for the technical details of the change).</li> + <li>Modeling projects created using Viewpoint will not be recognized directly by Sirius, because the nature identfier has changed. You must use the «Configure/Convert to Modeling Project» action in the project’s context menu to make it a Sirius-compatible modeling project (see the section below for the technical details of the change).</li> <li>The migration of you representation files ( <code>*.aird</code>) is performed automatically when they are loaded in memory. It will become permanent the first time you save it (you can force this by opening a representation, making some arbitrary change and saving the session). </li> @@ -2308,20 +2312,20 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. </tr> </table> <h4 id="JavaPackagesandClassesNames">Java Packages and Classes Names</h4> - <p>The Java package names have changed to start with the identifier of the plug-in they are defined in (which has changed). A simple “Source > Organize Imports” on your source folders should find most classes you used in their new namespace.</p> - <p>The Viewpoint code base and APIs used the term “Viewpoint” both for the name of the product and for the name of the concept. When it refered to the name of the product, the names where changed to use “Sirius” instead (for example, + <p>The Java package names have changed to start with the identifier of the plug-in they are defined in (which has changed). A simple «Source > Organize Imports» on your source folders should find most classes you used in their new namespace.</p> + <p>The Viewpoint code base and APIs used the term «Viewpoint» both for the name of the product and for the name of the concept. When it refered to the name of the product, the names where changed to use «Sirius» instead (for example, <code>ViewpointControlCommand</code> is now <code>SiriusControlCommand</code>). </p> <h4 id="ModelsnamespaceURIs">Models namespace URIs</h4> - <p>All namespace URIs have also been changed from “http://www.obeo.fr/dsl/viewpoint*” to “http://www.eclipse.org/sirius/”.</p> + <p>All namespace URIs have also been changed from «http://www.obeo.fr/dsl/viewpoint*» to «http://www.eclipse.org/sirius/».</p> <p>If you have created VSM file (.odesign) or representations file (.aird) with Viewpoint, the changes of the namespace URIs will be automatically migrated during the loading of your VSM or your representations file. These new nsURIs will be stored physically in the file during the first save. If the file is not saved, the automatic migration will be replayed at the next opening.</p> <h3 id="NatureID">Nature ID</h3> <p>The modeling project has a specific nature ( <code>org.eclipse.sirius.nature.modelingproject</code>). - <br/>If you have modeling project created with Viewpoint, you must launch the action “Configure/Convert to Modeling Project” to replace old nature id ( + <br/>If you have modeling project created with Viewpoint, you must launch the action «Configure/Convert to Modeling Project» to replace old nature id ( <code>fr.obeo.dsl.viewpoint.nature.modelingproject</code>) by the new one. - <br/>If you have many modeling projects to “migrate”, you can easily make a script to replace + <br/>If you have many modeling projects to «migrate», you can easily make a script to replace <code>fr.obeo.dsl.viewpoint.nature.modelingproject</code> by <code>org.eclipse.sirius.nature.modelingproject</code> in all <code>.project</code> file of each modeling projects. @@ -2388,7 +2392,7 @@ void removeSelectedView(DView view); <em>targetView</em>: the target view of the current edge. </li> </ul> - <h3 id="UserVisibleChanges5">User-Visible Changes</h3> + <h3 id="UserVisibleChanges6">User-Visible Changes</h3> <ul> <li>The ability to print table representations has been disabled for the 0.9 release due to an external dependency issue (see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=422223" target="_blank">bug #422223</a>: for the details). It should be re-introduced in 1.0.</li> </ul> diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile index 4deea9a110..6df2472801 100644 --- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile +++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile @@ -6,6 +6,10 @@ This document contains the release notes for all major releases of Sirius. h2(#sirius3.0.0). Changes in Sirius 3.0.0 (from Sirius 2.0.0) +h3. User-Visible Changes + +* In the Viewpoint Selection Dialog and ViewpointsSelectionWizardPage, the "plug-in" decorator for viewpoints loaded from plug-ins is removed, and a "Folder" decorator for viewpoints loaded from the current workspace has been added on the top of the default viewpoint icon. + h3. Specifier-Visible Changes * In Open menu, the menu is computed from the navigation tool label instead of its name/id. diff --git a/plugins/org.eclipse.sirius.doc/doc/user/general/images/project_dependencies3.png b/plugins/org.eclipse.sirius.doc/doc/user/general/images/project_dependencies3.png Binary files differindex 3d801d9641..c7599bb636 100644 --- a/plugins/org.eclipse.sirius.doc/doc/user/general/images/project_dependencies3.png +++ b/plugins/org.eclipse.sirius.doc/doc/user/general/images/project_dependencies3.png diff --git a/plugins/org.eclipse.sirius.doc/doc/user/general/images/viewpoint_selection1.png b/plugins/org.eclipse.sirius.doc/doc/user/general/images/viewpoint_selection1.png Binary files differindex a783be423a..84374433e8 100644 --- a/plugins/org.eclipse.sirius.doc/doc/user/general/images/viewpoint_selection1.png +++ b/plugins/org.eclipse.sirius.doc/doc/user/general/images/viewpoint_selection1.png diff --git a/plugins/org.eclipse.sirius.ui/icons/full/decorator/folder_close.gif b/plugins/org.eclipse.sirius.ui/icons/full/decorator/folder_close.gif Binary files differnew file mode 100644 index 0000000000..ff0ef12ed6 --- /dev/null +++ b/plugins/org.eclipse.sirius.ui/icons/full/decorator/folder_close.gif diff --git a/plugins/org.eclipse.sirius.ui/icons/license.txt b/plugins/org.eclipse.sirius.ui/icons/license.txt index 2b71d6665c..ef94a9b257 100644 --- a/plugins/org.eclipse.sirius.ui/icons/license.txt +++ b/plugins/org.eclipse.sirius.ui/icons/license.txt @@ -6,6 +6,7 @@ These followings icons are made available under the terms of the Eclipse Public icons/full/decorator/MappingDecorator.png - org.eclipse.sirius.ui - org.eclipse.sirius.ui/icons/full/decorator/MappingDecorator.png icons/full/decorator/SiriusNature.gif - org.eclipse.sirius.ui - org.eclipse.sirius.ui/icons/full/decorator/SiriusNature.gif +icons/full/decorator/folder_close.gif - org.eclipse.ui.perspectives - org.eclipse.sirius.ui/icons/full/decorator/folder_close.gif icons/full/decorator/permission_denied.gif - org.eclipse.jdt.ui - icons/full/elcl16/deadlock_view.gif icons/full/decorator/permission_denied_overlay.gif - org.eclipse.jdt.ui - icons/full/elcl16/deadlock_view.gif icons/full/decorator/permission_granted_to_current_user_exclusively.gif - org.eclipse.jdt.ui - icons/full/elcl16/deadlock_view.gif diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelection.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelection.java index e3abf617b5..c6c8e6bda9 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelection.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelection.java @@ -665,7 +665,7 @@ public final class ViewpointSelection { private Image getEnhancedImage(final Image image, final Viewpoint viewpoint) { if (ViewpointRegistry.getInstance().isFromPlugin(viewpoint) && image != null) { - return SiriusEditPlugin.getPlugin().getImage(getOverlayedDescriptor(image, "icons/full/others/plugin.gif")); + return SiriusEditPlugin.getPlugin().getImage(getOverlayedDescriptor(image, "icons/full/decorator/folder_close.gif")); } return image; } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/viewpoint/ViewpointSelectionDialog.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/viewpoint/ViewpointSelectionDialog.java index afacfa4c83..5448aaf422 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/viewpoint/ViewpointSelectionDialog.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/viewpoint/ViewpointSelectionDialog.java @@ -199,9 +199,9 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { // Default image Image viewpointImage = SiriusEditPlugin.getPlugin().getBundledImage("icons/full/obj16/Viewpoint.gif"); - // Overlayed image ? - if (ViewpointRegistry.getInstance().isFromPlugin(item.getViewpoint())) { - final ImageDescriptor decoratorDescriptor = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/others/plugin.gif"); + // Add decorator if the viewpoint comes from workspace + if (!ViewpointRegistry.getInstance().isFromPlugin(item.getViewpoint())) { + final ImageDescriptor decoratorDescriptor = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/folder_close.gif"); viewpointImage = SiriusEditPlugin.getPlugin().getImage(new DecorationOverlayIcon(viewpointImage, decoratorDescriptor, IDecoration.BOTTOM_LEFT)); } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/wizards/page/ViewpointsSelectionWizardPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/wizards/page/ViewpointsSelectionWizardPage.java index 2f11201777..ac60c2d770 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/wizards/page/ViewpointsSelectionWizardPage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/wizards/page/ViewpointsSelectionWizardPage.java @@ -537,8 +537,9 @@ public class ViewpointsSelectionWizardPage extends WizardPage { } private Image getEnhancedImage(final Image image, final Viewpoint viewpoint) { - if (ViewpointRegistry.getInstance().isFromPlugin(viewpoint) && image != null) { - return SiriusEditPlugin.getPlugin().getImage(getOverlayedDescriptor(image, "icons/full/ovr16/plugin_ovr.gif")); + // Add decorator if the viewpoint comes from workspace + if (!ViewpointRegistry.getInstance().isFromPlugin(viewpoint) && image != null) { + return SiriusEditPlugin.getPlugin().getImage(getOverlayedDescriptor(image, "icons/full/decorator/folder_close.gif")); } return image; } |
