Release 0.2.4

Author: hajdam

apps/apps.gradle

@@ -1,6 +1,6 @@
 // Shared apps build
 
-version = '0.2.4-SNAPSHOT'
+version = '0.2.4'
 def repositoryName = "bined"
 def libraryUrl = 'https://bined.exbin.org/editor'
 

apps/bined-editor/build.gradle

@@ -22,15 +22,8 @@ if (!hasProperty('mainClass')) {
 
 def configureExec(task) {
     task.mainClass = mainClass
-//    task.classpath += files(['/home/hajdam/Software/Projekty/exbin/bined/apps/bined-editor/build/classes/java/main',
-//        '/home/hajdam/Software/Projekty/exbin/bined/apps/bined-editor/build/resources/main',
-//        '/home/hajdam/Software/Projekty/exbin/bined/modules/exbin-framework-bined-launcher/build/libs/exbin-framework-bined-launcher-0.3.0-SNAPSHOT.jar',
-//        '/home/hajdam/.gradle/caches/modules-2/files-2.1/org.exbin.framework/exbin-framework/0.3.0-SNAPSHOT/7ff52836111ce7c5c1d777a1299124a636c4728d/exbin-framework-0.3.0-SNAPSHOT.jar',
-//        '/home/hajdam/.gradle/caches/modules-2/files-2.1/org.exbin.framework/exbin-framework-basic/0.3.0-SNAPSHOT/8bfa5016c63d2e98a380c34218bf8048622561da/exbin-framework-basic-0.3.0-SNAPSHOT.jar',
-//        'lib/exbin-framework-language-0.3.0-SNAPSHOT.jar',
-//        'lib/exbin-framework-language-api-0.3.0-SNAPSHOT.jar'
-//      ])
-//    task.classpath += files(['/home/hajdam/Software/Projekty/exbin/bined/apps/bined-editor/build/classes/java/main', '/home/hajdam/Software/Projekty/exbin/bined/apps/bined-editor/build/resources/main', 'lib/commons-cli-1.2.jar', 'lib/exbin-framework-0.3.0-SNAPSHOT.jar', 'lib/exbin-framework-basic-0.3.0-SNAPSHOT.jar', 'lib/exbin-framework-language-0.3.0-SNAPSHOT.jar', 'lib/exbin-framework-language-api-0.3.0-SNAPSHOT.jar'])
+//    task.classpath += files(['build/classes/java/main'])
+//    task.classpath += files([''lib/commons-cli-1.2.jar', ...])
     task.classpath = sourceSets.main.runtimeClasspath
     if (hasProperty('appArgs')) {
         task.args appArgs
@@ -126,6 +119,7 @@ def manifestClassPath() {
 launch4j {
     outfile = "Bined.exe"
     mainClassName = project.mainClass
+    classpath = ['lib/commons-cli-1.2.jar', 'lib/flatlaf-desktop-3.2.jar', 'lib/exbin-framework-0.3.0-SNAPSHOT.jar', 'lib/exbin-framework-basic-0.3.0-SNAPSHOT.jar']
     //    jar = "../../build/libs/" + project.name + "-${version}.jar"
 
     productName = "BinEd"
@@ -140,7 +134,7 @@ jar {
     manifest {
         attributes(
             'Main-Class': mainClass,
-            'Class-Path': 'lib/commons-cli-1.2.jar lib/exbin-framework-0.3.0-SNAPSHOT.jar lib/exbin-framework-basic-0.3.0-SNAPSHOT.jar'
+            'Class-Path': 'lib/commons-cli-1.2.jar lib/flatlaf-desktop-3.2.jar lib/exbin-framework-0.3.0-SNAPSHOT.jar lib/exbin-framework-basic-0.3.0-SNAPSHOT.jar'
 //            'Class-Path': manifestClassPath()
         )
     }

apps/bined-editor/help/images/addon_manager_dialog.png

@@ -13,7 +13,7 @@ plugins {
     id "nebula.ospackage" version "8.6.3"
 }
 
-version = '0.2.4-SNAPSHOT'
+version = '0.2.4'
 
 task cleanDeps {
     if (gradle.startParameter.taskNames.contains("clean") && !project.gradle.startParameter.projectProperties.containsKey("moduleDep")) {
@@ -136,23 +136,25 @@ ospackage {
         }
     }
 }
-// Uncoment for deployment, breaks for Java 8+
-/*
-buildRpm {
-    from ('src/ospackage/bined.png') {
-        // Doesn't propagate correctly from ospackage task, so repeat it here
-        addParentDirs = false
-        into '/usr/share/pixmaps'
+
+// Breaks for Java 8+
+if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+    buildRpm {
+        from ('src/ospackage/bined.png') {
+            // Doesn't propagate correctly from ospackage task, so repeat it here
+            addParentDirs = false
+            into '/usr/share/pixmaps'
+        }
+
+        requires('jre', '1.8.0', GREATER | EQUAL)
     }
 
-    requires('jre', '1.8.0', GREATER | EQUAL)
+    buildDeb {
+        arch = 'all'
+        requires('default-jre', '1.8.0', GREATER | EQUAL)
+    }
 }
 
-buildDeb {
-    arch = 'all'
-    requires('default-jre', '1.8.0', GREATER | EQUAL)
-}
-*/
 task("copyDependencies", type: Copy) {
     from(project(':apps:bined-editor').configurations.runtimeClasspath).into("$buildDir/jars")
 }

apps/bined-editor/help/images/addon_operation_dialog.png

@@ -1,4 +1,4 @@
-0.2.4
+0.2.4 (2025-01-22)
 - Added addon manager
 - Added keymap overview
 - Added Base 64 conversion

apps/bined-editor/help/manual.html

@@ -1,6 +1,6 @@
 // Shared modules build
 
-version = '0.2.4-SNAPSHOT'
+version = '0.2.4'
 def repositoryName = "bined"
 def githubProfile = 'exbin'
 def libraryUrl = 'https://bined.exbin.org/editor'

build.gradle

@@ -18,11 +18,16 @@
 import java.awt.BorderLayout;
 import java.awt.Font;
 import java.awt.font.TextAttribute;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
 import org.exbin.bined.swing.section.SectCodeArea;
+import org.exbin.framework.App;
 import org.exbin.framework.bined.gui.BinEdComponentPanel;
 import org.exbin.framework.bined.inspector.gui.BasicValuesPanel;
 import org.exbin.framework.bined.inspector.preferences.DataInspectorPreferences;
@@ -46,8 +51,23 @@ public class BinEdComponentInspector implements BinEdComponentPanel.BinEdCompone
     @Override
     public void onCreate(BinEdComponentPanel componentPanel) {
         this.componentPanel = componentPanel;
-        SectCodeArea codeArea = componentPanel.getCodeArea();
 
+        if (SwingUtilities.isEventDispatchThread()) {
+            onCreateInt();
+        } else {
+            try {
+                SwingUtilities.invokeAndWait(() -> {
+                    onCreateInt();
+                });
+            } catch (InterruptedException | InvocationTargetException ex) {
+                Logger.getLogger(BinEdComponentInspector.class.getName()).log(Level.SEVERE, null, ex);
+            }
+        }
+        setShowParsingPanel(true);
+    }
+
+    private void onCreateInt() {
+        SectCodeArea codeArea = componentPanel.getCodeArea();
         valuesPanel = new BasicValuesPanel();
         valuesPanel.setCodeArea(codeArea, null);
         if (basicValuesColorModifier != null) {
@@ -56,7 +76,6 @@ public void onCreate(BinEdComponentPanel componentPanel) {
 
         valuesPanelScrollPane = new JScrollPane(valuesPanel);
         valuesPanelScrollPane.setBorder(null);
-        setShowParsingPanel(true);
     }
 
     @Override
@@ -75,7 +94,9 @@ public void onInitFromPreferences(BinaryEditorPreferences preferences) {
         DataInspectorPreferences dataInspectorPreferences = new DataInspectorPreferences(preferences.getPreferences());
         setShowParsingPanel(dataInspectorPreferences.isShowParsingPanel());
         boolean useDefaultFont = dataInspectorPreferences.isUseDefaultFont();
-        if (!useDefaultFont) {
+        if (useDefaultFont) {
+            setInputFieldsFont(new Font(Font.SANS_SERIF, Font.PLAIN, 13));
+        } else {
             Map<TextAttribute, Object> fontAttributes = dataInspectorPreferences.getFontAttributes();
             setInputFieldsFont(new Font(fontAttributes));
         }

changes.txt

@@ -23,7 +23,6 @@
 import java.util.ResourceBundle;
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
-import javax.swing.JTextField;
 import org.exbin.framework.App;
 import org.exbin.framework.Module;
 import org.exbin.framework.ModuleUtils;
@@ -75,7 +74,7 @@ public class BinedInspectorModule implements Module {
 
     private EditorProvider editorProvider;
 
-    private BasicValuesPositionColorModifier basicValuesColorModifier = new BasicValuesPositionColorModifier();
+    private BasicValuesPositionColorModifier basicValuesColorModifier;
 
     private DefaultOptionsPage<DataInspectorOptionsImpl> dataInspectorOptionsPage;
 
@@ -85,6 +84,7 @@ public BinedInspectorModule() {
     public void setEditorProvider(EditorProvider editorProvider) {
         this.editorProvider = editorProvider;
 
+        basicValuesColorModifier = new BasicValuesPositionColorModifier();
         BinedModule binedModule = App.getModule(BinedModule.class);
         BinEdFileManager fileManager = binedModule.getFileManager();
         fileManager.addPainterColorModifier(basicValuesColorModifier);