[cleanup] Fix various styling errors

Signed-off-by: Stéphane Bégaudeau <[email protected]>
eclipse-sirius · Jan 11, 2024 · 8dc7300 · 8dc7300
1 parent dbbc20c
commit 8dc7300
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/bundles/org.eclipse.sirius.emfjson/META-INF/MANIFEST.MF b/bundles/org.eclipse.sirius.emfjson/META-INF/MANIFEST.MF
@@ -19,4 +19,3 @@ Import-Package: com.google.gson;version="2.2.4",
  org.eclipse.emf.ecore.resource.impl;version="0.0.0",
  org.eclipse.emf.ecore.util;version="0.0.0"
 Automatic-Module-Name: org.eclipse.sirius.emfjson
-Require-Bundle: javax.xml.bind;bundle-version="2.2.0"
diff --git a/....sirius.emfjson/src/main/java/org/eclipse/sirius/emfjson/utils/GsonEObjectSerializer.java b/....sirius.emfjson/src/main/java/org/eclipse/sirius/emfjson/utils/GsonEObjectSerializer.java
@@ -688,15 +688,12 @@ private JsonElement createSchemaLocationHeader() {
                         xsiNoNamespaceSchemaLocation = this.getNoNamespaceSchemaLocation(ePackage);
                     }
                 } else {
-                    Resource resource = ePackage.eResource();
-                    if (resource != null) {
-                        JsonObjectProperty jsonObjectProperty = this.getJsonObjectFromResource(ePackage, handleBySchemaLocationMap, resource);
-                        if (jsonObjectProperty != null) {
-                            if (jsonObject == null) {
-                                jsonObject = new JsonObject();
-                            }
-                            jsonObject.add(jsonObjectProperty.getKey(), jsonObjectProperty.getElement());
+                    JsonObjectProperty jsonObjectProperty = this.getJsonObjectProperty(ePackage, handleBySchemaLocationMap);
+                    if (jsonObjectProperty != null) {
+                        if (jsonObject == null) {
+                            jsonObject = new JsonObject();
                         }
+                        jsonObject.add(jsonObjectProperty.getKey(), jsonObjectProperty.getElement());
                     }
                 }
             }
@@ -713,6 +710,14 @@ private JsonElement createSchemaLocationHeader() {
         return jsonObject;
     }
 
+    private JsonObjectProperty getJsonObjectProperty(EPackage ePackage, Map<String, String> handleBySchemaLocationMap) {
+        Resource resource = ePackage.eResource();
+        if (resource != null) {
+            return this.getJsonObjectFromResource(ePackage, handleBySchemaLocationMap, resource);
+        }
+        return null;
+    }
+
     /**
      * Return JsonObject representation of schemLocation xml Attribute from given elements.
      *