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-serv22519/src/main/java/org/xdoclet/plugin/externalizer
Modified Files:
MessageBundlePlugin.java PropertiesTranslatorPlugin.java
PropertiesTranslatorPlugin.vm
Log Message:
(XDP-78) Applied patch which corrects output bundle filename
Index: PropertiesTranslatorPlugin.vm
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-externalizer/src/main/java/org/xdoclet/plugin/externalizer/PropertiesTranslatorPlugin.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PropertiesTranslatorPlugin.vm 8 Dec 2003 14:53:27 -0000 1.1
--- PropertiesTranslatorPlugin.vm 6 Jul 2005 07:27:59 -0000 1.2
***************
*** 9,15 ****
import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
- import java.util.Locale;
public class ${plugin.getDestinationClassname($class)} {
--- 9,15 ----
import java.text.MessageFormat;
+ import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
public class ${plugin.getDestinationClassname($class)} {
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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MessageBundlePlugin.java 9 Dec 2004 19:23:47 -0000 1.8
--- MessageBundlePlugin.java 6 Jul 2005 07:27:59 -0000 1.9
***************
*** 1,13 ****
package org.xdoclet.plugin.externalizer;
! import com.thoughtworks.qdox.model.JavaClass;
! import org.generama.defaults.QDoxPlugin;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;
import org.xdoclet.plugin.externalizer.qtags.MsgMessageTagImpl;
import org.xdoclet.plugin.externalizer.qtags.TagLibrary;
! import java.util.Collection;
public class MessageBundlePlugin extends QDoxPlugin {
--- 1,21 ----
+ /*
+ * Copyright (c) 2003
+ * XDoclet Team
+ * All rights reserved.
+ */
package org.xdoclet.plugin.externalizer;
! import java.util.Collection;
!
import org.generama.QDoxCapableMetadataProvider;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;
+
+ import org.generama.defaults.QDoxPlugin;
+
import org.xdoclet.plugin.externalizer.qtags.MsgMessageTagImpl;
import org.xdoclet.plugin.externalizer.qtags.TagLibrary;
! import com.thoughtworks.qdox.model.JavaClass;
public class MessageBundlePlugin extends QDoxPlugin {
***************
*** 15,22 ****
private String country;
private String variant;
-
public MessageBundlePlugin(VelocityTemplateEngine templateEngine,
QDoxCapableMetadataProvider metadataProvider,
! WriterMapper writerMapper) {
super(templateEngine, metadataProvider, writerMapper);
setFileregex("\\.java");
--- 23,29 ----
private String country;
private String variant;
public MessageBundlePlugin(VelocityTemplateEngine templateEngine,
QDoxCapableMetadataProvider metadataProvider,
! WriterMapper writerMapper) {
super(templateEngine, metadataProvider, writerMapper);
setFileregex("\\.java");
***************
*** 24,28 ****
setMultioutput(true);
new TagLibrary(metadataProvider);
-
}
--- 31,34 ----
***************
*** 53,57 ****
--- 59,65 ----
public String getBundleKey() {
StringBuffer sb = new StringBuffer();
+
if (getLang() != null) {
+ sb.append("_");
sb.append(getLang());
} else {
***************
*** 70,73 ****
--- 78,82 ----
sb.append(getVariant());
}
+
return sb.toString();
}
***************
*** 91,95 ****
}
}
!
// fallen through
return false;
--- 100,104 ----
}
}
!
// fallen through
return false;
***************
*** 100,102 ****
return clazz.getTagByName("msg.bundle") != null;
}
! }
--- 109,111 ----
return clazz.getTagByName("msg.bundle") != null;
}
! }
\ No newline at end of file
Index: PropertiesTranslatorPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-externalizer/src/main/java/org/xdoclet/plugin/externalizer/PropertiesTranslatorPlugin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PropertiesTranslatorPlugin.java 13 Nov 2004 09:27:04 -0000 1.5
--- PropertiesTranslatorPlugin.java 6 Jul 2005 07:27:59 -0000 1.6
***************
*** 1,14 ****
package org.xdoclet.plugin.externalizer;
- import com.thoughtworks.qdox.model.JavaClass;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;
import org.generama.defaults.JavaGeneratingPlugin;
import org.xdoclet.plugin.externalizer.qtags.TagLibrary;
! public class PropertiesTranslatorPlugin extends JavaGeneratingPlugin {
! public PropertiesTranslatorPlugin(VelocityTemplateEngine
velocityTemplateEngine, QDoxCapableMetadataProvider metadataProvider,
WriterMapper writerMapper) throws ClassNotFoundException {
super(velocityTemplateEngine, metadataProvider, writerMapper);
setFileregex("\\.java");
--- 1,23 ----
+ /*
+ * Copyright (c) 2003
+ * XDoclet Team
+ * All rights reserved.
+ */
package org.xdoclet.plugin.externalizer;
import org.generama.QDoxCapableMetadataProvider;
import org.generama.VelocityTemplateEngine;
import org.generama.WriterMapper;
+
import org.generama.defaults.JavaGeneratingPlugin;
+
import org.xdoclet.plugin.externalizer.qtags.TagLibrary;
! import com.thoughtworks.qdox.model.JavaClass;
! public class PropertiesTranslatorPlugin extends JavaGeneratingPlugin {
! public PropertiesTranslatorPlugin(VelocityTemplateEngine
velocityTemplateEngine,
! QDoxCapableMetadataProvider metadataProvider, WriterMapper
writerMapper)
! throws ClassNotFoundException {
super(velocityTemplateEngine, metadataProvider, writerMapper);
setFileregex("\\.java");
***************
*** 16,27 ****
setMultioutput(true);
new TagLibrary(metadataProvider);
-
}
-
public boolean shouldGenerate(Object metadata) {
JavaClass clazz = (JavaClass) metadata;
return clazz.getTagByName("msg.bundle") != null;
}
! }
!
--- 25,33 ----
setMultioutput(true);
new TagLibrary(metadataProvider);
}
public boolean shouldGenerate(Object metadata) {
JavaClass clazz = (JavaClass) metadata;
return clazz.getTagByName("msg.bundle") != null;
}
! }
\ No newline at end of file
-------------------------------------------------------
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
