Author: bdaw Date: 2007-07-09 17:13:28 -0400 (Mon, 09 Jul 2007) New Revision: 7696 Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidgetInfo.java Log: JBPORTAL-1557 - drop the 'title' parameter when rendering a gadget so the best default will be resolved JBPORTAL-1554 - use 'directory_title' instead of 'title' attribute in for google widgets selection Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-07-09 18:13:38 UTC (rev 7695) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-07-09 21:13:28 UTC (rev 7696) @@ -78,6 +78,11 @@ return getInfo().getTitle(); } + public LocalizedString getDirectoryTitle() + { + return getInfo().getDirectoryTitle(); + } + public LocalizedString getDescription() { return getInfo().getDescription(); @@ -98,7 +103,8 @@ tmp.append("&synd=open"); tmp.append("&w=").append(info.getWidth()); tmp.append("&h=").append(info.getHeight()); - tmp.append("&title=").append(FastURLEncoder.DEFAULT_ENCODER.encode(info.getTitle().getDefaultString())); + //don's let to override the title param - proper one will be picked up with i18n support + //tmp.append("&title=").append(FastURLEncoder.DEFAULT_ENCODER.encode(info.getTitle().getDefaultString())); tmp.append("&border=%23ffffff%7C3px%2C1px+none+%23999999"); // "&border=%23ffffff%7C3px%2C1px+solid+%23999999" tmp.append("&output=js"); Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidgetInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidgetInfo.java 2007-07-09 18:13:38 UTC (rev 7695) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidgetInfo.java 2007-07-09 21:13:28 UTC (rev 7696) @@ -37,6 +37,9 @@ private final LocalizedString title; /** . */ + private final LocalizedString directoryTitle; + + /** . */ private final LocalizedString description; /** . */ @@ -50,12 +53,14 @@ public GGWidgetInfo( LocalizedString title, + LocalizedString directoryTitle, LocalizedString description, int width, int height, GGPreferencesInfo preferences) { this.title = title; + this.directoryTitle = directoryTitle; this.description = description; this.width = width; this.height = height; @@ -86,4 +91,10 @@ { return height; } + + + public LocalizedString getDirectoryTitle() + { + return directoryTitle; + } }