You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2006/02/20 18:29:08 UTC
svn commit: r379174 -
/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/
Author: djd
Date: Mon Feb 20 09:29:03 2006
New Revision: 379174
URL: http://svn.apache.org/viewcvs?rev=379174&view=rev
Log:
DERBY-467 Make DRDA implementation classes and their constructors package
protected instead of public or protected. Code is only required to be accessed
from this package.
Modified:
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ConsistencyToken.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAString.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Pkgnamcsn.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java Mon Feb 20 09:29:03 2006
@@ -74,7 +74,7 @@
*
* @exception throws IOException
*/
- protected AppRequester ()
+ AppRequester ()
{
for (int i = 0; i < CodePoint.MGR_CODEPOINTS.length; i++)
managerLevels[i] = MGR_LEVEL_UNKNOWN;
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java Mon Feb 20 09:29:03 2006
@@ -20,7 +20,7 @@
package org.apache.derby.impl.drda;
-public final class CharacterEncodings
+final class CharacterEncodings
{
// This is a static class, so hide the default constructor.
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ConsistencyToken.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ConsistencyToken.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ConsistencyToken.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ConsistencyToken.java Mon Feb 20 09:29:03 2006
@@ -34,7 +34,7 @@
*
* @param bytes byte array representing the token
*/
- public ConsistencyToken(byte[] bytes) {
+ ConsistencyToken(byte[] bytes) {
this.bytes = bytes;
}
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java Mon Feb 20 09:29:03 2006
@@ -152,7 +152,7 @@
private InputStream inputStream;
// constructor
- protected DDMReader (DRDAConnThread agent, DssTrace dssTrace)
+ DDMReader (DRDAConnThread agent, DssTrace dssTrace)
{
buffer = new byte[DEFAULT_BUFFER_SIZE];
ddmCollectionLenStack = new long[MAX_MARKS_NESTING];
@@ -163,7 +163,7 @@
* It is used by TestProto to read the protocol returned by the
* server
*/
- protected DDMReader(CcsidManager ccsidManager, InputStream inputStream)
+ DDMReader(CcsidManager ccsidManager, InputStream inputStream)
{
buffer = new byte[DEFAULT_BUFFER_SIZE];
ddmCollectionLenStack = new long[MAX_MARKS_NESTING];
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Mon Feb 20 09:29:03 2006
@@ -60,7 +60,7 @@
import org.apache.derby.impl.jdbc.EmbedStatement;
import org.apache.derby.impl.jdbc.Util;
-public class DRDAConnThread extends Thread {
+class DRDAConnThread extends Thread {
private static final String leftBrace = "{";
private static final String rightBrace = "}";
@@ -180,7 +180,7 @@
* @param logConnections
**/
- public DRDAConnThread(Session session, NetworkServerControlImpl server,
+ DRDAConnThread(Session session, NetworkServerControlImpl server,
long timeSlice,
boolean logConnections) {
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java Mon Feb 20 09:29:03 2006
@@ -32,7 +32,7 @@
package org.apache.derby.impl.drda;
import java.util.Hashtable;
-public class DRDAProtocolException extends Exception
+class DRDAProtocolException extends Exception
{
/* Static values, used in constructor if there is no associated
@@ -210,7 +210,7 @@
*
*/
- protected DRDAProtocolException(String msgid,
+ DRDAProtocolException(String msgid,
DRDAConnThread agent,
int cpArg,
int errCdArg, Object []args)
@@ -291,7 +291,7 @@
}
// Constructor with no additional args
- protected DRDAProtocolException(String msgid,
+ DRDAProtocolException(String msgid,
DRDAConnThread agent,
int cpArg,
int errCdArg)
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java Mon Feb 20 09:29:03 2006
@@ -20,7 +20,7 @@
package org.apache.derby.impl.drda;
-public class DRDAProtocolExceptionInfo {
+class DRDAProtocolExceptionInfo {
/*
Holds static information about the protocol error
@@ -38,7 +38,7 @@
// Sends an originating Codepoint
protected boolean sendsCodpntArg;
- protected DRDAProtocolExceptionInfo(int errorCodePoint, int svrcod,
+ DRDAProtocolExceptionInfo(int errorCodePoint, int svrcod,
int errCdCodePoint,
boolean sendsCodpntArg)
{
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java Mon Feb 20 09:29:03 2006
@@ -89,7 +89,7 @@
// emitted in the next QRYDTA response to a CNTQRY request.
private byte []splitQRYDTA;
- protected DRDAResultSet()
+ DRDAResultSet()
{
state = NOT_OPENED;
// Initialize qryclsimp to NO. Only result sets requested by
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Mon Feb 20 09:29:03 2006
@@ -117,7 +117,7 @@
* @param database
*
*/
- protected DRDAStatement (Database database)
+ DRDAStatement (Database database)
{
this.database = database;
setTypDefValues();
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAString.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAString.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAString.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAString.java Mon Feb 20 09:29:03 2006
@@ -47,7 +47,7 @@
* @param m a <code>CcsidManager</code> value specifying
* which encoding is used
*/
- public DRDAString(CcsidManager m) {
+ DRDAString(CcsidManager m) {
this.buffer = new byte[0];
this.ccsidManager = m;
this.cachedString = null;
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java Mon Feb 20 09:29:03 2006
@@ -34,14 +34,14 @@
import javax.transaction.xa.*;
-public class DRDAXAProtocol {
+class DRDAXAProtocol {
private DRDAConnThread connThread;
private DDMReader reader;
private DDMWriter writer;
- public DRDAXAProtocol(DRDAConnThread connThread)
+ DRDAXAProtocol(DRDAConnThread connThread)
{
this.connThread = connThread;
reader = connThread.getReader();
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java Mon Feb 20 09:29:03 2006
@@ -81,7 +81,7 @@
*
* @param dbName database name
*/
- protected Database (String dbName)
+ Database (String dbName)
{
if (dbName != null)
{
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java Mon Feb 20 09:29:03 2006
@@ -44,7 +44,7 @@
* to do Diffie_Hellman algorithm and DES encryption.
*/
-public class DecryptionManager
+class DecryptionManager
{
// DRDA's Diffie-Hellman agreed public value: prime.
private static final byte modulusBytes__[] = {
@@ -94,7 +94,7 @@
*
* @throws SQLException that wraps any error
*/
- public DecryptionManager () throws SQLException
+ DecryptionManager () throws SQLException
{
try {
if (java.security.Security.getProvider ("IBMJCE") == null) // IBMJCE is not installed, install it.
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java Mon Feb 20 09:29:03 2006
@@ -40,7 +40,7 @@
*
*
*/
-public class EXTDTAInputStream extends InputStream {
+class EXTDTAInputStream extends InputStream {
long dataLength = 0; // length of the stream;
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java Mon Feb 20 09:29:03 2006
@@ -33,7 +33,7 @@
* be fine since this class is intended for converting
* DDM Parameter data only.
*/
-public class EbcdicCcsidManager extends CcsidManager
+class EbcdicCcsidManager extends CcsidManager
{
private static final int[] conversionArrayToEbcdic = {
0x0000,0x0001,0x0002,0x0003,0x0037,0x002d,0x002e,0x002f
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Pkgnamcsn.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Pkgnamcsn.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Pkgnamcsn.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Pkgnamcsn.java Mon Feb 20 09:29:03 2006
@@ -49,7 +49,7 @@
* @param pkgsn RDB Package Section Number
* @param pkgcnstkn RDB Package Consistency Token
*/
- public Pkgnamcsn(String rdbnam, String rdbcolid, String pkgid,
+ Pkgnamcsn(String rdbnam, String rdbcolid, String pkgid,
int pkgsn, ConsistencyToken pkgcnstkn) {
this.rdbnam = rdbnam;
this.rdbcolid = rdbcolid;
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java Mon Feb 20 09:29:03 2006
@@ -27,7 +27,7 @@
-public class SQLTypes {
+class SQLTypes {
// define final statics for the fdoca type codes here!!!
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java Mon Feb 20 09:29:03 2006
@@ -81,7 +81,7 @@
*
* @exception throws IOException
*/
- protected Session (int connNum, Socket clientSocket, String traceDirectory,
+ Session (int connNum, Socket clientSocket, String traceDirectory,
boolean traceOn) throws IOException
{
this.connNum = connNum;
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java Mon Feb 20 09:29:03 2006
@@ -22,7 +22,7 @@
/**
* Converters from signed binary bytes to Java <code>short</code>, <code>int</code>, or <code>long</code>.
*/
-public class SignedBinary
+class SignedBinary
{
// Hide the default constructor, this is a static class.
private SignedBinary () {}
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java?rev=379174&r1=379173&r2=379174&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java Mon Feb 20 09:29:03 2006
@@ -52,7 +52,7 @@
private XAConnection xaConnection;
- protected XADatabase (String dbName)
+ XADatabase (String dbName)
{
super(dbName);
forXA = true;