You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-dev@portals.apache.org by st...@apache.org on 2004/02/22 13:06:59 UTC
cvs commit: jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/om/common/impl LanguageImpl.java LanguageSetImpl.java
sthepper 2004/02/22 04:06:59
Modified: portal/src/java/org/apache/pluto/portalImpl/om/common/impl
LanguageImpl.java LanguageSetImpl.java
Log:
fixed bug 27140: resouce bundle in portlet.xml not recognized
Revision Changes Path
1.2 +0 -25 jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java
Index: LanguageImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LanguageImpl.java 7 Jan 2004 20:37:16 -0000 1.1
+++ LanguageImpl.java 22 Feb 2004 12:06:59 -0000 1.2
@@ -65,30 +65,6 @@
public class LanguageImpl implements Language, java.io.Serializable {
// ResourceBundle creation part
- /*private static class Resources extends ListResourceBundle {
- private Object [][] resources = null;
- private Language source = null;
-
- public Resources(Language source)
- {
- this.source = source;
- Vector v = new Vector();
- Iterator it = source.getKeywords();
- while(it != null && it.hasNext())
- v.add(it.next());
-
- resources = new Object [][] {
- { "javax.portlet.title", source.getTitle()==null? "": source.getTitle()},
- { "javax.portlet.short-title", source.getShortTitle()==null? "": source.getShortTitle()},
- { "javax.portlet.keywords", v.size() > 0 ? v.toArray().toString() : ""}};
- }
-
- public Object[][] getContents()
- {
- return resources;
- }
- }*/
-
private static class DefaultsResourceBundle extends ListResourceBundle {
private Object[][] resources;
@@ -120,7 +96,6 @@
for (Enumeration enum = bundle.getKeys(); enum.hasMoreElements();) {
String key = (String)enum.nextElement();
Object value = bundle.getObject(key);
-
data.put(key, value);
}
}
1.3 +2 -1 jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java
Index: LanguageSetImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LanguageSetImpl.java 19 Feb 2004 20:30:56 -0000 1.2
+++ LanguageSetImpl.java 22 Feb 2004 12:06:59 -0000 1.3
@@ -98,7 +98,6 @@
private Language createLanguage(Locale locale, ResourceBundle bundle)
{
LanguageImpl lang = new LanguageImpl(locale, bundle, title, shortTitle, castorKeywords);
-
return(Language)lang;
}
@@ -190,6 +189,8 @@
{
locales.addAll((Collection)parameter);
initInlinedInfos();
+ if ( resources != null )
+ initResourceBundle();
}
public void postStore(Object parameter) throws Exception