From 3c699b20ad2083e440b380c353faa0c551f18de0 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 2 Dec 2013 15:10:43 +0200 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D0=9B?= =?UTF-8?q?=D0=A03=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=B4=20AbstractFileChooser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tse/lr3/DirCopy.java | 6 ++++-- src/tse/lr3/DirFindText.java | 6 ++++-- src/tse/lr3/DirZip.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/tse/lr3/DirCopy.java b/src/tse/lr3/DirCopy.java index 1e197be..abb60f6 100644 --- a/src/tse/lr3/DirCopy.java +++ b/src/tse/lr3/DirCopy.java @@ -1,5 +1,6 @@ package tse.lr3; +import com.annimon.ui.AbstractFileChooser; import java.io.BufferedWriter; import java.io.File; import java.io.FileFilter; @@ -13,7 +14,7 @@ import java.nio.channels.FileChannel; * * @author aNNiMON */ -public class DirCopy extends AbstractDirectoryChooser { +public class DirCopy extends AbstractFileChooser { private static final int DAYS = 3; @@ -43,7 +44,7 @@ public class DirCopy extends AbstractDirectoryChooser { } @Override - protected void directorySelected(File directory) { + protected void onFileSelected(File directory) { dirSource = directory; dirDest.mkdirs(); @@ -66,6 +67,7 @@ public class DirCopy extends AbstractDirectoryChooser { writer.close(); } catch (IOException ex) {} } + System.out.println("Готово!"); } private void copyFile(File sourceFile, File destDirectory) throws IOException { diff --git a/src/tse/lr3/DirFindText.java b/src/tse/lr3/DirFindText.java index 34b48cf..a2052f7 100644 --- a/src/tse/lr3/DirFindText.java +++ b/src/tse/lr3/DirFindText.java @@ -1,5 +1,6 @@ package tse.lr3; +import com.annimon.ui.AbstractFileChooser; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -17,7 +18,7 @@ import java.util.List; * * @author aNNiMON */ -public class DirFindText extends AbstractDirectoryChooser { +public class DirFindText extends AbstractFileChooser { private static final String SEARCH_TEXT = "class"; @@ -47,7 +48,7 @@ public class DirFindText extends AbstractDirectoryChooser { } @Override - protected void directorySelected(File directory) { + protected void onFileSelected(File directory) { scanFiles(directory); writeFindInfo(findInfos); if (writer != null) { @@ -56,6 +57,7 @@ public class DirFindText extends AbstractDirectoryChooser { writer.close(); } catch (IOException ex) {} } + System.out.println("Готово!"); } private void scanFiles(File dir) { diff --git a/src/tse/lr3/DirZip.java b/src/tse/lr3/DirZip.java index 4e40160..96b02f2 100644 --- a/src/tse/lr3/DirZip.java +++ b/src/tse/lr3/DirZip.java @@ -1,5 +1,6 @@ package tse.lr3; +import com.annimon.ui.AbstractFileChooser; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -12,7 +13,7 @@ import java.util.zip.ZipOutputStream; * * @author aNNiMON */ -public class DirZip extends AbstractDirectoryChooser { +public class DirZip extends AbstractFileChooser { private static final boolean EXTRACT = false; @@ -32,7 +33,7 @@ public class DirZip extends AbstractDirectoryChooser { } @Override - protected void directorySelected(File directory) { + protected void onFileSelected(File directory) { try { if (EXTRACT) { FileInputStream fis = new FileInputStream(zipFile); @@ -49,6 +50,7 @@ public class DirZip extends AbstractDirectoryChooser { } catch (IOException ex) { ex.printStackTrace(); } + System.out.println("Готово!"); } private void unzipDirectory(ZipInputStream zis, File directory) throws IOException {