use generics for more elegant code

[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / commandline / parameterparser / parameter / FileParameter.java

diff --git a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/parameter/FileParameter.java b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/parameter/FileParameter.java
index 5fa357c..79b0a10 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/parameter/FileParameter.java
+++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/parameter/FileParameter.java
@@ -1,7 +1,7 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
  * Copyright ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public License
  * or later as published by the Free Software Foundation.
@@ -14,7 +14,7 @@ import java.io.File;
 import eu.svjatoslav.commons.commandline.parameterparser.ArgumentCount;
 import eu.svjatoslav.commons.commandline.parameterparser.Parameter;
 
-public class FileParameter extends Parameter {
+public class FileParameter extends Parameter<FileParameter> {
 
        private ExistanceType existanceType = ExistanceType.DOES_NOT_MATTER;
 
@@ -22,17 +22,12 @@ public class FileParameter extends Parameter {
                super(description, ArgumentCount.SINGLE);
        }
 
-       @Override
-       public FileParameter addAliases(final String... aliasArray) {
-               super.addAliases(aliasArray);
-               return this;
-       }
-
        @Override
        public java.lang.String describeFormat() {
-               return existanceType.description + "file";
+               return existanceType.description + " file";
        }
 
+       @Override
        public File getValue() {
 
                if (arguments.size() != 1)
@@ -52,12 +47,6 @@ public class FileParameter extends Parameter {
                return this;
        }
 
-       @Override
-       public FileParameter setMandatory() {
-               mandatory = true;
-               return this;
-       }
-
        @Override
        public boolean validate(final java.lang.String value) {
                final File file = new File(value);