Author: scottbw
Date: Tue Feb 23 21:06:44 2010
New Revision: 915520
URL: http://svn.apache.org/viewvc?rev=915520&view=rev
Log:
Renamed "WidgetFactory" to "WidgetInstanceFactory", as that's what it actually
is.
Added:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
- copied, changed from r895490,
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
Removed:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
Modified:
incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java?rev=915520&r1=915519&r2=915520&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java Tue
Feb 23 21:06:44 2010
@@ -30,7 +30,7 @@
import org.apache.wookie.beans.Widget;
import org.apache.wookie.beans.WidgetInstance;
import org.apache.wookie.controller.WidgetInstancesController;
-import org.apache.wookie.helpers.WidgetFactory;
+import org.apache.wookie.helpers.WidgetInstanceFactory;
import org.apache.wookie.helpers.WidgetKeyManager;
import org.apache.wookie.manager.IWidgetAdminManager;
import org.apache.wookie.manager.impl.WidgetAdminManager;
@@ -155,7 +155,7 @@
String userId = "testuser"; //$NON-NLS-1$
String sharedDataKey = "myshareddata"; //$NON-NLS-1$
String widgetId = widget.getGuid();
- instance = WidgetFactory.getWidgetFactory(session,
LocaleHandler.localizeMessages(request)).newInstance(apiKey, userId,
sharedDataKey, null, widgetId, null);
+ instance =
WidgetInstanceFactory.getWidgetFactory(session,
LocaleHandler.localizeMessages(request)).newInstance(apiKey, userId,
sharedDataKey, null, widgetId, null);
if (instance != null) {
widgetsHash.put(instance.getIdKey(), widget);
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java?rev=915520&r1=915519&r2=915520&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
Tue Feb 23 21:06:44 2010
@@ -32,7 +32,7 @@
import org.apache.wookie.beans.WidgetInstance;
import org.apache.wookie.exceptions.InvalidWidgetCallException;
import org.apache.wookie.helpers.Notifier;
-import org.apache.wookie.helpers.WidgetFactory;
+import org.apache.wookie.helpers.WidgetInstanceFactory;
import org.apache.wookie.helpers.WidgetInstanceHelper;
import org.apache.wookie.helpers.WidgetKeyManager;
import org.apache.wookie.server.LocaleHandler;
@@ -202,7 +202,7 @@
// Widget exists
if(instance==null){
String apiKey = request.getParameter("api_key");
//$NON-NLS-1$
- instance = WidgetFactory.getWidgetFactory(session,
localizedMessages).newInstance(apiKey, userId, sharedDataKey, serviceType,
widgetId, locale);
+ instance =
WidgetInstanceFactory.getWidgetFactory(session,
localizedMessages).newInstance(apiKey, userId, sharedDataKey, serviceType,
widgetId, locale);
response.setStatus(HttpServletResponse.SC_CREATED);
} else {
response.setStatus(HttpServletResponse.SC_OK);
@@ -210,7 +210,7 @@
// Return the default widget if not created by now
if(instance==null){
- instance = WidgetFactory.defaultInstance(locale);
+ instance =
WidgetInstanceFactory.defaultInstance(locale);
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
Copied:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
(from r895490,
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java)
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java?p2=incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java&p1=incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java&r1=895490&r2=915520&rev=915520&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
Tue Feb 23 21:06:44 2010
@@ -35,9 +35,9 @@
* @version $Id
*
*/
-public class WidgetFactory{
+public class WidgetInstanceFactory{
- static Logger _logger = Logger.getLogger(WidgetFactory.class.getName());
+ static Logger _logger =
Logger.getLogger(WidgetInstanceFactory.class.getName());
private Messages localizedMessages;
private HttpSession session;
@@ -50,13 +50,13 @@
* @param localizedMessages
* @return
*/
- public static WidgetFactory getWidgetFactory(HttpSession session,
Messages localizedMessages){
- WidgetFactory factory =
(WidgetFactory)session.getAttribute(WidgetFactory.class.getName());
+ public static WidgetInstanceFactory getWidgetFactory(HttpSession
session, Messages localizedMessages){
+ WidgetInstanceFactory factory =
(WidgetInstanceFactory)session.getAttribute(WidgetInstanceFactory.class.getName());
if(factory == null){
- factory = new WidgetFactory();
+ factory = new WidgetInstanceFactory();
factory.localizedMessages = localizedMessages;
factory.session = session;
- session.setAttribute(WidgetFactory.class.getName(),
factory);
+
session.setAttribute(WidgetInstanceFactory.class.getName(), factory);
}
return factory;
}
