cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r526697 - /cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
Date Mon, 09 Apr 2007 09:59:13 GMT
Author: aadamchik
Date: Mon Apr  9 02:59:12 2007
New Revision: 526697

URL: http://svn.apache.org/viewvc?view=rev&rev=526697
Log:
no change - reformatting per project eclipse defaults

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java?view=diff&rev=526697&r1=526696&r2=526697
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
Mon Apr  9 02:59:12 2007
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.conn;
 
 import java.io.Serializable;
@@ -25,65 +24,66 @@
 import org.apache.cayenne.conf.PasswordEncoding;
 import org.apache.cayenne.util.Util;
 
-/** 
- * Helper JavaBean class that holds DataSource login information. 
- * 
- * <p><i>For more information see <a href="../../../../../../userguide/index.html"
- * target="_top">Cayenne User Guide.</a></i></p>
+/**
+ * Helper JavaBean class that holds DataSource login information.
+ * <p>
+ * <i>For more information see <a href="../../../../../../userguide/index.html"
+ * target="_top">Cayenne User Guide.</a></i>
+ * </p>
  * 
  * @author Andrus Adamchik
  */
-public class DataSourceInfo implements Cloneable, Serializable {	
-	protected String userName;
-	protected String password;
-	protected String jdbcDriver;
-	protected String dataSourceUrl;
-	protected String adapterClassName;
-	protected int minConnections = 1;
-	protected int maxConnections = 1;
+public class DataSourceInfo implements Cloneable, Serializable {
+
+    protected String userName;
+    protected String password;
+    protected String jdbcDriver;
+    protected String dataSourceUrl;
+    protected String adapterClassName;
+    protected int minConnections = 1;
+    protected int maxConnections = 1;
 
     // Constants for passwordLocation
-	public static final String PASSWORD_LOCATION_CLASSPATH  = "classpath";
+    public static final String PASSWORD_LOCATION_CLASSPATH = "classpath";
     public static final String PASSWORD_LOCATION_EXECUTABLE = "executable";
-	public static final String PASSWORD_LOCATION_MODEL      = "model";
-    public static final String PASSWORD_LOCATION_URL        = "url";
+    public static final String PASSWORD_LOCATION_MODEL = "model";
+    public static final String PASSWORD_LOCATION_URL = "url";
 
     // Extended parameters
-    protected String passwordEncoderClass     = PasswordEncoding.standardEncoders[0];
-    protected String passwordEncoderSalt      = "";
+    protected String passwordEncoderClass = PasswordEncoding.standardEncoders[0];
+    protected String passwordEncoderSalt = "";
     protected String passwordSourceExecutable = "";
-    protected String passwordSourceFilename   = "";
-    protected String passwordSourceModel      = "Not Applicable";
-    protected String passwordSourceUrl        = "";
-    protected String passwordLocation         = PASSWORD_LOCATION_MODEL;
+    protected String passwordSourceFilename = "";
+    protected String passwordSourceModel = "Not Applicable";
+    protected String passwordSourceUrl = "";
+    protected String passwordLocation = PASSWORD_LOCATION_MODEL;
+
+    public boolean equals(Object obj) {
+        if (obj == this)
+            return true;
 
+        if (obj == null)
+            return false;
 
-	public boolean equals(Object obj) {
-		if (obj == this)
-			return true;
-
-		if (obj == null)
-			return false;
-
-		if (obj.getClass() != this.getClass())
-			return false;
+        if (obj.getClass() != this.getClass())
+            return false;
 
-		DataSourceInfo dsi = (DataSourceInfo) obj;
+        DataSourceInfo dsi = (DataSourceInfo) obj;
 
         if (!Util.nullSafeEquals(this.userName, dsi.userName))
-			return false;
-		if (!Util.nullSafeEquals(this.password, dsi.password))
-			return false;
-		if (!Util.nullSafeEquals(this.jdbcDriver, dsi.jdbcDriver))
-			return false;
-		if (!Util.nullSafeEquals(this.dataSourceUrl, dsi.dataSourceUrl))
-			return false;
-		if (!Util.nullSafeEquals(this.adapterClassName, dsi.adapterClassName))
-			return false;
-		if (this.minConnections != dsi.minConnections)
-			return false;
-		if (this.maxConnections != dsi.maxConnections)
-			return false;
+            return false;
+        if (!Util.nullSafeEquals(this.password, dsi.password))
+            return false;
+        if (!Util.nullSafeEquals(this.jdbcDriver, dsi.jdbcDriver))
+            return false;
+        if (!Util.nullSafeEquals(this.dataSourceUrl, dsi.dataSourceUrl))
+            return false;
+        if (!Util.nullSafeEquals(this.adapterClassName, dsi.adapterClassName))
+            return false;
+        if (this.minConnections != dsi.minConnections)
+            return false;
+        if (this.maxConnections != dsi.maxConnections)
+            return false;
         if (!Util.nullSafeEquals(this.passwordEncoderClass, dsi.passwordEncoderClass))
             return false;
         if (!Util.nullSafeEquals(this.passwordEncoderSalt, dsi.passwordEncoderSalt))
@@ -91,279 +91,259 @@
         if (!Util.nullSafeEquals(this.passwordSourceFilename, dsi.passwordSourceFilename))
             return false;
         if (!Util.nullSafeEquals(this.passwordSourceModel, dsi.passwordSourceModel))
-          return false;
+            return false;
         if (!Util.nullSafeEquals(this.passwordSourceUrl, dsi.passwordSourceUrl))
-          return false;
+            return false;
         if (!Util.nullSafeEquals(this.passwordLocation, dsi.passwordLocation))
             return false;
 
-		return true;
-	}
+        return true;
+    }
 
-	public DataSourceInfo cloneInfo() {
-		try {
-			return (DataSourceInfo) super.clone();
-		} catch (CloneNotSupportedException ex) {
+    public DataSourceInfo cloneInfo() {
+        try {
+            return (DataSourceInfo) super.clone();
+        }
+        catch (CloneNotSupportedException ex) {
             throw new RuntimeException("Cloning error", ex);
-		}
-	}
+        }
+    }
 
-	public String toString() {
-		StringBuffer buf = new StringBuffer();
-		buf
-			.append("[")
-			.append(this.getClass().getName())
-			.append(":")
-			.append("\n   user name: ")
-			.append(userName)
-			.append("\n   password: ");
-
-		if (password == null)
-			buf.append("null");
-		else
-			buf.append("**********");
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        buf.append("[").append(this.getClass().getName()).append(":").append(
+                "\n   user name: ").append(userName).append("\n   password: ");
+
+        if (password == null)
+            buf.append("null");
+        else
+            buf.append("**********");
 
         buf
-			.append("\n   driver: ")
-			.append(jdbcDriver)
-			.append("\n   db adapter class: ")
-			.append(adapterClassName)
-			.append("\n   url: ")
-			.append(dataSourceUrl)
-			.append("\n   min. connections: ")
-			.append(minConnections)
-			.append("\n   max. connections: ")
-			.append(maxConnections)
-            .append("\n   encoder class: ")
-            .append(passwordEncoderClass)
-            .append("\n   encoder salt: ")
-            .append(passwordEncoderSalt)
-            .append("\n   password location: ")
-            .append(passwordLocation)
-            .append("\n   password source: ")
-            .append(getPasswordSource())
-			.append("\n]");
-
-		return buf.toString();
-	}
-
-	public String getAdapterClassName() {
-		return adapterClassName;
-	}
-
-	public void setAdapterClassName(String adapterClassName) {
-		this.adapterClassName = adapterClassName;
-	}
-
-	public void setMinConnections(int minConnections) {
-		this.minConnections = minConnections;
-	}
-
-	public int getMinConnections() {
-		return minConnections;
-	}
-
-	public void setMaxConnections(int maxConnections) {
-		this.maxConnections = maxConnections;
-	}
-
-	public int getMaxConnections() {
-		return maxConnections;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setJdbcDriver(String jdbcDriver) {
-		this.jdbcDriver = jdbcDriver;
-	}
-
-	public String getJdbcDriver() {
-		return jdbcDriver;
-	}
-
-	public void setDataSourceUrl(String dataSourceUrl) {
-		this.dataSourceUrl = dataSourceUrl;
-	}
-
-	public String getDataSourceUrl() {
-		return dataSourceUrl;
-	}
-
-
-	public PasswordEncoding getPasswordEncoder()
-    {
-      PasswordEncoding encoder = null;
-
-      try
-      {
-        encoder = (PasswordEncoding) Thread.currentThread().getContextClassLoader().loadClass(getPasswordEncoderClass()).newInstance();
-        //encoder = (PasswordEncoding) Class.forName(getPasswordEncoderClass()).newInstance();
-      }
-      catch (InstantiationException exception)
-      {
-        // TODO Auto-generated catch block
-        exception.printStackTrace();
-      }
-      catch (IllegalAccessException exception)
-      {
-        // TODO Auto-generated catch block
-        exception.printStackTrace();
-      }
-      catch (ClassNotFoundException exception)
-      {
-        // TODO Auto-generated catch block
-        exception.printStackTrace();
-      }
-      
-      return encoder;
-    }
-   
-  /**
-   * @return the passwordEncoderClass
-   */
-  public String getPasswordEncoderClass()
-  {
-    return passwordEncoderClass;
-  }
-
-  /**
-   * @param passwordEncoderClass the passwordEncoderClass to set
-   */
-  public void setPasswordEncoderClass(String passwordEncoderClass)
-  {
-    if (passwordEncoderClass == null)
-      this.passwordEncoderClass = PasswordEncoding.standardEncoders[0];
-    else
-      this.passwordEncoderClass = passwordEncoderClass;
-  }
-
-  /**
-   * @return the passwordEncoderSalt
-   */
-  public String getPasswordEncoderSalt()
-  {
-    return passwordEncoderSalt;
-  }
-
-  /**
-   * @param passwordEncoderSalt the passwordEncoderSalt to set
-   */
-  public void setPasswordEncoderSalt(String passwordEncoderSalt)
-  {
-    this.passwordEncoderSalt = passwordEncoderSalt;
-  }
-
-  /**
-   * @return the passwordLocationFilename
-   */
-  public String getPasswordSourceFilename()
-  {
-    return passwordSourceFilename;
-  }
-
-  /**
-   * @param passwordSourceFilename the passwordSourceFilename to set
-   */
-  public void setPasswordSourceFilename(String passwordSourceFilename)
-  {
-    this.passwordSourceFilename = passwordSourceFilename;
-  }
-
-  /**
-   * @return the passwordLocationModel
-   */
-  public String getPasswordSourceModel()
-  {
-    return passwordSourceModel;
-  }
-
-  /**
-   * @return the passwordLocationUrl
-   */
-  public String getPasswordSourceUrl()
-  {
-    return passwordSourceUrl;
-  }
-
-  /**
-   * @param passwordSourceUrl the passwordSourceUrl to set
-   */
-  public void setPasswordSourceUrl(String passwordSourceUrl)
-  {
-    this.passwordSourceUrl = passwordSourceUrl;
-  }
-
-  /**
-   * @return the passwordLocationExecutable
-   */
-  public String getPasswordSourceExecutable()
-  {
-    return passwordSourceExecutable;
-  }
-
-  /**
-   * @param passwordSourceExecutable the passwordSourceExecutable to set
-   */
-  public void setPasswordSourceExecutable(String passwordSourceExecutable)
-  {
-    this.passwordSourceExecutable = passwordSourceExecutable;
-  }
-
-  public String getPasswordSource()
-  {
-    if (getPasswordLocation().equals(PASSWORD_LOCATION_CLASSPATH))
-      return getPasswordSourceFilename();
-    else if (getPasswordLocation().equals(PASSWORD_LOCATION_EXECUTABLE))
-      return getPasswordSourceExecutable();
-    else if (getPasswordLocation().equals(PASSWORD_LOCATION_MODEL))
-      return getPasswordSourceModel();
-    else if (getPasswordLocation().equals(PASSWORD_LOCATION_URL))
-      return getPasswordSourceUrl();
-
-    throw new RuntimeException("Invalid password source detected");
-  }
-  
-  public void setPasswordSource(String passwordSource)
-  {
-    // The location for the model is omitted since it cannot change
-    if (getPasswordLocation().equals(PASSWORD_LOCATION_CLASSPATH))
-      setPasswordSourceFilename(passwordSource);
-    else if (getPasswordLocation().equals(PASSWORD_LOCATION_EXECUTABLE))
-      setPasswordSourceExecutable(passwordSource);
-    else if (getPasswordLocation().equals(PASSWORD_LOCATION_URL))
-      setPasswordSourceUrl(passwordSource);
-  }
-
-  /**
-   * @return the passwordLocation
-   */
-  public String getPasswordLocation()
-  {
-    return passwordLocation;
-  }
-
-  /**
-   * @param passwordLocation the passwordLocation to set
-   */
-  public void setPasswordLocation(String passwordLocation)
-  {
-    if (passwordLocation == null)
-      this.passwordLocation = DataSourceInfo.PASSWORD_LOCATION_MODEL;
-    else
-      this.passwordLocation = passwordLocation;
-  }
+                .append("\n   driver: ")
+                .append(jdbcDriver)
+                .append("\n   db adapter class: ")
+                .append(adapterClassName)
+                .append("\n   url: ")
+                .append(dataSourceUrl)
+                .append("\n   min. connections: ")
+                .append(minConnections)
+                .append("\n   max. connections: ")
+                .append(maxConnections)
+                .append("\n   encoder class: ")
+                .append(passwordEncoderClass)
+                .append("\n   encoder salt: ")
+                .append(passwordEncoderSalt)
+                .append("\n   password location: ")
+                .append(passwordLocation)
+                .append("\n   password source: ")
+                .append(getPasswordSource())
+                .append("\n]");
+
+        return buf.toString();
+    }
+
+    public String getAdapterClassName() {
+        return adapterClassName;
+    }
+
+    public void setAdapterClassName(String adapterClassName) {
+        this.adapterClassName = adapterClassName;
+    }
+
+    public void setMinConnections(int minConnections) {
+        this.minConnections = minConnections;
+    }
+
+    public int getMinConnections() {
+        return minConnections;
+    }
+
+    public void setMaxConnections(int maxConnections) {
+        this.maxConnections = maxConnections;
+    }
+
+    public int getMaxConnections() {
+        return maxConnections;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setJdbcDriver(String jdbcDriver) {
+        this.jdbcDriver = jdbcDriver;
+    }
+
+    public String getJdbcDriver() {
+        return jdbcDriver;
+    }
+
+    public void setDataSourceUrl(String dataSourceUrl) {
+        this.dataSourceUrl = dataSourceUrl;
+    }
+
+    public String getDataSourceUrl() {
+        return dataSourceUrl;
+    }
+
+    public PasswordEncoding getPasswordEncoder() {
+        PasswordEncoding encoder = null;
+
+        try {
+            encoder = (PasswordEncoding) Thread
+                    .currentThread()
+                    .getContextClassLoader()
+                    .loadClass(getPasswordEncoderClass())
+                    .newInstance();
+            // encoder = (PasswordEncoding)
+            // Class.forName(getPasswordEncoderClass()).newInstance();
+        }
+        catch (InstantiationException exception) {
+            // TODO Auto-generated catch block
+            exception.printStackTrace();
+        }
+        catch (IllegalAccessException exception) {
+            // TODO Auto-generated catch block
+            exception.printStackTrace();
+        }
+        catch (ClassNotFoundException exception) {
+            // TODO Auto-generated catch block
+            exception.printStackTrace();
+        }
+
+        return encoder;
+    }
+
+    /**
+     * @return the passwordEncoderClass
+     */
+    public String getPasswordEncoderClass() {
+        return passwordEncoderClass;
+    }
+
+    /**
+     * @param passwordEncoderClass the passwordEncoderClass to set
+     */
+    public void setPasswordEncoderClass(String passwordEncoderClass) {
+        if (passwordEncoderClass == null)
+            this.passwordEncoderClass = PasswordEncoding.standardEncoders[0];
+        else
+            this.passwordEncoderClass = passwordEncoderClass;
+    }
+
+    /**
+     * @return the passwordEncoderSalt
+     */
+    public String getPasswordEncoderSalt() {
+        return passwordEncoderSalt;
+    }
+
+    /**
+     * @param passwordEncoderSalt the passwordEncoderSalt to set
+     */
+    public void setPasswordEncoderSalt(String passwordEncoderSalt) {
+        this.passwordEncoderSalt = passwordEncoderSalt;
+    }
+
+    /**
+     * @return the passwordLocationFilename
+     */
+    public String getPasswordSourceFilename() {
+        return passwordSourceFilename;
+    }
+
+    /**
+     * @param passwordSourceFilename the passwordSourceFilename to set
+     */
+    public void setPasswordSourceFilename(String passwordSourceFilename) {
+        this.passwordSourceFilename = passwordSourceFilename;
+    }
+
+    /**
+     * @return the passwordLocationModel
+     */
+    public String getPasswordSourceModel() {
+        return passwordSourceModel;
+    }
+
+    /**
+     * @return the passwordLocationUrl
+     */
+    public String getPasswordSourceUrl() {
+        return passwordSourceUrl;
+    }
+
+    /**
+     * @param passwordSourceUrl the passwordSourceUrl to set
+     */
+    public void setPasswordSourceUrl(String passwordSourceUrl) {
+        this.passwordSourceUrl = passwordSourceUrl;
+    }
+
+    /**
+     * @return the passwordLocationExecutable
+     */
+    public String getPasswordSourceExecutable() {
+        return passwordSourceExecutable;
+    }
+
+    /**
+     * @param passwordSourceExecutable the passwordSourceExecutable to set
+     */
+    public void setPasswordSourceExecutable(String passwordSourceExecutable) {
+        this.passwordSourceExecutable = passwordSourceExecutable;
+    }
+
+    public String getPasswordSource() {
+        if (getPasswordLocation().equals(PASSWORD_LOCATION_CLASSPATH))
+            return getPasswordSourceFilename();
+        else if (getPasswordLocation().equals(PASSWORD_LOCATION_EXECUTABLE))
+            return getPasswordSourceExecutable();
+        else if (getPasswordLocation().equals(PASSWORD_LOCATION_MODEL))
+            return getPasswordSourceModel();
+        else if (getPasswordLocation().equals(PASSWORD_LOCATION_URL))
+            return getPasswordSourceUrl();
+
+        throw new RuntimeException("Invalid password source detected");
+    }
+
+    public void setPasswordSource(String passwordSource) {
+        // The location for the model is omitted since it cannot change
+        if (getPasswordLocation().equals(PASSWORD_LOCATION_CLASSPATH))
+            setPasswordSourceFilename(passwordSource);
+        else if (getPasswordLocation().equals(PASSWORD_LOCATION_EXECUTABLE))
+            setPasswordSourceExecutable(passwordSource);
+        else if (getPasswordLocation().equals(PASSWORD_LOCATION_URL))
+            setPasswordSourceUrl(passwordSource);
+    }
+
+    /**
+     * @return the passwordLocation
+     */
+    public String getPasswordLocation() {
+        return passwordLocation;
+    }
+
+    /**
+     * @param passwordLocation the passwordLocation to set
+     */
+    public void setPasswordLocation(String passwordLocation) {
+        if (passwordLocation == null)
+            this.passwordLocation = DataSourceInfo.PASSWORD_LOCATION_MODEL;
+        else
+            this.passwordLocation = passwordLocation;
+    }
 }



Mime
View raw message