Skip to content

Commit

Permalink
2024.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@pvlasov
pvlasov committed May 31, 2024
1 parent 30efe92 commit f2ef894
Show file tree
Hide file tree
Showing 21 changed files with 36 additions and 25 deletions.
2 changes: 1 addition & 1 deletion capability-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>capability-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion capability/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>capability</artifactId>
Expand Down
9 changes: 6 additions & 3 deletions capability/src/main/java/org/nasdanika/capability/emf/ResourceSetCapabilityFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@ protected ResourceSet contribute(
for (CapabilityProvider<Object> cp: contributorProviders) {
cp.getPublisher().subscribe(contributor -> ((ResourceSetContributor) contributor).contribute(resourceSet, progressMonitor));
}
Consumer<ResourceSet> configurator = requirement.configurator();
if (configurator != null) {
configurator.accept(resourceSet);

if (requirement != null) {
Consumer<ResourceSet> configurator = requirement.configurator();
if (configurator != null) {
configurator.accept(resourceSet);
}
}

return resourceSet;
Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion diagram/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>diagram</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion drawio.model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>drawio-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion drawio/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>drawio</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion emf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>emf</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion exec.gen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>exec-gen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion exec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>exec</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion graph.model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>graph-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion graph/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>graph</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion maven/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ncore.gen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>ncore-gen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ncore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>ncore</artifactId>
Expand Down
14 changes: 11 additions & 3 deletions ncore/src/main/java/org/nasdanika/ncore/util/NcoreUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.nasdanika.common.Util;
import org.nasdanika.ncore.ModelElement;
import org.nasdanika.ncore.NamedElement;
import org.nasdanika.ncore.NcoreFactory;
import org.nasdanika.ncore.NcorePackage;
import org.nasdanika.ncore.Period;
import org.nasdanika.ncore.Temporal;
Expand Down Expand Up @@ -155,8 +154,6 @@ public static int distance(EClass sub, EClass sup) {
}
return ret;
}



/**
* Finds objects referencing the argument object (target) via the specified reference.
Expand Down Expand Up @@ -191,6 +188,17 @@ public static <T extends EObject> EList<T> getReferrers(EObject target, EReferen
}
return ret;
}

/**
* Get a list of all objects in the resource set which point to this
* object with the provided {@link EReference}'s opposite.
* @param <T>
* @param eReference
* @return
*/
public <T extends EObject> EList<T> getOppositeReferrers(EObject target, EReference reference) {
return getReferrers(target, Objects.requireNonNull(NcoreUtil.getOpposite(reference), "Opposite is null: " + reference));
}

@SuppressWarnings("unchecked")
private static <T extends EObject> void collect(
Expand Down
2 changes: 1 addition & 1 deletion persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>persistence</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<name>Nasdanika Core Parent</name>
Expand Down
2 changes: 1 addition & 1 deletion resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.nasdanika.core</groupId>
<version>2024.5.0</version>
<version>2024.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>resources</artifactId>
Expand Down

0 comments on commit f2ef894

Please sign in to comment.