Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[41] Do not delegate to EMF on failed id lookup #42

Merged
merged 2 commits into from
Jun 16, 2024
Merged

[41] Do not delegate to EMF on failed id lookup #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94b13d
[41] Do not delegate to EMF on failed id lookup
pcdavid Jun 10, 2024
07f4480
[releng] Bump version to 2.3.11
sbegaudeau Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.sirius.emfjson.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.sirius.emfjson.ide;singleton:=true
Bundle-Version: 2.3.10.qualifier
Bundle-Version: 2.3.11.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: bundle
Require-Bundle: org.eclipse.sirius.emfjson;bundle-version="2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.sirius.emfjson.ide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson.ide</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<name>Sirius EMF JSON - IDE Integration</name>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.sirius.emfjson/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.sirius.emfjson
Bundle-Version: 2.3.10.qualifier
Bundle-Version: 2.3.11.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: bundle
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.sirius.emfjson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<name>Sirius EMF JSON</name>
Expand Down
12 changes: 4 additions & 8 deletions ...se.sirius.emfjson/src/main/java/org/eclipse/sirius/emfjson/resource/JsonResourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 Obeo.
* Copyright (c) 2020, 2024 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -57,7 +57,7 @@ public class JsonResourceImpl extends ResourceImpl implements JsonResource {
/**
* The options.
*/
private Map<Object, Object> resourceOptions = new HashMap<Object, Object>();
private Map<Object, Object> resourceOptions = new HashMap<>();

/**
* Use to know is an id is used to identified an EObject.
Expand Down Expand Up @@ -111,7 +111,7 @@ public static String toJson(EObject eObject, Map<Object, Object> options) {
* @return the json representation of the given Resource
*/
public static String toJson(Resource resource, Map<Object, Object> options) {
Map<Object, Object> loadOptions = new HashMap<Object, Object>();
Map<Object, Object> loadOptions = new HashMap<>();
if (options != null) {
loadOptions.putAll(options);
}
Expand Down Expand Up @@ -444,12 +444,8 @@ public void setID(EObject eObject, String id) {
@Override
protected EObject getEObjectByID(String id) {
if (this.useID) {
EObject eObject = this.idToEObjectMap.get(id);
if (eObject != null) {
return eObject;
}
return this.idToEObjectMap.get(id);
}

return super.getEObjectByID(id);
}

Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.sirius.emfjson.feature.ide/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.sirius.emfjson.feature.ide"
label="%Feature-name"
version="2.3.10.qualifier"
version="2.3.11.qualifier"
provider-name="%Feature-vendor">

<description url="">
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.sirius.emfjson.feature.ide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson.feature.ide</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<name>Sirius EMF JSON - IDE Integration Feature</name>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.sirius.emfjson.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.sirius.emfjson.feature"
label="%Feature-name"
version="2.3.10.qualifier"
version="2.3.11.qualifier"
provider-name="%Feature-vendor">

<description url="">
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.sirius.emfjson.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson.feature</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<name>Sirius EMF JSON Feature</name>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.sirius.emfjson.releng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Sirius EMF JSON</name>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.eclipse.sirius.emfjson.targetplatforms/2019-06/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<relativePath>../../org.eclipse.sirius.emfjson.releng</relativePath>
</parent>

<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>emfjson-2019-06</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>

</project>
4 changes: 2 additions & 2 deletions releng/org.eclipse.sirius.emfjson.targetplatforms/luna/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<relativePath>../../org.eclipse.sirius.emfjson.releng</relativePath>
</parent>

<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>emfjson-luna</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>

</project>
2 changes: 1 addition & 1 deletion repositories/org.eclipse.sirius.emfjson.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.sirius.emfjson.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.sirius.emfjson.tests
Bundle-Version: 2.3.10.qualifier
Bundle-Version: 2.3.11.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: bundle
Expand Down
4 changes: 2 additions & 2 deletions tests/org.eclipse.sirius.emfjson.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson.tests</artifactId>
<version>2.3.10-SNAPSHOT</version>
<version>2.3.11-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>

<name>Sirius EMF JSON - Tests</name>
Expand Down
Loading