From: Andreas Müller <a.mueller@bgbm.org>
Date: Wed, 27 Nov 2013 17:26:21 +0000 (+0000)
Subject: jvadoc/override
X-Git-Tag: cdmlib-parent-3.3.0~102
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/23d65c7be2bd24020cab95650e5e7892a78fd770

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