ready: doc and image

files/src/main/java/ru/molokoin/Audio.java

@@ -0,0 +1,10 @@
+package ru.molokoin;
+
+public class Audio extends File{
+
+    public Audio(String name, byte size, Extension extension) {
+        super(name, size, extension);
+        //TODO Auto-generated constructor stub
+    }
+    
+}

files/src/main/java/ru/molokoin/Dimensions.java

@@ -1,8 +1,8 @@
 package ru.molokoin;
 
 public class Dimensions {
-    int width;
+    private int width;
-    int height;
+    private int height;
     Dimensions(int width, int height){
         setWidth(width);
         setHeight(height);

files/src/main/java/ru/molokoin/Document.java

@@ -0,0 +1,60 @@
+package ru.molokoin;
+
+public class Document extends File{
+    private String format;
+    private int lists;
+
+    /**
+     * Базовый конструктор класса File
+     * @param name
+     * @param size
+     * @param extension
+     */
+    public Document(String name, byte size, Extension extension) {
+        super(name, size, extension);
+        //TODO Auto-generated constructor stub
+    }
+
+    /**
+     * Основной конструктор документа
+     * @param name
+     * @param size
+     * @param extension
+     * @param format
+     * @param lists
+     */
+    public Document(String name, byte size, Extension extension,String format, int lists) {
+        super(name, size, extension);
+        init(format, lists);
+    }
+
+    /**
+     * Инициируем атрибуты документа:
+     * формат и количество страниц.
+     * @param format
+     * @param lists
+     */
+    public void init(String format, int lists){
+        setFormat(format);
+        setLists(lists);
+    }
+    public void print(){
+        super.print();
+        System.out.println("format: " + getFormat());
+        System.out.println("lists: " + getLists());
+        System.out.println("--------------------------------------------");
+        
+    }
+    public void setFormat(String format) {
+        this.format = format;
+    }
+    public String getFormat() {
+        return format;
+    }
+    public void setLists(int lists) {
+        this.lists = lists;
+    }
+    public int getLists() {
+        return lists;
+    }
+}

files/src/main/java/ru/molokoin/Extension.java

@@ -1,57 +1,9 @@
 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;
-    }
 }

files/src/main/java/ru/molokoin/File.java

@@ -2,7 +2,7 @@ package ru.molokoin;
 
 /**
  * Класс - обертка
- * предоставляет инструментарий обращения с отдельным файлом
+ * 
  */
 public class File {
     private String name;

files/src/main/java/ru/molokoin/Image.java

@@ -0,0 +1,35 @@
+package ru.molokoin;
+
+public class Image extends File{
+    private String format;
+    private Dimensions dimensions;
+
+    public Image(String name, byte size, Extension extension, String format, Dimensions dimensions) {
+        super(name, size, extension);
+        init(format, dimensions);
+    }
+    public void print(){
+        super.print();
+        System.out.println("format: " + getFormat());
+        System.out.println("Dimensions: " + getDimensions().getHeight() + " x " + getDimensions().getWidth());
+        System.out.println("--------------------------------------------");
+        
+    }
+    public void init(String format, Dimensions dimensions){
+        setFormat(format);
+        setDimensions(dimensions);
+    }
+    public void setFormat(String format) {
+        this.format = format;
+    }
+    public void setDimensions(Dimensions dimensions) {
+        this.dimensions = dimensions;
+    }
+    public String getFormat() {
+        return format;
+    }
+    public Dimensions getDimensions() {
+        return dimensions;
+    }
+    
+}

files/src/main/java/ru/molokoin/Storage.java

@@ -1,26 +1,47 @@
 package ru.molokoin;
+
+import java.util.Arrays;
+
 /**
- * Класс - хранилище
+ * Класс - хранилище информации обо всех файлах
  * предоставляет инструментарий обращения с массивом файлов
  */
 public class Storage {
     private File[] files;
-
+    public Storage(){}
+    public Storage(File[] files){
+        setFiles(files);
+    }
     public void setFiles(File[] files) {
         this.files = files;
     }
     public File[] getFiles() {
         return files;
     }
-
+    public void print(){
-
+        int i = 0;
+        while (i < getFiles().length){
+            getFiles()[i].print();
+            i++;
+        }
+    }
+    public void add(File file) {
+        if(getFiles() == null){
+            File[] result = new File[1];
+            result[0] = file;
+            setFiles(result);
+        }
+        else{
+            File[] result = Arrays.copyOf(getFiles(), getFiles().length+1);
+            result[result.length - 1] = file;
+            setFiles(result);
+        }
+    }
     public static void main(String[] args) {
         Storage storage = new Storage();
-        storage.setFiles(new File[1]);
+        storage.add(new Document("myDocument", (byte)10, Extension.DOCUMENT, "txt", 5));
-        Extension e = Extension.DOCUMENT;
+        storage.add(new Image("myImage", (byte)15, Extension.IMAGE, "jpg", new Dimensions(12, 8)));
-        e.initDocument("null", 0);
+        storage.print();
-        storage.files[0] = new File("noname", (byte)0, e);
-        storage.files[0].print();
 
     }
 

files/src/main/java/ru/molokoin/Video.java

@@ -0,0 +1,10 @@
+package ru.molokoin;
+
+public class Video extends File{
+
+    public Video(String name, byte size, Extension extension) {
+        super(name, size, extension);
+        //TODO Auto-generated constructor stub
+    }
+    
+}