db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r545579 - in /db/derby/code/trunk/java/engine/org/apache/derby: catalog/TypeDescriptor.java iapi/types/DataTypeDescriptor.java
Date Fri, 08 Jun 2007 18:21:29 GMT
Author: djd
Date: Fri Jun  8 11:21:28 2007
New Revision: 545579

URL: http://svn.apache.org/viewvc?view=rev&rev=545579
Log:
DERBY-2775 (partial) Remove the setCollation methods from TypeDescriptor as it presents a
read-only view
of a type.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java?view=diff&rev=545579&r1=545578&r2=545579
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java Fri Jun 
8 11:21:28 2007
@@ -160,16 +160,6 @@
 	public int getCollationType();
 
 	/**
-	 * Set the collation type of this TypeDescriptor
-	 * @param collationTypeValue This will be COLLATION_TYPE_UCS_BASIC
-     * or COLLATION_TYPE_TERRITORY_BASED
-     * 
-     * @see StringDataValue#COLLATION_TYPE_UCS_BASIC
-     * @see StringDataValue#COLLATION_TYPE_TERRITORY_BASED
-	 */
-	public void setCollationType(int collationTypeValue);
-
-	/**
 	 * Get the collation derivation for this type. This applies only for
 	 * character string types. For the other types, this api should be
 	 * ignored.
@@ -206,19 +196,6 @@
      * @see StringDataValue#COLLATION_DERIVATION_EXPLICIT
 	 */
 	public int getCollationDerivation();
-
-	/**
-	 * Set the collation derivation of this DTD
-	 * @param collationDerivationValue This will be 
-	 * COLLATION_DERIVATION_NONE/COLLATION_DERIVATION_IMPLICIT/COLLATION_DERIVATION_EXPLICIT
-	 * In Derby 10.3, we do not expect to get value COLLATION_DERIVATION_EXPLICIT.
-     * 
-     * @see StringDataValue#COLLATION_DERIVATION_NONE
-     * @see StringDataValue#COLLATION_DERIVATION_IMPLICIT
-     * @see StringDataValue#COLLATION_DERIVATION_EXPLICIT
-
-	 */
-	public void setCollationDerivation(int collationDerivationValue);
 
 	/**
 	 * Gets the name of the collation type in this descriptor.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java?view=diff&rev=545579&r1=545578&r2=545579
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java Fri
Jun  8 11:21:28 2007
@@ -21,38 +21,23 @@
 
 package org.apache.derby.iapi.types;
 
-import org.apache.derby.iapi.services.io.Formatable;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.services.loader.ClassFactory;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.sql.Types;
+import java.text.RuleBasedCollator;
 
 import org.apache.derby.catalog.TypeDescriptor;
 import org.apache.derby.catalog.types.TypeDescriptorImpl;
-
-import org.apache.derby.iapi.services.sanity.SanityManager;
-
-import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.services.io.FormatIdUtil;
-import org.apache.derby.iapi.services.io.Formatable;
-
 import org.apache.derby.iapi.error.StandardException;
-
-import org.apache.derby.iapi.types.RowLocation;
-
+import org.apache.derby.iapi.reference.SQLState;
+import org.apache.derby.iapi.services.io.Formatable;
+import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.loader.ClassFactory;
 import org.apache.derby.iapi.services.loader.ClassInspector;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.sql.conn.ConnectionUtil;
 
-import java.text.RuleBasedCollator;
-
-import org.apache.derby.iapi.reference.JDBC30Translation;
-import org.apache.derby.iapi.reference.SQLState;
-
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-
-import java.sql.Types;
-
 /**
  * This is an implementation of DataTypeDescriptor from the generic language
  * datatype module interface.
@@ -868,8 +853,15 @@
         return(typeDescriptor.getCollationName());
 	}
 
-	/** @see TypeDescriptor#setCollationType(int) */
-	public void	setCollationType(int collationTypeValue)
+    /**
+     * Set the collation type of this TypeDescriptor
+     * @param collationTypeValue This will be COLLATION_TYPE_UCS_BASIC
+     * or COLLATION_TYPE_TERRITORY_BASED
+     * 
+     * @see StringDataValue#COLLATION_TYPE_UCS_BASIC
+     * @see StringDataValue#COLLATION_TYPE_TERRITORY_BASED
+     */
+    public void	setCollationType(int collationTypeValue)
 	{
 		typeDescriptor.setCollationType(collationTypeValue);
 	}
@@ -880,7 +872,17 @@
 		return typeDescriptor.getCollationDerivation();
 	}
 
-	/** @see TypeDescriptor#setCollationDerivation(int) */
+    /**
+     * Set the collation derivation of this DTD
+     * @param collationDerivationValue This will be 
+     * COLLATION_DERIVATION_NONE/COLLATION_DERIVATION_IMPLICIT/COLLATION_DERIVATION_EXPLICIT
+     * In Derby 10.3, we do not expect to get value COLLATION_DERIVATION_EXPLICIT.
+     * 
+     * @see StringDataValue#COLLATION_DERIVATION_NONE
+     * @see StringDataValue#COLLATION_DERIVATION_IMPLICIT
+     * @see StringDataValue#COLLATION_DERIVATION_EXPLICIT
+
+     */
 	public void	setCollationDerivation(int collationDerivationValue)
 	{
 		typeDescriptor.setCollationDerivation(collationDerivationValue);



Mime
View raw message