dlr 01/05/30 23:58:50
Modified: src/java/org/apache/turbine/services TurbineServices.java
Log:
* Refactored getProperties() to do slightly less work.
* Added new getLogger() macro to reduce dup'd code and casting.
* Refactored notice(), error(), and enableLogging() to take advantage
of getLogger() and to add some whitespace for better readability.
Revision Changes Path
1.28 +33 -21
jakarta-turbine/src/java/org/apache/turbine/services/TurbineServices.java
Index: TurbineServices.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/TurbineServices.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TurbineServices.java 2001/05/05 13:26:56 1.27
+++ TurbineServices.java 2001/05/31 06:58:50 1.28
@@ -71,7 +71,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Kevin Burton</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: TurbineServices.java,v 1.27 2001/05/05 13:26:56 jvanzyl Exp $
+ * @version $Id: TurbineServices.java,v 1.28 2001/05/31 06:58:50 dlr Exp $
*/
public class TurbineServices
extends BaseServiceBroker
@@ -273,8 +273,9 @@
{
Properties properties = new Properties();
- Iterator keys = TurbineResources.getKeys(SERVICE_PREFIX + name + ".");
- int pref = SERVICE_PREFIX.length() + name.length() + 1;
+ String servicePrefix = SERVICE_PREFIX + name + '.';
+ Iterator keys = TurbineResources.getKeys(servicePrefix);
+
while(keys.hasNext())
{
String key = (String)keys.next();
@@ -288,7 +289,8 @@
String[] values = TurbineResources.getStringArray(key);
value = values[values.length - 1];
}
- properties.setProperty(key.substring(pref), value);
+ properties.setProperty(key.substring(servicePrefix.length()),
+ value);
}
return properties;
@@ -341,18 +343,19 @@
{
if (enabledLogging)
{
- LoggingService logger=(LoggingService)TurbineServices
- .getInstance().getService(LoggingService.SERVICE_NAME);
- if (logger==null)
+ LoggingService logger = getLogger();
+ if (logger == null)
+ {
+ System.out.println("(!) NOTICE: " + msg);
+ }
+ else
{
- System.out.println("(!) NOTICE: "+msg);
- return;
+ logger.info(msg);
}
- logger.info(msg);
}
else
{
- System.out.println("NOTICE: "+msg);
+ System.out.println("NOTICE: " + msg);
}
}
@@ -370,18 +373,19 @@
{
if (enabledLogging)
{
- LoggingService logger =
- (LoggingService)getService(LoggingService.SERVICE_NAME);
- if (logger==null)
+ LoggingService logger = getLogger();
+ if (logger == null)
{
- System.out.println("(!) ERROR: "+t.getMessage());
- return;
+ System.out.println("(!) ERROR: " + t.getMessage());
}
- logger.error("",t);
+ else
+ {
+ logger.error("", t);
+ }
}
else
{
- System.out.println("ERROR: "+t.getMessage());
+ System.out.println("ERROR: " + t.getMessage());
t.printStackTrace();
}
@@ -393,11 +397,19 @@
*/
private void enableLogging()
{
- LoggingService
logger=(LoggingService)getService(LoggingService.SERVICE_NAME);
- if (logger!=null)
+ LoggingService logger = getLogger();
+ if (logger != null)
{
logger.info("ServiceBroker: LoggingService enabled.");
- enabledLogging=true;
+ enabledLogging = true;
}
+ }
+
+ /**
+ * Macro to reduce duplicated code and casting.
+ */
+ private final LoggingService getLogger()
+ {
+ return (LoggingService) getService(LoggingService.SERVICE_NAME);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
