Методы из tse.lr5.Utils перенесены в tse.Util
This commit is contained in:
parent
fa9aa7d2f9
commit
72b797de7c
@ -1,7 +1,10 @@
|
||||
package tse;
|
||||
|
||||
import java.awt.Image;
|
||||
import java.awt.Point;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FilenameFilter;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
@ -88,6 +91,23 @@ public class Util {
|
||||
return "";
|
||||
}
|
||||
|
||||
public static File[] readFiles(String path, final String extension) {
|
||||
File dir = new File(path);
|
||||
return dir.listFiles(new FilenameFilter() {
|
||||
|
||||
@Override
|
||||
public boolean accept(File dir, String name) {
|
||||
return name.toLowerCase().endsWith(extension);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public static Point readPoint(String s1, String s2) {
|
||||
int x = Integer.parseInt(s1);
|
||||
int y = Integer.parseInt(s2);
|
||||
return new Point(x, y);
|
||||
}
|
||||
|
||||
private static InputStream getInputStream(String resource) {
|
||||
return Runtime.getRuntime().getClass().getResourceAsStream(resource);
|
||||
}
|
||||
|
@ -6,6 +6,7 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JOptionPane;
|
||||
import tse.Util;
|
||||
|
||||
/**
|
||||
* @author aNNiMON
|
||||
@ -25,7 +26,7 @@ public class TrianglesWindow extends JFrame {
|
||||
}
|
||||
|
||||
public void execute() {
|
||||
File[] csvFiles = Utils.readFiles("lr5", ".csv");
|
||||
File[] csvFiles = Util.readFiles("lr5", ".csv");
|
||||
if (csvFiles == null) {
|
||||
JOptionPane.showMessageDialog(this, "CSV-файлов не обнаружено! Сворачиваемся, ребята",
|
||||
"Ошибка", JOptionPane.ERROR_MESSAGE);
|
||||
@ -66,7 +67,7 @@ public class TrianglesWindow extends JFrame {
|
||||
csvReader.readCsv();
|
||||
} catch (IOException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private final CsvReader.ReaderHandler<TrianglePaintable> trianglesHandler
|
||||
@ -83,9 +84,9 @@ public class TrianglesWindow extends JFrame {
|
||||
|
||||
Color fill = Color.decode(params[0]);
|
||||
Color stroke = Color.decode(params[1]);
|
||||
Point p1 = Utils.readPoint(params[2], params[3]);
|
||||
Point p2 = Utils.readPoint(params[4], params[5]);
|
||||
Point p3 = Utils.readPoint(params[6], params[7]);
|
||||
Point p1 = Util.readPoint(params[2], params[3]);
|
||||
Point p2 = Util.readPoint(params[4], params[5]);
|
||||
Point p3 = Util.readPoint(params[6], params[7]);
|
||||
TrianglePaintable obj = new TrianglePaintable(fill, stroke, p1, p2, p3);
|
||||
panel.addPaintable(obj);
|
||||
try {
|
||||
|
@ -1,28 +0,0 @@
|
||||
package tse.lr5;
|
||||
|
||||
import java.awt.Point;
|
||||
import java.io.File;
|
||||
import java.io.FilenameFilter;
|
||||
|
||||
/**
|
||||
* @author aNNiMON
|
||||
*/
|
||||
public class Utils {
|
||||
|
||||
public static File[] readFiles(String path, final String extension) {
|
||||
File dir = new File(path);
|
||||
return dir.listFiles(new FilenameFilter() {
|
||||
|
||||
@Override
|
||||
public boolean accept(File dir, String name) {
|
||||
return name.toLowerCase().endsWith(extension);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public static Point readPoint(String s1, String s2) {
|
||||
int x = Integer.parseInt(s1);
|
||||
int y = Integer.parseInt(s2);
|
||||
return new Point(x, y);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user