Author: scottbw
Date: Thu Nov 26 16:14:45 2009
New Revision: 884620
URL: http://svn.apache.org/viewvc?rev=884620&view=rev
Log:
Refactored WidgetAdmin, removing unused methods and pushing some things down
into the Widget bean class
Modified:
incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
incubator/wookie/trunk/src/org/apache/wookie/beans/Widget.java
incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java
incubator/wookie/trunk/src/org/apache/wookie/manager/impl/WidgetAdminManager.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=884620&r1=884619&r2=884620&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java Thu
Nov 26 16:14:45 2009
@@ -359,7 +359,8 @@
final String WIDGETFOLDER =
request.getSession().getServletContext().getRealPath(properties.getString("widget.widgetfolder"));//$NON-NLS-1$
Messages localizedMessages =
LocaleHandler.localizeMessages(request);
String widgetId = request.getParameter("widgetId");
//$NON-NLS-1$
- String guid = manager.getWidgetGuid(Integer.parseInt(widgetId));
+ Widget widget = Widget.findById(Integer.parseInt(widgetId));
+ String guid = widget.getGuid();
if(manager.removeWidgetAndReferences(Integer.parseInt(widgetId))){
if(WidgetPackageUtils.removeWidgetResources(WIDGETFOLDER, guid)){
session.setAttribute("message_value",
localizedMessages.getString("WidgetAdminServlet.12"));
//$NON-NLS-1$ //$NON-NLS-2$
@@ -464,7 +465,7 @@
try {
if(zipFile.exists()){
IManifestModel widgetModel =
WidgetPackageUtils.processWidgetPackage(zipFile,properties.getString("widget.widgetfolder"),
WIDGETFOLDER,UPLOADFOLDER);//$NON-NLS-1$
-
if(!manager.doesWidgetAlreadyExistInSystem(widgetModel.getIdentifier())){
+
if(!Widget.exists(widgetModel.getIdentifier())){
// ADD
int dbkey =
manager.addNewWidget(widgetModel, new String[]{});
// widget added
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/Widget.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/Widget.java?rev=884620&r1=884619&r2=884620&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/Widget.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/Widget.java Thu Nov 26
16:14:45 2009
@@ -216,4 +216,10 @@
Widget widget =
(Widget)dbManager.createSQLQuery(sqlQuery).addEntity(Widget.class).uniqueResult();
return widget;
}
+
+ public static boolean exists(String guid){
+ Widget[] widget = Widget.findByValue("guid", guid);
+ if (widget == null || widget.length!=1) return false;
+ return true;
+ }
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java?rev=884620&r1=884619&r2=884620&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java
Thu Nov 26 16:14:45 2009
@@ -27,14 +27,6 @@
boolean addNewService(String serviceName);
- /**
- * Add a new widget to the system - without the widget type
- * @param widgetName - the name of this widget
- * @param url - the url which it resides
- * @param height - the height at which it is supposed to be displayed
- * @param width - the width at which it is supposed to be displayed
- */
- void addNewWidget(IManifestModel model);
/**
* Add a new widget to the system
@@ -82,13 +74,6 @@
String serviceType);
/**
- * using the GIUD found in the config.xml file, ascertain if this
widget already exists
- * @param guid
- * @return
- */
- boolean doesWidgetAlreadyExistInSystem(String guid);
-
- /**
* Find if this widget is maximizable, from given key
* @param dbKey
* @return
@@ -96,12 +81,6 @@
boolean isWidgetMaximized(int dbKey);
/**
- * Prints the details of all widgets
- * @param magr - a widgetAdminManager instance
- */
- void printOutAllWidgets(IWidgetAdminManager magr);
-
- /**
* Remove from the system the service & any other places it may reside
in the DB
* - i.e in widgetDefault
* @param serviceId
@@ -146,11 +125,5 @@
void setWidgetTypesForWidget(int dbKey,
String[] widgetTypes, boolean maximize);
- /**
- * Get this widgets GUID
- * @param parseInt
- * @return
- */
- String getWidgetGuid(int parseInt);
}
\ No newline at end of file
Modified:
incubator/wookie/trunk/src/org/apache/wookie/manager/impl/WidgetAdminManager.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/manager/impl/WidgetAdminManager.java?rev=884620&r1=884619&r2=884620&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/manager/impl/WidgetAdminManager.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/manager/impl/WidgetAdminManager.java
Thu Nov 26 16:14:45 2009
@@ -65,14 +65,6 @@
return service.save();
}
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.manager.IWidgetAdminManager#addNewWidget(java.lang.String,
java.lang.String, java.lang.String, int, int)
- */
- public void addNewWidget(IManifestModel model) {
- addNewWidget(model, null);
- }
-
/* (non-Javadoc)
* @see
org.apache.wookie.manager.IWidgetAdminManager#addNewWidget(java.lang.String,
java.lang.String, java.lang.String, int, int, java.lang.String[])
*/
@@ -187,15 +179,6 @@
}
/* (non-Javadoc)
- * @see
org.apache.wookie.manager.IWidgetAdminManager#doesWidgetAlreadyExistInSystem(java.lang.String)
- */
- public boolean doesWidgetAlreadyExistInSystem(String guid){
- Widget[] widget = Widget.findByValue("guid", guid);
- if (widget == null || widget.length!=1) return false;
- return true;
- }
-
- /* (non-Javadoc)
* @see
org.apache.wookie.manager.IWidgetAdminManager#isWidgetMaximized(int)
*/
public boolean isWidgetMaximized(int dbKey){
@@ -206,29 +189,6 @@
}
/* (non-Javadoc)
- * @see
org.apache.wookie.manager.IWidgetAdminManager#printOutAllWidgets(org.apache.wookie.manager.IWidgetAdminManager)
- */
- @SuppressWarnings("unchecked")
- public void printOutAllWidgets(IWidgetAdminManager magr){
- Widget[] widgets = Widget.findAll();
- for (int i = 0; i < widgets.length; i++) {
- Widget theWidget = (Widget) widgets[i];
- _logger.debug(
- "\n\t Name: " +
theWidget.getWidgetTitle() +
- "\n\t URL: " +
theWidget.getUrl() +
- "\n\t Height: " + theWidget.getHeight() +
- "\n\t width: " + theWidget.getWidth() +
"\n\t Types:");
-
- Set<WidgetType> types = theWidget.getWidgetTypes();
- WidgetType[] widgetTypes = types.toArray(new
WidgetType[types.size()]);
- for(int j=0;j<widgetTypes.length;j++){
- _logger.debug("\n\t
"+widgetTypes[j].getWidgetContext());
- }
- }
- }
-
-
- /* (non-Javadoc)
* @see
org.apache.wookie.manager.IWidgetAdminManager#removeServiceAndReferences(int)
*/
public boolean removeServiceAndReferences(int serviceId){
@@ -381,13 +341,4 @@
}
}
- /* (non-Javadoc)
- * @see org.apache.wookie.manager.IWidgetAdminManager#getWidgetGuid(int)
- */
- public String getWidgetGuid(int dbKey) {
- //Widget widget = Widget.findById(String.valueOf(dbKey));
- Widget widget = Widget.findById(Integer.valueOf(dbKey));
- return widget.getGuid();
- }
-
}
