Author: julien(a)jboss.com Date: 2007-07-05 18:21:07 -0400 (Thu, 05 Jul 2007) New Revision: 7673 Modified: trunk/widget/src/main/org/jboss/portal/test/widget/google/PreferencesTestCase.java trunk/widget/src/main/org/jboss/portal/widget/google/GGPreferencesInfo.java trunk/widget/src/main/org/jboss/portal/widget/google/GGWidget.java trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp Log: renamed getPreferencesInfo() and getPreferenceInfo() to getPreferences() and getPreference() on the GGWidgetPreferencesInfo Modified: trunk/widget/src/main/org/jboss/portal/test/widget/google/PreferencesTestCase.java =================================================================== --- trunk/widget/src/main/org/jboss/portal/test/widget/google/PreferencesTestCase.java 2007-07-05 22:03:29 UTC (rev 7672) +++ trunk/widget/src/main/org/jboss/portal/test/widget/google/PreferencesTestCase.java 2007-07-05 22:21:07 UTC (rev 7673) @@ -68,7 +68,7 @@ GGPreferencesInfo prefs = ggw.getPreferencesInfo(); // String - GGPreferenceInfo pi = prefs.getPreferenceInfo("testString"); + GGPreferenceInfo pi = prefs.getPreference("testString"); assertNotNull(pi); assertEquals("testString", pi.getName()); assertEquals("Test String", pi.getDisplayName()); @@ -76,7 +76,7 @@ assertEquals(DataType.STRING, pi.getType().getOrdinal()); // Default - pi = prefs.getPreferenceInfo("testDefault"); + pi = prefs.getPreference("testDefault"); assertNotNull(pi); assertEquals("testDefault", pi.getName()); assertEquals("Test Default", pi.getDisplayName()); @@ -84,7 +84,7 @@ assertEquals(DataType.STRING, pi.getType().getOrdinal()); // Required - pi = prefs.getPreferenceInfo("testRequired"); + pi = prefs.getPreference("testRequired"); assertNotNull(pi); assertEquals("testRequired", pi.getName()); assertEquals("Test Required", pi.getDisplayName()); @@ -93,7 +93,7 @@ assertTrue(pi.isRequired()); // Enum - pi = prefs.getPreferenceInfo("testEnum"); + pi = prefs.getPreference("testEnum"); assertNotNull(pi); assertEquals("testEnum", pi.getName()); assertEquals("Test Enum", pi.getDisplayName()); @@ -109,7 +109,7 @@ assertEquals("enumThree", enumer.getValue(2).getDisplayValue()); // Bool - pi = prefs.getPreferenceInfo("testBool"); + pi = prefs.getPreference("testBool"); assertNotNull(pi); assertEquals("testBool", pi.getName()); assertEquals("Test Bool", pi.getDisplayName()); @@ -117,7 +117,7 @@ assertEquals(DataType.BOOL, pi.getType().getOrdinal()); // Hidden - pi = prefs.getPreferenceInfo("testHidden"); + pi = prefs.getPreference("testHidden"); assertNotNull(pi); assertEquals("testHidden", pi.getName()); assertEquals("Test Hidden", pi.getDisplayName()); @@ -125,7 +125,7 @@ assertEquals(DataType.HIDDEN, pi.getType().getOrdinal()); // List - pi = prefs.getPreferenceInfo("testList"); + pi = prefs.getPreference("testList"); assertNotNull(pi); assertEquals("testList", pi.getName()); assertEquals("Test List", pi.getDisplayName()); Modified: trunk/widget/src/main/org/jboss/portal/widget/google/GGPreferencesInfo.java =================================================================== --- trunk/widget/src/main/org/jboss/portal/widget/google/GGPreferencesInfo.java 2007-07-05 22:03:29 UTC (rev 7672) +++ trunk/widget/src/main/org/jboss/portal/widget/google/GGPreferencesInfo.java 2007-07-05 22:21:07 UTC (rev 7673) @@ -35,6 +35,7 @@ public final class GGPreferencesInfo { + /** . */ public static final GGPreferencesInfo EMPTY_PREFS = new GGPreferencesInfo(); /** . */ @@ -59,12 +60,12 @@ content = null; } - public Collection getPreferencesInfo() + public Collection getPreferences() { return content == null ? Collections.EMPTY_SET : content.values(); } - public GGPreferenceInfo getPreferenceInfo(String name) + public GGPreferenceInfo getPreference(String name) { if (name == null) { Modified: trunk/widget/src/main/org/jboss/portal/widget/google/GGWidget.java =================================================================== --- trunk/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-07-05 22:03:29 UTC (rev 7672) +++ trunk/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-07-05 22:21:07 UTC (rev 7673) @@ -112,7 +112,7 @@ tmp.append("&amp;output=js"); // Append default values - for (Iterator i = prefsInfo.getPreferencesInfo().iterator();i.hasNext();) + for (Iterator i = prefsInfo.getPreferences().iterator();i.hasNext();) { GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next(); String prefName = prefInfo.getName(); Modified: trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-07-05 22:03:29 UTC (rev 7672) +++ trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-07-05 22:21:07 UTC (rev 7673) @@ -80,7 +80,7 @@ selectURL.setParameter("content.uri", widget.getId()); // Set default parametrization state - for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator(); j.hasNext();) + for (Iterator j = widget.getPreferencesInfo().getPreferences().iterator(); j.hasNext();) { GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next(); String paramName = "content.param." + prefInfo.getName(); @@ -105,7 +105,7 @@ </p> <% - if (selWidget != null && !selWidget.getPreferencesInfo().getPreferencesInfo().isEmpty()) + if (selWidget != null && !selWidget.getPreferencesInfo().getPreferences().isEmpty()) { PortletURL selectURL = renderResponse.createActionURL(); @@ -120,7 +120,7 @@ <p> <form action="<%= selectURL %>" method="post"> <% - for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();) + for (Iterator i = selWidget.getPreferencesInfo().getPreferences().iterator(); i.hasNext();) { GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next(); if (prefInfo.getType().getOrdinal() == DataType.HIDDEN) @@ -135,7 +135,7 @@ <table> <tbody> <% - for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();) + for (Iterator i = selWidget.getPreferencesInfo().getPreferences().iterator(); i.hasNext();) { GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next();