Update of 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-externalizer/src/main/java/org/xdoclet/plugin/externalizer
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7230/src/main/java/org/xdoclet/plugin/externalizer

Modified Files:
        MessageBundlePlugin.java MessageBundlePlugin.vm 
Log Message:
(XDP-79) Improvement of struts resouce bundle

Index: MessageBundlePlugin.java
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-externalizer/src/main/java/org/xdoclet/plugin/externalizer/MessageBundlePlugin.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MessageBundlePlugin.java    6 Jul 2005 07:27:59 -0000       1.9
--- MessageBundlePlugin.java    22 Jul 2005 10:18:31 -0000      1.10
***************
*** 6,11 ****
  package org.xdoclet.plugin.externalizer;
  
- import java.util.Collection;
- 
  import org.generama.QDoxCapableMetadataProvider;
  import org.generama.VelocityTemplateEngine;
--- 6,9 ----
***************
*** 23,32 ****
      private String country;
      private String variant;
! 
      public MessageBundlePlugin(VelocityTemplateEngine templateEngine, 
QDoxCapableMetadataProvider metadataProvider,
          WriterMapper writerMapper) {
          super(templateEngine, metadataProvider, writerMapper);
-         setFileregex("\\.java");
-         setFilereplace("\\" + getBundleKey() + ".properties");
          setMultioutput(true);
          new TagLibrary(metadataProvider);
--- 21,29 ----
      private String country;
      private String variant;
!     private String destinationfilename = "ResourceBundle.properties";
!     
      public MessageBundlePlugin(VelocityTemplateEngine templateEngine, 
QDoxCapableMetadataProvider metadataProvider,
          WriterMapper writerMapper) {
          super(templateEngine, metadataProvider, writerMapper);
          setMultioutput(true);
          new TagLibrary(metadataProvider);
***************
*** 57,60 ****
--- 54,65 ----
      }
  
+       public String getDestinationfilename() {
+               return destinationfilename;
+       }
+ 
+       public void setDestinationfilename(String destinationfilename) {
+               this.destinationfilename = destinationfilename;
+       }
+       
      public String getBundleKey() {
          StringBuffer sb = new StringBuffer();
***************
*** 109,111 ****
--- 114,127 ----
          return clazz.getTagByName("msg.bundle") != null;
      }
+     
+       public void start() {
+               if (isMultioutput()) {
+               setFileregex("\\.java");
+               setFilereplace("\\" + getBundleKey() + ".properties");
+               } else {
+                       setFileregex("");
+                       setFilereplace(getDestinationfilename());
+               }
+               super.start();
+       }
  }
\ No newline at end of file

Index: MessageBundlePlugin.vm
===================================================================
RCS file: 
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-externalizer/src/main/java/org/xdoclet/plugin/externalizer/MessageBundlePlugin.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MessageBundlePlugin.vm      8 May 2004 14:04:13 -0000       1.2
--- MessageBundlePlugin.vm      22 Jul 2005 10:18:31 -0000      1.3
***************
*** 2,11 ****
  # generated message bundle for locale $plugin.bundleKey
  
! #foreach( $field in $metadata.fields )
!     #foreach( $tag in $field.getTagsByName( 'msg.message' ) )
!         #if($plugin.messageApplicable( $tag ) )
! 
  $field.name.toLowerCase()=$tag.msg
-         #end
-     #end
  #end
--- 2,20 ----
  # generated message bundle for locale $plugin.bundleKey
  
! #macro(generate_messages $list)
! #foreach( $field in $list )
! #foreach( $tag in $field.getTagsByName( 'msg.message' ) )
! #if($plugin.messageApplicable( $tag ) )
  $field.name.toLowerCase()=$tag.msg
  #end
+ #end
+ #end
+ #end
+ 
+ #if($plugin.multioutput)
+ #generate_messages($metadata.fields)
+ #else
+ #foreach( $class in $metadata )
+ #generate_messages($class.fields)
+ #end
+ #end 



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits

Reply via email to