diff --git a/src/GlobalData/FileObject/FileObject.java b/src/GlobalData/FileObject/DirInfo.java similarity index 100% rename from src/GlobalData/FileObject/FileObject.java rename to src/GlobalData/FileObject/DirInfo.java diff --git a/src/GlobalData/FileObject/FileObjectsDataSet.java b/src/GlobalData/FileObject/DirInfosDataSet.java similarity index 78% rename from src/GlobalData/FileObject/FileObjectsDataSet.java rename to src/GlobalData/FileObject/DirInfosDataSet.java index 30c8932c..905daeba 100644 --- a/src/GlobalData/FileObject/FileObjectsDataSet.java +++ b/src/GlobalData/FileObject/DirInfosDataSet.java @@ -1,12 +1,11 @@ package GlobalData.FileObject; import Common.Database.DataSet; import Common.UI.DataSetControlForm; -import GlobalData.Machine.Machine; import static Common.UI.Tables.TableRenderers.*; -public class FileObjectsDataSet extends DataSet { +public class FileObjectsDataSet extends DataSet { public FileObjectsDataSet() { - super(String.class, FileObject.class); + super(String.class, DirInfo.class); } @Override protected DataSetControlForm createUI() { @@ -23,7 +22,7 @@ public class FileObjectsDataSet extends DataSet { "дата изменения"}; } @Override - public Object getFieldAt(FileObject object, int columnIndex) { + public Object getFieldAt(DirInfo object, int columnIndex) { switch (columnIndex) { case 1: return object.getDate(); diff --git a/src/GlobalData/FileObject/FileObjectsFields.form b/src/GlobalData/FileObject/DirInfosFields.form similarity index 100% rename from src/GlobalData/FileObject/FileObjectsFields.form rename to src/GlobalData/FileObject/DirInfosFields.form diff --git a/src/GlobalData/FileObject/FileObjectsFields.java b/src/GlobalData/FileObject/DirInfosFields.java similarity index 100% rename from src/GlobalData/FileObject/FileObjectsFields.java rename to src/GlobalData/FileObject/DirInfosFields.java