You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by jm...@apache.org on 2004/06/02 18:55:35 UTC
cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver PortletInvokerImpl.java
jmacna 2004/06/02 09:55:35
Modified: src/org/apache/wsrp4j/producer/driver WSRPEngine.java
src/org/apache/wsrp4j/util Utility.java
src/org/apache/wsrp4j/producer/provider/pluto/driver
PortletInvokerImpl.java
Log:
Fixes WSRP4J-10: org.apache.wsrp4j.util.Utility defines an incorrect constant as the LOCALE_SEPARATOR
org.apache.wsrp4j.util.Utility defines redundant methods with LocaleHelper, so references to Utility
are changed to call equivalent methods on LocaleHelper, which takes into account both "_" and "-" as
locale separators.
Revision Changes Path
1.6 +4 -3 ws-wsrp4j/src/org/apache/wsrp4j/producer/driver/WSRPEngine.java
Index: WSRPEngine.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/driver/WSRPEngine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSRPEngine.java 1 Jun 2004 10:48:53 -0000 1.5
+++ WSRPEngine.java 2 Jun 2004 16:55:35 -0000 1.6
@@ -74,6 +74,7 @@
import org.apache.wsrp4j.producer.provider.ProducerOfferedPortlet;
import org.apache.wsrp4j.producer.provider.Provider;
import org.apache.wsrp4j.util.Constants;
+import org.apache.wsrp4j.util.LocaleHelper;
import org.apache.wsrp4j.util.ParameterChecker;
import org.apache.wsrp4j.util.Utility;
@@ -648,12 +649,12 @@
} else
{
// lets see if at least a the language can be done
- if (Utility
+ if (LocaleHelper
.getLanguageCode(locales[m])
- .equalsIgnoreCase(Utility.getLanguageCode(reqLocales[n])))
+ .equalsIgnoreCase(LocaleHelper.getLanguageCode(reqLocales[n])))
{
match.setLocales(
- new String[] { Utility.getLanguageCode(locales[m])});
+ new String[] { LocaleHelper.getLanguageCode(locales[m])});
if (logger.isLogging(Logger.TRACE_HIGH))
{
1.3 +0 -64 ws-wsrp4j/src/org/apache/wsrp4j/util/Utility.java
Index: Utility.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/Utility.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Utility.java 9 Mar 2004 21:42:11 -0000 1.2
+++ Utility.java 2 Jun 2004 16:55:35 -0000 1.3
@@ -31,70 +31,6 @@
public class Utility
{
- private final static String LOCALE_SEPARATOR = "-";
-
- /**
- * Gets the language code from a locales string representation, assuming
- * that the provided locale has a format like [2 char language code]"-"[2 char country code].
- *
- * @param locale The locale as <code>String</code>.
- * @return The language code.
- **/
- public static String getLanguageCode(String locale)
- {
-
- String code = "";
-
- int pos = locale.indexOf(LOCALE_SEPARATOR);
-
- if (pos != -1)
- {
- code = locale.substring(0, pos);
- } else {
-
- if(locale.length() == 2) {
- // guess the locale consists is the only language code
- code = locale;
- }
- }
-
- return code;
- }
-
- /**
- * Gets the country code from a locales string representation, assuming
- * that the provided locale has a format like [2 char language code]"-"[2 char country code].
- *
- * @param locale The locale as <code>String</code>.
- * @return The country code.
- **/
- public static String getCountryCode(String locale)
- {
-
- String code = "";
-
- int pos = locale.indexOf(LOCALE_SEPARATOR);
-
- if (pos != -1)
- {
- code = locale.substring(pos + 1, locale.length());
- }
-
- return code;
- }
-
- /**
- * Convinence method to create a <code>Locale</code> object from a locales
- * string representation, assuming that the provided locale has a format like
- * [2 char language code]"-"[2 char country code].
- *
- * @param locale The locale as <code>String</code>.
- * @return The corresponding <code>Locale</code> object.
- **/
- public static Locale getLocale(String locale)
- {
- return new Locale(getLanguageCode(locale), getCountryCode(locale));
- }
/**
* Loads a property file with the given name using the class loader.
1.7 +3 -2 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java
Index: PortletInvokerImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortletInvokerImpl.java 1 Jun 2004 10:48:54 -0000 1.6
+++ PortletInvokerImpl.java 2 Jun 2004 16:55:35 -0000 1.7
@@ -49,6 +49,7 @@
import org.apache.wsrp4j.producer.util.MapDeserializer;
import org.apache.wsrp4j.producer.util.MapSerializer;
import org.apache.wsrp4j.producer.util.ServletAccess;
+import org.apache.wsrp4j.util.LocaleHelper;
import org.apache.wsrp4j.util.Utility;
import org.apache.wsrp4j.util.Constants;
@@ -116,7 +117,7 @@
win = getPortletWindow(portletEntity, portletID);
}
- Locale usedLocale = Utility.getLocale(request.getMarkupParams().getLocales()[0]);
+ Locale usedLocale = LocaleHelper.getLocale(request.getMarkupParams().getLocales()[0]);
StoredResponse servletResponse = new StoredResponse();
HttpServletRequest servletRequestOrig = ServletAccess.getServletRequest();
@@ -231,7 +232,7 @@
win = getPortletWindow(portletEntity, portletID);
}
- Locale usedLocale = Utility.getLocale(request.getMarkupParams().getLocales()[0]);
+ Locale usedLocale = LocaleHelper.getLocale(request.getMarkupParams().getLocales()[0]);
StoredResponse servletResponse = new StoredResponse();
HttpServletRequest servletRequestOrig = ServletAccess.getServletRequest();