Merge pull request #480 from hajdam/bined-library-update

Update of BinEd library
Konloch · Jan 10, 2024 · e60f12e · e60f12e
2 parents ceaad0d + e89c89b
commit e60f12e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
         <annotations.version>24.1.0</annotations.version>
         <apktool.version>2.9.1</apktool.version>
         <asm.version>9.6</asm.version>
-        <bined.version>0.2.0</bined.version>
+        <bined.version>0.2.1</bined.version>
         <byteanalysis.version>1.0bcv</byteanalysis.version>
         <cfr.version>0.152</cfr.version>
         <cloning.version>1.9.12</cloning.version>
@@ -41,7 +41,7 @@
         <jgraphx.version>3.4.1.3</jgraphx.version>
         <js.version>21.2.0</js.version>
         <objenesis.version>3.3</objenesis.version>
-        <paged-data.version>0.2.0</paged-data.version>
+        <binary-data.version>0.2.1</binary-data.version>
         <procyon.version>0.6.0</procyon.version>
         <rsyntaxtextarea.version>3.3.4</rsyntaxtextarea.version>
         <semantic-version.version>2.1.1</semantic-version.version>
@@ -242,8 +242,13 @@
         </dependency>
         <dependency>
             <groupId>org.exbin.auxiliary</groupId>
-            <artifactId>paged_data</artifactId>
-            <version>${paged-data.version}</version>
+            <artifactId>binary_data</artifactId>
+            <version>${binary-data.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.exbin.auxiliary</groupId>
+            <artifactId>binary_data-paged</artifactId>
+            <version>${binary-data.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bitbucket.mstrobel</groupId>

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/hexviewer/HexViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/hexviewer/HexViewer.java
@@ -1,6 +1,6 @@
 package the.bytecode.club.bytecodeviewer.gui.hexviewer;
 
-import org.exbin.auxiliary.paged_data.ByteArrayData;
+import org.exbin.auxiliary.binary_data.ByteArrayData;
 import org.exbin.bined.CodeAreaCaretPosition;
 import org.exbin.bined.CodeType;
 import org.exbin.bined.EditMode;
@@ -37,6 +37,7 @@ public class HexViewer extends JPanel {
     public HexViewer(byte[] contentData) {
         super(new BorderLayout());
         codeArea = new CodeArea();
+        codeArea.setFocusTraversalKeysEnabled(false);
         codeArea.setPainter(new HighlightNonAsciiCodeAreaPainter(codeArea));
         toolBar = new JToolBar();
         statusPanel = new BinaryStatusPanel() {

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/hexviewer/ValuesPanel.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/hexviewer/ValuesPanel.java
@@ -14,8 +14,7 @@
 import org.exbin.bined.CodeAreaCaretPosition;
 import org.exbin.bined.DataChangedListener;
 import org.exbin.bined.swing.basic.CodeArea;
-import org.exbin.auxiliary.paged_data.BinaryData;
-import org.exbin.bined.capability.EditModeCapable;
+import org.exbin.auxiliary.binary_data.BinaryData;
 
 /**
  * Values side panel.
@@ -711,7 +710,7 @@ private boolean isSigned() {
     }
 
     private boolean isEditable() {
-        return ((EditModeCapable) codeArea).isEditable();
+        return codeArea.isEditable();
     }
 
     private ByteOrder getByteOrder() {