harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lvj...@apache.org
Subject svn commit: r998820 - in /harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools: Diagnostic.java FileObject.java ForwardingFileObject.java JavaFileObject.java StandardLocation.java
Date Mon, 20 Sep 2010 07:57:00 GMT
Author: lvjing
Date: Mon Sep 20 07:57:00 2010
New Revision: 998820

URL: http://svn.apache.org/viewvc?rev=998820&view=rev
Log:
fix minor signature difference

Modified:
    harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/Diagnostic.java
    harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/FileObject.java
    harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/ForwardingFileObject.java
    harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/JavaFileObject.java
    harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/StandardLocation.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/Diagnostic.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/Diagnostic.java?rev=998820&r1=998819&r2=998820&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/Diagnostic.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/Diagnostic.java
Mon Sep 20 07:57:00 2010
@@ -21,7 +21,7 @@ import java.util.Locale;
 
 public interface Diagnostic<S> {
     static enum Kind {
-        ERROR, MANDATORY_WARNING, NOTE, OTHER, WARNING
+        ERROR, WARNING, MANDATORY_WARNING, NOTE, OTHER 
     }
 
     String getCode();

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/FileObject.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/FileObject.java?rev=998820&r1=998819&r2=998820&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/FileObject.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/FileObject.java
Mon Sep 20 07:57:00 2010
@@ -16,6 +16,7 @@
  */
 package javax.tools;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -25,19 +26,22 @@ import java.net.URI;
 public interface FileObject {
     boolean delete();
 
-    CharSequence getCharContent(boolean ignoreEncodingErrors);
+    CharSequence getCharContent(boolean ignoreEncodingErrors)
+            throws IOException;
 
     long getLastModified();
 
     String getName();
 
-    InputStream openInputStream();
+    InputStream openInputStream() throws IllegalStateException,
+            UnsupportedOperationException, IOException;
 
-    OutputStream openOutputStream();
+    OutputStream openOutputStream() throws IllegalStateException,
+            UnsupportedOperationException, IOException;
 
-    Reader openReader(boolean ignoreEncodingErrors);
+    Reader openReader(boolean ignoreEncodingErrors) throws IOException;
 
-    Writer openWriter();
+    Writer openWriter() throws IOException;
 
     URI toUri();
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/ForwardingFileObject.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/ForwardingFileObject.java?rev=998820&r1=998819&r2=998820&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/ForwardingFileObject.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/ForwardingFileObject.java
Mon Sep 20 07:57:00 2010
@@ -17,6 +17,7 @@
 
 package javax.tools;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -24,10 +25,10 @@ import java.io.Writer;
 import java.net.URI;
 
 public class ForwardingFileObject<F extends FileObject> implements FileObject {
-    
+
     protected final F fileObject;
-    
-    protected ForwardingFileObject(F fileObject){
+
+    protected ForwardingFileObject(F fileObject) {
         this.fileObject = fileObject;
     }
 
@@ -36,29 +37,29 @@ public class ForwardingFileObject<F exte
         return fileObject.delete();
     }
 
-    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+    public CharSequence getCharContent(boolean ignoreEncodingErrors)
+            throws IOException {
         // do nothing here
         return fileObject.getCharContent(ignoreEncodingErrors);
     }
 
-
     public long getLastModified() {
         return fileObject.getLastModified();
     }
 
-    public InputStream openInputStream() {
+    public InputStream openInputStream() throws IOException {
         return fileObject.openInputStream();
     }
 
-    public OutputStream openOutputStream() {
+    public OutputStream openOutputStream() throws IOException {
         return fileObject.openOutputStream();
     }
 
-    public Reader openReader(boolean ignoreEncodingErrors) {
+    public Reader openReader(boolean ignoreEncodingErrors) throws IOException {
         return fileObject.openReader(ignoreEncodingErrors);
     }
 
-    public Writer openWriter() {
+    public Writer openWriter() throws IOException {
         return fileObject.openWriter();
     }
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/JavaFileObject.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/JavaFileObject.java?rev=998820&r1=998819&r2=998820&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/JavaFileObject.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/JavaFileObject.java
Mon Sep 20 07:57:00 2010
@@ -24,7 +24,7 @@ import javax.lang.model.element.NestingK
 
 public interface JavaFileObject extends FileObject {
     public static enum Kind {
-        CLASS, HTML, OTHER, SOURCE;
+        SOURCE, CLASS, HTML, OTHER;
         public final String extension = "";
     }
     

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/StandardLocation.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/StandardLocation.java?rev=998820&r1=998819&r2=998820&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/StandardLocation.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/src/main/java/javax/tools/StandardLocation.java
Mon Sep 20 07:57:00 2010
@@ -22,7 +22,7 @@ import java.util.Set;
 import java.util.Map.Entry;
 
 public enum StandardLocation implements JavaFileManager.Location {
-	ANNOTATION_PROCESSOR_PATH, CLASS_OUTPUT, CLASS_PATH, PLATFORM_CLASS_PATH, SOURCE_OUTPUT,
SOURCE_PATH;
+    CLASS_OUTPUT, SOURCE_OUTPUT, CLASS_PATH, SOURCE_PATH, ANNOTATION_PROCESSOR_PATH, PLATFORM_CLASS_PATH,
;
 
 	static HashMap<String, JavaFileManager.Location> slist = new HashMap<String, JavaFileManager.Location>();
 



Mime
View raw message