Author: scottbw
Date: Mon Feb 20 16:09:11 2012
New Revision: 1291336
URL: http://svn.apache.org/viewvc?rev=1291336&view=rev
Log:
Removed service types from methods of WidgetFactory (see WOOKIE-263)
Modified:
incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java?rev=1291336&r1=1291335&r2=1291336&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java Mon
Feb 20 16:09:11 2012
@@ -282,7 +282,7 @@ public class WidgetAdminServlet extends
WidgetJavascriptSyntaxAnalyzer jsa = new
WidgetJavascriptSyntaxAnalyzer(fac.getUnzippedWidgetDirectory());
if(persistenceManager.findWidgetByGuid(widgetModel.getIdentifier()) == null){
// ADD
- IWidget widget =
WidgetFactory.addNewWidget(widgetModel, null, zipFile, false);
+ IWidget widget =
WidgetFactory.addNewWidget(widgetModel, zipFile, false);
Object dbkey = widget.getId();
// widget added
request.setAttribute("message_value",
"'"+ widgetModel.getLocalName("en") +"' - " +
localizedMessages.getString("WidgetAdminServlet.19")); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
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=1291336&r1=1291335&r2=1291336&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java Mon
Feb 20 16:09:11 2012
@@ -61,21 +61,11 @@ public class WidgetFactory {
* @param grantAccessRequests whether to automatically grant access
requests for the widget
* @return the widget
*/
- public static IWidget addNewWidget(W3CWidget model,String[]
widgetTypes, File file, boolean grantAccessRequests) {
- IWidget widget = addNewWidget(model,widgetTypes,
grantAccessRequests);
+ public static IWidget addNewWidget(W3CWidget model, File file, boolean
grantAccessRequests) {
+ IWidget widget = addNewWidget(model, grantAccessRequests);
widget.setPackagePath(file.getPath());
return widget;
}
-
- /**
- * Adds a new widget
- * @param model the model of the widget to add
- * @param grantAccessRequests whether to automatically grant access
requests for the widget
- * @return the widget
- */
- public static IWidget addNewWidget(W3CWidget model, boolean
grantAccessRequests) {
- return addNewWidget(model,null, grantAccessRequests);
- }
/**
* Adds a new widget
@@ -83,28 +73,17 @@ public class WidgetFactory {
* @return the widget
*/
public static IWidget addNewWidget(W3CWidget model) {
- return addNewWidget(model,null,false);
+ return addNewWidget(model,false);
}
- /**
- * Adds a new widget
- * @param model the model of the widget to add
- * @param widgetTypes the types to allocate the widget to
- * @return the widget
- */
- public static IWidget addNewWidget(W3CWidget model,String[]
widgetTypes) {
- return addNewWidget(model,widgetTypes,false);
- }
-
/**
* Constructs a new Widget and persists it and all dependent objects
* @param model the model for the widget
- * @param widgetTypes the types to set for the widget
* @param grantAccessRequests whether to grant access requests created
for the widget
* @return the widget
*/
- public static IWidget addNewWidget(W3CWidget model, String[]
widgetTypes, boolean grantAccessRequests) {
+ public static IWidget addNewWidget(W3CWidget model, boolean
grantAccessRequests) {
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
IWidget widget = createWidget(persistenceManager, model);
createAuthor(persistenceManager, model, widget);
Modified:
incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java?rev=1291336&r1=1291335&r2=1291336&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
Mon Feb 20 16:09:11 2012
@@ -188,7 +188,7 @@ public class ContextListener implements
W3CWidget model =
fac.parse(upload);
WidgetJavascriptSyntaxAnalyzer jsa = new
WidgetJavascriptSyntaxAnalyzer(fac.getUnzippedWidgetDirectory());
if(persistenceManager.findWidgetByGuid(model.getIdentifier()) == null) {
-
WidgetFactory.addNewWidget(model, null, upload, true);
+
WidgetFactory.addNewWidget(model, upload, true);
String message
= model.getLocalName("en") +"' - " +
localizedMessages.getString("WidgetAdminServlet.19");
_logger.info(message);
FlashMessage.getInstance().message(message);
