Updated after b3dgs/lionengine#808

Single build profile.
b3dgs · Dec 13, 2023 · ad3a7db · ad3a7db
1 parent 9306361
commit ad3a7db
Show file tree

Hide file tree

Showing 29 changed files with 229 additions and 200 deletions.
diff --git a/com.b3dgs.lionheart.editor.product/.gitignore b/com.b3dgs.lionheart.editor.product/.gitignore
@@ -1,5 +1,6 @@
 /bin
 /target
+/.m2
 org.eclipse.core.resources.prefs
 org.eclipse.m2e.core.prefs
 org.sonar.ide.eclipse.core.prefs

diff --git a/com.b3dgs.lionheart.editor.product/com.b3dgs.lionheart.editor.product b/com.b3dgs.lionheart.editor.product/com.b3dgs.lionheart.editor.product
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Lionheart Remake Editor" uid="com.b3dgs.lionheart.editor.product" id="com.b3dgs.lionheart.editor.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.4.0.qualifier" useFeatures="false" includeLaunchers="true" autoIncludeRequirements="false">
-
+<product name="Lionheart Remake Editor" uid="com.b3dgs.lionheart.editor.product" id="com.b3dgs.lionheart.editor.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.4.0.qualifier" type="bundles" includeLaunchers="true" autoIncludeRequirements="false">
 
    <configIni use="default">
    </configIni>
@@ -39,7 +38,6 @@
       </win>
    </launcher>
 
-
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
@@ -63,6 +61,7 @@
       <plugin id="com.ibm.icu"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.i18n"/>
@@ -71,6 +70,9 @@
       <plugin id="org.apache.commons.jxpath"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.scr"/>
+      <plugin id="org.apache.logging.log4j.api"/>
+      <plugin id="org.apache.logging.log4j.core"/>
+      <plugin id="org.apache.logging.log4j.slf4j2.impl"/>
       <plugin id="org.apache.xmlgraphics"/>
       <plugin id="org.eclipse.core.commands"/>
       <plugin id="org.eclipse.core.contenttype"/>
@@ -93,6 +95,7 @@
       <plugin id="org.eclipse.e4.ui.css.swt"/>
       <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
       <plugin id="org.eclipse.e4.ui.di"/>
+      <plugin id="org.eclipse.e4.ui.dialogs"/>
       <plugin id="org.eclipse.e4.ui.model.workbench"/>
       <plugin id="org.eclipse.e4.ui.services"/>
       <plugin id="org.eclipse.e4.ui.widgets"/>
@@ -107,34 +110,41 @@
       <plugin id="org.eclipse.emf.ecore.xmi"/>
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.ds"/>
       <plugin id="org.eclipse.equinox.event"/>
       <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.region" fragment="true"/>
+      <plugin id="org.eclipse.equinox.region"/>
       <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.simpleconfigurator"/>
-      <plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>
-      <plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
+      <plugin id="org.eclipse.equinox.transforms.hook"/>
+      <plugin id="org.eclipse.equinox.weaving.hook"/>
       <plugin id="org.eclipse.help"/>
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
+      <plugin id="org.eclipse.osgi.compatibility.state"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86_64"/>
       <plugin id="org.eclipse.ui"/>
       <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.objectweb.asm"/>
+      <plugin id="org.objectweb.asm.commons"/>
+      <plugin id="org.objectweb.asm.tree"/>
+      <plugin id="org.objectweb.asm.tree.analysis"/>
+      <plugin id="org.objectweb.asm.util"/>
       <plugin id="org.w3c.css.sac"/>
       <plugin id="org.w3c.dom.events"/>
       <plugin id="org.w3c.dom.smil"/>
       <plugin id="org.w3c.dom.svg"/>
+      <plugin id="slf4j.api"/>
    </plugins>
 
    <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.logging.log4j.api" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.logging.log4j.core" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.logging.log4j.slf4j2.impl" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
    </configurations>
 
    <preferencesInfo>

diff --git a/com.b3dgs.lionheart.editor.repository/.gitignore b/com.b3dgs.lionheart.editor.repository/.gitignore
@@ -1,5 +1,6 @@
 /bin
 /target
+/.m2
 org.eclipse.core.resources.prefs
 org.eclipse.m2e.core.prefs
 org.sonar.ide.eclipse.core.prefs

diff --git a/com.b3dgs.lionheart.editor.target/.gitignore b/com.b3dgs.lionheart.editor.target/.gitignore
@@ -1,5 +1,6 @@
 /bin
 /target
+/.m2
 org.eclipse.core.resources.prefs
 org.eclipse.m2e.core.prefs
 org.sonar.ide.eclipse.core.prefs

diff --git a/com.b3dgs.lionheart.editor.target/com.b3dgs.lionheart.editor.base.target b/com.b3dgs.lionheart.editor.target/com.b3dgs.lionheart.editor.base.target
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Lionheart Remake Editor Target Platform" sequenceNumber="24">
+<target name="Lionheart Remake Editor Target Platform">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/eclipse/updates/4.27/"/>
+            <repository location="https://download.eclipse.org/eclipse/updates/4.9/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
-            <repository location="http://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
+            <repository location="http://download.eclipse.org/technology/swtbot/releases/4.1.0/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <repository location="https://lionengine.b3dgs.com/repository"/>

diff --git a/com.b3dgs.lionheart.editor.test/.gitignore b/com.b3dgs.lionheart.editor.test/.gitignore
@@ -1,5 +1,6 @@
 /bin
 /target
+/.m2
 org.eclipse.core.resources.prefs
 org.eclipse.m2e.core.prefs
 org.sonar.ide.eclipse.core.prefs

diff --git a/com.b3dgs.lionheart.editor.test/META-INF/MANIFEST.MF b/com.b3dgs.lionheart.editor.test/META-INF/MANIFEST.MF
@@ -7,7 +7,9 @@ Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-License: http://www.gnu.org/licenses/gpl-3.0.txt
 Export-Package: com.b3dgs.lionheart.editor
-Require-Bundle: javax.inject;bundle-version="1.0.0",
+Require-Bundle: org.apache.aries.spifly.dynamic.bundle;bundle-version="1.3.7",
+ slf4j.api;bundle-version="2.0.9",
+ javax.inject;bundle-version="1.0.0",
  javax.annotation;bundle-version="1.2.0",
  org.eclipse.core.runtime;bundle-version="3.13.0",
  org.eclipse.core.expressions;bundle-version="3.6.0",

diff --git a/com.b3dgs.lionheart.editor/.gitignore b/com.b3dgs.lionheart.editor/.gitignore
@@ -1,5 +1,6 @@
 /bin
 /target
+/.m2
 org.eclipse.core.resources.prefs
 org.eclipse.m2e.core.prefs
 org.sonar.ide.eclipse.core.prefs

diff --git a/com.b3dgs.lionheart.editor/META-INF/MANIFEST.MF b/com.b3dgs.lionheart.editor/META-INF/MANIFEST.MF
@@ -8,7 +8,9 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: OSGI-INF/l10n/bundle
 Bundle-License: http://www.gnu.org/licenses/gpl-3.0.txt
 Export-Package: com.b3dgs.lionheart.editor
-Require-Bundle: javax.inject;bundle-version="1.0.0",
+Require-Bundle: org.apache.aries.spifly.dynamic.bundle;bundle-version="1.3.7",
+ slf4j.api;bundle-version="2.0.9",
+ javax.inject;bundle-version="1.0.0",
  javax.annotation;bundle-version="1.2.0",
  org.eclipse.core.runtime;bundle-version="3.13.0",
  org.eclipse.core.expressions;bundle-version="3.6.0",

diff --git a/com.b3dgs.lionheart.editor/src/com/b3dgs/lionheart/editor/ApplicationConfiguration.java b/com.b3dgs.lionheart.editor/src/com/b3dgs/lionheart/editor/ApplicationConfiguration.java
@@ -33,8 +33,9 @@
 import org.eclipse.e4.ui.workbench.UIEvents;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.b3dgs.lionengine.Verbose;
 import com.b3dgs.lionengine.audio.AudioFactory;
 import com.b3dgs.lionengine.audio.AudioVoidFormat;
 import com.b3dgs.lionengine.editor.ObjectRepresentation;
@@ -111,6 +112,8 @@ public class ApplicationConfiguration
 {
     /** Import project argument. */
     private static final String ARG_IMPORT = "-import";
+    /** Logger. */
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationConfiguration.class);
 
     /** Application reference. */
     private final MApplication application;
@@ -294,7 +297,7 @@ private void importProject(String projectPath)
             }
             catch (final IOException exception)
             {
-                Verbose.exception(exception);
+                LOGGER.error("importProject error", exception);
             }
         }
 

diff --git a/...b3dgs.lionheart.editor/src/com/b3dgs/lionheart/editor/object/properties/PartAbstract.java b/...b3dgs.lionheart.editor/src/com/b3dgs/lionheart/editor/object/properties/PartAbstract.java
@@ -31,8 +31,9 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.b3dgs.lionengine.Verbose;
 import com.b3dgs.lionengine.editor.utility.Focusable;
 import com.b3dgs.lionengine.editor.utility.UtilPart;
 import com.b3dgs.lionengine.editor.utility.UtilTree;
@@ -51,6 +52,8 @@ public class PartAbstract<C, E extends Editable<C>> implements Focusable, Proper
 {
     /** Id. */
     protected static final String ID_PREFIX = Activator.PLUGIN_ID + ".part.properties.";
+    /** Logger. */
+    private static final Logger LOGGER = LoggerFactory.getLogger(PartAbstract.class);
 
     private final String id;
     private final String menuId;
@@ -102,7 +105,7 @@ public void enable()
             }
             catch (final ReflectiveOperationException exception)
             {
-                Verbose.exception(exception);
+                LOGGER.error("enabled error", exception);
             }
         }
     }
@@ -205,7 +208,7 @@ public void mouseDoubleClick(MouseEvent event)
                     }
                     catch (final ReflectiveOperationException exception)
                     {
-                        Verbose.exception(exception);
+                        LOGGER.error("listener error", exception);
                     }
                 }
             }

diff --git a/com.b3dgs.lionheart.editor/src/com/b3dgs/lionheart/editor/stage/StageLoadHandler.java b/com.b3dgs.lionheart.editor/src/com/b3dgs/lionheart/editor/stage/StageLoadHandler.java
@@ -20,10 +20,11 @@
 
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.swt.widgets.Shell;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.b3dgs.lionengine.Media;
 import com.b3dgs.lionengine.Medias;
-import com.b3dgs.lionengine.Verbose;
 import com.b3dgs.lionengine.editor.utility.UtilPart;
 import com.b3dgs.lionengine.editor.utility.dialog.UtilDialog;
 import com.b3dgs.lionengine.editor.world.WorldModel;
@@ -50,6 +51,8 @@ public final class StageLoadHandler
 {
     /** Element ID. */
     public static final String ID = "menu.file.load";
+    /** Logger. */
+    private static final Logger LOGGER = LoggerFactory.getLogger(StageLoadHandler.class);
 
     /**
      * Load world.
@@ -82,7 +85,7 @@ private static void load(Shell shell, Media media)
         }
         catch (final IOException exception)
         {
-            Verbose.exception(exception);
+            LOGGER.error("load error", exception);
             UtilDialog.error(shell, Messages.ErrorLoadTitle, Messages.ErrorLoadMessage);
         }
 

diff --git a/lionheart-assets/.settings/org.eclipse.jdt.core.prefs b/lionheart-assets/.settings/org.eclipse.jdt.core.prefs
@@ -4,5 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=1.8