Skip to content

Commit

Permalink
Merge branch 'v0.17.x_bugfix' into v0.17.x
Browse files Browse the repository at this point in the history
  • Loading branch information
S1artie committed Jan 3, 2019
2 parents d4f8d15 + 1944fbd commit 2aa30a8
Show file tree
Hide file tree
Showing 31 changed files with 10,724 additions and 14,341 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ packagedef mypackage with
// Resets date/time on all forks and the master to live system date/time
timeset live

timeset + 12 minutes on master
timeset + 12minutes on master


suite bsuite on fork1
Expand All @@ -96,7 +96,7 @@ packagedef mypackage with
timeset 10.02.2001 on fork1
timeset 10.03.2001 on master

timeset + 1 months
timeset + 1months

suite csuite on fork1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,32 +296,6 @@ public void completeTimeDifference_Direction(EObject model, Assignment assignmen
public void completeTimeDifference_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeTimeDifferencePart_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeTimeDifferencePart_TemporalUnit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
// subclasses may override
}
public void completeSuite_Inlined(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
Expand Down Expand Up @@ -644,9 +618,6 @@ public void complete_TimeSet(EObject model, RuleCall ruleCall, ContentAssistCont
public void complete_TimeDifference(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_TimeDifferencePart(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_Suite(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
Expand Down Expand Up @@ -872,6 +843,9 @@ public void complete_TWENTYFOURHRSTIME(EObject model, RuleCall ruleCall, Content
public void complete_TWELVEHRSTIME(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_TIMESPAN(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_ANY_OTHER(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getTimeSetAccess().getAlternatives_2_1_0(), "rule__TimeSet__Alternatives_2_1_0");
put(grammarAccess.getTimeSetAccess().getAlternatives_3_2_0(), "rule__TimeSet__Alternatives_3_2_0");
put(grammarAccess.getTimeDifferenceAccess().getDirectionAlternatives_0_0(), "rule__TimeDifference__DirectionAlternatives_0_0");
put(grammarAccess.getTimeDifferencePartAccess().getTemporalUnitAlternatives_2_0(), "rule__TimeDifferencePart__TemporalUnitAlternatives_2_0");
put(grammarAccess.getParameterNameAccess().getAlternatives(), "rule__ParameterName__Alternatives");
put(grammarAccess.getArbitraryParameterOrResultNameAccess().getAlternatives_1(), "rule__ArbitraryParameterOrResultName__Alternatives_1");
put(grammarAccess.getOperationAccess().getAlternatives(), "rule__Operation__Alternatives");
Expand Down Expand Up @@ -135,7 +134,6 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getTimeSetAccess().getGroup_3_2(), "rule__TimeSet__Group_3_2__0");
put(grammarAccess.getTimeDifferenceAccess().getGroup(), "rule__TimeDifference__Group__0");
put(grammarAccess.getTimeDifferenceAccess().getGroup_1(), "rule__TimeDifference__Group_1__0");
put(grammarAccess.getTimeDifferencePartAccess().getGroup(), "rule__TimeDifferencePart__Group__0");
put(grammarAccess.getSuiteAccess().getGroup(), "rule__Suite__Group__0");
put(grammarAccess.getSuiteAccess().getGroup_3(), "rule__Suite__Group_3__0");
put(grammarAccess.getSuiteAccess().getGroup_6(), "rule__Suite__Group_6__0");
Expand Down Expand Up @@ -269,8 +267,6 @@ protected String getRuleName(AbstractElement element) {
put(grammarAccess.getTimeSetAccess().getMasterForkAssignment_3_2_0_1(), "rule__TimeSet__MasterForkAssignment_3_2_0_1");
put(grammarAccess.getTimeDifferenceAccess().getDirectionAssignment_0(), "rule__TimeDifference__DirectionAssignment_0");
put(grammarAccess.getTimeDifferenceAccess().getValuesAssignment_1_1(), "rule__TimeDifference__ValuesAssignment_1_1");
put(grammarAccess.getTimeDifferencePartAccess().getValueAssignment_0(), "rule__TimeDifferencePart__ValueAssignment_0");
put(grammarAccess.getTimeDifferencePartAccess().getTemporalUnitAssignment_2(), "rule__TimeDifferencePart__TemporalUnitAssignment_2");
put(grammarAccess.getSuiteAccess().getInlinedAssignment_0(), "rule__Suite__InlinedAssignment_0");
put(grammarAccess.getSuiteAccess().getMultiplierAssignment_3_0(), "rule__Suite__MultiplierAssignment_3_0");
put(grammarAccess.getSuiteAccess().getDefinitionAssignment_4(), "rule__Suite__DefinitionAssignment_4");
Expand Down
Loading

0 comments on commit 2aa30a8

Please sign in to comment.