Author: mfranklin
Date: Mon Oct 22 16:33:33 2012
New Revision: 1400944
URL: http://svn.apache.org/viewvc?rev=1400944&view=rev
Log:
Fixed duplicate page error
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java?rev=1400944&r1=1400943&r2=1400944&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
Mon Oct 22 16:33:33 2012
@@ -111,6 +111,22 @@ public class MongoDbUser extends UserImp
return layout;
}
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null || !(obj instanceof User)) {
+ return false;
+ }
+ final User other = (User) obj;
+ return !(this.getId().equals(other.getId()) && (this.getId() == null
|| !this.getId().equals(other.getId())));
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 67 * hash + (this.getId() != null ? this.getId().hashCode() :
0);
+ return hash;
+ }
+
public void setPageLayoutRepository(PageLayoutRepository
pageLayoutRepository) {
this.pageLayoutRepository = pageLayoutRepository;
}
Modified:
rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java?rev=1400944&r1=1400943&r2=1400944&view=diff
==============================================================================
---
rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
(original)
+++
rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
Mon Oct 22 16:33:33 2012
@@ -66,19 +66,19 @@ public class OpenSocialWidgetRenderer im
//Note the widgets.push() call. This defines the widget objects, which are
//added to the widgets[] array in home.jsp.
private static final String SCRIPT_BLOCK =
- "<script>rave.registerWidget(%1$s, {type: '%2$s'," +
- " regionWidgetId: %3$s," +
+ "<script>rave.registerWidget('%1$s', {type: '%2$s'," +
+ " regionWidgetId: '%3$s'," +
" widgetUrl: '%4$s', " +
" securityToken: '%5$s', " +
" metadata: %6$s," +
" userPrefs: %7$s," +
" collapsed: %8$s, " +
- " widgetId: %9$s," +
+ " widgetId: '%9$s'," +
" locked: %10$s," +
" hideChrome: %11$s," +
" subPage: {id: %12$s, name: '%13$s', isDefault: %14$s}" +
"});</script>";
- private static final String MARKUP = "<!-- RegionWidget %1$s placeholder
-->";
+ private static final String MARKUP = "<!-- RegionWidget '%1$s' placeholder
-->";
@Override
public String getSupportedContext() {
@@ -123,12 +123,12 @@ public class OpenSocialWidgetRenderer im
// get attributes about the sub page this regionWidget is on. This is
needed to assist the client in
// determining which gadgets are on visible tabs/sub pages initially
to make widget rendering more efficient
- Long pageId = null;
+ String pageId = null;
String pageName = "";
boolean isDefault = false;
Page page = item.getRegion().getPage();
if (PageType.SUB_PAGE.equals(page.getPageType())) {
- pageId = page.getId();
+ pageId = "'" + page.getId() + "'";
pageName = page.getName();
// check to see if this regionWidget is on the first sub page,
which will be the default
// subpage rendered if the user doesn't specify which subpage via
the URL hash
Modified:
rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java?rev=1400944&r1=1400943&r2=1400944&view=diff
==============================================================================
---
rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
(original)
+++
rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
Mon Oct 22 16:33:33 2012
@@ -109,17 +109,17 @@ public class OpenSocialWidgetRendererTes
new RegionWidgetPreferenceImpl( 1L,
null, null)));
final String markup =
- "<script>rave.registerWidget(" + REGION_ID + ", {type:
'OpenSocial'," +
- " regionWidgetId: " + REGION_WIDGET_ID + "," +
+ "<script>rave.registerWidget('" + REGION_ID + "', {type:
'OpenSocial'," +
+ " regionWidgetId: '" + REGION_WIDGET_ID + "'," +
" widgetUrl: '" + VALID_GADGET_URL +"', " +
" securityToken: '" + VALID_SECURITY_TOKEN + "', " +
" metadata: " + VALID_METADATA + "," +
" userPrefs: {\"speed\":\"fast\",\"color\":\"blue\"}," +
" collapsed: " + VALID_COLLAPSED + ", " +
- " widgetId: " + WIDGET_ID + "," +
+ " widgetId: '" + WIDGET_ID + "'," +
" locked: " + VALID_LOCKED + "," +
" hideChrome: " + VALID_HIDE_CHROME + "," +
- " subPage: {id: " + VALID_SUBPAGE_ID + ", name: '" +
VALID_SUBPAGE_NAME + "', isDefault: " + VALID_IS_DEFAULT_SUBPAGE + "}" +
+ " subPage: {id: '" + VALID_SUBPAGE_ID + "', name: '" +
VALID_SUBPAGE_NAME + "', isDefault: " + VALID_IS_DEFAULT_SUBPAGE + "}" +
"});</script>";
expect(securityTokenService.getEncryptedSecurityToken(rw)).andReturn(VALID_SECURITY_TOKEN);
@@ -132,7 +132,7 @@ public class OpenSocialWidgetRendererTes
String result = renderer.render(rw, renderContext);
- assertThat(result, is(equalTo("<!-- RegionWidget " + rw.getId() + "
placeholder -->")));
+ assertThat(result, is(equalTo("<!-- RegionWidget '" + rw.getId() + "'
placeholder -->")));
verify(scriptManager);
}
@@ -150,14 +150,14 @@ public class OpenSocialWidgetRendererTes
rw.setRegion(region);
final String markup =
- "<script>rave.registerWidget(1, {type: 'OpenSocial'," +
- " regionWidgetId: null," +
+ "<script>rave.registerWidget('1', {type: 'OpenSocial'," +
+ " regionWidgetId: 'null'," +
" widgetUrl: 'null', " +
" securityToken: 'null', " +
" metadata: null," +
" userPrefs: {}," +
" collapsed: false, " +
- " widgetId: null," +
+ " widgetId: 'null'," +
" locked: false," +
" hideChrome: false," +
" subPage: {id: null, name: '', isDefault: false}" +
