* gnu/java/security/provider/DefaultPolicy.java: New file, from libgcj.

	* java/security: Merge from libgcj. These are mostly formatting
	fixes, with a few fixes and enhancements.

1 files changed, 12 insertions, 13 deletions

diff --git a/java/security/DomainCombiner.java b/java/security/DomainCombiner.java
index 0219d5b3c..57f78b164 100644
--- a/java/security/DomainCombiner.java
+++ b/java/security/DomainCombiner.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -24,7 +24,6 @@ resulting executable to be covered by the GNU General Public License.
 This exception does not however invalidate any other reasons why the
 executable file might be covered by the GNU General Public License. */
 
-
 package java.security;
 
 /**
@@ -38,17 +37,17 @@ package java.security;
 
    @since JDK 1.3
    @author Mark Benvenuto 
-*/
+ */
 public interface DomainCombiner
 {
-    /**
-       Combines the current ProtectionDomains of the Thread with new
-       ProtectionDomains.
-
-       @param currentDomains - the ProtectionDomains for the current thread.
-       @param assignedDomains - ProtectionsDomains to add
-       @returns a new array of all the ProtectionDomains 
-    */
-  public ProtectionDomain[] combine(ProtectionDomain[] currentDomains,
-				    ProtectionDomain[] assignedDomains);
+  /**
+     Combines the current ProtectionDomains of the Thread with new
+     ProtectionDomains.
+
+     @param currentDomains - the ProtectionDomains for the current thread.
+     @param assignedDomains - ProtectionsDomains to add
+     @returns a new array of all the ProtectionDomains 
+   */
+  public ProtectionDomain[] combine(ProtectionDomain[]currentDomains,
+				    ProtectionDomain[]assignedDomains);
 }