Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-03-25Merge remote-tracking branch 'origin/master' intobugs/441962-multipleXTextEditorsForUMLElementsGabriel Pascual1123-154629/+57534
bugs/441962-multipleXTextEditorsForUMLElements Change-Id: I6d01c30bcfaa6169bec19e81ee31dfd2839f83c5 Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>
2015-03-25Bug 441962: [Xtext Editor] Papyrus does not properly support multipleGabriel Pascual9-8025/+8028
XText editors for UML Elements https://bugs.eclipse.org/bugs/show_bug.cgi?id=441962 - Modification of extension point to add constraint of MetaClass - Modification of generation template - Integration of Constraint notion in Preferences page - User can modify Priority of an Direct Editor through Preferences Change-Id: I924438c6c6da9b93c73dd2ece2e0d6c4839cabf1 Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>
2015-03-24Bug 462958: [Communication] Drag-and-drop multiple messages creates multiple ↵Christian W. Damus4-158/+213
edges https://bugs.eclipse.org/bugs/show_bug.cgi?id=462958 Update the message-path creation command to check first that some other command hasn't already created it and, if so, to delegate to the message-view creation command, instead.
2015-03-24Bug 461899 - [Element Types] Component diagram should be migrated to theCamille Letavernier1-1/+8
elementtypes framework - Fix build.properties
2015-03-23Merge "Bug 461734: [General]: add a quick formatting button for label"vincent lorenzo13-15/+429
2015-03-23Bug 461899 - [Element Types] Component diagram should be migrated to theCamille Letavernier191-18233/+494
elementtypes framework
2015-03-23Bug 461734: [General]: add a quick formatting button for labelFrancois Le Fevre - CEA13-15/+429
- management of EOBject from Diagram and Model explorer - version with undo operationnal but with an api modification to pass the event to the getCommand - version with enable/disable - defining a infra.ui plugin to hold the command - refactoring to delegate implementation across plugins diag,uml and nattable - api formating - adding the plugin to the feature org.eclipse.papyrus.infra.feature >actions relatives to review of Camille - reverting proposition for getCommand - adding a generic implementation for getCommend(event) >actions relatives to review of Vincent -naming convention -api simplification -string externalization -refactoring to suppress code duplication, again Change-Id: I87ef8a24e1bd5d6c9658c1d8994c86b47f466124 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=461734 Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
2015-03-19Merge "bug 459591 - [All Diagrams] MaskManagedFloatingLabelEditPolicy ↵Camille Letavernier2-151/+47
shouldn't be omniscient https://bugs.eclipse.org/bugs/show_bug.cgi?id=459591"
2015-03-18Bug 461899 - [Element Types] Component diagram should be migrated to theashatilov16-3690/+0
elementtypes framework - remove CANONICAl policies Change-Id: I8b83d390e4065aa264087f4f6405ae38a2be09b6 Signed-off-by: ashatilov <montages.as@gmail.com>
2015-03-18Bug 461899 - [Element Types] Component diagram should be migrated to theashatilov30-4356/+0
elementtypes framework - remove unused create commands Change-Id: Ia633d5b283dd8fe4ea7cd08a6b2b6d7d43bf1e10 Signed-off-by: ashatilov <montages.as@gmail.com>
2015-03-18Bug 461899 - [Element Types] Component diagram should be migrated to theashatilov20-397/+0
elementtypes framework - remove unused helpers Change-Id: I3b32ed29f550d6e0469afdb0cc9915ef744281f7 Signed-off-by: ashatilov <montages.as@gmail.com>
2015-03-18Bug 461899 - [Element Types] Component diagram should be migrated to theashatilov41-9088/+0
elementtypes framework - remove unused semantic edit policies Change-Id: I01677221b53047e787c46c26cb6b0322ad5b747e Signed-off-by: ashatilov <montages.as@gmail.com>
2015-03-18Bug 461899 - [Element Types] Component diagram should be migrated to theashatilov1-2/+2
elementtypes framework - creation fix of CommentLink and ConstrainLink Change-Id: I33dd52616bf819a99413559af9bf1c8f097678ba Signed-off-by: ashatilov <montages.as@gmail.com>
2015-03-18Bug 461899 - [Element Types] Component diagram should be migrated to theashatilov84-702/+494
elementtypes framework - definedExternally="true" - deinstallation: CANONICAL_ROLE and SEMANTIC_ROLE - diagram regeneration - register elementTypeSetConfiguration - mark failing tests Change-Id: I4933abc0ade63469885bc5e8e1b5e4f6984c0b09 Signed-off-by: ashatilov <montages.as@gmail.com>
2015-03-18bug 459669 - [Class Diagram] Classes are not resized automatically whenMickael ADAM1-7/+3
contents are added https://bugs.eclipse.org/bugs/show_bug.cgi?id=459669 -Fix it by remove a not relevant condition. Change-Id: I056b158b50bb96179016e38f00d4b0e6d9516bef Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
2015-03-18Merge "Bug 453343 - Default stereotype-like label are lost after first ↵Camille Letavernier12-89/+51
diagram reopening"
2015-03-18462024 - [StateMachine Diagram] Contents of composite states are not ↵Ansgar Radermacher4-13/+27
rendered (fix resize issue)
2015-03-17bug 459591 - [All Diagrams] MaskManagedFloatingLabelEditPolicy shouldn'tMickael ADAM2-151/+47
be omniscient https://bugs.eclipse.org/bugs/show_bug.cgi?id=459591 -Moved default mask from MaskManagedFloatingLabelEditPolicy to umlBase.css -add "stereotype" attribute for mask label: related to bug 457131 Patch set 2: -less omniscient -remove default value from CSS -set back operation util method to private -add constants Change-Id: I663aa2b6647b7e52b49bb521e980d9147dd080d9 Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
2015-03-17462024 - [StateMachine Diagram] Contents of composite states are not renderedAnsgar Radermacher2-6/+13
2015-03-16Merge "Bug 458386 - [Activity Diagram] ActivityParameterNode symbol may be ↵Camille Letavernier5-0/+451
labeled by its parameter "
2015-03-16Merge "Bug 458264 - [Activity Diagram] Pin type not displayed in diagram"Camille Letavernier118-0/+836
2015-03-16Merge branch 'master' of ↵Florian Noyrit1-0/+3
ssh://fnoyrit@git.eclipse.org:29418/papyrus/org.eclipse.papyrus
2015-03-16462257: NPE in JoinSpecParser.isValidFeature (181)Camille Letavernier1-0/+3
https://bugs.eclipse.org/bugs/show_bug.cgi?id=462257
2015-03-16Merge branch 'master' of ↵Florian Noyrit6-717/+1115
ssh://fnoyrit@git.eclipse.org:29418/papyrus/org.eclipse.papyrus
2015-03-16Merge "Bug 462081 - [ViewPoint] [Palette] Integrate the paletteconfiguration ↵Benoit Maggi2-664/+692
framework"
2015-03-13Bug 458386 - [Activity Diagram] ActivityParameterNode symbol may beskovalsky5-0/+451
labeled by its parameter Change-Id: Iec55fe578880c0243b9bd60cf5ebf5d06ce3f455 Signed-off-by: skovalsky <kovalsky@montages.com>
2015-03-13Bug 458264 - [Activity Diagram] Pin type not displayed in diagramskovalsky118-0/+836
Change-Id: I912f5814d5d99ecf7c3b21706c8ebc9dd6894fb0 Signed-off-by: skovalsky <kovalsky@montages.com>
2015-03-13Bug 462081 - [ViewPoint] [Palette] Integrate the paletteconfigurationBenoit Maggi2-664/+692
framework Change-Id: Icd64644dbe0c4b51b7a4bbe38c297220f3e102b2 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
2015-03-13Merge "Bug 459665: OperationCallAction name label: since lines below the ↵Camille Letavernier1-51/+17
first are not shown anyway, no need to produce them from parser "
2015-03-13[Minor] Fix equality comparison to avoid NPEsCamille Letavernier1-2/+2
2015-03-13Bug 459665: OperationCallAction name label: since lines below the firstmgolubev1-51/+17
are not shown anyway, no need to produce them from parser Change-Id: I0cf1d388714563d813a10020fdbbf05439f183fb Signed-off-by: mgolubev <golubev@montages.com>
2015-03-13bug 461491 - [CSS] UML related properties shall be in a specific CSS. Mickael ADAM2-0/+404
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=461491 Patch set 1 : -Adds new extension point: userAgentStyleSheet to define CSS to the user agent scope. Patch set 2 : -include uml.css on umlBase.css -use sysml.css to a use_agent scope -delete black & white theme Patch set 3 : -restore of B&W theme with associated css files. Change-Id: Id3eeb2c57358e838eaeded6972224c04fd7a0b99 Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
2015-03-12Merge branch 'master' ofFlorian Noyrit793-94654/+15451
ssh://fnoyrit@git.eclipse.org:29418/papyrus/org.eclipse.papyrus Conflicts: plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InstanceSpecificationLinkCreateCommand.java plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConstraintEditHelper.java plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InstanceSpecificationEditHelperAdvice.java
2015-03-12Migration of Composite Structure Diagram to ElementTypesConfigurations. Florian Noyrit770-134083/+55184
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger2-229/+0
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger50-12099/+0
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger5-583/+0
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger4-292/+1
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger3-114/+2
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger4-248/+2
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger4-246/+2
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger4-246/+2
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger4-248/+17
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger173-19753/+0
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger48-828/+0
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger216-40720/+2
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger1-2/+2
2015-03-11Merge "Activity migration on elementtypes framework:"Remi Schnekenburger214-1482/+2203
2015-03-09Merge "Bug 456688 - [All Diagrams] CommonDragAndDropPolicy should be moved ↵Benoit Maggi17-5110/+3858
in infra.gmfdiag - move utility class in gmfdiag - update dependancies in all drag&dropeditpolicy Change-Id: I226c6b208f68d8b832355f7c25bdde9d0d096d49 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>"
2015-03-04Bug 453343 - Default stereotype-like label are lost after first diagrammgolubev12-89/+51
reopening - The contribution for ClassD Change-Id: Iea4955efb2ccfff5e99f8007b8781325289c02ee Signed-off-by: mgolubev <golubev@montages.com>

Back to the top