Master fix exchanges #55
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
|
🚀 Build master-PR-55-1 started! |
|
😞 Build master-PR-55-1 failed! |
- not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
georgiana-e
force-pushed
the
master-FixExchanges
branch
from
7ee66e7
to
e86b392
Compare
|
🚀 Build master-PR-55-2 started! |
|
😞 Build master-PR-55-2 failed! |
claudiasima-ro
approved these changes
Nov 5, 2020
| import org.polarsys.capella.core.data.la.LogicalArchitecture; | ||
| import org.polarsys.capella.core.data.oa.Role; | ||
| import org.polarsys.capella.core.data.pa.PhysicalArchitecture; | ||
| import org.polarsys.capella.core.model.helpers.BlockArchitectureExt; | ||
| import org.polarsys.capella.core.model.helpers.ScenarioExt; | ||
| import org.polarsys.capella.core.sirius.analysis.CsServices; |
There was a problem hiding this comment.
Remove unused imports
| import org.polarsys.capella.core.data.cs.ExchangeItemAllocation; | ||
| import org.polarsys.capella.core.data.cs.Interface; |
There was a problem hiding this comment.
Remove unused imports
georgiana-ecobici
approved these changes
Nov 5, 2020
georgiana-e
added a commit
to georgiana-e/capella-textual-editor
that referenced
this pull request
Nov 6, 2020
* [567448] Bug Fixing - no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 * [567448] Search of available exchange item extended to Capella elements - not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Conflicts: plugins/org.polarsys.capella.scenario.editor.dsl.ui/xtend-gen/org/polarsys/capella/scenario/editor/dsl/ui/contentassist/TextualScenarioProposalProvider.java plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/helpers/TextualScenarioHelper.java plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/validation/TextualScenarioValidator.java plugins/org.polarsys.capella.scenario.editor/src/org/polarsys/capella/scenario/editor/helper/EmbeddedEditorInstanceHelper.java Change-Id: I58d8e701c1a3b8daf595ce3a63223b7bafba9785
georgiana-ecobici
added a commit
that referenced
this pull request
Nov 7, 2020
* [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Master fix exchanges (#55) * [567448] Bug Fixing - no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Search of available exchange item extended to Capella elements - not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Refresh diagram (#57) Change-Id: I7f6f90592051076766cada4f4dad70a2732fd96f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [build] Renamed download resource to TextualEditor (#58) Change-Id: I5cc98be4f980e980533903ec8f9372dd66245f0f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
georgiana-e
added a commit
to georgiana-e/capella-textual-editor
that referenced
this pull request
Nov 8, 2020
Change-Id: I9b89461169a870b02e4a7a5c1c0505c2ef02bb8b Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Master wip duplicated merge from master (eclipse-capella#52) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated operands and combined fragments (eclipse-capella#54) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Allow duplicated combined fragments and duplicated operands. Expression can be optional. Change-Id: Ib208d500b5869fda1ea93d51dcde831c81b8fd6c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated junits duplicated operands fragments (eclipse-capella#56) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (eclipse-capella#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Junits for duplicated combined fragments and operands Change-Id: Id86845f10648b29077954982df32aa689f408f4c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Add references (eclipse-capella#61) diag to xtext, xtext to diag, validation, proposal, formatter Change-Id: I5cbd24e9fa5772cdc7237367da8a49a550fe9bb4 Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com> Master wip duplicated more junits (eclipse-capella#64) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (eclipse-capella#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Master fix exchanges (eclipse-capella#55) * [567448] Bug Fixing - no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Search of available exchange item extended to Capella elements - not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Refresh diagram (eclipse-capella#57) Change-Id: I7f6f90592051076766cada4f4dad70a2732fd96f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [build] Renamed download resource to TextualEditor (eclipse-capella#58) Change-Id: I5cc98be4f980e980533903ec8f9372dd66245f0f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
georgiana-e
added a commit
to georgiana-e/capella-textual-editor
that referenced
this pull request
Nov 9, 2020
Change-Id: I9b89461169a870b02e4a7a5c1c0505c2ef02bb8b Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Master wip duplicated merge from master (eclipse-capella#52) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated operands and combined fragments (eclipse-capella#54) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Allow duplicated combined fragments and duplicated operands. Expression can be optional. Change-Id: Ib208d500b5869fda1ea93d51dcde831c81b8fd6c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated junits duplicated operands fragments (eclipse-capella#56) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (eclipse-capella#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Junits for duplicated combined fragments and operands Change-Id: Id86845f10648b29077954982df32aa689f408f4c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Add references (eclipse-capella#61) diag to xtext, xtext to diag, validation, proposal, formatter Change-Id: I5cbd24e9fa5772cdc7237367da8a49a550fe9bb4 Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com> Master wip duplicated more junits (eclipse-capella#64) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (eclipse-capella#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Master fix exchanges (eclipse-capella#55) * [567448] Bug Fixing - no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Search of available exchange item extended to Capella elements - not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Refresh diagram (eclipse-capella#57) Change-Id: I7f6f90592051076766cada4f4dad70a2732fd96f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [build] Renamed download resource to TextualEditor (eclipse-capella#58) Change-Id: I5cc98be4f980e980533903ec8f9372dd66245f0f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
georgiana-ecobici
added a commit
that referenced
this pull request
Nov 9, 2020
Change-Id: I9b89461169a870b02e4a7a5c1c0505c2ef02bb8b Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Master wip duplicated merge from master (#52) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated operands and combined fragments (#54) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Allow duplicated combined fragments and duplicated operands. Expression can be optional. Change-Id: Ib208d500b5869fda1ea93d51dcde831c81b8fd6c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated junits duplicated operands fragments (#56) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Junits for duplicated combined fragments and operands Change-Id: Id86845f10648b29077954982df32aa689f408f4c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Add references (#61) diag to xtext, xtext to diag, validation, proposal, formatter Change-Id: I5cbd24e9fa5772cdc7237367da8a49a550fe9bb4 Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com> Master wip duplicated more junits (#64) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Master fix exchanges (#55) * [567448] Bug Fixing - no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Search of available exchange item extended to Capella elements - not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Refresh diagram (#57) Change-Id: I7f6f90592051076766cada4f4dad70a2732fd96f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [build] Renamed download resource to TextualEditor (#58) Change-Id: I5cc98be4f980e980533903ec8f9372dd66245f0f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: claudiasima-ro <63597519+claudiasima-ro@users.noreply.github.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
georgiana-ecobici
added a commit
that referenced
this pull request
Nov 9, 2020
* Allow duplicate messages in xtext scenario (#46) Change-Id: I9b89461169a870b02e4a7a5c1c0505c2ef02bb8b Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Master wip duplicated merge from master (#52) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated operands and combined fragments (#54) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Allow duplicated combined fragments and duplicated operands. Expression can be optional. Change-Id: Ib208d500b5869fda1ea93d51dcde831c81b8fd6c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated junits duplicated operands fragments (#56) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Junits for duplicated combined fragments and operands Change-Id: Id86845f10648b29077954982df32aa689f408f4c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Add references (#61) diag to xtext, xtext to diag, validation, proposal, formatter Change-Id: I5cbd24e9fa5772cdc7237367da8a49a550fe9bb4 Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com> Master wip duplicated more junits (#64) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Master fix exchanges (#55) * [567448] Bug Fixing - no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Search of available exchange item extended to Capella elements - not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Refresh diagram (#57) Change-Id: I7f6f90592051076766cada4f4dad70a2732fd96f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [build] Renamed download resource to TextualEditor (#58) Change-Id: I5cc98be4f980e980533903ec8f9372dd66245f0f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Rebase with master Change-Id: I4988d61efe1926e9c7036dfbce9828a09eae1656 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Lost/Found support Change-Id: I6af677f59b4d56d655ec2b6bca6ddc801f475140 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: claudiasima-ro <63597519+claudiasima-ro@users.noreply.github.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
georgiana-e
added a commit
to georgiana-e/capella-textual-editor
that referenced
this pull request
Nov 10, 2020
* Allow duplicate messages in xtext scenario (eclipse-capella#46) Change-Id: I9b89461169a870b02e4a7a5c1c0505c2ef02bb8b Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Master wip duplicated merge from master (eclipse-capella#52) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated operands and combined fragments (eclipse-capella#54) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Allow duplicated combined fragments and duplicated operands. Expression can be optional. Change-Id: Ib208d500b5869fda1ea93d51dcde831c81b8fd6c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated junits duplicated operands fragments (eclipse-capella#56) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (eclipse-capella#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Junits for duplicated combined fragments and operands Change-Id: Id86845f10648b29077954982df32aa689f408f4c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Add references (eclipse-capella#61) diag to xtext, xtext to diag, validation, proposal, formatter Change-Id: I5cbd24e9fa5772cdc7237367da8a49a550fe9bb4 Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com> Master wip duplicated more junits (eclipse-capella#64) * [567448] Fix synchronization text editor issues (eclipse-capella#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (eclipse-capella#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (eclipse-capella#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Master fix exchanges (eclipse-capella#55) * [567448] Bug Fixing - no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Search of available exchange item extended to Capella elements - not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Refresh diagram (eclipse-capella#57) Change-Id: I7f6f90592051076766cada4f4dad70a2732fd96f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [build] Renamed download resource to TextualEditor (eclipse-capella#58) Change-Id: I5cc98be4f980e980533903ec8f9372dd66245f0f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Rebase with master Change-Id: I4988d61efe1926e9c7036dfbce9828a09eae1656 * Lost/Found support Change-Id: I6af677f59b4d56d655ec2b6bca6ddc801f475140 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: claudiasima-ro <63597519+claudiasima-ro@users.noreply.github.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Conflicts: plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/TextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenario.g plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenarioLexer.java plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl.ui/src-gen/org/polarsys/capella/scenario/editor/dsl/ui/contentassist/AbstractTextualScenarioProposalProvider.java plugins/org.polarsys.capella.scenario.editor.dsl.ui/xtend-gen/org/polarsys/capella/scenario/editor/dsl/ui/contentassist/TextualScenarioProposalProvider.java plugins/org.polarsys.capella.scenario.editor.dsl/model/generated/TextualScenario.genmodel plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenario.g plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenarioLexer.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/serializer/TextualScenarioSemanticSequencer.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/services/TextualScenarioGrammarAccess.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/TextualScenarioFactory.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/TextualScenarioPackage.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/impl/TextualScenarioFactoryImpl.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/impl/TextualScenarioPackageImpl.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/util/TextualScenarioAdapterFactory.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/util/TextualScenarioSwitch.java plugins/org.polarsys.capella.scenario.editor.dsl/src/org/polarsys/capella/scenario/editor/dsl/validation/TextualScenarioValidator.xtend plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/formatting2/TextualScenarioFormatter.java plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/helpers/TextualScenarioHelper.java plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/validation/TextualScenarioValidator.java plugins/org.polarsys.capella.scenario.editor.embeddededitor/src/org/polarsys/capella/scenario/editor/embeddededitor/commands/XtextToDiagramCommands.java plugins/org.polarsys.capella.scenario.editor.embeddededitor/src/org/polarsys/capella/scenario/editor/embeddededitor/listener/EmbeddedEditorSessionListener.java plugins/org.polarsys.capella.scenario.editor/src/org/polarsys/capella/scenario/editor/helper/EmbeddedEditorInstanceHelper.java tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.aird tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.melodymodeller Change-Id: Iabe2d767c8bd3cb32128d59553b1a104a174869e
georgiana-ecobici
added a commit
that referenced
this pull request
Nov 10, 2020
* Master wip duplicated lost found (#70) * Allow duplicate messages in xtext scenario (#46) Change-Id: I9b89461169a870b02e4a7a5c1c0505c2ef02bb8b Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Master wip duplicated merge from master (#52) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated operands and combined fragments (#54) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Allow duplicated combined fragments and duplicated operands. Expression can be optional. Change-Id: Ib208d500b5869fda1ea93d51dcde831c81b8fd6c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Master wip duplicated junits duplicated operands fragments (#56) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Junits for duplicated combined fragments and operands Change-Id: Id86845f10648b29077954982df32aa689f408f4c Signed-off-by: claudiasima <claudia.sima@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Add references (#61) diag to xtext, xtext to diag, validation, proposal, formatter Change-Id: I5cbd24e9fa5772cdc7237367da8a49a550fe9bb4 Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com> Master wip duplicated more junits (#64) * [567448] Fix synchronization text editor issues (#48) Change-Id: Ia18550618de3cad034684756afe1ccd4b45cf436 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Conflict key bindings (#50) Change-Id: I03a1747c622fa0c7a9c16f1817ea4f0be208187d Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Bug Fixing (#53) - no auto refresh Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Master fix exchanges (#55) * [567448] Bug Fixing - no auto refresh - cannot cast role to part Change-Id: I33a6067a8b09acdd11eaf53857fe9ee32dd6bb61 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Search of available exchange item extended to Capella elements - not only search the exchanges between InstanceRoles Change-Id: If7e779b56cb13b435ed88259480fc1ae04187fb5 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [567448] Refresh diagram (#57) Change-Id: I7f6f90592051076766cada4f4dad70a2732fd96f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * [build] Renamed download resource to TextualEditor (#58) Change-Id: I5cc98be4f980e980533903ec8f9372dd66245f0f Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: georgiana-e <georgiana.e90@gmail.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> * Rebase with master Change-Id: I4988d61efe1926e9c7036dfbce9828a09eae1656 * Lost/Found support Change-Id: I6af677f59b4d56d655ec2b6bca6ddc801f475140 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: claudiasima-ro <63597519+claudiasima-ro@users.noreply.github.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Conflicts: plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/TextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenario.g plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenarioLexer.java plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl.ui/src-gen/org/polarsys/capella/scenario/editor/dsl/ui/contentassist/AbstractTextualScenarioProposalProvider.java plugins/org.polarsys.capella.scenario.editor.dsl.ui/xtend-gen/org/polarsys/capella/scenario/editor/dsl/ui/contentassist/TextualScenarioProposalProvider.java plugins/org.polarsys.capella.scenario.editor.dsl/model/generated/TextualScenario.genmodel plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenario.g plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenarioLexer.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/serializer/TextualScenarioSemanticSequencer.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/services/TextualScenarioGrammarAccess.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/TextualScenarioFactory.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/TextualScenarioPackage.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/impl/TextualScenarioFactoryImpl.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/impl/TextualScenarioPackageImpl.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/util/TextualScenarioAdapterFactory.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/util/TextualScenarioSwitch.java plugins/org.polarsys.capella.scenario.editor.dsl/src/org/polarsys/capella/scenario/editor/dsl/validation/TextualScenarioValidator.xtend plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/formatting2/TextualScenarioFormatter.java plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/helpers/TextualScenarioHelper.java plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/validation/TextualScenarioValidator.java plugins/org.polarsys.capella.scenario.editor.embeddededitor/src/org/polarsys/capella/scenario/editor/embeddededitor/commands/XtextToDiagramCommands.java plugins/org.polarsys.capella.scenario.editor.embeddededitor/src/org/polarsys/capella/scenario/editor/embeddededitor/listener/EmbeddedEditorSessionListener.java plugins/org.polarsys.capella.scenario.editor/src/org/polarsys/capella/scenario/editor/helper/EmbeddedEditorInstanceHelper.java tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.aird tests/org.polarsys.capella.scenario.editor.ju/model/TextualEditor/TextualEditor.melodymodeller Change-Id: Iabe2d767c8bd3cb32128d59553b1a104a174869e * Reference - set referenced scenario correctly (#72) Change-Id: I8945769f5925623d90cc2a50d2ff5c563a79e140 Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com> * [567448] Bug fixing (#71) - null expression on operands - deactivation on found Change-Id: I4f0f276c58eddff05ea4493332d68c7e4a511422 Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Conflicts: plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/TextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenario.g plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenarioLexer.java plugins/org.polarsys.capella.scenario.editor.dsl.ide/src-gen/org/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl.ui/src-gen/org/polarsys/capella/scenario/editor/dsl/ui/contentassist/AbstractTextualScenarioProposalProvider.java plugins/org.polarsys.capella.scenario.editor.dsl.ui/xtend-gen/org/polarsys/capella/scenario/editor/dsl/ui/contentassist/TextualScenarioProposalProvider.java plugins/org.polarsys.capella.scenario.editor.dsl.ui/xtend-gen/org/polarsys/capella/scenario/editor/dsl/ui/labeling/TextualScenarioLabelProvider.java plugins/org.polarsys.capella.scenario.editor.dsl/model/generated/TextualScenario.genmodel plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenario.g plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenarioLexer.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/parser/antlr/internal/InternalTextualScenarioParser.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/serializer/TextualScenarioSemanticSequencer.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/services/TextualScenarioGrammarAccess.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/TextualScenarioPackage.java plugins/org.polarsys.capella.scenario.editor.dsl/src-gen/org/polarsys/capella/scenario/editor/dsl/textualScenario/impl/TextualScenarioPackageImpl.java plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/helpers/TextualScenarioHelper.java plugins/org.polarsys.capella.scenario.editor.dsl/xtend-gen/org/polarsys/capella/scenario/editor/dsl/validation/TextualScenarioValidator.java Change-Id: I687762e0e9166d47bda59af432161aab305e27a2 * [567448] Add duplicated messages, references, lost/founf Change-Id: I12935d3685b51429da98a902d0c3df486108d129 Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com> Co-authored-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com> Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.