You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2003/02/25 21:00:28 UTC
cvs commit: jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/xmlmodel AppData.java
dlr 2003/02/25 12:00:25
Modified: src/java/org/apache/fulcrum/intake/xmlmodel AppData.java
Log:
* src/java/org/apache/fulcrum/intake/xmlmodel/AppData.java
loadFromXML(Attributes): Simplified method, pushing logic into
setBasePackage(String).
setBasePackage(String): Pushed business logic previously in the
loadFromXML() callback into this method.
Revision Changes Path
1.2 +21 -18 jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/xmlmodel/AppData.java
Index: AppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/xmlmodel/AppData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- AppData.java 30 May 2002 02:27:21 -0000 1.1
+++ AppData.java 25 Feb 2003 20:00:24 -0000 1.2
@@ -85,22 +85,7 @@
*/
public void loadFromXML (Attributes attrib)
{
- String basePkg = attrib.getValue("basePackage");
- if ( basePkg == null )
- {
- setBasePackage("");
- }
- else
- {
- if ( basePkg.charAt(basePkg.length()-1) != '.' )
- {
- setBasePackage(basePkg + '.');
- }
- else
- {
- setBasePackage(basePkg);
- }
- }
+ setBasePackage(basePkg);
}
/**
@@ -178,6 +163,18 @@
*/
public void setBasePackage(String v)
{
+ if (v != null)
+ {
+ int len = v.length();
+ if (len > 0 && v.chatAt(len - 1) != '.')
+ {
+ v += '.';
+ }
+ }
+ else
+ {
+ v = "";
+ }
this.basePackage = v;
}
@@ -189,7 +186,13 @@
{
StringBuffer result = new StringBuffer();
- result.append ("<input-data>\n");
+ result.append ("<input-data");
+ String basePackage = getBasePackage();
+ if (basePackage != null && basePackage.length() > 0)
+ {
+ result.append(" basePackage=\"").append(basePackage).append('"');
+ }
+ result.append(">\n");
for (Iterator iter = inputs.iterator() ; iter.hasNext() ;)
{
result.append (iter.next());
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org