Skip to content

Commit

Permalink
[567448] Add duplicated messages, references, lost/found (#73)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@georgiana-e @MalinaStefaniaStoicanescu @georgiana-ecobici
3 people committed Nov 10, 2020
1 parent a58250b commit 1f90d7a
Show file tree
Hide file tree
Showing 66 changed files with 18,723 additions and 7,230 deletions.
17 changes: 17 additions & 0 deletions ...g/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/TextualScenarioParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getElementAccess().getAlternatives(), "rule__Element__Alternatives");
put(grammarAccess.getMessageAccess().getAlternatives(), "rule__Message__Alternatives");
put(grammarAccess.getSequenceMessageTypeAccess().getAlternatives(), "rule__SequenceMessageType__Alternatives");
put(grammarAccess.getLostFoundMessageAccess().getAlternatives(), "rule__LostFoundMessage__Alternatives");
put(grammarAccess.getCombinedFragmentAccess().getKeywordAlternatives_0_0(), "rule__CombinedFragment__KeywordAlternatives_0_0");
put(grammarAccess.getStateFragmentAccess().getKeywordAlternatives_2_0(), "rule__StateFragment__KeywordAlternatives_2_0");
put(grammarAccess.getModelAccess().getGroup(), "rule__Model__Group__0");
Expand All @@ -67,11 +68,14 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getCreateMessageAccess().getGroup(), "rule__CreateMessage__Group__0");
put(grammarAccess.getDeleteMessageAccess().getGroup(), "rule__DeleteMessage__Group__0");
put(grammarAccess.getArmTimerMessageAccess().getGroup(), "rule__ArmTimerMessage__Group__0");
put(grammarAccess.getLostMessageAccess().getGroup(), "rule__LostMessage__Group__0");
put(grammarAccess.getFoundMessageAccess().getGroup(), "rule__FoundMessage__Group__0");
put(grammarAccess.getParticipantDeactivationAccess().getGroup(), "rule__ParticipantDeactivation__Group__0");
put(grammarAccess.getCombinedFragmentAccess().getGroup(), "rule__CombinedFragment__Group__0");
put(grammarAccess.getOperandAccess().getGroup(), "rule__Operand__Group__0");
put(grammarAccess.getBlockAccess().getGroup(), "rule__Block__Group__0");
put(grammarAccess.getStateFragmentAccess().getGroup(), "rule__StateFragment__Group__0");
put(grammarAccess.getReferenceAccess().getGroup(), "rule__Reference__Group__0");
put(grammarAccess.getModelAccess().getBeginAssignment_1(), "rule__Model__BeginAssignment_1");
put(grammarAccess.getModelAccess().getParticipantsAssignment_2(), "rule__Model__ParticipantsAssignment_2");
put(grammarAccess.getModelAccess().getElementsAssignment_3(), "rule__Model__ElementsAssignment_3");
Expand Down Expand Up @@ -112,6 +116,15 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getArmTimerMessageAccess().getExecutionAssignment_2(), "rule__ArmTimerMessage__ExecutionAssignment_2");
put(grammarAccess.getArmTimerMessageAccess().getDoubleDotAssignment_3(), "rule__ArmTimerMessage__DoubleDotAssignment_3");
put(grammarAccess.getArmTimerMessageAccess().getNameAssignment_4(), "rule__ArmTimerMessage__NameAssignment_4");
put(grammarAccess.getLostMessageAccess().getSourceAssignment_0(), "rule__LostMessage__SourceAssignment_0");
put(grammarAccess.getLostMessageAccess().getArrowAssignment_1(), "rule__LostMessage__ArrowAssignment_1");
put(grammarAccess.getLostMessageAccess().getDoubleDotAssignment_2(), "rule__LostMessage__DoubleDotAssignment_2");
put(grammarAccess.getLostMessageAccess().getNameAssignment_3(), "rule__LostMessage__NameAssignment_3");
put(grammarAccess.getFoundMessageAccess().getArrowAssignment_0(), "rule__FoundMessage__ArrowAssignment_0");
put(grammarAccess.getFoundMessageAccess().getTargetAssignment_1(), "rule__FoundMessage__TargetAssignment_1");
put(grammarAccess.getFoundMessageAccess().getExecutionAssignment_2(), "rule__FoundMessage__ExecutionAssignment_2");
put(grammarAccess.getFoundMessageAccess().getDoubleDotAssignment_3(), "rule__FoundMessage__DoubleDotAssignment_3");
put(grammarAccess.getFoundMessageAccess().getNameAssignment_4(), "rule__FoundMessage__NameAssignment_4");
put(grammarAccess.getParticipantDeactivationAccess().getKeywordAssignment_0(), "rule__ParticipantDeactivation__KeywordAssignment_0");
put(grammarAccess.getParticipantDeactivationAccess().getNameAssignment_1(), "rule__ParticipantDeactivation__NameAssignment_1");
put(grammarAccess.getCombinedFragmentAccess().getKeywordAssignment_0(), "rule__CombinedFragment__KeywordAssignment_0");
Expand All @@ -130,6 +143,10 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getStateFragmentAccess().getTimelineAssignment_1(), "rule__StateFragment__TimelineAssignment_1");
put(grammarAccess.getStateFragmentAccess().getKeywordAssignment_2(), "rule__StateFragment__KeywordAssignment_2");
put(grammarAccess.getStateFragmentAccess().getNameAssignment_3(), "rule__StateFragment__NameAssignment_3");
put(grammarAccess.getReferenceAccess().getKeywordAssignment_0(), "rule__Reference__KeywordAssignment_0");
put(grammarAccess.getReferenceAccess().getNameAssignment_1(), "rule__Reference__NameAssignment_1");
put(grammarAccess.getReferenceAccess().getOverAssignment_2(), "rule__Reference__OverAssignment_2");
put(grammarAccess.getReferenceAccess().getTimelinesAssignment_3(), "rule__Reference__TimelinesAssignment_3");
}
};
}
Expand Down
Loading

0 comments on commit 1f90d7a

Please sign in to comment.