Skip to content

Commit

Permalink
Merge branch 'develop' into IM-518-Error-in-k.hub-when-refreshing-a-page
Browse files Browse the repository at this point in the history
  • Loading branch information
@kristinaBc3
kristinaBc3 committed Jan 15, 2025
2 parents 3ee9c8a + 9718787 commit cd5f445
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 39 deletions.
22 changes: 11 additions & 11 deletions ...rg.integratedmodelling.klab.ide.platform/org.integratedmodelling.klab.ide.platform.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/nebula/releases/2.6.0"/>
<unit id="org.eclipse.nebula.widgets.opal.commons.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.opal.header.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.opal.notifier.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="0.0.0"/>
Expand All @@ -45,5 +35,15 @@
<unit id="org.eclipse.jgit.source.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/egit/updates-6.3/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://archive.eclipse.org/nebula/releases/2.6.0"/>
<unit id="org.eclipse.nebula.widgets.opal.commons.feature.feature.group" version="1.0.0.202202012159"/>
<unit id="org.eclipse.nebula.widgets.opal.header.feature.feature.group" version="1.0.0.202202012159"/>
<unit id="org.eclipse.nebula.widgets.opal.notifier.feature.feature.group" version="1.0.0.202202012159"/>
<unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.202202012159"/>
<unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.202202012159"/>
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.5.0.202202012159"/>
<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.1.0.202202012159"/>
</location>
</locations>
</target>
</target>
2 changes: 0 additions & 2 deletions ...tegratedmodelling.kim/xtend-gen/org/integratedmodelling/kim/formatting2/KimFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import org.eclipse.xtext.formatting2.IFormattableDocument;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;
import org.integratedmodelling.kim.kim.Concept;
import org.integratedmodelling.kim.kim.ConceptDeclaration;
import org.integratedmodelling.kim.kim.ConceptStatement;
Expand Down Expand Up @@ -61,7 +60,6 @@ protected void _format(final ConceptDeclaration conceptDeclaration, @Extension f
document.<ConceptDeclaration>format(conceptDeclaration.getContext());
}

@XbaseGenerated
public void format(final Object conceptDeclaration, final IFormattableDocument document) {
if (conceptDeclaration instanceof XtextResource) {
_format((XtextResource)conceptDeclaration, document);
Expand Down
52 changes: 26 additions & 26 deletions ...ntegratedmodelling.kim/xtend-gen/org/integratedmodelling/kim/validation/KimValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
*/
package org.integratedmodelling.kim.validation;

import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Objects;
import java.util.Set;
import java.util.logging.Level;
import org.eclipse.emf.common.util.EList;
Expand Down Expand Up @@ -443,20 +443,20 @@ public void checkModelStatement(final ModelStatement model) {
int _level = ref.getLevel();
boolean _matched = false;
int _intValue = Level.SEVERE.intValue();
if (Objects.equals(_level, _intValue)) {
if (Objects.equal(_level, _intValue)) {
_matched=true;
this.error(ref.getMessage(), KimPackage.Literals.MODEL_STATEMENT__MODEL, KimValidator.REASONING_PROBLEM);
}
if (!_matched) {
int _intValue_1 = Level.WARNING.intValue();
if (Objects.equals(_level, _intValue_1)) {
if (Objects.equal(_level, _intValue_1)) {
_matched=true;
this.warning(ref.getMessage(), KimPackage.Literals.MODEL_STATEMENT__MODEL, KimValidator.REASONING_PROBLEM);
}
}
if (!_matched) {
int _intValue_2 = Level.INFO.intValue();
if (Objects.equals(_level, _intValue_2)) {
if (Objects.equal(_level, _intValue_2)) {
_matched=true;
this.info(ref.getMessage(), KimPackage.Literals.MODEL_STATEMENT__MODEL, KimValidator.REASONING_PROBLEM);
}
Expand Down Expand Up @@ -533,22 +533,22 @@ public void checkModelDefinition(final ModelBodyStatement model) {
int _level = ref.getLevel();
boolean _matched = false;
int _intValue = Level.SEVERE.intValue();
if (Objects.equals(_level, _intValue)) {
if (Objects.equal(_level, _intValue)) {
_matched=true;
this.error(ref.getMessage(), KimPackage.Literals.MODEL_BODY_STATEMENT__OBSERVABLES, obsIdx,
KimValidator.REASONING_PROBLEM);
}
if (!_matched) {
int _intValue_1 = Level.WARNING.intValue();
if (Objects.equals(_level, _intValue_1)) {
if (Objects.equal(_level, _intValue_1)) {
_matched=true;
this.warning(ref.getMessage(), KimPackage.Literals.MODEL_BODY_STATEMENT__OBSERVABLES, obsIdx,
KimValidator.REASONING_PROBLEM);
}
}
if (!_matched) {
int _intValue_2 = Level.INFO.intValue();
if (Objects.equals(_level, _intValue_2)) {
if (Objects.equal(_level, _intValue_2)) {
_matched=true;
this.info(ref.getMessage(), KimPackage.Literals.MODEL_BODY_STATEMENT__OBSERVABLES, obsIdx,
KimValidator.REASONING_PROBLEM);
Expand Down Expand Up @@ -668,22 +668,22 @@ public void checkModelDefinition(final ModelBodyStatement model) {
int _level = ref.getLevel();
boolean _matched = false;
int _intValue = Level.SEVERE.intValue();
if (Objects.equals(_level, _intValue)) {
if (Objects.equal(_level, _intValue)) {
_matched=true;
this.error(ref.getMessage(), KimPackage.Literals.MODEL_BODY_STATEMENT__DEPENDENCIES, i,
KimValidator.REASONING_PROBLEM);
}
if (!_matched) {
int _intValue_1 = Level.WARNING.intValue();
if (Objects.equals(_level, _intValue_1)) {
if (Objects.equal(_level, _intValue_1)) {
_matched=true;
this.warning(ref.getMessage(), KimPackage.Literals.MODEL_BODY_STATEMENT__DEPENDENCIES, i,
KimValidator.REASONING_PROBLEM);
}
}
if (!_matched) {
int _intValue_2 = Level.INFO.intValue();
if (Objects.equals(_level, _intValue_2)) {
if (Objects.equal(_level, _intValue_2)) {
_matched=true;
this.info(ref.getMessage(), KimPackage.Literals.MODEL_BODY_STATEMENT__DEPENDENCIES, i,
KimValidator.REASONING_PROBLEM);
Expand Down Expand Up @@ -775,7 +775,7 @@ public void checkModelDefinition(final ModelBodyStatement model) {
for (final Classifier classifier : _classifiers) {
{
KimConcept decl = Kim.INSTANCE.declareConcept(classifier.getDeclaration());
boolean _equals = Objects.equals(type, Integer.valueOf(0));
boolean _equals = Objects.equal(type, Integer.valueOf(0));
if (_equals) {
type = decl.getType();
} else {
Expand Down Expand Up @@ -853,18 +853,18 @@ public void checkModelDefinition(final ModelBodyStatement model) {
String _id = arg.getId();
boolean _tripleNotEquals_4 = (_id != null);
if (_tripleNotEquals_4) {
if (((!Objects.equals(arg.getId(), "?")) && (!Objects.equals(arg.getId(), "*")))) {
if (((!Objects.equal(arg.getId(), "?")) && (!Objects.equal(arg.getId(), "*")))) {
boolean found = false;
for (final KimObservable dependency : dependencies) {
if (((dependency.getName() != null) && Objects.equals(dependency.getName(), arg))) {
if (((dependency.getName() != null) && Objects.equal(dependency.getName(), arg))) {
found = true;
}
}
if ((!found)) {
}
} else {
String _id_1 = arg.getId();
boolean _equals = Objects.equals(_id_1, "?");
boolean _equals = Objects.equal(_id_1, "?");
if (_equals) {
if (checkFound) {
this.error("Only one \'?\' is allowed in the argument list, to mark the result column",
Expand Down Expand Up @@ -1118,18 +1118,18 @@ public void checkModelDefinition(final ModelBodyStatement model) {
public void notify(final KimNotification notification, final EObject object, final EStructuralFeature cls) {
final Level _switchValue = notification.level;
boolean _matched = false;
if (Objects.equals(_switchValue, Level.SEVERE)) {
if (Objects.equal(_switchValue, Level.SEVERE)) {
_matched=true;
this.error(notification.message, object, cls);
}
if (!_matched) {
if (Objects.equals(_switchValue, Level.WARNING)) {
if (Objects.equal(_switchValue, Level.WARNING)) {
_matched=true;
this.warning(notification.message, object, cls);
}
}
if (!_matched) {
if (Objects.equals(_switchValue, Level.INFO)) {
if (Objects.equal(_switchValue, Level.INFO)) {
_matched=true;
this.info(notification.message, object, cls);
}
Expand Down Expand Up @@ -1208,7 +1208,7 @@ public KimAcknowledgement checkObservation(final ObserveStatementBody observatio
for (final KimNotification notification : _addAction) {
{
this.notify(notification, observation, KimPackage.Literals.OBSERVE_STATEMENT_BODY__ACTIONS, i);
boolean _equals = Objects.equals(notification.level, Level.SEVERE);
boolean _equals = Objects.equal(notification.level, Level.SEVERE);
if (_equals) {
ok = false;
}
Expand Down Expand Up @@ -2366,7 +2366,7 @@ public KimConceptStatement validateConceptBody(final ConceptStatementBody concep
EnumSet<IKimConcept.Type> corectype = Kim.INSTANCE.getType(((ConceptStatement) _eContainer).getConcept(), null);
EnumSet<IKimConcept.Type> a = Kim.intersection(type, IKimConcept.DECLARABLE_TYPES);
EnumSet<IKimConcept.Type> b = Kim.intersection(corectype, IKimConcept.DECLARABLE_TYPES);
if ((((a.size() != 1) || (b.size() != 1)) || (!Objects.equals(((IKimConcept.Type[])Conversions.unwrapArray(a, IKimConcept.Type.class))[0], ((Object[])Conversions.unwrapArray(b, Object.class))[0])))) {
if ((((a.size() != 1) || (b.size() != 1)) || (!Objects.equal(((IKimConcept.Type[])Conversions.unwrapArray(a, IKimConcept.Type.class))[0], ((Object[])Conversions.unwrapArray(b, Object.class))[0])))) {
this.error("Core concept is not compatible with the stated type", concept,
KimPackage.Literals.CONCEPT_STATEMENT_BODY__PARENTS);
error = true;
Expand Down Expand Up @@ -2428,7 +2428,7 @@ public KimConceptStatement validateConceptBody(final ConceptStatementBody concep
if (_not_1) {
KimConcept declaration = Kim.INSTANCE.declareConcept(p);
if (((declaration != null) && (!declaration.getType().isEmpty()))) {
if (((i == 0) || Objects.equals(concept.getConnectors().get((i - 1)), ","))) {
if (((i == 0) || Objects.equal(concept.getConnectors().get((i - 1)), ","))) {
KimConceptStatement.ParentConceptImpl group = new KimConceptStatement.ParentConceptImpl();
group.getConcepts().add(declaration);
declaredParents.add(group);
Expand Down Expand Up @@ -2458,12 +2458,12 @@ public KimConceptStatement validateConceptBody(final ConceptStatementBody concep
_xifexpression_1 = _xifexpression_2;
}
BinarySemanticOperator connector = _xifexpression_1;
if ((Objects.equals(connector, BinarySemanticOperator.FOLLOWS) &&
if ((Objects.equal(connector, BinarySemanticOperator.FOLLOWS) &&
(!declaration.getType().contains(IKimConcept.Type.EVENT)))) {
this.error("The consequentiality (\'follows\') operator is only allowed between events", concept, KimPackage.Literals.CONCEPT_STATEMENT_BODY__PARENTS, i);
error = true;
}
if (((group_1.getConnector() != BinarySemanticOperator.NONE) && (!Objects.equals(group_1.getConnector(), connector)))) {
if (((group_1.getConnector() != BinarySemanticOperator.NONE) && (!Objects.equal(group_1.getConnector(), connector)))) {
this.error(
"Cannot mix union (\'or\'), intersection (\'and\') and consequentiality (\'follows\') operators", concept, KimPackage.Literals.CONCEPT_STATEMENT_BODY__PARENTS, i);
error = true;
Expand Down Expand Up @@ -2592,7 +2592,7 @@ public KimConceptStatement validateConceptBody(final ConceptStatementBody concep
{
KimConcept iden = Kim.INSTANCE.declareConcept(identity);
String _type = requirement.getType();
boolean _equals = Objects.equals(_type, "identity");
boolean _equals = Objects.equal(_type, "identity");
if (_equals) {
boolean _contains = iden.getType().contains(IKimConcept.Type.IDENTITY);
boolean _not_1 = (!_contains);
Expand Down Expand Up @@ -3026,18 +3026,18 @@ public KimConceptStatement validateConceptBody(final ConceptStatementBody concep
public void notify(final KimNotification notification, final EObject object, final EStructuralFeature cls, final int index) {
final Level _switchValue = notification.level;
boolean _matched = false;
if (Objects.equals(_switchValue, Level.SEVERE)) {
if (Objects.equal(_switchValue, Level.SEVERE)) {
_matched=true;
this.error(notification.message, object, cls, index);
}
if (!_matched) {
if (Objects.equals(_switchValue, Level.WARNING)) {
if (Objects.equal(_switchValue, Level.WARNING)) {
_matched=true;
this.warning(notification.message, object, cls, index);
}
}
if (!_matched) {
if (Objects.equals(_switchValue, Level.INFO)) {
if (Objects.equal(_switchValue, Level.INFO)) {
_matched=true;
this.info(notification.message, object, cls, index);
}
Expand Down

0 comments on commit cd5f445

Please sign in to comment.