svn commit: rev 36090 - incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt

[kentam]

Author: kentam
Date: Sun Aug  8 15:33:45 2004
New Revision: 36090

Modified:
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientManifest.java
Log:
Surface charset specification in client manifest emit(), misc fixes/cleanup



Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
        Sun Aug  8 15:33:45 2004
@@ -112,7 +112,8 @@
         for ( TypeDeclaration clientType : clientTypes )
         {
             String clientPkg = clientType.getPackage().getQualifiedName();
-            File clientManifestName = new File( clientType.getSimpleName() + 
".controls.properties" );
+            File clientManifestName =
+                new File( clientType.getSimpleName() + 
ControlClientManifest.FILE_EXTENSION );
 
             ControlClientManifest mf = new ControlClientManifest( 
clientType.getQualifiedName() );
 
@@ -132,7 +133,7 @@
                     mf.addControlType( controlIntfOrExt.toString(), defBinding 
);
                 }
 
-                mf.emit( f, clientPkg, clientManifestName );
+                mf.emit( f, clientPkg, clientManifestName, null );
             }
             catch ( IOException ie )
             {

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientManifest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientManifest.java
   (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientManifest.java
   Sun Aug  8 15:33:45 2004
@@ -102,9 +102,9 @@
      * @param mf the name of the manifest
      * @throws IOException
      */
-    public void emit( Filer f, String pkg, File mf ) throws IOException
+    public void emit( Filer f, String pkg, File mf, String csn ) throws 
IOException
     {
-        PrintWriter pw = f.createTextFile( Filer.Location.CLASS_TREE, pkg, mf, 
null );
+        PrintWriter pw = f.createTextFile( Filer.Location.CLASS_TREE, pkg, mf, 
csn );
 
         pw.println( "# Apache Beehive Controls client manifest 
(auto-generated, do not edit!)");
         Set props = _properties.keySet();
@@ -114,6 +114,9 @@
             String value = _properties.getProperty( name );
             pw.println( name + "=" + value );
         }
+
+        pw.flush();
+        pw.close();
     }
 
     private Properties _properties = new Properties();