svn commit: r1348005 - in /incubator/wookie/trunk/src/org/apache/wookie: beans/util/PersistenceManagerFactory.java util/SiblingPageNormalizer.java util/WidgetFormattingUtils.java

[scottbw]

Author: scottbw
Date: Fri Jun  8 10:10:37 2012
New Revision: 1348005

URL: http://svn.apache.org/viewvc?rev=1348005&view=rev
Log:
Replaced references to deprecated APIs - see WOOKIE-343

Modified:
    
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
    incubator/wookie/trunk/src/org/apache/wookie/util/SiblingPageNormalizer.java
    incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java

Modified: 
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java?rev=1348005&r1=1348004&r2=1348005&view=diff
==============================================================================
--- 
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
 (original)
+++ 
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
 Fri Jun  8 10:10:37 2012
@@ -17,6 +17,7 @@ package org.apache.wookie.beans.util;
 import java.lang.reflect.Method;
 
 import org.apache.commons.configuration.Configuration;
+import org.apache.wookie.beans.IAuthor;
 import org.apache.wookie.beans.IDescription;
 import org.apache.wookie.beans.IName;
 import org.apache.wookie.beans.IStartFile;
@@ -89,9 +90,12 @@ public class PersistenceManagerFactory
                     widget.setHeight(350);
                     widget.setWidth(500);
                     widget.setGuid("http://notsupported";);
-                    widget.setWidgetAuthor("Paul Sharples");
-                    widget.setWidgetAuthorEmail("p.sharp...@bolton.ac.uk");
-                    widget.setWidgetAuthorHref("http://iec.bolton.ac.uk";);
+                    
+                    IAuthor author = 
persistenceManager.newInstance(IAuthor.class);
+                    author.setAuthor("Paul Sharples");
+                    author.setEmail("p.sharp...@bolton.ac.uk");
+                    author.setHref("http://iec.bolton.ac.uk";);
+                    widget.setAuthor(author);
                     widget.setVersion("v1.0");
                     IName widgetName = 
persistenceManager.newInstance(IName.class);
                     widgetName.setName("Unsupported widget widget");

Modified: 
incubator/wookie/trunk/src/org/apache/wookie/util/SiblingPageNormalizer.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/SiblingPageNormalizer.java?rev=1348005&r1=1348004&r2=1348005&view=diff
==============================================================================
--- 
incubator/wookie/trunk/src/org/apache/wookie/util/SiblingPageNormalizer.java 
(original)
+++ 
incubator/wookie/trunk/src/org/apache/wookie/util/SiblingPageNormalizer.java 
Fri Jun  8 10:10:37 2012
@@ -15,6 +15,7 @@ package org.apache.wookie.util;
 
 import java.util.HashMap;
 
+import org.apache.wookie.beans.IWidget;
 import org.apache.wookie.beans.IWidgetInstance;
 import org.apache.wookie.beans.util.IPersistenceManager;
 import org.apache.wookie.beans.util.PersistenceManagerFactory;
@@ -44,7 +45,8 @@ org.directwebremoting.extend.PageNormali
         * @return the normalized URI of the widget instance
         */
        public String getNormalizedPage(IWidgetInstance instance){
-               return 
super.normalizePage(instance.getWidget().getUrl())+"?"+instance.getApiKey()+"="+SharedDataHelper.getInternalSharedDataKey(instance);
+               
+               return 
super.normalizePage(IWidget.Utilities.getUrl(instance.getWidget(), 
instance.getLang()))+"?"+instance.getApiKey()+"="+SharedDataHelper.getInternalSharedDataKey(instance);
        }
 
        /**

Modified: 
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java?rev=1348005&r1=1348004&r2=1348005&view=diff
==============================================================================
--- 
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java 
(original)
+++ 
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java 
Fri Jun  8 10:10:37 2012
@@ -62,14 +62,6 @@ public class WidgetFormattingUtils exten
                return getFormatted(description.getDir(), 
description.getContent());
        }
        /**
-        * Returns the CSS formatted i18n string for the widget author's name
-        * @param widget  the Widget
-        * @return a CSS-formatted i18n string
-        */
-       public static String getFormattedWidgetAuthor(IWidget widget){
-               return getFormatted(widget.getWidgetAuthor());
-       }
-       /**
         * Returns the CSS formatted i18n string for the widget license
         * @param license the Widget's License 
         * @return a CSS-formatted i18n string