svn commit: r1134047 - /incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java

[sc...@apache.org]

Author: scottbw
Date: Thu Jun  9 19:14:42 2011
New Revision: 1134047

URL: http://svn.apache.org/viewvc?rev=1134047&view=rev
Log:
Updated WidgetFactory to use the new Author object, including localization properties (dir and lang). See WOOKIE-119.

Modified:
    incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java

Modified: incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java?rev=1134047&r1=1134046&r2=1134047&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java Thu Jun  9 19:14:42 2011
@@ -17,6 +17,7 @@ import java.io.File;
 
 import org.apache.log4j.Logger;
 import org.apache.wookie.beans.IAccessRequest;
+import org.apache.wookie.beans.IAuthor;
 import org.apache.wookie.beans.IDescription;
 import org.apache.wookie.beans.IFeature;
 import org.apache.wookie.beans.ILicense;
@@ -105,6 +106,7 @@ public class WidgetFactory {
 	public static IWidget addNewWidget(W3CWidget model, String[] widgetTypes, boolean grantAccessRequests) {
 	    IPersistenceManager persistenceManager = PersistenceManagerFactory.getPersistenceManager();
 		IWidget widget = createWidget(persistenceManager, model);
+		createAuthor(persistenceManager, model, widget);
 		createTypes(persistenceManager, widgetTypes, widget);
 		createStartFiles(persistenceManager, model,widget);
 		createNames(persistenceManager, model,widget);
@@ -121,11 +123,6 @@ public class WidgetFactory {
 	private static IWidget createWidget(IPersistenceManager persistenceManager, W3CWidget model){
 		IWidget widget;
 		widget = persistenceManager.newInstance(IWidget.class);		
-		if (model.getAuthor() != null){
-			widget.setWidgetAuthor(model.getAuthor().getAuthorName());
-			widget.setWidgetAuthorEmail(model.getAuthor().getEmail());
-			widget.setWidgetAuthorHref(model.getAuthor().getHref());
-		}
 		widget.setDir(model.getDir());
 		widget.setGuid(model.getIdentifier());
 		widget.setHeight(model.getHeight());
@@ -134,6 +131,18 @@ public class WidgetFactory {
 		widget.setUpdateLocation(model.getUpdate());
 		return widget;
 	}
+	
+	private static void createAuthor(IPersistenceManager persistenceManager, W3CWidget model, IWidget widget){
+	   if (model.getAuthor() != null){
+	      IAuthor author = persistenceManager.newInstance(IAuthor.class);
+	      author.setAuthor(model.getAuthor().getAuthorName());
+	      author.setEmail(model.getAuthor().getEmail());
+	      author.setHref(model.getAuthor().getHref());
+	      author.setDir(model.getAuthor().getDir());
+	      author.setLang(model.getAuthor().getLang());
+	      widget.setAuthor(author);
+	    }
+	}
 
 	private static void createTypes(IPersistenceManager persistenceManager, String[] widgetTypes, IWidget widget){
 		IWidgetType widgetType;
@@ -309,11 +318,7 @@ public class WidgetFactory {
 	 */
 	public static void update( W3CWidget model, IWidget widget,  boolean grantAccessRequests ){
 	    IPersistenceManager persistenceManager = PersistenceManagerFactory.getPersistenceManager();
-		if (model.getAuthor() != null){
-			widget.setWidgetAuthor(model.getAuthor().getAuthorName());
-			widget.setWidgetAuthorEmail(model.getAuthor().getEmail());
-			widget.setWidgetAuthorHref(model.getAuthor().getHref());
-		}
+    
 		widget.setDir(model.getDir());
 		widget.setGuid(model.getIdentifier());
 		widget.setHeight(model.getHeight());
@@ -331,6 +336,7 @@ public class WidgetFactory {
 		widget.setPreferenceDefaults(null);
 		
 		// Set with updated values
+		createAuthor(persistenceManager, model,widget);
 		createStartFiles(persistenceManager, model,widget);
 		createNames(persistenceManager, model,widget);
 		createDescriptions(persistenceManager, model,widget);