diff --git a/files/src/main/docs/diagrams/src/Files.puml b/files/src/main/docs/diagrams/src/Files.puml index ed7201a..8212d61 100644 --- a/files/src/main/docs/diagrams/src/Files.puml +++ b/files/src/main/docs/diagrams/src/Files.puml @@ -1,9 +1,6 @@ @startuml Files - title Files class diagram -class Storage { - File[] files -} + enum Extension{ DOCUMENT IMAGE @@ -16,5 +13,30 @@ class File { byte size Extension extension } +class Document{ + String format + int lists +} +class Image{ + +} +class Audio{ + +} +class Video{ + +} + +Extension -> File +File -> Document +File -> Image +File -> Audio +File -> Video + +class Storage { + File[] files + File[] getDefaultList() + void print() +} @enduml \ No newline at end of file diff --git a/files/src/main/java/ru/molokoin/Dimensions.java b/files/src/main/java/ru/molokoin/Dimensions.java new file mode 100644 index 0000000..0028f12 --- /dev/null +++ b/files/src/main/java/ru/molokoin/Dimensions.java @@ -0,0 +1,22 @@ +package ru.molokoin; + +public class Dimensions { + int width; + int height; + Dimensions(int width, int height){ + setWidth(width); + setHeight(height); + } + public void setWidth(int width) { + this.width = width; + } + public void setHeight(int height) { + this.height = height; + } + public int getWidth() { + return width; + } + public int getHeight() { + return height; + } +} diff --git a/files/src/main/java/ru/molokoin/DocumentFile.java b/files/src/main/java/ru/molokoin/DocumentFile.java deleted file mode 100644 index 851314a..0000000 --- a/files/src/main/java/ru/molokoin/DocumentFile.java +++ /dev/null @@ -1,3 +0,0 @@ -public class DocumentFile extends File{ - -} diff --git a/files/src/main/java/ru/molokoin/Extension.java b/files/src/main/java/ru/molokoin/Extension.java index 01ecbe6..bf645d4 100644 --- a/files/src/main/java/ru/molokoin/Extension.java +++ b/files/src/main/java/ru/molokoin/Extension.java @@ -1,8 +1,57 @@ -public enum Extension { +package ru.molokoin; + +import java.sql.Time; + +public enum Extension{ DOCUMENT, IMAGE, AUDIO, VIDEO, OTHER; + private String format; + private int lists; + private Dimensions dimensions; + private String content; + private Time lenght; + + protected void initDocument(String format, int lists){ + setFormat(format); + setLists(lists); + } + protected void printDocument(){ + System.out.println("format: " + getFormat()); + System.out.println("lists: " + getLists()); + } + + protected void setFormat(String format) { + this.format = format; + } + protected void setLists(int lists) { + this.lists = lists; + } + protected void setDimensions(Dimensions dimensions) { + this.dimensions = dimensions; + } + protected void setContent(String content) { + this.content = content; + } + protected void setLenght(Time lenght) { + this.lenght = lenght; + } + protected String getFormat() { + return format; + } + protected int getLists() { + return lists; + } + protected Dimensions getDimensions() { + return dimensions; + } + protected String getContent() { + return content; + } + protected Time getLenght() { + return lenght; + } } diff --git a/files/src/main/java/ru/molokoin/File.java b/files/src/main/java/ru/molokoin/File.java index 7b4dd58..9ab3547 100644 --- a/files/src/main/java/ru/molokoin/File.java +++ b/files/src/main/java/ru/molokoin/File.java @@ -1,16 +1,40 @@ package ru.molokoin; +/** + * Класс - обертка + * предоставляет инструментарий обращения с отдельным файлом + */ public class File { - String name; - Byte size; - Extension extension; - - public File (String name, Byte size, Extension extension){ - + private String name; + private byte size; + private Extension extension; + public File(String name, byte size, Extension extension){ + setName(name); + setSize(size); + setExtension(extension); } - - public static void main(String[] args) { - // + public void print(){ + System.out.println("name: " + getName()); + System.out.println("size: " + (byte) getSize()); + System.out.println("extension: " + extension); } + public void setName(String name) { + this.name = name; + } + public void setSize(byte size) { + this.size = size; + } + public void setExtension(Extension extension) { + this.extension = extension; + } + public String getName() { + return name; + } + public byte getSize() { + return size; + } + public Extension getExtension() { + return extension; + } } diff --git a/files/src/main/java/ru/molokoin/Storage.java b/files/src/main/java/ru/molokoin/Storage.java index 11c218f..a5cbc95 100644 --- a/files/src/main/java/ru/molokoin/Storage.java +++ b/files/src/main/java/ru/molokoin/Storage.java @@ -1,3 +1,27 @@ +package ru.molokoin; +/** + * Класс - хранилище + * предоставляет инструментарий обращения с массивом файлов + */ public class Storage { - File[] files; + private File[] files; + + public void setFiles(File[] files) { + this.files = files; + } + public File[] getFiles() { + return files; + } + + + public static void main(String[] args) { + Storage storage = new Storage(); + storage.setFiles(new File[1]); + Extension e = Extension.DOCUMENT; + e.initDocument("null", 0); + storage.files[0] = new File("noname", (byte)0, e); + storage.files[0].print(); + + } + } diff --git a/files/target/classes/ru/molokoin/AnnotationReseacher.class b/files/target/classes/ru/molokoin/AnnotationReseacher.class deleted file mode 100644 index 8b46457..0000000 Binary files a/files/target/classes/ru/molokoin/AnnotationReseacher.class and /dev/null differ diff --git a/files/target/classes/ru/molokoin/Dimensions.class b/files/target/classes/ru/molokoin/Dimensions.class new file mode 100644 index 0000000..df12d4b Binary files /dev/null and b/files/target/classes/ru/molokoin/Dimensions.class differ diff --git a/files/target/classes/ru/molokoin/Extension.class b/files/target/classes/ru/molokoin/Extension.class index 0c76b87..19073a8 100644 Binary files a/files/target/classes/ru/molokoin/Extension.class and b/files/target/classes/ru/molokoin/Extension.class differ diff --git a/files/target/classes/ru/molokoin/File.class b/files/target/classes/ru/molokoin/File.class index 205ea04..fa0c8f2 100644 Binary files a/files/target/classes/ru/molokoin/File.class and b/files/target/classes/ru/molokoin/File.class differ diff --git a/files/target/classes/ru/molokoin/Storage.class b/files/target/classes/ru/molokoin/Storage.class index 2a1e6ec..3743d35 100644 Binary files a/files/target/classes/ru/molokoin/Storage.class and b/files/target/classes/ru/molokoin/Storage.class differ