You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2011/04/15 14:56:29 UTC
svn commit: r1092690 - in
/incubator/wookie/trunk/src/org/apache/wookie/beans:
jcr/impl/ParticipantImpl.java jcr/impl/WidgetImpl.java
jpa/impl/WidgetImpl.java
Author: scottbw
Date: Fri Apr 15 12:56:29 2011
New Revision: 1092690
URL: http://svn.apache.org/viewvc?rev=1092690&view=rev
Log:
Removed more redundant code missed by the previous changeset
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java?rev=1092690&r1=1092689&r2=1092690&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java Fri Apr 15 12:56:29 2011
@@ -14,13 +14,10 @@
package org.apache.wookie.beans.jcr.impl;
-import org.apache.jackrabbit.ocm.manager.beanconverter.impl.ReferenceBeanConverterImpl;
-import org.apache.jackrabbit.ocm.mapper.impl.annotation.Bean;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
import org.apache.wookie.beans.IParticipant;
-import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.jcr.IPathBean;
import org.apache.wookie.beans.jcr.JCRPersistenceManager;
@@ -47,9 +44,6 @@ public class ParticipantImpl implements
@Field(jcrName="wookie:sharedDataKey")
private String sharedDataKey;
-
- @Bean(jcrName="wookie:widget", converter=ReferenceBeanConverterImpl.class)
- private WidgetImpl widgetImpl;
/* (non-Javadoc)
* @see org.apache.wookie.beans.IBean#getId()
@@ -74,7 +68,7 @@ public class ParticipantImpl implements
{
if (path == null)
{
- path = nodeRootPath+"/"+JCRPersistenceManager.escapeJCRName(sharedDataKey)+"/"+JCRPersistenceManager.escapeJCRName(widgetImpl.getGuid())+"/"+JCRPersistenceManager.escapeJCRName(participantId);
+ path = nodeRootPath+"/"+JCRPersistenceManager.escapeJCRName(sharedDataKey)+"/"+JCRPersistenceManager.escapeJCRName(participantId);
}
return path;
}
@@ -163,39 +157,4 @@ public class ParticipantImpl implements
this.sharedDataKey = sharedDataKey;
}
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IParticipant#getWidget()
- */
- public IWidget getWidget()
- {
- return widgetImpl;
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IParticipant#setWidget(org.apache.wookie.beans.IWidget)
- */
- public void setWidget(IWidget widget)
- {
- this.widgetImpl = (WidgetImpl)widget;
- }
-
- /**
- * Get widget implementation.
- *
- * @return widget implementation
- */
- public WidgetImpl getWidgetImpl()
- {
- return widgetImpl;
- }
-
- /**
- * Set widget implementation.
- *
- * @return widgetImpl widget implementation
- */
- public void setWidgetImpl(WidgetImpl widgetImpl)
- {
- this.widgetImpl = widgetImpl;
- }
}
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java?rev=1092690&r1=1092689&r2=1092690&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java Fri Apr 15 12:56:29 2011
@@ -25,7 +25,6 @@ import org.apache.wookie.beans.IFeature;
import org.apache.wookie.beans.ILicense;
import org.apache.wookie.beans.IName;
import org.apache.wookie.beans.IPreferenceDefault;
-import org.apache.wookie.beans.ISharedData;
import org.apache.wookie.beans.IStartFile;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetIcon;
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java?rev=1092690&r1=1092689&r2=1092690&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java Fri Apr 15 12:56:29 2011
@@ -38,7 +38,6 @@ import org.apache.wookie.beans.IFeature;
import org.apache.wookie.beans.ILicense;
import org.apache.wookie.beans.IName;
import org.apache.wookie.beans.IPreferenceDefault;
-import org.apache.wookie.beans.ISharedData;
import org.apache.wookie.beans.IStartFile;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetIcon;
@@ -132,10 +131,6 @@ public class WidgetImpl extends Localize
@ElementDependent
private Collection<PreferenceDefaultImpl> preferenceDefaults;
- @OneToMany(mappedBy="widget", fetch=FetchType.LAZY, cascade=CascadeType.ALL)
- @ElementDependent
- private Collection<SharedDataImpl> sharedData;
-
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getDescriptions()
*/