dgraham 2003/07/26 12:01:12
Modified: src/share/org/apache/struts/taglib TagUtils.java
Log:
Simplified return logic in getActionMappingName().
Revision Changes Path
1.12 +8 -12 jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java
Index: TagUtils.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TagUtils.java 26 Jul 2003 18:58:37 -0000 1.11
+++ TagUtils.java 26 Jul 2003 19:01:12 -0000 1.12
@@ -353,11 +353,7 @@
value = value.substring(0, period);
}
- if (value.startsWith("/")) {
- return (value);
- } else {
- return ("/" + value);
- }
+ return value.startsWith("/") ? value : ("/" + value);
}
/**
@@ -601,9 +597,9 @@
Locale userLocale = getUserLocale(pageContext, locale);
if (args == null) {
- return (resources.getMessage(userLocale, key));
+ return resources.getMessage(userLocale, key);
} else {
- return (resources.getMessage(userLocale, key, args));
+ return resources.getMessage(userLocale, key, args);
}
}
@@ -633,7 +629,7 @@
Locale userLocale = getUserLocale(pageContext, locale);
- return (resources.isPresent(userLocale, key));
+ return resources.isPresent(userLocale, key);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
