From 72b797de7ce8443b1da664afff788b79fd8c7e97 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Mon, 2 Dec 2013 15:23:52 +0200
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20tse.lr5.Utils=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20tse.Util?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tse/Util.java                | 20 ++++++++++++++++++++
 src/tse/lr5/TrianglesWindow.java | 11 ++++++-----
 src/tse/lr5/Utils.java           | 28 ----------------------------
 3 files changed, 26 insertions(+), 33 deletions(-)
 delete mode 100644 src/tse/lr5/Utils.java

diff --git a/src/tse/Util.java b/src/tse/Util.java
index ac2baa7..542482e 100644
--- a/src/tse/Util.java
+++ b/src/tse/Util.java
@@ -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);
     }
diff --git a/src/tse/lr5/TrianglesWindow.java b/src/tse/lr5/TrianglesWindow.java
index 131885f..e17948e 100644
--- a/src/tse/lr5/TrianglesWindow.java
+++ b/src/tse/lr5/TrianglesWindow.java
@@ -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 {
diff --git a/src/tse/lr5/Utils.java b/src/tse/lr5/Utils.java
deleted file mode 100644
index cc98b8d..0000000
--- a/src/tse/lr5/Utils.java
+++ /dev/null
@@ -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);
-    }
-}
\ No newline at end of file