Author: scottbw
Date: Sun Oct 30 13:38:11 2011
New Revision: 1195157
URL: http://svn.apache.org/viewvc?rev=1195157&view=rev
Log:
Refactored to remove unnecessary indirection, and reuse existing queries
Modified:
incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.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=1195157&r1=1195156&r2=1195157&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java Sun
Oct 30 13:38:11 2011
@@ -376,7 +376,7 @@ public class WidgetAdminServlet extends
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
IWidget widget = persistenceManager.findById(IWidget.class,
widgetId);
String guid = widget.getGuid();
- if(WidgetFactory.destroy(widgetId)){
+ if(WidgetFactory.destroy(widget)){
if(WidgetFileUtils.removeWidgetResources(WIDGETFOLDER,
guid)){
request.setAttribute("message_value",
localizedMessages.getString("WidgetAdminServlet.12"));
//$NON-NLS-1$ //$NON-NLS-2$
}
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=1195157&r1=1195156&r2=1195157&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java Sun
Oct 30 13:38:11 2011
@@ -267,17 +267,6 @@ public class WidgetFactory {
/**
* Destroy a widget and all dependent objects and references
- * @param id the id of the widget
- * @return true if the widget is destroyed successfully
- */
- public static boolean destroy(Object id){
- IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
- IWidget widget = persistenceManager.findById(IWidget.class, id);
- return destroy(widget);
- }
-
- /**
- * Destroy a widget and all dependent objects and references
* @param widget the widget to destroy
* @return true if the widget is destroyed successfully
*/
@@ -310,7 +299,7 @@ public class WidgetFactory {
persistenceManager.delete(sharedData);
// remove any preferences
- IPreference[] preferences =
persistenceManager.findByValue(IPreference.class, "widgetInstance", instance);
+ IPreference[] preferences =
instance.getPreferences().toArray(new
IPreference[instance.getPreferences().size()]);//
persistenceManager.findByValue(IPreference.class, "widgetInstance", instance);
persistenceManager.delete(preferences);
// remove the instance
@@ -319,7 +308,7 @@ public class WidgetFactory {
}
// remove any AccessRequests
- IAccessRequest[] accessRequests =
persistenceManager.findByValue(IAccessRequest.class, "widget", widget);
+ IAccessRequest[] accessRequests =
persistenceManager.findApplicableAccessRequests(widget);
persistenceManager.delete(accessRequests);
// remove the widget itself
