jvadoc/override

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
index 3b466637745ea0d1483796ef5c0277ae175ea101..ea23ee772f24c3bdc99ae57ca0a9cb373a7db679 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
@@ -153,10 +153,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
                dataSourceName = strDataSource;\r
        }\r
        \r
-       /**\r
-        * Returns the name of the bean.\r
-        * @return\r
-        */\r
+       @Override\r
        public String getName(){\r
                return dataSourceName;\r
        }\r
@@ -172,31 +169,33 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
 \r
 \r
        \r
+       @Override\r
        public String getDatabase() {\r
                return getDatabaseProperty(DbProperties.DATABASE);\r
        }\r
 \r
 \r
+       @Override\r
        public String getFilePath() {\r
                //TODO null\r
                return getDatabaseProperty(DbProperties.FILEPATH);\r
        }\r
 \r
 \r
+       @Override\r
        public H2Mode getMode() {\r
                //TODO null\r
                return H2Mode.fromString(getDatabaseProperty(DbProperties.MODE));\r
        }\r
        \r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.database.ICdmDataSource#getNomenclaturalCode()\r
-        */\r
+       @Override\r
        public NomenclaturalCode getNomenclaturalCode() {\r
                // TODO null\r
                return NomenclaturalCode.fromString(getDatabaseProperty(DbProperties.NOMENCLATURAL_CODE));\r
        }\r
 \r
+       @Override\r
        public int getPort() {\r
                String port = CdmUtils.Nz(getDatabaseProperty(DbProperties.PORT));\r
                if ("".equals(port)){\r
@@ -208,14 +207,13 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
        }\r
 \r
 \r
+       @Override\r
        public String getServer() {\r
                return getDatabaseProperty(DbProperties.SERVER);\r
        }\r
 \r
-       /**\r
-        * Returns the database type of the data source. \r
-        * @return the database type of the data source. Null if the bean or the driver class property does not exist or the driver class is unknown.\r
-        */\r
+\r
+       @Override\r
        public DatabaseTypeEnum getDatabaseType(){\r
                Element bean = getDatasourceBeanXml(this.dataSourceName);\r
                if (bean == null){\r
@@ -342,6 +340,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
         * @return\r
         */\r
        @SuppressWarnings("unchecked")\r
+       @Override\r
        public BeanDefinition getDatasourceBean(){\r
                DatabaseTypeEnum dbtype = DatabaseTypeEnum.getDatabaseEnumByDriverClass(getDatasourceProperty(DbProperties.DRIVER_CLASS));\r
                \r
@@ -387,6 +386,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
         * @param showSql\r
         * @return\r
         */\r
+       @Override\r
        public BeanDefinition getHibernatePropertiesBean(DbSchemaValidation hbm2dll){\r
                boolean showSql = false;\r
                boolean formatSql = false;\r
@@ -401,6 +401,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
         * @param showSql\r
         * @return\r
         */\r
+       @Override\r
        public BeanDefinition getHibernatePropertiesBean(DbSchemaValidation hbm2dll, Boolean showSql, Boolean formatSql, Boolean registerSearchListener, Class<? extends RegionFactory> cacheProviderClass){\r
                //Hibernate default values\r
                if (hbm2dll == null){\r
@@ -646,26 +647,17 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
                return dataSources;\r
        }\r
        \r
+       @Override\r
        public String getUsername(){\r
                return getDatasourceProperty(DbProperties.USERNAME);\r
        }\r
        \r
+       @Override\r
        public String getPassword(){\r
                return getDatasourceProperty(DbProperties.PASSWORD);\r
        }\r
 \r
 \r
-       /* (non-Javadoc)\r
-        * @see java.lang.Object#toString()\r
-        */\r
-       public String toString(){\r
-               if (this.dataSourceName != null){\r
-                       return dataSourceName;\r
-               }else{\r
-                       return null;\r
-               }\r
-       }\r
-\r
 \r
        \r
        /**\r
@@ -739,6 +731,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
                }\r
        }\r
        \r
+       @Override\r
        public boolean equals(Object obj){\r
                if (obj == null){\r
                        return false;\r
@@ -750,4 +743,14 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
                }\r
 \r
        }\r
+       \r
+       @Override\r
+       public String toString(){\r
+               if (this.dataSourceName != null){\r
+                       return dataSourceName;\r
+               }else{\r
+                       return null;\r
+               }\r
+       }\r
+\r
 }
\ No newline at end of file

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/ICdmDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/ICdmDataSource.java
index f5a0ded3ae8d5a4aba6ab4f279bd86a7df967ef2..60c6fe2565bba049605809248537ad94580624ca 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/ICdmDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/ICdmDataSource.java
@@ -61,6 +61,11 @@ public interface ICdmDataSource {
         */\r
        public String getDatabase();\r
        \r
+       /**\r
+        * Returns the database type of the data source. \r
+        * @return the database type of the data source. \r
+        * <code>null</code> if the bean or the driver class property does not exist or the driver class is unknown.\r
+        */\r
        public DatabaseTypeEnum getDatabaseType();\r
        \r
        /**\r