Commit: 2d78ccb058c5325c2c7e5db5b9dff21aa4fa1848 - DokonanJar (hg)

Gradle/Mavenが持っているjarファイルのパスを表示するツール

Commit MetaInfo

• Revisão: 2d78ccb058c5325c2c7e5db5b9dff21aa4fa1848 (tree)
• Hora: 2022-08-28 09:50:08
• Autor: kemono7h
• Commiter: kemono7h

Mensagem de Log

出力先ディレクトリもExplorerで開けるようにした

Mudança Sumário

• modified: src/jp/nanah/dnj/DokonanFrame.java
• modified: src/jp/nanah/dnj/DokonanJarMain.java
• modified: src/jp/nanah/dnj/util/FileUtils.java
• modified: src/jp/nanah/dnj/util/JarUtils.java

Diff

diff -r 3c6720599dd7 -r 2d78ccb058c5 src/jp/nanah/dnj/DokonanFrame.java
--- a/src/jp/nanah/dnj/DokonanFrame.java	Sun Apr 10 07:34:05 2022 +0900
+++ b/src/jp/nanah/dnj/DokonanFrame.java	Sun Aug 28 09:50:08 2022 +0900
@@ -15,6 +15,7 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
+import javax.swing.JToolTip;
 import javax.swing.LayoutFocusTraversalPolicy;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.ChangeEvent;
@@ -68,7 +69,7 @@
 		frame = new JFrame();
 		frame.setSize(600, 300);
 		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		frame.setTitle("DokonanJar - Gradle/MavenのJarファイルを探す");
+		frame.setTitle("DokonanJar - Gradle/MavenのJarファイルを探してコピー");
 
 		Font font = (fontName == null) ? frame.getFont() : new Font(fontName, Font.PLAIN, 12);
 
@@ -77,6 +78,9 @@
 		topPanel.setBorder(new EmptyBorder(0,4,0,4));
 		topPanel.setLayout(new BorderLayout());
 		frame.getContentPane().add(topPanel, BorderLayout.NORTH);
+		JPanel editPanel = new JPanel();
+		editPanel.setLayout(new BorderLayout());
+		topPanel.add(editPanel, BorderLayout.NORTH);
 
 		//チェックボックス
 		{
@@ -90,7 +94,7 @@
 			panel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
 			panel.add(cbGradle);
 			panel.add(cbMaven);
-			topPanel.add(panel, BorderLayout.NORTH);
+			editPanel.add(panel, BorderLayout.CENTER);
 
 			CheckBoxActionListener cbActionListener = new CheckBoxActionListener();
 			cbGradle.addActionListener(cbActionListener);
@@ -128,12 +132,19 @@
 
 		//コピーボタン
 		{
-			copyButton = new JButton("コピー");
+			copyButton = new JButton("出力先にコピー") {
+				@Override
+				public JToolTip createToolTip() {
+					JToolTip toolTip = new JToolTip();
+					toolTip.setFont(font);
+					return toolTip;
+				}
+			};
 			JPanel panel = new JPanel();
 			panel.setBorder(new EmptyBorder(4,4,4,4));
 			panel.setLayout(new BorderLayout());
 			panel.add(copyButton);
-			frame.getContentPane().add(panel, BorderLayout.SOUTH);
+			editPanel.add(panel, BorderLayout.EAST);
 
 		}
 

diff -r 3c6720599dd7 -r 2d78ccb058c5 src/jp/nanah/dnj/DokonanJarMain.java
--- a/src/jp/nanah/dnj/DokonanJarMain.java	Sun Apr 10 07:34:05 2022 +0900
+++ b/src/jp/nanah/dnj/DokonanJarMain.java	Sun Aug 28 09:50:08 2022 +0900
@@ -2,6 +2,8 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
@@ -83,7 +85,9 @@
 	public void initFrame() {
 		dokoFrame.initComponent();
 		JButton button = dokoFrame.getCopyButton();
+		button.setToolTipText("表示中のjarを [" + FileUtils.getFullPath(outputDir) + "] にコピー。右クリックで出力先を開きます");
 		button.addActionListener(new CopyButtonActionListener());
+		button.addMouseListener(new DokonanMouseListener());
 		Thread thread = new Thread(){
 			@Override
 			public void run(){
@@ -99,14 +103,8 @@
 		dokoFrame.getResultArea().addHyperlinkListener(new HyperlinkListener() {
 			@Override public void hyperlinkUpdate(HyperlinkEvent e) {
 				if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-					try {
-						//Windows Only
-						String path = e.getURL().getPath().replaceAll("/", "\\\\");
-						Runtime.getRuntime().exec("explorer.exe /select," + path);
-					} catch (Throwable th) {
-						System.out.println("フォルダ表示に失敗しました。");
-						//th.printStackTrace();
-					}
+					String path = e.getURL().getPath().replaceAll("/", "\\\\");
+					FileUtils.openFiler(path, true);
 				}
 			}
 		});
@@ -168,6 +166,15 @@
 		}
 	}
 
+	private class DokonanMouseListener extends MouseAdapter {
+		@Override
+		public void mousePressed(MouseEvent e) {
+			if (e.getButton() == MouseEvent.BUTTON3) {
+				FileUtils.openFiler(FileUtils.getFullPath(outputDir), false);
+			}
+		}
+	}
+
 	public void searchFiles(String path) {
 		String[] texts = getSearchTexts(path);
 		List<File> allList = new ArrayList<File>();
@@ -195,7 +202,7 @@
 	}
 
 	private String toPathText(File file, String[] texts) {
-		String fullpath = file.getAbsolutePath();
+		String fullpath = FileUtils.getFullPath(file);
 		int filenameIndex = fullpath.lastIndexOf(File.separator) + 1;
 		String beforeLastFolder = fullpath.substring(0, filenameIndex);
 		String filename = fullpath.substring(filenameIndex);

diff -r 3c6720599dd7 -r 2d78ccb058c5 src/jp/nanah/dnj/util/FileUtils.java
--- a/src/jp/nanah/dnj/util/FileUtils.java	Sun Apr 10 07:34:05 2022 +0900
+++ b/src/jp/nanah/dnj/util/FileUtils.java	Sun Aug 28 09:50:08 2022 +0900
@@ -288,4 +288,27 @@
         file.delete();
     }
 
+    //---------------------------------------------
+    // パス処理
+    //---------------------------------------------
+
+    public static String getFullPath(File file) {
+    	try {
+    		return file.getCanonicalPath();
+    	} catch (IOException e) {
+    		return file.getAbsolutePath();
+    	}
+    }
+
+    public static void openFiler(String path, boolean isFile) {
+		try {
+
+			//Windows Only
+			String args = isFile ? "/select," : "";
+			Runtime.getRuntime().exec("explorer.exe "+args + path);
+		} catch (Throwable th) {
+			System.out.println("フォルダ表示に失敗しました。");
+			//th.printStackTrace();
+		}
+    }
 }
\ No newline at end of file

diff -r 3c6720599dd7 -r 2d78ccb058c5 src/jp/nanah/dnj/util/JarUtils.java
--- a/src/jp/nanah/dnj/util/JarUtils.java	Sun Apr 10 07:34:05 2022 +0900
+++ b/src/jp/nanah/dnj/util/JarUtils.java	Sun Aug 28 09:50:08 2022 +0900
@@ -20,23 +20,10 @@
 
             while ((zipEntry = zistr.getNextEntry()) != null) {
             	String name = zipEntry.getName();
-                System.out.println(name);
             	if (name.endsWith(".class")) {
             		return true;
             	}
-            	//classList
-//                File uncompressFile = new File(zipEntry.getName());
-//                System.out.println("");
-    //
-//                if (zipEntry.isDirectory()) {
-//                    uncompressFile.mkdirs();
-//                } else {
-//                    BufferedOutputStream bostr = new BufferedOutputStream(new FileOutputStream(uncompressFile));
-//                    while ((len = zistr.read(buf)) != -1) {
-//                        bostr.write(buf, 0, len);
-//                    }
-//                    bostr.close();
-//                }
+
             }
         } catch (IOException ex) {
         	ex.printStackTrace();