db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1480941 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/
Date Fri, 10 May 2013 08:56:20 GMT
Author: kahatlen
Date: Fri May 10 08:56:19 2013
New Revision: 1480941

URL: http://svn.apache.org/r1480941
Log:
DERBY-6169: Reduce visibility of classes and methods under impl/sql

Reduce visibility of some methods and fields in impl/sql/compile that
expose package-private classes outside of the package.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
Fri May 10 08:56:19 2013
@@ -154,7 +154,7 @@ public class ConstraintDefinitionNode ex
 	 *
 	 * @exception StandardException on error
 	 */
-	protected void bind(DDLStatementNode ddlNode, DataDictionary dd)	throws StandardException
+    void bind(DDLStatementNode ddlNode, DataDictionary dd) throws StandardException
 	{
 		// we need to allow drops on constraints with different schemas
 		// to support removing constraints created pre 5.2.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java Fri
May 10 08:56:19 2013
@@ -84,10 +84,9 @@ public class DeleteNode extends DMLModSt
 	private static final String COLUMNNAME = "###RowLocationToDelete";
 
 	/* Filled in by bind. */
-	protected boolean				deferred;
-	protected FromTable				targetTable;
-	protected FKInfo				fkInfo;
-	protected FormatableBitSet readColsBitSet;
+    private boolean deferred;
+    private FromTable targetTable;
+    private FormatableBitSet readColsBitSet;
 
 	private ConstantAction[] dependentConstantActions;
 	private boolean cascadeDelete;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
Fri May 10 08:56:19 2013
@@ -81,7 +81,7 @@ public final class FKConstraintDefinitio
 	 * 
 	 * @exception StandardException on error
 	 */
-	protected void bind(DDLStatementNode ddlNode, DataDictionary dd)	throws StandardException
+    void bind(DDLStatementNode ddlNode, DataDictionary dd) throws StandardException
 	{
 		super.bind(ddlNode, dd);
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java Fri May
10 08:56:19 2013
@@ -142,7 +142,7 @@ public class FromList extends QueryTreeN
 	 * @exception StandardException		Thrown on error
 	 */
 
-	public void addFromTable(FromTable fromTable) throws StandardException
+    void addFromTable(FromTable fromTable) throws StandardException
 	{
 		/* Don't worry about checking TableOperatorNodes since
 		 * they don't have exposed names.  This will potentially
@@ -262,10 +262,9 @@ public class FromList extends QueryTreeN
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+    FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
 		throws StandardException
 	{
-		boolean			found = false;
 		FromTable		fromTable;
 		FromTable		result = null;
 
@@ -872,7 +871,7 @@ public class FromList extends QueryTreeN
 	 *
 	 * @return FromTable	The matching FromTable.
 	 */
-	public FromTable getFromTableByResultColumn(ResultColumn rc)
+    FromTable getFromTableByResultColumn(ResultColumn rc)
 	{
 		FromTable	fromTable = null;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java Fri May
10 08:56:19 2013
@@ -1382,7 +1382,7 @@ abstract class FromTable extends ResultS
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
+    FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
 		throws StandardException
 	{
 		return this;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java Fri May
10 08:56:19 2013
@@ -448,7 +448,7 @@ public class FromVTI extends FromTable i
 	/** 
 	 * Return the constructor or static method invoked from this node
 	 */
-	public MethodCallNode getMethodCall()
+    final MethodCallNode getMethodCall()
 	{
 		return methodCall;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
Fri May 10 08:56:19 2013
@@ -95,7 +95,7 @@ public final class GetCurrentConnectionN
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void preprocess(int numTables,
+    void preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
 								PredicateList outerPredicateList) 
@@ -127,7 +127,7 @@ public final class GetCurrentConnectionN
 	 * @return boolean		Whether or not source.expression is a ColumnReference
 	 *						or a VirtualColumnNode.
 	 */
-	public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+    boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	{
 		return false;
 	}
@@ -139,7 +139,7 @@ public final class GetCurrentConnectionN
 	 * @return JavaValueNode			The remapped expression tree.
 	 *
 	 */
-	public JavaValueNode remapColumnReferencesToExpressions()
+    JavaValueNode remapColumnReferencesToExpressions()
 	{
 		return this;
 	}
@@ -164,7 +164,7 @@ public final class GetCurrentConnectionN
 	 *
 	 * @return	The variant type for the underlying expression.
 	 */
-	protected int getOrderableVariantType()
+    int getOrderableVariantType()
 	{
 		return Qualifier.QUERY_INVARIANT;
 	}
@@ -177,8 +177,7 @@ public final class GetCurrentConnectionN
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void generateExpression(ExpressionClassBuilder acb,
-											MethodBuilder mb)
+    void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 									throws StandardException
 	{
 		mb.pushThis();
@@ -192,7 +191,7 @@ public final class GetCurrentConnectionN
 
 		@see org.apache.derby.iapi.sql.compile.CompilerContext
 	*/
-	public void checkReliability(ValueNode sqlNode)
+    void checkReliability(ValueNode sqlNode)
 		throws StandardException {
 		sqlNode.checkReliability("getCurrentConnection()",
 			CompilerContext.CURRENT_CONNECTION_ILLEGAL);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java Fri
May 10 08:56:19 2013
@@ -782,7 +782,7 @@ public class GroupByNode extends SingleC
 	 *
 	 * @return the parent node
 	 */
-	public FromTable getParent()
+    final FromTable getParent()
 	{
 		return parent;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
Fri May 10 08:56:19 2013
@@ -644,7 +644,7 @@ private boolean isNullRejecting (
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
+    FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
 		throws StandardException
 	{
 		ResultSetNode innerRS;
@@ -802,8 +802,7 @@ private boolean isNullRejecting (
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	 protected int addOuterJoinArguments(ActivationClassBuilder acb,
-											MethodBuilder mb)
+    int addOuterJoinArguments(ActivationClassBuilder acb, MethodBuilder mb)
 		 throws StandardException
 	 {
 		/* Nulls always generated from the right */
@@ -824,8 +823,7 @@ private boolean isNullRejecting (
 		return super.getNumJoinArguments() + 2;
 	}
 
-	protected void oneRowRightSide(ActivationClassBuilder acb,
-									   MethodBuilder mb)
+    void oneRowRightSide(ActivationClassBuilder acb, MethodBuilder mb)
 	{
 		// always return false for now
 		mb.push(false);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
Fri May 10 08:56:19 2013
@@ -692,7 +692,7 @@ public final class InListOperatorNode ex
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void generateStartStopKey(boolean isAsc, boolean isStartKey,
+    void generateStartStopKey(boolean isAsc, boolean isStartKey,
 									 ExpressionClassBuilder acb,
 									 MethodBuilder mb)
 											   throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
Fri May 10 08:56:19 2013
@@ -200,7 +200,7 @@ public class JavaToSQLValueNode extends 
 	 * @return	The JavaValueNode that lives under this node.
 	 */
 
-	public JavaValueNode getJavaValueNode()
+    JavaValueNode getJavaValueNode()
 	{
 		return javaNode;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java Fri
May 10 08:56:19 2013
@@ -74,12 +74,12 @@ abstract class JavaValueNode extends Que
     /**
      * Get the resolved data type of this node. May be overridden by descendants.
      */
-    public DataTypeDescriptor getDataType() throws StandardException
+    DataTypeDescriptor getDataType() throws StandardException
     {
         return DataTypeDescriptor.getSQLDataTypeDescriptor( getJavaTypeName()) ;
     }
 
-	public boolean isPrimitiveType() throws StandardException
+    final boolean isPrimitiveType() throws StandardException
 	{
 		JSQLType	myType = getJSQLType();
 		
@@ -87,7 +87,7 @@ abstract class JavaValueNode extends Que
 		else { return ( myType.getCategory() == JSQLType.JAVA_PRIMITIVE ); }
 	}
 
-	public String getJavaTypeName() throws StandardException
+    String getJavaTypeName() throws StandardException
 	{
 		JSQLType	myType = getJSQLType();
 
@@ -108,12 +108,12 @@ abstract class JavaValueNode extends Que
 		return "";
 	}
 
-	public void setJavaTypeName(String javaTypeName)
+    final void setJavaTypeName(String javaTypeName)
 	{
 		jsqlType = new JSQLType( javaTypeName );
 	}
 
-	public String getPrimitiveTypeName()
+    String getPrimitiveTypeName()
 		throws StandardException
 	{
 		JSQLType	myType = getJSQLType();
@@ -140,7 +140,7 @@ abstract class JavaValueNode extends Que
 	  *	@param	booleanValue	true if we want the code generator to add a cast
 	  *							false otherwise
 	  */
-	public void castToPrimitive(boolean booleanValue)
+    final void castToPrimitive(boolean booleanValue)
 	{
 		mustCastToPrimitive = booleanValue;
 	}
@@ -152,7 +152,7 @@ abstract class JavaValueNode extends Que
 	  *	@return	true if we want the code generator to add a cast
 	  *				false otherwise
 	  */
-	public	boolean	mustCastToPrimitive() { return mustCastToPrimitive; }
+    final boolean mustCastToPrimitive() { return mustCastToPrimitive; }
 
 	/**
 	  *	Get the JSQLType that corresponds to this node. Could be a SQLTYPE,
@@ -161,8 +161,9 @@ abstract class JavaValueNode extends Que
 	  *	@return	the corresponding JSQLType
 	  *
 	  */
-	public	JSQLType	getJSQLType() throws StandardException
-	{ return jsqlType; }
+    JSQLType getJSQLType() throws StandardException {
+        return jsqlType;
+    }
 
 
 	/**
@@ -173,7 +174,7 @@ abstract class JavaValueNode extends Que
 	  *	@return	the corresponding compilation type id
 	  *
 	  */
-	public	static  TypeId	mapToTypeID( JSQLType jsqlType )
+    static TypeId mapToTypeID(JSQLType jsqlType)
         throws StandardException
 	{
 		DataTypeDescriptor	dts = jsqlType.getSQLType();
@@ -187,7 +188,7 @@ abstract class JavaValueNode extends Que
 	 * Mark this node as being for a CALL Statement.
 	 * (void methods are only okay for CALL Statements)
 	 */
-	public void markForCallStatement()
+    final void markForCallStatement()
 	{
 		forCallStatement = true;
 	}
@@ -197,7 +198,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	abstract public JavaValueNode remapColumnReferencesToExpressions()
+    abstract JavaValueNode remapColumnReferencesToExpressions()
 		throws StandardException;
 
 	/**
@@ -205,7 +206,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	abstract public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+    abstract boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 		throws StandardException;
 
 	/**
@@ -222,7 +223,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	abstract public void preprocess(int numTables,
+    abstract void preprocess(int numTables,
 									FromList outerFromList,
 									SubqueryList outerSubqueryList,
 									PredicateList outerPredicateList)
@@ -276,7 +277,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	protected boolean generateReceiver(ExpressionClassBuilder acb,
+    boolean generateReceiver(ExpressionClassBuilder acb,
 													MethodBuilder mb)
 									throws StandardException
 	{
@@ -295,7 +296,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @return	The variant type for the underlying expression.
 	 */
-	protected int getOrderableVariantType() throws StandardException
+    int getOrderableVariantType() throws StandardException
 	{
 		// The default is VARIANT
 		return Qualifier.VARIANT;
@@ -311,8 +312,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-
-	protected abstract  void generateExpression(
+    abstract void generateExpression(
 											ExpressionClassBuilder acb,
 											MethodBuilder mb)
 									throws StandardException;
@@ -349,7 +349,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	protected final boolean generateReceiver(ExpressionClassBuilder acb,
+    final boolean generateReceiver(ExpressionClassBuilder acb,
 											MethodBuilder mb,
 											JavaValueNode receiver)
 									throws StandardException
@@ -394,7 +394,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	protected final void getReceiverExpression(ExpressionClassBuilder acb,
+    final void getReceiverExpression(ExpressionClassBuilder acb,
 									MethodBuilder mb,
 									JavaValueNode receiver)
 										throws StandardException
@@ -410,25 +410,25 @@ abstract class JavaValueNode extends Que
 	}
 
 	/** Inform this node that it returns its value to the SQL domain */
-	protected void returnValueToSQLDomain()
+    void returnValueToSQLDomain()
 	{
 		valueReturnedToSQLDomain = true;
 	}
 
 	/** Tell whether this node returns its value to the SQL domain */
-	protected boolean valueReturnedToSQLDomain()
+    boolean valueReturnedToSQLDomain()
 	{
 		return valueReturnedToSQLDomain;
 	}
 
 	/** Tell this node that nothing is done with the returned value */
-	protected void markReturnValueDiscarded()
+    void markReturnValueDiscarded()
 	{
 		returnValueDiscarded = true;
 	}
 
 	/** Tell whether the return value from this node is discarded */
-	protected boolean returnValueDiscarded()
+    boolean returnValueDiscarded()
 	{
 		return returnValueDiscarded;
 	}
@@ -440,7 +440,7 @@ abstract class JavaValueNode extends Que
 
 		@see org.apache.derby.iapi.sql.compile.CompilerContext
 	*/
-	public void checkReliability(ValueNode sqlNode) throws StandardException {
+    void checkReliability(ValueNode sqlNode) throws StandardException {
         sqlNode.checkReliability( 
                 CompilerContext.FUNCTION_CALL_ILLEGAL,
                 SQLState.LANG_JAVA_METHOD_CALL_OR_FIELD_REF
@@ -450,7 +450,7 @@ abstract class JavaValueNode extends Que
     /**
      * @return collationType as set by setCollationType
      */
-    public int getCollationType() {
+    int getCollationType() {
         return collationType;
     }
     
@@ -462,7 +462,7 @@ abstract class JavaValueNode extends Que
      * @param type one of <code>StringDataValue.COLLATION_TYPE_UCS_BASIC </code>
or
      *                    <code>StringDataValue.COLLATION_TYPE_TERRITORY_BASED </code>
 
      */
-    public void setCollationType(int type) {
+    void setCollationType(int type) {
         collationType = type;
     }
     

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java Fri May
10 08:56:19 2013
@@ -1508,7 +1508,7 @@ public class JoinNode extends TableOpera
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
+    FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
 		throws StandardException
 	{
 		/* Can't flatten if no predicates in where clause. */
@@ -1554,7 +1554,7 @@ public class JoinNode extends TableOpera
 	 *
 	 * @exception StandardException		Thrown on error
      */
-	public void generateCore(ActivationClassBuilder acb,
+    void generateCore(ActivationClassBuilder acb,
 								   MethodBuilder mb,
 								   int joinType) 
 			throws StandardException
@@ -1573,7 +1573,7 @@ public class JoinNode extends TableOpera
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	protected void generateCore(ActivationClassBuilder acb,
+    void generateCore(ActivationClassBuilder acb,
 									  MethodBuilder mb,
 									  int joinType,
 									  ValueNode joinClause,
@@ -1754,8 +1754,7 @@ public class JoinNode extends TableOpera
 		return finalCostEstimate;
 	}
 
-	protected void oneRowRightSide(ActivationClassBuilder acb,
-									   MethodBuilder mb)
+    void oneRowRightSide(ActivationClassBuilder acb, MethodBuilder mb)
 		throws StandardException
 	{
 		mb.push(rightResultSet.isOneRowResultSet());
@@ -1782,8 +1781,7 @@ public class JoinNode extends TableOpera
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	 protected int addOuterJoinArguments(ActivationClassBuilder acb,
-											MethodBuilder mb)
+    int addOuterJoinArguments(ActivationClassBuilder acb, MethodBuilder mb)
 		 throws StandardException
 	 {
 		 return 0;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
Fri May 10 08:56:19 2013
@@ -417,7 +417,7 @@ abstract class MethodCallNode extends Ja
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void preprocess(int numTables,
+    void preprocess(int numTables,
 							FromList outerFromList,
 							SubqueryList outerSubqueryList,
 							PredicateList outerPredicateList) 
@@ -466,7 +466,7 @@ abstract class MethodCallNode extends Ja
 	 *						or a VirtualColumnNode.
 	 * @exception StandardException			Thrown on error
 	 */
-	public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+    boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 		throws StandardException
 	{
 		/* We stop here when only considering simple predicates
@@ -508,7 +508,7 @@ abstract class MethodCallNode extends Ja
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
-	public JavaValueNode remapColumnReferencesToExpressions()
+    JavaValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
 		int	param;
@@ -727,7 +727,7 @@ abstract class MethodCallNode extends Ja
 	 * @exception StandardException		Thrown on error
 	 */
 
-	public	void generateOneParameter(ExpressionClassBuilder acb,
+    void generateOneParameter(ExpressionClassBuilder acb,
 											MethodBuilder mb,
 											int parameterNumber )
 			throws StandardException
@@ -1386,7 +1386,7 @@ abstract class MethodCallNode extends Ja
 	 *
 	 * @return	The variant type for the underlying expression.
 	 */
-	protected int getOrderableVariantType() throws StandardException
+    int getOrderableVariantType() throws StandardException
 	{
 		// beetle 4880. We return the most variant type of the parameters. If no
 		// params then query-invariant. This makes more sense, and we can evaluate
@@ -1426,7 +1426,7 @@ abstract class MethodCallNode extends Ja
     /**
      * Override method in ancestor.
      */
-    public DataTypeDescriptor getDataType() throws StandardException
+    DataTypeDescriptor getDataType() throws StandardException
     {
         if ( routineInfo != null )
         {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
Fri May 10 08:56:19 2013
@@ -339,7 +339,7 @@ public class NewInvocationNode extends M
 	 *						or a VirtualColumnNode.
 	 * @exception StandardException		Thrown on error
 	 */
-	public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+    boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 		throws StandardException
 	{
 		/* We stop here when only considering simple predicates
@@ -453,9 +453,7 @@ public class NewInvocationNode extends M
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-
-	public void generateExpression(ExpressionClassBuilder acb,
-											MethodBuilder mb)
+    void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 									throws StandardException
 	{
 		/* If this node is for an ungrouped aggregator, 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
Fri May 10 08:56:19 2013
@@ -148,7 +148,7 @@ public class NextSequenceNode extends Va
      * @param mb The method the expression will go into
      * @throws StandardException on error
      */
-    public void generateConstant
+    void generateConstant
             (
                     ExpressionClassBuilder ecb,
                     MethodBuilder mb

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
Fri May 10 08:56:19 2013
@@ -197,7 +197,7 @@ public class NonStaticMethodCallNode ext
 	 *						or a VirtualColumnNode.
 	 * @exception StandardException			Thrown on error
 	 */
-	public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+    boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 		throws StandardException
 	{
 		/* We stop here when only considering simple predicates
@@ -233,7 +233,7 @@ public class NonStaticMethodCallNode ext
 	 *
 	 * @return	The variant type for the underlying expression.
 	 */
-	protected int getOrderableVariantType() throws StandardException
+    int getOrderableVariantType() throws StandardException
 	{
 		int receiverVariant = receiver.getOrderableVariantType();
 
@@ -261,7 +261,7 @@ public class NonStaticMethodCallNode ext
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
-	public JavaValueNode remapColumnReferencesToExpressions()
+    JavaValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
 		if (receiver != null)
@@ -307,7 +307,7 @@ public class NonStaticMethodCallNode ext
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void preprocess(int numTables,
+    void preprocess(int numTables,
 							FromList outerFromList,
 							SubqueryList outerSubqueryList,
 							PredicateList outerPredicateList) 
@@ -331,9 +331,7 @@ public class NonStaticMethodCallNode ext
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-
-	public void generateExpression(ExpressionClassBuilder acb,
-											MethodBuilder mb)
+    void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 									throws StandardException
 	{
 		boolean inConditional = false;
@@ -430,7 +428,7 @@ public class NonStaticMethodCallNode ext
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	protected boolean generateReceiver(ExpressionClassBuilder acb,
+    boolean generateReceiver(ExpressionClassBuilder acb,
 											MethodBuilder mb)
 									throws StandardException
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java Fri
May 10 08:56:19 2013
@@ -343,7 +343,7 @@ public class OrderByList extends Ordered
 		@param mb	the method the generated code is to go into
 		@exception StandardException thrown on failure
 	 */
-	public void generate(ActivationClassBuilder acb, 
+    void generate(ActivationClassBuilder acb,
 								MethodBuilder mb,
 								ResultSetNode child)
 							throws StandardException 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java Fri
May 10 08:56:19 2013
@@ -404,7 +404,7 @@ public class ParameterNode extends Value
 	 *
 	 * @exception StandardException on error
 	 */
-	static public	void generateParameterValueSet(ExpressionClassBuilder	acb,
+    static void generateParameterValueSet(ExpressionClassBuilder acb,
 								   int		numberOfParameters,
 								   List     parameterList)
 		throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java Fri
May 10 08:56:19 2013
@@ -55,12 +55,12 @@ public class ParserImpl implements Parse
 
         /* Don't ever access these objects directly, call getParser(), and getTokenManager()
*/
         private SQLParser cachedParser; 
-	protected Object cachedTokenManager;
+        private Object cachedTokenManager;
 
-	protected CharStream charStream;
+        private CharStream charStream;
         protected String SQLtext;
 
-        protected final CompilerContext cc;
+        private final CompilerContext cc;
 
 	/**
 	 * Constructor for Parser

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java Fri
May 10 08:56:19 2013
@@ -2952,7 +2952,7 @@ public class PredicateList extends Query
 	 * @param acb The ActivationClassBuilder for the class we're building
 	 * @param mb The MethodBuilder for the method we're building
 	 */
-	protected void generateInListValues(ExpressionClassBuilder acb,
+    void generateInListValues(ExpressionClassBuilder acb,
 		MethodBuilder mb) throws StandardException
 	{
 		for (int index = size() - 1; index >= 0; index--)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java Fri
May 10 08:56:19 2013
@@ -1091,24 +1091,6 @@ public class ResultColumn extends ValueN
 									getColumnExpress));
 	}
 */
-	/**
-		Generate the code to create a column the same shape and
-		size as this ResultColumn.
-
-		Used in ResultColumnList.generateHolder().
-
-		@exception StandardException  thrown on failure
-	*/
-	public void generateHolder(ExpressionClassBuilder acb,
-									MethodBuilder mb)
-		throws StandardException
-	{
-		// generate expression of the form
-		// (DataValueDescriptor) columnSpace
-
-		acb.generateNull(mb, getTypeCompiler(), getTypeServices().getCollationType());
-		mb.upCast(ClassName.DataValueDescriptor);
-	}
 
 	/**
 	** Check whether the column length and type of this result column

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
Fri May 10 08:56:19 2013
@@ -894,7 +894,7 @@ public class ResultColumnList extends Qu
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public FormatableBitSet bindResultColumnsByName(TableDescriptor targetTableDescriptor,
+    FormatableBitSet bindResultColumnsByName(TableDescriptor targetTableDescriptor,
                                                     DMLStatementNode statement)
 					throws StandardException
 	{
@@ -945,7 +945,7 @@ public class ResultColumnList extends Qu
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void bindResultColumnsByName(ResultColumnList fullRCL,
+    void bindResultColumnsByName(ResultColumnList fullRCL,
 										FromVTI targetVTI,
 										DMLStatementNode statement)
 					throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
Fri May 10 08:56:19 2013
@@ -102,7 +102,7 @@ public class SQLToJavaValueNode extends 
 	  *	@return	name of java class type
 	  *
 	  */
-	public String getJavaTypeName()
+    String getJavaTypeName()
 	throws StandardException
 	{
 		JSQLType	myType = getJSQLType();
@@ -118,7 +118,7 @@ public class SQLToJavaValueNode extends 
 	  *
 	  * @exception StandardException		Thrown on error
 	  */
-	public String getPrimitiveTypeName()
+    String getPrimitiveTypeName()
 		throws StandardException
 	{
 		JSQLType	myType = getJSQLType();
@@ -144,7 +144,7 @@ public class SQLToJavaValueNode extends 
 	  *	@return	the corresponding JSQLType
 	  *
 	  */
-	public	JSQLType	getJSQLType	() throws StandardException
+    JSQLType getJSQLType() throws StandardException
 	{
 		if ( jsqlType == null )
 		{
@@ -198,7 +198,7 @@ public class SQLToJavaValueNode extends 
     /**
      * Override behavior in superclass.
      */
-    public DataTypeDescriptor getDataType() throws StandardException
+    DataTypeDescriptor getDataType() throws StandardException
     {
         return value.getTypeServices();
     }
@@ -211,7 +211,7 @@ public class SQLToJavaValueNode extends 
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
-	public JavaValueNode remapColumnReferencesToExpressions()
+    JavaValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
 		value = value.remapColumnReferencesToExpressions();
@@ -244,7 +244,7 @@ public class SQLToJavaValueNode extends 
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
-	public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+    boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 		throws StandardException
 	{
 		return value.categorize(referencedTabs, simplePredsOnly);
@@ -263,7 +263,7 @@ public class SQLToJavaValueNode extends 
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void preprocess(int numTables,
+    void preprocess(int numTables,
 							FromList outerFromList,
 							SubqueryList outerSubqueryList,
 							PredicateList outerPredicateList) 
@@ -287,7 +287,7 @@ public class SQLToJavaValueNode extends 
 	 * @return	The variant type for the underlying expression.
 	 * @exception StandardException	thrown on error
 	 */
-	protected int getOrderableVariantType() throws StandardException
+    int getOrderableVariantType() throws StandardException
 	{
 		return value.getOrderableVariantType();
 	}
@@ -319,9 +319,7 @@ public class SQLToJavaValueNode extends 
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-
-	public void generateExpression(ExpressionClassBuilder acb,
-											MethodBuilder mb)
+    void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 									throws StandardException
 	{       
 		/* Compile the expression under us */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
Fri May 10 08:56:19 2013
@@ -132,7 +132,7 @@ public final class StaticClassFieldRefer
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void preprocess(int numTables,
+    void preprocess(int numTables,
 							FromList outerFromList,
 							SubqueryList outerSubqueryList,
 							PredicateList outerPredicateList) 
@@ -164,7 +164,7 @@ public final class StaticClassFieldRefer
 	 * @return boolean		Whether or not source.expression is a ColumnReference
 	 *						or a VirtualColumnNode.
 	 */
-	public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+    boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	{
 		return true;
 	}
@@ -177,7 +177,7 @@ public final class StaticClassFieldRefer
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
-	public JavaValueNode remapColumnReferencesToExpressions()
+    JavaValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
 		return this;
@@ -195,7 +195,7 @@ public final class StaticClassFieldRefer
 	 *
 	 * @return	The variant type for the underlying expression.
 	 */
-	protected int getOrderableVariantType()
+    int getOrderableVariantType()
 	{
 		if (SanityManager.DEBUG)
 		{
@@ -220,8 +220,7 @@ public final class StaticClassFieldRefer
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public void generateExpression(ExpressionClassBuilder acb,
-											MethodBuilder mb)
+    void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	throws StandardException
 	{
 		/*

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
Fri May 10 08:56:19 2013
@@ -889,7 +889,7 @@ public class StaticMethodCallNode extend
 		Push extra code to generate the casts within the
 		arrays for the parameters passed as arrays.
 	*/
-	public	void generateOneParameter(ExpressionClassBuilder acb,
+    void generateOneParameter(ExpressionClassBuilder acb,
 											MethodBuilder mb,
 											int parameterNumber )
 			throws StandardException
@@ -1026,7 +1026,7 @@ public class StaticMethodCallNode extend
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-	public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+    boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 		throws StandardException
 	{
 		/* We stop here when only considering simple predicates
@@ -1075,9 +1075,7 @@ public class StaticMethodCallNode extend
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-
-	public void generateExpression(ExpressionClassBuilder acb,
-											MethodBuilder mb)
+    void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 									throws StandardException
 	{
 		if (routineInfo != null) {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
Fri May 10 08:56:19 2013
@@ -723,7 +723,7 @@ public class UnaryOperatorNode extends O
      * @param resultField the field that contains the previous result
      * @return Number of parameters added.
      */
-    protected int addXmlOpMethodParams(ExpressionClassBuilder acb,
+    int addXmlOpMethodParams(ExpressionClassBuilder acb,
 		MethodBuilder mb, LocalField resultField) throws StandardException
     {
         if ((operatorType != XMLPARSE_OP) && (operatorType != XMLSERIALIZE_OP))

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java?rev=1480941&r1=1480940&r2=1480941&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
Fri May 10 08:56:19 2013
@@ -412,7 +412,7 @@ public class WindowResultSetNode extends
      * @return parent of this node, a PRN, used by SelectNode to retrieve new
      * top result set node after window result set rewrite of result set tree.
      */
-    public FromTable getParent() {
+    final FromTable getParent() {
         return parent;
     }
 



Mime
View raw message