Merge pull request #11 from zhyhang/feature/dev-2.4.0

Feature/dev 2.4.0

Author: zhyhang

CHANGELOG.md

@@ -5,6 +5,10 @@
 
 ## [Unreleased]
 
+## [2.4.0]
+- Supports add directory entries option 
+- Remember export options
+
 ## [2.3.1]
 - Compatible with coming version 2022
 - Build tool change to gradle

Handy Export Jar-2.3.1.zip

@@ -68,4 +68,12 @@ Plugin of Intellij IDEA for quickly export java project's class, resource, sourc
 - help docs
 - throw swing context event exception when trigger by first-keystroke (key-map)
 - button component mnemonic not working
-## Note
+## Build
+
+```shell
+# win
+.\gradlew.bat clean build
+
+# linux/macos
+.\gradlew clean build
+```

Handy Export Jar-2.4.0.zip

@@ -4,7 +4,7 @@
 pluginGroup = org.yanhuang.plugins.intellij.exportjar
 pluginName = Handy Export Jar
 # SemVer format -> https://semver.org
-pluginVersion = 2.3.1
+pluginVersion = 2.4.0
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

README.md

@@ -11,6 +11,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;
+import org.yanhuang.plugins.intellij.exportjar.HistoryData.ExportOptions;
 import org.yanhuang.plugins.intellij.exportjar.utils.CommonUtils;
 import org.yanhuang.plugins.intellij.exportjar.utils.Constants;
 import org.yanhuang.plugins.intellij.exportjar.utils.action.CopyTextToClipboardAction;
@@ -21,6 +22,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static org.yanhuang.plugins.intellij.exportjar.utils.MessagesUtils.*;
 
@@ -31,17 +33,13 @@ public class ExportPacker implements CompileStatusNotification {
     private final Project project;
     private final VirtualFile[] selectedFiles;
     private final Path exportJarFullPath;
-    private final boolean exportJava;
-    private final boolean exportClass;
-    private final boolean exportTests;
+    private final Set<ExportOptions> exportOptionSet;
 
-    public ExportPacker(Project project, VirtualFile[] selectedFiles, Path exportJarFullPath, boolean exportJava, boolean exportClass, boolean exportTests) {
+    public ExportPacker(Project project, VirtualFile[] selectedFiles, Path exportJarFullPath, ExportOptions[] exportOptions) {
         this.project = project;
         this.selectedFiles = selectedFiles;
         this.exportJarFullPath = exportJarFullPath;
-        this.exportClass = exportClass;
-        this.exportJava = exportJava;
-        this.exportTests = exportTests;
+        this.exportOptionSet = Arrays.stream(exportOptions).collect(Collectors.toSet());
     }
 
     private void pack() {
@@ -64,13 +62,36 @@ private void pack() {
                 filePathVfMap.put(filePaths.get(i), vf);
             }
         }
+        if (exportOptionSet.contains(ExportOptions.add_directory)) {
+            addDirectoryEntries(filePaths, jarEntryNames);
+        }
         CommonUtils.createNewJar(project, exportJarFullPath, filePaths, jarEntryNames, filePathVfMap);
     }
 
+    private void addDirectoryEntries(List<Path> filePaths, List<String> entryNames) {
+        final var added = new HashSet<String>();
+        final int size = entryNames.size();
+        for (int i = 0; i < size; i++) {
+            addDirectoryEntry(filePaths, entryNames, entryNames.get(i), added);
+        }
+    }
+
+    private void addDirectoryEntry(List<Path> filePaths, List<String> entryNames, String entryName, HashSet<String> added) {
+        int spIndex = entryName.indexOf("/");
+        while (spIndex > 0) {
+            final String dir = entryName.substring(0, spIndex + 1);
+            if (added.add(dir)) {
+                filePaths.add(null);
+                entryNames.add(dir);
+            }
+            spIndex = entryName.indexOf("/", spIndex + 1);
+        }
+    }
+
     private void collectExportVirtualFile(List<Path> filePaths, List<String> jarEntryNames, VirtualFile virtualFile) {
         final boolean inTestSourceContent =
                 ProjectRootManager.getInstance(project).getFileIndex().isInTestSourceContent(virtualFile);
-        if (inTestSourceContent && !exportTests) { // not export test source and resource files
+        if (inTestSourceContent && !exportOptionSet.contains(ExportOptions.export_test)) { // not export test source and resource files
             return;
         }
         // find package name
@@ -80,11 +101,11 @@ private void collectExportVirtualFile(List<Path> filePaths, List<String> jarEntr
         String packagePath = psiPackage == null ? "" : psiPackage.getQualifiedName().replaceAll("\\.", "/");
         String fileName = virtualFile.getName();
         if (CompilerManager.getInstance(project).isCompilableFileType(virtualFile.getFileType())) {
-            if (exportJava) {
+            if (exportOptionSet.contains(ExportOptions.export_java)) {
                 collectExportFile(filePaths, jarEntryNames, packagePath, Paths.get(virtualFile.getPath()));
             }
             // only export java classes
-            if (psiPackage != null && exportClass && fileName.endsWith(".java")) {
+            if (psiPackage != null && exportOptionSet.contains(ExportOptions.export_class) && fileName.endsWith(".java")) {
                 PsiClass[] psiClasses = psiPackage.getClasses();
                 if (psiClasses.length == 0) {
                     warn(project, "not found class info of java file " + virtualFile.getPath());

gradle.properties

@@ -12,10 +12,12 @@
  */
 public class HistoryData {
 
-    private static final int maxHistory = 100;
+    private static final int maxHistory = 2022;
 
     private SavedJarInfo[] savedJarInfo;
 
+    private ExportOptions[] lastExportOptions;
+
     public SavedJarInfo[] getSavedJarInfo() {
         return savedJarInfo;
     }
@@ -24,6 +26,14 @@ public void setSavedJarInfo(SavedJarInfo[] savedJarInfo) {
         this.savedJarInfo = savedJarInfo;
     }
 
+    public ExportOptions[] getLastExportOptions() {
+        return lastExportOptions;
+    }
+
+    public void setLastExportOptions(ExportOptions[] lastExportOptions) {
+        this.lastExportOptions = lastExportOptions;
+    }
+
     public void addSavedJarInfo(SavedJarInfo savedJarInfo) {
         if (savedJarInfo == null) {
             return;
@@ -88,4 +98,8 @@ public int compareTo(@NotNull SavedJarInfo that) {
             return Long.compare(this.getCreation(), that.getCreation());
         }
     }
+
+    public enum ExportOptions {
+        export_java,export_class,export_test,add_directory
+    }
 }

src/main/java/org/yanhuang/plugins/intellij/exportjar/ExportPacker.java

@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="592" height="285"/>
+      <xy x="48" y="54" width="674" height="285"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -54,7 +54,7 @@
               </component>
             </children>
           </grid>
-          <grid id="e0128" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="e0128" binding="optionsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -68,6 +68,7 @@
                 </constraints>
                 <properties>
                   <enabled value="true"/>
+                  <name value="export_java"/>
                   <selected value="true"/>
                   <text value="Export &amp;java file"/>
                 </properties>
@@ -77,6 +78,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <name value="export_class"/>
                   <selected value="true"/>
                   <text value="Export &amp;class file"/>
                 </properties>
@@ -86,9 +88,20 @@
                   <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <name value="export_test"/>
                   <text value="Export &amp;test file"/>
                 </properties>
               </component>
+              <component id="18a82" class="javax.swing.JCheckBox" binding="exportAddDirectoryCheckBox">
+                <constraints>
+                  <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <name value="add_directory"/>
+                  <selected value="false"/>
+                  <text value="Add directory entries"/>
+                </properties>
+              </component>
             </children>
           </grid>
           <vspacer id="543c1">

src/main/java/org/yanhuang/plugins/intellij/exportjar/HistoryData.java

@@ -22,6 +22,8 @@
 import org.jetbrains.annotations.Nullable;
 import org.yanhuang.plugins.intellij.exportjar.ExportPacker;
 import org.yanhuang.plugins.intellij.exportjar.HistoryData;
+import org.yanhuang.plugins.intellij.exportjar.HistoryData.ExportOptions;
+import org.yanhuang.plugins.intellij.exportjar.HistoryData.SavedJarInfo;
 import org.yanhuang.plugins.intellij.exportjar.utils.CommonUtils;
 import org.yanhuang.plugins.intellij.exportjar.utils.Constants;
 import org.yanhuang.plugins.intellij.exportjar.utils.MessagesUtils;
@@ -39,6 +41,7 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.intellij.openapi.ui.Messages.getWarningIcon;
 import static com.intellij.openapi.ui.Messages.showErrorDialog;
@@ -47,6 +50,7 @@
 
 /**
  * export jar settings dialog (link to SettingDialog.form)
+ * <li><b>In UIDesigner: export options JCheckBox's name is same as HistoryData.ExportOptions</b></li>
  */
 public class SettingDialog extends JDialog {
     private final Project project;
@@ -58,12 +62,14 @@ public class SettingDialog extends JDialog {
     private JCheckBox exportJavaFileCheckBox;
     private JCheckBox exportClassFileCheckBox;
     private JCheckBox exportTestFileCheckBox;
+    private JCheckBox exportAddDirectoryCheckBox;
     private JComboBox<String> outPutJarFileComboBox;
     private JButton selectJarFileButton;
     private JPanel settingPanel;
     private JPanel fileListPanel;
     private JButton debugButton;
     private JPanel actionPanel;
+    private JPanel optionsPanel;
     private HistoryData historyData;
     private FileListDialog fileListDialog;
     private BorderLayoutPanel fileListLabel;
@@ -91,6 +97,7 @@ public void windowClosing(WindowEvent e) {
 
         readSaveHistory();
         initComboBox();
+        initOptionCheckBox();
         createFileListTree();
 
 //        uiDebug();
@@ -109,15 +116,34 @@ private void initComboBox() {
         String[] historyFiles;
         if (historyData != null) {
             historyFiles =
-                    Arrays.stream(Optional.ofNullable(historyData.getSavedJarInfo()).orElse(new HistoryData.SavedJarInfo[0]))
-                            .map(HistoryData.SavedJarInfo::getPath).toArray(String[]::new);
+                    Arrays.stream(Optional.ofNullable(historyData.getSavedJarInfo()).orElse(new SavedJarInfo[0]))
+                            .map(SavedJarInfo::getPath).toArray(String[]::new);
         } else {
             historyFiles = new String[0];
         }
         ComboBoxModel<String> model = new DefaultComboBoxModel<>(historyFiles);
         outPutJarFileComboBox.setModel(model);
     }
 
+    private void initOptionCheckBox(){
+        final Component[] components = optionsPanel.getComponents();
+        final Set<String> optionSet = Optional.ofNullable(historyData.getLastExportOptions()).stream().flatMap(Arrays::stream)
+                .map(ExportOptions::name)
+                .map(String::toLowerCase)
+                .collect(Collectors.toSet());
+        if (optionSet.size() == 0) {
+            return;
+        }
+        //set select state according to last saved
+        for (Component c : components) {
+            if (c instanceof JCheckBox && optionSet.contains(c.getName().toLowerCase())) {
+                ((JCheckBox) c).setSelected(true);
+            } else if (c instanceof JCheckBox) {
+                ((JCheckBox) c).setSelected(false);
+            }
+        }
+    }
+
     private void createFileListTree() {
         //remove old component
         if (this.fileListLabel != null) {
@@ -174,7 +200,8 @@ private void writeSaveHistory(Path exportJarName) {
         if (historyData == null) {
             this.historyData = new HistoryData();
         }
-        HistoryData.SavedJarInfo savedJar = new HistoryData.SavedJarInfo();
+        this.historyData.setLastExportOptions(pickExportOptions());
+        SavedJarInfo savedJar = new SavedJarInfo();
         savedJar.setCreation(System.currentTimeMillis());
         savedJar.setPath(exportJarName.toString());
         historyData.addSavedJarInfo(savedJar);
@@ -189,6 +216,22 @@ private void writeSaveHistory(Path exportJarName) {
         }
     }
 
+    private ExportOptions[] pickExportOptions(){
+        final Component[] components = optionsPanel.getComponents();
+        return Arrays.stream(components).filter(c -> c instanceof JCheckBox)
+                .filter(c->((JCheckBox) c).isSelected())
+                .map(Component::getName)
+                .map(String::toLowerCase)
+                .filter(n -> {
+                    try {
+                        ExportOptions.valueOf(n);
+                        return true;
+                    } catch (Exception e) {
+                        return false;
+                    }
+                }).map(ExportOptions::valueOf).toArray(ExportOptions[]::new);
+    }
+
     private void onSelectJarFileButton(ActionEvent event) {
         FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFileDescriptor();
         Consumer<VirtualFile> chooserConsumer = new FileChooserConsumerImplForComboBox(this.outPutJarFileComboBox);
@@ -260,9 +303,7 @@ public void doExport(VirtualFile[] exportFiles) {
                 }
                 this.dispose();
                 writeSaveHistory(exportJarFullPath);
-                final CompileStatusNotification packager = new ExportPacker(project, exportFiles, exportJarFullPath,
-                        exportJavaFileCheckBox.isSelected(), exportClassFileCheckBox.isSelected(),
-                        exportTestFileCheckBox.isSelected());
+                final CompileStatusNotification packager = new ExportPacker(project, exportFiles, exportJarFullPath, pickExportOptions());
                 app.invokeAndWait(() -> CompilerManager.getInstance(project).make(project, null == modules ? new Module[0] : modules, packager));
             }
         } else {

src/main/java/org/yanhuang/plugins/intellij/exportjar/ui/SettingDialog.form

@@ -86,15 +86,17 @@ public static void createNewJar(Project project, Path jarFileFullPath, List<Path
                 String entryName = entryNames.get(i);
                 JarEntry je = new JarEntry(entryName);
                 Path filePath = filePaths.get(i);
-                // using origin entry(file) last modified time
-                je.setLastModifiedTime(Files.getLastModifiedTime(filePath));
                 jos.putNextEntry(je);
-                if (!Files.isDirectory(filePath)) {
+                if (filePath != null && Files.isRegularFile(filePath)) {
+                    // using origin entry(file) last modified time
+                    je.setLastModifiedTime(Files.getLastModifiedTime(filePath));
                     jos.write(Files.readAllBytes(filePath));
                 }
                 jos.closeEntry();
                 VirtualFile vf = filePathVfMap.get(filePath);
-                MessagesUtils.infoAndMore(project, "packed " + filePath + " to jar", vf);
+                if (vf != null) {
+                    MessagesUtils.infoAndMore(project, "packed " + filePath + " to jar", vf);
+                }
             }
         } catch (Exception e) {
             throw new RuntimeException(e);