Release 0.2.8

exbin · May 19, 2023 · c2901fb · c2901fb
1 parent 08f032e
commit c2901fb
Show file tree

Hide file tree

Showing 30 changed files with 834 additions and 285 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ Java Development Kit (JDK) version 11 or later is required to build this project
 
 IntelliJ Idea platform is necessary to build this plugin. See. http://jetbrains.org  
 
-Assign SDK using 2022.2.1 IntelliJ platform / add and use "Plugin" run configuration to execute.
+Assign SDK using 2022.2.1 IntelliJ platform / add and use "Other/Plugin" run configuration to execute.
 
 License
 -------

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "org.exbin.deltahex.intellij"
-version = "0.2.8-SNAPSHOT"
+version = "0.2.8"
 val ideLocalPath = providers.gradleProperty("ideLocalPath").getOrElse("")
 
 repositories {

diff --git a/changes.txt b/changes.txt
@@ -1,4 +1,4 @@
-0.2.8
+0.2.8 (2023-05-19)
 - Added edit as binary action for columns in database view
 - Added byte-to-byte compare diff option
 - Added integration options page

diff --git a/lib/bined-core-0.2.1-SNAPSHOT.jar b/lib/bined-core-0.2.1-SNAPSHOT.jar
diff --git a/lib/bined-extended-0.2.1-SNAPSHOT.jar b/lib/bined-extended-0.2.1-SNAPSHOT.jar
diff --git a/lib/bined-highlight-swing-0.2.1-SNAPSHOT.jar b/lib/bined-highlight-swing-0.2.1-SNAPSHOT.jar
diff --git a/lib/bined-operation-0.2.1-SNAPSHOT.jar b/lib/bined-operation-0.2.1-SNAPSHOT.jar
diff --git a/lib/bined-operation-swing-0.2.1-SNAPSHOT.jar b/lib/bined-operation-swing-0.2.1-SNAPSHOT.jar
diff --git a/lib/bined-swing-0.2.1-SNAPSHOT.jar b/lib/bined-swing-0.2.1-SNAPSHOT.jar
diff --git a/lib/bined-swing-extended-0.2.1-SNAPSHOT.jar b/lib/bined-swing-extended-0.2.1-SNAPSHOT.jar
diff --git a/lib/jetbrains/database-plugin-2022.2.1.jar b/lib/jetbrains/database-plugin-2022.2.1.jar
diff --git a/lib/paged_data-0.2.1-SNAPSHOT.jar b/lib/paged_data-0.2.1-SNAPSHOT.jar
diff --git a/lib/paged_data-delta-0.2.1-SNAPSHOT.jar b/lib/paged_data-delta-0.2.1-SNAPSHOT.jar
diff --git a/src/main/java/org/exbin/bined/intellij/BinEdDiffTool.java b/src/main/java/org/exbin/bined/intellij/BinEdDiffTool.java
diff --git a/src/main/java/org/exbin/bined/intellij/BinEdFileListener.java b/src/main/java/org/exbin/bined/intellij/BinEdFileListener.java
diff --git a/src/main/java/org/exbin/bined/intellij/BinEdPluginStartupActivity.java b/src/main/java/org/exbin/bined/intellij/BinEdPluginStartupActivity.java
@@ -18,11 +18,17 @@
 import com.intellij.openapi.extensions.ExtensionPointAdapter;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.PluginDescriptor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.FileEditorManagerListener;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.startup.StartupActivity;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.messages.MessageBus;
+import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.components.BorderLayoutPanel;
 import org.exbin.auxiliary.paged_data.BinaryData;
@@ -34,6 +40,7 @@
 import org.exbin.bined.intellij.gui.BinEdComponentPanel;
 import org.exbin.bined.intellij.options.IntegrationOptions;
 import org.exbin.bined.intellij.preferences.IntegrationPreferences;
+import org.exbin.framework.bined.BinEdFileHandler;
 import org.exbin.framework.bined.FileHandlingMode;
 
 import javax.annotation.Nonnull;
@@ -66,16 +73,20 @@ public final class BinEdPluginStartupActivity implements StartupActivity, DumbAw
 
     @Override
     public void runActivity(Project project) {
-        ProjectManager.getInstance().addProjectManagerListener(new BinEdVetoableProjectListener());
+        if (initialIntegrationOptions == null) {
+            ProjectManager.getInstance().addProjectManagerListener(new BinEdVetoableProjectListener());
 
-        BINED_VIEW_DATA.addExtensionPointListener(new ExtensionPointAdapter<>() {
-            @Override
-            public void extensionListChanged() {
-                initExtensions();
-            }
-        }, null);
-        initExtensions();
-        initIntegration();
+            BINED_VIEW_DATA.addExtensionPointListener(new ExtensionPointAdapter<>() {
+                @Override
+                public void extensionListChanged() {
+                    initExtensions();
+                }
+            }, null);
+            initExtensions();
+            initIntegration();
+        }
+
+        projectOpened(project);
     }
 
     private void initExtensions() {
@@ -88,13 +99,33 @@ private void initExtensions() {
                 });
     }
 
-    private void initIntegration() {
+    private static void initIntegration() {
         initialIntegrationOptions = new IntegrationPreferences(
                 new IntelliJPreferencesWrapper(BinEdComponentPanel.getPreferences(), BinEdIntelliJPlugin.PLUGIN_PREFIX)
         );
         applyIntegrationOptions(initialIntegrationOptions);
     }
 
+    private static void projectOpened(Project project) {
+        MessageBus messageBus = project.getMessageBus();
+        MessageBusConnection connect = messageBus.connect();
+        connect.subscribe(FileEditorManagerListener.Before.FILE_EDITOR_MANAGER, new FileEditorManagerListener.Before() {
+            @Override
+            public void beforeFileClosed(@Nonnull FileEditorManager source, @Nonnull VirtualFile file) {
+                if (file instanceof BinEdVirtualFile && !((BinEdVirtualFile) file).isMoved()
+                        && !((BinEdVirtualFile) file).isClosing()) {
+                    ((BinEdVirtualFile) file).setClosing(true);
+                    BinEdFileHandler editorPanel = ((BinEdVirtualFile) file).getEditorFile();
+                    if (!editorPanel.releaseFile()) {
+                        ((BinEdVirtualFile) file).setClosing(false);
+                        throw new ProcessCanceledException();
+                    }
+                    ((BinEdVirtualFile) file).setClosing(false);
+                }
+            }
+        });
+    }
+
     public static void addIntegrationOptionsListener(IntegrationOptionsListener integrationOptionsListener) {
         INTEGRATION_OPTIONS_LISTENERS.add(integrationOptionsListener);
         if (initialIntegrationOptions != null) {

diff --git a/src/main/java/org/exbin/bined/intellij/BinEdProjectListener.java b/src/main/java/org/exbin/bined/intellij/BinEdProjectListener.java
diff --git a/src/main/java/org/exbin/bined/intellij/action/SearchAction.java b/src/main/java/org/exbin/bined/intellij/action/SearchAction.java
@@ -341,7 +341,7 @@ public void actionPerformed(ActionEvent e) {
 
             @Override
             public boolean isEnabled() {
-                return codeArea.hasSelection();
+                return codeArea.isEditable() && codeArea.hasSelection();
             }
         });
         cutMenuItem.setText("Cut");
@@ -369,7 +369,7 @@ public void actionPerformed(ActionEvent e) {
 
             @Override
             public boolean isEnabled() {
-                return codeArea.canPaste();
+                return codeArea.isEditable() && codeArea.canPaste();
             }
         });
         pasteMenuItem.setText("Paste");
@@ -383,7 +383,7 @@ public void actionPerformed(ActionEvent e) {
 
             @Override
             public boolean isEnabled() {
-                return codeArea.hasSelection();
+                return codeArea.isEditable() && codeArea.hasSelection();
             }
         });
         deleteMenuItem.setText("Delete");