Author: tv
Date: Sun Jun 22 02:37:21 2008
New Revision: 670330
URL: http://svn.apache.org/viewvc?rev=670330&view=rev
Log:
Major code cleanup, formatting and styling, warnings removed
Modified:
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/LocaleTokenizer.java
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java
turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java
turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
Modified:
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/LocaleTokenizer.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/LocaleTokenizer.java?rev=670330&r1=670329&r2=670330&view=diff
==============================================================================
---
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/LocaleTokenizer.java
(original)
+++
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/LocaleTokenizer.java
Sun Jun 22 02:37:21 2008
@@ -53,7 +53,7 @@
* The default quality value for an <code>AcceptLanguage</code>
* object.
*/
- private static final Float DEFAULT_QUALITY = new Float(1.0f);
+ protected static final Float DEFAULT_QUALITY = new Float(1.0f);
/**
* The parsed locales.
@@ -90,6 +90,7 @@
}
catch (NumberFormatException useDefault)
{
+ // ignore
}
}
}
@@ -153,7 +154,7 @@
* Struct representing an element of the HTTP
* <code>Accept-Language</code> header.
*/
- private class AcceptLanguage implements Comparable
+ protected static class AcceptLanguage implements Comparable
{
/**
* The language and country.
Modified:
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java?rev=670330&r1=670329&r2=670330&view=diff
==============================================================================
---
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java
Sun Jun 22 02:37:21 2008
@@ -509,6 +509,7 @@
}
catch (MissingResourceException ignored)
{
+ // ignore
}
}
return null;
@@ -554,24 +555,14 @@
String key,
Object[] args)
{
- if (locale == null)
- {
- // When formatting Date objects and such, MessageFormat
- // cannot have a null Locale.
- locale = getDefaultLocale();
- }
+ // When formatting Date objects and such, MessageFormat
+ // cannot have a null Locale.
+ Locale formatLocale = (locale == null) ? getDefaultLocale() : locale;
String value = getString(bundleName, locale, key);
- if (args == null)
- {
- args = NO_ARGS;
- }
- // FIXME: after switching to JDK 1.4, it will be possible to clean
- // this up by providing the Locale along with the string in the
- // constructor to MessageFormat. Until 1.4, the following workaround
- // is required for constructing the format with the appropriate locale:
- MessageFormat messageFormat = new MessageFormat("");
- messageFormat.setLocale(locale);
- messageFormat.applyPattern(value);
- return messageFormat.format(args);
+
+ Object[] formatArgs = (args == null) ? NO_ARGS : args;
+
+ MessageFormat messageFormat = new MessageFormat(value, formatLocale);
+ return messageFormat.format(formatArgs);
}
}
Modified:
turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java?rev=670330&r1=670329&r2=670330&view=diff
==============================================================================
---
turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java
(original)
+++
turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java
Sun Jun 22 02:37:21 2008
@@ -286,12 +286,7 @@
private Map capacityMap;
private FactoryService factoryService;
private ServiceManager manager;
- /**
- * Constructs a Pool Service.
- */
- public DefaultPoolService()
- {
- }
+
/**
* Gets an instance of a named class either from the pool
* or by calling the Factory Service if the pool is empty.
@@ -568,10 +563,11 @@
*
* @return the factory service.
*/
- private FactoryService getFactory()
+ protected FactoryService getFactory()
{
return factoryService;
}
+
// ---------------- Avalon Lifecycle Methods ---------------------
/**
* Avalon component lifecycle method
Modified:
turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java?rev=670330&r1=670329&r2=670330&view=diff
==============================================================================
---
turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java
(original)
+++
turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java
Sun Jun 22 02:37:21 2008
@@ -39,10 +39,10 @@
*/
private ClassLoader classLoader;
- // this is to make the proxy happy.
public ObjectInputStreamForContext()
throws IOException
{
+ // this is to make the proxy happy.
}
/**
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java?rev=670330&r1=670329&r2=670330&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
Sun Jun 22 02:37:21 2008
@@ -190,9 +190,9 @@
catch (TorqueException e)
{
throw new DataBackendException("grant('"
- + (user != null ? user.getName() : "null") + "', '"
- + (group != null ? group.getName() : "null") + "', '"
- + (role != null ? role.getName() : "null") + "')
failed", e);
+ + user.getName() + "', '"
+ + group.getName() + "', '"
+ + role.getName() + "') failed", e);
}
finally
{
@@ -271,9 +271,9 @@
catch (TorqueException e)
{
throw new DataBackendException("revoke('"
- + (user != null ? user.getName() : "null") + "', '"
- + (group != null ? group.getName() : "null") + "', '"
- + (role != null ? role.getName() : "null") + "')
failed", e);
+ + user.getName() + "', '"
+ + group.getName() + "', '"
+ + role.getName() + "') failed", e);
}
finally
{
