Bug 327846 - Method names conflicting with Java keywords should have underscore prepended, not appended. Expand list of Java keywords. General cleanup. r=bsmedberg. xulrunner only

Original committer: pedemont%us.ibm.com
Original revision: 1.2
Original date: 2006/03/30 22:31:57

extensions/java/xpcom/interfaces/org/mozilla/xpcom/IAppFileLocProvider.java

@@ -76,7 +76,7 @@ public interface IAppFileLocProvider {
    *
    * @return            the file represented by the property
    */
-  public File getFile(String prop, boolean[] persistent);
+  File getFile(String prop, boolean[] persistent);
 
   /**
    * Directory Service calls this when it gets a request for
@@ -86,7 +86,7 @@ public interface IAppFileLocProvider {
    *
    * @return      an array of file locations
    */
-  public File[] getFiles(String prop);
+  File[] getFiles(String prop);
 
 }
 

extensions/java/xpcom/interfaces/org/mozilla/xpcom/IGRE.java

@@ -62,7 +62,7 @@ public interface IGRE {
    *
    * @throws XPCOMException  if a failure occurred during initialization
    */
-  public void initEmbedding(File aLibXULDirectory, File aAppDirectory,
+  void initEmbedding(File aLibXULDirectory, File aAppDirectory,
           IAppFileLocProvider aAppDirProvider) throws XPCOMException;
 
   /**
@@ -73,7 +73,7 @@ public interface IGRE {
    *
    * @throws XPCOMException  if a failure occurred during initialization
    */
-  public void termEmbedding() throws XPCOMException;
+  void termEmbedding() throws XPCOMException;
 
 }
 

extensions/java/xpcom/interfaces/org/mozilla/xpcom/IXPCOM.java

@@ -65,7 +65,7 @@ public interface IXPCOM {
    *      <li> Other error codes indicate a failure during initialisation. </li>
    * </ul>
    */
-  public nsIServiceManager initXPCOM(File aMozBinDirectory,
+  nsIServiceManager initXPCOM(File aMozBinDirectory,
           IAppFileLocProvider aAppFileLocProvider) throws XPCOMException;
 
   /**
@@ -77,7 +77,7 @@ public interface IXPCOM {
    *
    * @exception XPCOMException  if a failure occurred during termination
    */
-  public void shutdownXPCOM(nsIServiceManager aServMgr) throws XPCOMException;
+  void shutdownXPCOM(nsIServiceManager aServMgr) throws XPCOMException;
 
   /**
    * Public Method to access to the service manager.
@@ -86,7 +86,7 @@ public interface IXPCOM {
    *
    * @exception XPCOMException
    */
-  public nsIServiceManager getServiceManager() throws XPCOMException;
+  nsIServiceManager getServiceManager() throws XPCOMException;
 
   /**
    * Public Method to access to the component manager.
@@ -95,7 +95,7 @@ public interface IXPCOM {
    *
    * @exception XPCOMException
    */
-  public nsIComponentManager getComponentManager() throws XPCOMException;
+  nsIComponentManager getComponentManager() throws XPCOMException;
 
   /**
    * Public Method to access to the component registration manager.
@@ -104,7 +104,7 @@ public interface IXPCOM {
    *
    * @exception XPCOMException
    */
-  public nsIComponentRegistrar getComponentRegistrar() throws XPCOMException;
+  nsIComponentRegistrar getComponentRegistrar() throws XPCOMException;
 
   /**
    * Public Method to create an instance of a nsILocalFile.
@@ -124,7 +124,7 @@ public interface IXPCOM {
    *           or relative paths (must supply full file path) </li>
    * </ul>
    */
-  public nsILocalFile newLocalFile(String aPath, boolean aFollowLinks)
+  nsILocalFile newLocalFile(String aPath, boolean aFollowLinks)
           throws XPCOMException;
 
 }