db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r220095 - in /incubator/derby/code/branches/10.1/java: drda/org/apache/derby/impl/drda/ engine/org/apache/derby/diag/ engine/org/apache/derby/iapi/jdbc/ engine/org/apache/derby/iapi/services/info/ engine/org/apache/derby/impl/io/ engine/org...
Date Thu, 21 Jul 2005 14:41:39 GMT
Author: djd
Date: Thu Jul 21 07:41:36 2005
New Revision: 220095

URL: http://svn.apache.org/viewcvs?rev=220095&view=rev
Log:
DERBY-467 Make classes and methods with privileged blocks private or package protected.
merge from trunk (220015)

Modified:
    incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java
    incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/diag/ErrorMessages.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/JarDBFile.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/URLFile.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteData.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/Import.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportAbstract.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportReadData.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/TopService.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/stream/SingleStream.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/RawStore.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java
    incubator/derby/code/branches/10.1/java/engine/org/apache/derby/osgi/EmbeddedActivator.java
    incubator/derby/code/branches/10.1/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
    incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/util.java

Modified: incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java Thu Jul 21 07:41:36 2005
@@ -24,7 +24,7 @@
 import java.net.*;
 import java.security.*;
 
-class ClientThread extends Thread {
+final class ClientThread extends Thread {
 
 	NetworkServerControlImpl parent;
 	ServerSocket serverSocket;
@@ -33,7 +33,7 @@
 	private String traceDir;
 	private boolean traceAll;
 
-		protected ClientThread (NetworkServerControlImpl nsi, ServerSocket ss) {
+		ClientThread (NetworkServerControlImpl nsi, ServerSocket ss) {
 
 			// Create a more meaningful name for this thread (but preserve its
 			// thread id from the default name).

Modified: incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ incubator/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Thu Jul 21 07:41:36 2005
@@ -77,7 +77,7 @@
 	@see NetworkServerControl for description
 
 */
-public class NetworkServerControlImpl {
+public final class NetworkServerControlImpl {
 	private final static int NO_USAGE_MSGS= 12;
 	private final static String [] COMMANDS = 
 	{"start","shutdown","trace","tracedirectory","ping", 

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/diag/ErrorMessages.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/diag/ErrorMessages.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/diag/ErrorMessages.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/diag/ErrorMessages.java Thu Jul 21 07:41:36 2005
@@ -62,7 +62,7 @@
  * </UL>
  * 
  */
-public class ErrorMessages extends VTITemplate implements VTICosting, java.security.PrivilegedAction  {
+public final class ErrorMessages extends VTITemplate implements VTICosting, java.security.PrivilegedAction  {
 	
 	/* The name of the file containing all the SQLSTate codes.
 	 * The class gets the SQLState code from the messages

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java Thu Jul 21 07:41:36 2005
@@ -36,7 +36,7 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 
-public class DRDAServerStarter implements ModuleControl, Runnable
+public final class DRDAServerStarter implements ModuleControl, Runnable
 {
 
     private Object server;

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java Thu Jul 21 07:41:36 2005
@@ -522,7 +522,7 @@
 	** Security related methods 
 	*/
 	private String productGenus;
-	public Object run() {
+	public final Object run() {
 
 		// SECURITY PERMISSION - IP4
 		return loadProperties(this.productGenus);

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/JarDBFile.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/JarDBFile.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/JarDBFile.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/JarDBFile.java Thu Jul 21 07:41:36 2005
@@ -33,10 +33,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
 
 /**
  * This class provides a jar file based implementation of the StorageFile interface. It is used by the

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/URLFile.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/URLFile.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/URLFile.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/io/URLFile.java Thu Jul 21 07:41:36 2005
@@ -32,11 +32,6 @@
 
 import java.net.URL;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-
 /**
  * This class provides a class path based implementation of the StorageFile interface. It is used by the
  * database engine to access persistent data and transaction logs under the classpath subsubprotocol.

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Thu Jul 21 07:41:36 2005
@@ -83,7 +83,7 @@
  *
  * @author ames
  */
-public class EmbedDatabaseMetaData extends ConnectionChild 
+public final class EmbedDatabaseMetaData extends ConnectionChild 
 	implements DatabaseMetaData, java.security.PrivilegedAction {
 
 	/*

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteData.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteData.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteData.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteData.java Thu Jul 21 07:41:36 2005
@@ -41,7 +41,7 @@
   private OutputStreamWriter aStream;
 
   //writes data into the o/p file using control file properties
-  public ExportWriteData(String outputFileName, ControlInfo controlFileReader)
+  ExportWriteData(String outputFileName, ControlInfo controlFileReader)
   throws Exception {
     this.outputFileName = outputFileName;
     this.controlFileReader = controlFileReader;
@@ -74,7 +74,7 @@
   *  data file
  	* @exception	Exception if there is an error
 	*/
-  public void writeColumnDefinitionOptionally(String[] columnNames,
+  void writeColumnDefinitionOptionally(String[] columnNames,
   											  String[] columnTypes)
   														throws Exception {
 	boolean ignoreColumnTypes=true;

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java Thu Jul 21 07:41:36 2005
@@ -52,7 +52,7 @@
 
   //if control file says true for column definition, write it as first line of the
   //data file
-  public abstract void writeColumnDefinitionOptionally(String[] columnNames,
+  abstract void writeColumnDefinitionOptionally(String[] columnNames,
   													   String[] columnTypes)
   											throws Exception;
 

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/Import.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/Import.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/Import.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/Import.java Thu Jul 21 07:41:36 2005
@@ -248,7 +248,7 @@
 	/** virtual method from the abstract class
 	 * @exception	Exception on error
 	 */
-	protected ImportReadData getImportReadData() throws Exception {
+	ImportReadData getImportReadData() throws Exception {
 		return new ImportReadData(inputFileName, controlFileReader);
 	}
 }

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportAbstract.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportAbstract.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportAbstract.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportAbstract.java Thu Jul 21 07:41:36 2005
@@ -32,28 +32,28 @@
  */
 abstract class ImportAbstract extends VTITemplate {
 
-  protected ControlInfo controlFileReader;
-  protected ImportReadData importReadData;
+  ControlInfo controlFileReader;
+  ImportReadData importReadData;
 
-  protected String[] columnNames;
-  protected int numberOfColumns;
-  protected int[] columnWidths;
+  String[] columnNames;
+  int numberOfColumns;
+  int[] columnWidths;
 
-  protected String[] nextRow;
+  String[] nextRow;
 
-  protected ResultSetMetaData importResultSetMetaData;
-  protected int noOfColumnsExpected;
+  ResultSetMetaData importResultSetMetaData;
+  int noOfColumnsExpected;
 
   private boolean wasNull;
 
-	protected static final String COLUMNNAMEPREFIX = "COLUMN";
+	static final String COLUMNNAMEPREFIX = "COLUMN";
 
-  protected abstract ImportReadData getImportReadData() throws Exception;
+  abstract ImportReadData getImportReadData() throws Exception;
 
   /** Does all the work
  	* @exception	Exception if there is an error
 	*/
-  protected void doAllTheWork() throws Exception {
+  void doAllTheWork() throws Exception {
 
     //prepare the input file for import. Get the number of columns per row
     //from the input file.
@@ -80,7 +80,7 @@
 //    while (next()) ;
   }
   //the column names will be Column#
-  protected void loadColumnNames() {
+  void loadColumnNames() {
     for (int i=1; i<=numberOfColumns; i++)
       columnNames[i-1] = COLUMNNAMEPREFIX + i;
   }

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportReadData.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportReadData.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportReadData.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ImportReadData.java Thu Jul 21 07:41:36 2005
@@ -133,7 +133,7 @@
   }
   //inputFileName: File to read data from
   //controlFileReader: File used to interpret data in the inputFileName
-  public ImportReadData(String inputFileName, ControlInfo controlFileReader)
+  ImportReadData(String inputFileName, ControlInfo controlFileReader)
   throws Exception {
     this.inputFileName = inputFileName;
     this.controlFileReader = controlFileReader;
@@ -147,7 +147,7 @@
   }
 
   //just a getter returning number of columns for a row in the data file
-  public int getNumberOfColumns() {
+  int getNumberOfColumns() {
     return numberOfColumns;
   }
   /**if columndefinition is true, ignore first row. The way to do that is to just
@@ -262,7 +262,7 @@
   /**close the input data file
  	* @exception	Exception if there is an error
 	*/
-  public void closeStream() throws Exception {
+  void closeStream() throws Exception {
     if (streamOpenForReading) {
        bufferedReader.close();
        streamOpenForReading = false;
@@ -270,7 +270,7 @@
   }
 
   //actually looks at the data file to find how many columns make up a row
-  public int findNumberOfColumnsInARow() throws Exception {
+  int findNumberOfColumnsInARow() throws Exception {
     // init the number of columns to 1 - no such thing as a table
     // without columns
     numberOfColumns=1;
@@ -358,7 +358,7 @@
   //keep looking for field and record separators simultaneously because we don't yet
   //know how many columns make up a row in this data file. Stop as soon as we get
   //the record separator which is indicated by a return value of true from this function
-  public boolean readTokensUntilEndOfRecord() throws Exception {
+  boolean readTokensUntilEndOfRecord() throws Exception {
     int nextChar;
     int fieldSeparatorIndex = 0;
     int recordSeparatorIndex = 0;
@@ -610,14 +610,14 @@
 
   /**returns the number of the current row
   */
-  public int getCurrentRowNumber() {
+  int getCurrentRowNumber() {
     return lineNumber;
   }
 
   /**the way we read the next row from input file depends on it's format
  	* @exception	Exception if there is an error
 	*/
-  public boolean readNextRow(String[] returnStringArray) throws Exception {
+  boolean readNextRow(String[] returnStringArray) throws Exception {
     boolean readVal;
     int idx;
 
@@ -856,7 +856,7 @@
     return true;
   }
   //read one column's value at a time
-  public boolean readNextToken(char[] delimiter, int delimiterIndex,
+  boolean readNextToken(char[] delimiter, int delimiterIndex,
 							   int delimiterLength, 
 							   boolean isRecordSeperator) throws Exception {
     int nextChar;

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java Thu Jul 21 07:41:36 2005
@@ -99,7 +99,7 @@
 
 */
 
-public abstract class BaseMonitor
+abstract class BaseMonitor
 	implements ModuleFactory, BundleFinder {
 
 	/* Fields */
@@ -107,17 +107,17 @@
 	/**
 		Hashtable of objects that implement PersistentService keyed by their getType() method.
 	*/
-	protected Hashtable serviceProviders;
+	Hashtable serviceProviders;
 
 	// Vector of class objects of implementations, found in the System, application
 	// and default (modules.properties) properties
 
-	protected Vector[]     implementationSets;
+	Vector[]     implementationSets;
 
 	private Vector	  services;					// Vector of TopServices
 
-	protected Properties bootProperties;		// specifc properties provided by the boot method, override everything else
-	protected Properties applicationProperties;
+	Properties bootProperties;		// specifc properties provided by the boot method, override everything else
+	Properties applicationProperties;
 
 	boolean inShutdown;
 
@@ -126,10 +126,10 @@
 	private ContextService contextService;
 	private UUIDFactory uuidFactory;
 
-	protected boolean reportOn;
+	boolean reportOn;
 	private PrintStream logging;
 
-	protected ThreadGroup daemonGroup;
+	ThreadGroup daemonGroup;
 
 	// anti GC stuff
 	AntiGC dontGC;
@@ -142,7 +142,7 @@
 //	private InstanceGetter[]	rc4;
 
 	/* Constructor  */
-	public  BaseMonitor() {
+	BaseMonitor() {
 		super();
 
 		services = new Vector(0, 1);
@@ -1304,7 +1304,7 @@
 		return getImplementations(moduleList, true);
 	} // end of getDefaultImplementations
 
-	protected InputStream loadModuleDefinitions( URL propertyFileURL) throws IOException {
+	InputStream loadModuleDefinitions( URL propertyFileURL) throws IOException {
 		// SECURITY PERMISSION - IP1
 		return propertyFileURL.openStream();
 	}
@@ -1336,7 +1336,7 @@
 	/**	
 		Get InputStream for application properties file Returns nul if it does not exist.
 	*/
-	protected abstract InputStream applicationPropertiesStream()
+	abstract InputStream applicationPropertiesStream()
 	  throws IOException;
 
 
@@ -2086,7 +2086,7 @@
 		Initialize the monitor wrt the current environemnt.
 		Returns false if the monitor cannot be initialized, true otherwise.
 	*/
-	public abstract boolean initialize(boolean lite);
+	abstract boolean initialize(boolean lite);
 
     class ProviderEnumeration implements Enumeration
     {

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java Thu Jul 21 07:41:36 2005
@@ -23,7 +23,6 @@
 import org.apache.derby.iapi.services.monitor.Monitor;
 import org.apache.derby.iapi.reference.Property;
 
-import org.apache.derby.impl.services.monitor.BaseMonitor;
 import org.apache.derby.iapi.services.io.FileUtil;
 import org.apache.derby.iapi.services.info.ProductVersionHolder;
 import org.apache.derby.iapi.services.info.ProductGenusNames;
@@ -166,7 +165,7 @@
 	/**
 		Initialize the system in a privileged block.
 	**/
-	public synchronized final boolean initialize(boolean lite)
+	synchronized final boolean initialize(boolean lite)
 	{
 		action = lite ? 0 : 1;
 		try {
@@ -178,7 +177,7 @@
 		}
 	}
 
-	protected synchronized final InputStream loadModuleDefinitions(URL propertyFileURL) throws IOException {
+	synchronized final InputStream loadModuleDefinitions(URL propertyFileURL) throws IOException {
 		action = 2;
         this.propertyFileURL = propertyFileURL;
 		try {
@@ -239,7 +238,7 @@
 		}
 	}
 
-	protected synchronized final InputStream applicationPropertiesStream()
+	synchronized final InputStream applicationPropertiesStream()
 	  throws IOException {
 		action = 6;
 		try {

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java Thu Jul 21 07:41:36 2005
@@ -61,7 +61,7 @@
  * This class implements the PersistentService interface using a StorageFactory class.
  * It handles all subSubProtocols except for cache.
  */
-public class PersistentServiceImpl implements PersistentService
+final class PersistentServiceImpl implements PersistentService
 {
 
     private String home; // the path of the database home directory. Can be null
@@ -71,7 +71,7 @@
     private StorageFactory rootStorageFactory;
     private char separatorChar;
 
-    public PersistentServiceImpl( String subSubProtocol, Class storageFactoryClass)
+    PersistentServiceImpl( String subSubProtocol, Class storageFactoryClass)
         throws StandardException
     {
         this.subSubProtocol = subSubProtocol;
@@ -816,7 +816,7 @@
         return storageFactoryClass;
     }
     
-    class DirectoryList implements Enumeration, PrivilegedAction
+    final class DirectoryList implements Enumeration, PrivilegedAction
     {
         private String[] contents;
         private StorageFile systemDirectory;	 
@@ -853,7 +853,7 @@
         } // end of nextElement
 
         // PrivilegedAction method
-        public Object run()
+        public final Object run()
         {
             switch( actionCode)
             {

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/TopService.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/TopService.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/TopService.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/monitor/TopService.java Thu Jul 21 07:41:36 2005
@@ -40,7 +40,7 @@
 */
 
 
-class TopService {
+final class TopService {
 
 	/*
 	** Fields.
@@ -49,32 +49,32 @@
 	/**
 		The idenity of this service, note that it may not be active yet.
 	*/
-	protected ProtocolKey key;
+	ProtocolKey key;
 
 	/**
 		The top module instance
 	*/
-	protected ModuleInstance topModule;
+	ModuleInstance topModule;
 
 	/**
 		List of protocols.
 	*/
-	protected Hashtable		protocolTable;
+	Hashtable		protocolTable;
 
 	/**
 	*/
-	protected Vector		moduleInstances;
+	Vector		moduleInstances;
 
 	/**
 	*/
-	protected BaseMonitor	monitor;
+	BaseMonitor	monitor;
 
-	protected boolean inShutdown;
+	boolean inShutdown;
 
 	/**
 		The type of service this was created by. If null then this is a non-persistent service.
 	*/
-	protected PersistentService serviceType;
+	PersistentService serviceType;
 
 	Locale serviceLocale;
 
@@ -99,7 +99,7 @@
 		this.serviceLocale = serviceLocale;
 	}
 
-	protected void setTopModule(Object instance) {
+	void setTopModule(Object instance) {
 		synchronized (this) {
 			for (int i = 0; i < moduleInstances.size(); i++) {
 				ModuleInstance module = (ModuleInstance) moduleInstances.elementAt(i);
@@ -124,12 +124,12 @@
 		}
 	}
 
-	protected Object getService() {
+	Object getService() {
 
 		return topModule.getInstance();
 	}
 
-	protected boolean isPotentialService(ProtocolKey otherKey) {
+	boolean isPotentialService(ProtocolKey otherKey) {
 
 
 		String otherCanonicalName;
@@ -207,7 +207,7 @@
 		Returns the instance of the module or null if one does not exist in
 		the protocol table.
 	*/
-	protected synchronized Object findModule(ProtocolKey key, boolean findOnly, Properties properties) {
+	synchronized Object findModule(ProtocolKey key, boolean findOnly, Properties properties) {
 
 		ModuleInstance module = (ModuleInstance) protocolTable.get(key);
 
@@ -380,7 +380,7 @@
 		}
 	}
 
-	protected boolean inService(Object instance) {
+	boolean inService(Object instance) {
 
 		for (int i = 0; i < moduleInstances.size(); i++) {
 

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java Thu Jul 21 07:41:36 2005
@@ -220,7 +220,7 @@
 		}
 	}
 
-	protected Class loadClassNotInDatabaseJar(String className) throws ClassNotFoundException {
+	Class loadClassNotInDatabaseJar(String className) throws ClassNotFoundException {
 		return Class.forName(className);
 	}
 
@@ -294,5 +294,5 @@
 	** Keep track of loaded generated classes and their GeneratedClass objects.
 	*/
 
-	protected abstract LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifiedName, ByteArray classDump); 
+	abstract LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifiedName, ByteArray classDump); 
 }

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java Thu Jul 21 07:41:36 2005
@@ -33,7 +33,7 @@
 
 	private int action;
 
-	protected synchronized LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifiedName, ByteArray classDump) {
+	synchronized LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifiedName, ByteArray classDump) {
 
 		if (classDump == null || classDump.getArray() == null) {
 
@@ -61,7 +61,7 @@
 		return ((ReflectLoaderJava2) java.security.AccessController.doPrivileged(this)).loadGeneratedClass(fullyQualifiedName, classDump);
 	}
 
-	public Object run() {
+	public final Object run() {
 		// SECURITY PERMISSION - MP2
 		switch (action) {
 		case 1:
@@ -73,7 +73,7 @@
 		}
 	}
 
-	protected synchronized Class loadClassNotInDatabaseJar(String name) throws ClassNotFoundException {
+	synchronized Class loadClassNotInDatabaseJar(String name) throws ClassNotFoundException {
 		
 		Class foundClass = null;
 		action = 2;

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/stream/SingleStream.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/stream/SingleStream.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/stream/SingleStream.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/services/stream/SingleStream.java Thu Jul 21 07:41:36 2005
@@ -68,7 +68,7 @@
  *
  * @author ames
  */
-public class SingleStream
+public final class SingleStream
 implements InfoStreams, ModuleControl, java.security.PrivilegedAction
 {
 

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Thu Jul 21 07:41:36 2005
@@ -160,7 +160,7 @@
  * booting this class instead of booting the super-class.
  */
 
-public	class	DataDictionaryImpl
+public final class	DataDictionaryImpl
 	implements DataDictionary, CacheableFactory, ModuleControl, ModuleSupportable,java.security.PrivilegedAction
 {
 

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/RawStore.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/RawStore.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/RawStore.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/RawStore.java Thu Jul 21 07:41:36 2005
@@ -87,9 +87,13 @@
 	<PRE>
 	String TransactionFactoryId=<moduleIdentifier>
 	</PRE>
+	
+	<P>
+	Class is final as it has methods with privilege blocks
+	and implements PrivilegedExceptionAction.
 */
 
-public class RawStore implements RawStoreFactory, ModuleControl, ModuleSupportable, PrivilegedExceptionAction
+public final class RawStore implements RawStoreFactory, ModuleControl, ModuleSupportable, PrivilegedExceptionAction
 {
 	private static final String BACKUP_HISTORY = "BACKUP.HISTORY";
 	private static final String[] BACKUP_FILTER =
@@ -1044,7 +1048,7 @@
         }
 	}
 
-	protected synchronized boolean privExists( File file)
+	private synchronized boolean privExists( File file)
     {
         actionCode = REGULAR_FILE_EXISTS_ACTION;
         actionRegularFile = file;
@@ -1061,7 +1065,7 @@
         }
     }
 
-	protected synchronized boolean privExists(final StorageFile file)
+	private synchronized boolean privExists(final StorageFile file)
     {
         actionCode = STORAGE_FILE_EXISTS_ACTION;
         actionStorageFile = file;
@@ -1079,7 +1083,7 @@
     }
 
 
-    protected synchronized boolean privDelete( File file)
+    private synchronized boolean privDelete( File file)
     {
         actionCode = REGULAR_FILE_DELETE_ACTION;
         actionRegularFile = file;
@@ -1097,7 +1101,7 @@
     }
 
 
-    protected synchronized boolean privMkdirs( File file)
+    private synchronized boolean privMkdirs( File file)
     {
         actionCode = REGULAR_FILE_MKDIRS_ACTION;
         actionRegularFile = file;
@@ -1115,7 +1119,7 @@
     }
 
 
-    protected synchronized boolean privIsDirectory( File file)
+    private synchronized boolean privIsDirectory( File file)
     {
         actionCode = REGULAR_FILE_IS_DIRECTORY_ACTION;
         actionRegularFile = file;
@@ -1132,7 +1136,7 @@
         }
     }
 
-    protected synchronized boolean privRemoveDirectory( File file)
+    private synchronized boolean privRemoveDirectory( File file)
     {
         actionCode = REGULAR_FILE_REMOVE_DIRECTORY_ACTION;
         actionRegularFile = file;
@@ -1149,7 +1153,7 @@
         }
     }
 
-    protected synchronized boolean privRenameTo( File file1, File file2)
+    private synchronized boolean privRenameTo( File file1, File file2)
     {
         actionCode = REGULAR_FILE_RENAME_TO_ACTION;
         actionRegularFile = file1;
@@ -1168,7 +1172,7 @@
         }
     }
 
-    protected synchronized boolean privCopyDirectory( StorageFile from, File to, byte[] buffer, String[] filter)
+    private synchronized boolean privCopyDirectory( StorageFile from, File to, byte[] buffer, String[] filter)
     {
         actionCode = COPY_STORAGE_DIRECTORY_TO_REGULAR_ACTION;
         actionStorageFile = from;
@@ -1192,7 +1196,7 @@
     }
 
 
-    protected synchronized boolean privCopyDirectory( File from, StorageFile to, byte[] buffer, String[] filter)
+    private synchronized boolean privCopyDirectory( File from, StorageFile to, byte[] buffer, String[] filter)
     {
         actionCode = COPY_REGULAR_DIRECTORY_TO_STORAGE_ACTION;
         actionStorageFile = to;
@@ -1216,7 +1220,7 @@
     }
 
 	
-    protected synchronized boolean privCopyFile( File from, StorageFile to)
+    private synchronized boolean privCopyFile( File from, StorageFile to)
     {
         actionCode = COPY_REGULAR_FILE_TO_STORAGE_ACTION;
         actionStorageFile = to;
@@ -1235,7 +1239,7 @@
         }
     }
 
-    protected synchronized String[] privList(final File file)
+    private synchronized String[] privList(final File file)
     {
         actionCode = REGULAR_FILE_LIST_DIRECTORY_ACTION;
         actionRegularFile = file;
@@ -1252,7 +1256,7 @@
     }
 
     // PrivilegedExceptionAction method
-    public Object run() throws IOException
+    public final Object run() throws IOException
     {
         switch(actionCode)
         {

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java Thu Jul 21 07:41:36 2005
@@ -59,7 +59,7 @@
 	allocated.
 	<BR> MT - Mutable - mutable identity : 
 */
-public abstract class BaseContainer implements Lockable {
+abstract class BaseContainer implements Lockable {
 
 	/**
 		Identity of the container.
@@ -100,7 +100,7 @@
 	*/
 	protected boolean isReusableRecordId = false;
 
-	protected BaseContainer() {
+	BaseContainer() {
 	}
 
 	/*

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Thu Jul 21 07:41:36 2005
@@ -121,7 +121,7 @@
 
 **/
 
-public class BaseDataFileFactory
+public final class BaseDataFileFactory
     implements DataFactory, CacheableFactory, ModuleControl, ModuleSupportable, PrivilegedExceptionAction
 {
 
@@ -2190,7 +2190,7 @@
     }
 
     // PrivilegedExceptionAction method
-    public Object run() throws Exception
+    public final Object run() throws Exception
     {
         switch( actionCode)
         {

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java Thu Jul 21 07:41:36 2005
@@ -81,7 +81,7 @@
 	This class extends BaseContainer and implements Cacheable and TypedFormat
 */
 
-public abstract class FileContainer 
+abstract class FileContainer 
     extends BaseContainer implements Cacheable, TypedFormat
 {
 
@@ -307,7 +307,7 @@
 	protected static final String SPACE_TRACE = 
         (SanityManager.DEBUG ? "SpaceTrace" : null);
 
-	protected FileContainer(BaseDataFileFactory factory) 
+	FileContainer(BaseDataFileFactory factory) 
     {
 		dataFactory = factory;
 		pageCache = factory.getPageCache();
@@ -547,7 +547,7 @@
      *
      * @exception StandardException Cloudscape Standard error policy
      **/
-	protected abstract void createContainer(ContainerKey newIdentity) 
+	abstract void createContainer(ContainerKey newIdentity) 
         throws StandardException;
 	
 
@@ -565,10 +565,10 @@
      *
 	 * @exception  StandardException  Standard exception policy.
      **/
-	protected abstract boolean openContainer(ContainerKey newIdentity) 
+	abstract boolean openContainer(ContainerKey newIdentity) 
         throws StandardException;
 
-	protected abstract void closeContainer();
+	abstract void closeContainer();
 
     /**
      * Drop Container.

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java Thu Jul 21 07:41:36 2005
@@ -44,7 +44,7 @@
 
 */
 
-public class InputStreamContainer extends FileContainer  {
+final class InputStreamContainer extends FileContainer  {
 
     private StorageFile containerPath;
     
@@ -52,12 +52,12 @@
 	 * Constructors
 	 */
 
-	public InputStreamContainer(BaseDataFileFactory factory) {
+	InputStreamContainer(BaseDataFileFactory factory) {
 		super(factory);
 		canUpdate = false;
 	}
 
-	protected final boolean openContainer(ContainerKey newIdentity) throws StandardException {
+	final boolean openContainer(ContainerKey newIdentity) throws StandardException {
 		DataInputStream dis = null;
 		try
         {
@@ -105,7 +105,7 @@
 		}
 	} // end of openContainer
 
-	protected void closeContainer()
+	void closeContainer()
     {
 		containerPath = null;
 	}
@@ -147,7 +147,7 @@
 		Create a new container, all references to identity must be through the
 		passed in identity, this object will no identity until after this method returns.
 	*/
-	protected void createContainer(ContainerKey newIdentity) throws StandardException {
+	void createContainer(ContainerKey newIdentity) throws StandardException {
 		// RESOLVE - probably should throw an error ...
 	}
 

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java Thu Jul 21 07:41:36 2005
@@ -51,7 +51,6 @@
 import java.io.IOException;
 
 import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 import java.security.PrivilegedActionException;
 
@@ -60,7 +59,7 @@
 	for FileContainers which are implemented on java.io.RandomAccessFile.
 */
 
-public class RAFContainer extends FileContainer implements PrivilegedExceptionAction
+class RAFContainer extends FileContainer implements PrivilegedExceptionAction
 {
 
 	/*
@@ -91,7 +90,7 @@
 	 * Constructors
 	 */
 
-	protected RAFContainer(BaseDataFileFactory factory) {
+	RAFContainer(BaseDataFileFactory factory) {
 		super(factory);
 	}
 
@@ -160,7 +159,7 @@
 		// RESOLVE: leaveStub false
 	}
 
-	protected final void closeContainer() {
+	final void closeContainer() {
 
 		if (fileData != null) {
 			try {
@@ -641,7 +640,7 @@
 	}
 
 
-	 protected synchronized StorageFile getFileName(ContainerKey identity, boolean stub,
+	 synchronized StorageFile getFileName(ContainerKey identity, boolean stub,
 											 boolean errorOK, boolean tryAlternatePath)
 		 throws StandardException
 	 {
@@ -706,7 +705,7 @@
     } // end of privGetFileName
 
 
-	protected synchronized void createContainer(ContainerKey newIdentity)
+	synchronized void createContainer(ContainerKey newIdentity)
         throws StandardException
     {
 
@@ -725,7 +724,7 @@
         finally{ actionIdentity = null; }
     } // end of createContainer
 
-	protected synchronized boolean removeFile(StorageFile file)
+	synchronized boolean removeFile(StorageFile file)
         throws SecurityException, StandardException
     {
         actionCode = REMOVE_FILE_ACTION;
@@ -757,7 +756,7 @@
 		return true;
     } // end of privRemoveFile
 
-	protected synchronized boolean openContainer(ContainerKey newIdentity)
+	synchronized boolean openContainer(ContainerKey newIdentity)
         throws StandardException
     {
         actionCode = OPEN_CONTAINER_ACTION;
@@ -770,7 +769,7 @@
         finally{ actionIdentity = null; }
     }
 
-	protected synchronized void stubbify(LogInstant instant)
+	private synchronized void stubbify(LogInstant instant)
         throws StandardException
 	{
          // update header, synchronized this in case the cache is cleaning

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java Thu Jul 21 07:41:36 2005
@@ -130,7 +130,7 @@
 		needsSync = false;
 	}
 
-	protected StorageFile getFileName(ContainerKey identity, boolean stub,
+	StorageFile getFileName(ContainerKey identity, boolean stub,
         boolean errorOK, boolean tryAlternatePath)
 	{
 		return privGetFileName( identity, stub, errorOK, tryAlternatePath);

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java Thu Jul 21 07:41:36 2005
@@ -205,9 +205,12 @@
 
 	<P>Multithreading considerations:<BR>
 	Log Factory must be MT-safe.
-*/
+	<P>
+	Class is final as it has methods with privilege blocks
+	and implements PrivilegedExceptionAction.
+	*/
 
-public class LogToFile implements LogFactory, ModuleControl, ModuleSupportable,
+public final class LogToFile implements LogFactory, ModuleControl, ModuleSupportable,
 								  Serviceable, java.security.PrivilegedExceptionAction
 {
 
@@ -4677,7 +4680,7 @@
 		return runBooleanAction(1, file);
     }
 
-    protected synchronized StorageRandomAccessFile privRandomAccessFile(StorageFile file, String perms)
+    private synchronized StorageRandomAccessFile privRandomAccessFile(StorageFile file, String perms)
         throws IOException
     {
 		action = 2;
@@ -4703,7 +4706,7 @@
 		return runBooleanAction(4, file);
     }
 
-	protected synchronized String[] privList(File file)
+	private synchronized String[] privList(File file)
     {
 		action = 8;
         toFile = file;
@@ -4718,7 +4721,7 @@
         }
 	}
     
-	protected synchronized String[] privList(StorageFile file)
+	private synchronized String[] privList(StorageFile file)
     {
 		action = 5;
         activeFile = file;
@@ -4734,7 +4737,7 @@
 	}
 
 
-	protected synchronized boolean privCopyFile(StorageFile from, File to)
+	private synchronized boolean privCopyFile(StorageFile from, File to)
 	{
 		action = 6;
 		activeFile = from;
@@ -4749,7 +4752,7 @@
         }	
 	}
 
-	protected synchronized boolean privCopyFile(File from, StorageFile to)
+	private synchronized boolean privCopyFile(File from, StorageFile to)
 	{
 		action = 9;
 		activeFile = to;
@@ -4764,7 +4767,7 @@
         }	
 	}
 
-	protected boolean privRemoveDirectory(StorageFile file)
+	private boolean privRemoveDirectory(StorageFile file)
 	{
 		return runBooleanAction(7, file);
 	}
@@ -4784,7 +4787,7 @@
 
 	
 
-	public Object run() throws IOException {
+	public final Object run() throws IOException {
 		switch (action) {
 		case 0:
 			// SECURITY PERMISSION - MP1

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java Thu Jul 21 07:41:36 2005
@@ -56,7 +56,7 @@
  * @see EmbeddedDataSource
  *
  */
-public class EmbeddedSimpleDataSource implements DataSource {
+public final class EmbeddedSimpleDataSource implements DataSource {
 
 	private String password;
 
@@ -462,7 +462,7 @@
 		return conn;
 	}
 
-	InternalDriver findDriver() throws SQLException {
+	private InternalDriver findDriver() throws SQLException {
 		String url = jdbcurl;
 
 		if (driver == null || !driver.acceptsURL(url)) {
@@ -488,7 +488,7 @@
 		// else driver != null and driver can accept url
 	}
 
-	void update() {
+	private void update() {
 		StringBuffer sb = new StringBuffer(64);
 
 		sb.append(Attribute.PROTOCOL);

Modified: incubator/derby/code/branches/10.1/java/engine/org/apache/derby/osgi/EmbeddedActivator.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/engine/org/apache/derby/osgi/EmbeddedActivator.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/engine/org/apache/derby/osgi/EmbeddedActivator.java (original)
+++ incubator/derby/code/branches/10.1/java/engine/org/apache/derby/osgi/EmbeddedActivator.java Thu Jul 21 07:41:36 2005
@@ -26,7 +26,7 @@
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
-public class EmbeddedActivator implements BundleActivator {
+public final class EmbeddedActivator implements BundleActivator {
 
 	public void start(BundleContext context) {
 		new org.apache.derby.jdbc.EmbeddedDriver();

Modified: incubator/derby/code/branches/10.1/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java (original)
+++ incubator/derby/code/branches/10.1/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java Thu Jul 21 07:41:36 2005
@@ -42,7 +42,7 @@
 import java.sql.Types;
 
 
-public class LocalizedResource  implements java.security.PrivilegedAction {
+public final class LocalizedResource  implements java.security.PrivilegedAction {
 
 	private ResourceBundle res;
 	private Locale locale;

Modified: incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/util.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/util.java?rev=220095&r1=220094&r2=220095&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/util.java (original)
+++ incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/util.java Thu Jul 21 07:41:36 2005
@@ -51,7 +51,7 @@
 	@see org.apache.derby.tools.JDBCDisplayUtil
 	@author ames
  */
-public class util implements java.security.PrivilegedAction {
+public final class util implements java.security.PrivilegedAction {
 	
 	private static boolean HAVE_BIG_DECIMAL;
 	
@@ -680,7 +680,7 @@
 		// perhaps just document the behavior... 
 	}
 
-	public static final String getSystemProperty(String propertyName) {
+	static final String getSystemProperty(String propertyName) {
 		try
 		{
 			if (propertyName.startsWith("ij.") || propertyName.startsWith("derby."))



Mime
View raw message