Author: scottbw
Date: Mon Mar 29 18:43:20 2010
New Revision: 928861
URL: http://svn.apache.org/viewvc?rev=928861&view=rev
Log:
Removed the "isMaximize" property from Widgets, from DB scripts, and from the
admin interface.
Modified:
incubator/wookie/trunk/WebContent/admin/uploadresults.jsp
incubator/wookie/trunk/scripts/derby/widgetdb.sql
incubator/wookie/trunk/scripts/mysql/widgetdb.sql
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/beans/schema.hbm.xml
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.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/WebContent/admin/uploadresults.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/uploadresults.jsp?rev=928861&r1=928860&r2=928861&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/uploadresults.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/uploadresults.jsp Mon Mar 29
18:43:20 2010
@@ -19,7 +19,6 @@ Integer dbkey = (Integer)session.getAttr
String errors = (String)session.getAttribute("error_value");
String messages = (String)session.getAttribute("message_value");
Boolean hasValidated = (Boolean)session.getAttribute("hasValidated");
-Boolean isMaxable = (Boolean)session.getAttribute("isMaxable");
Boolean closeWindow = (Boolean)session.getAttribute("closeWindow");
WidgetService[] services = (WidgetService[])session.getAttribute("services");
%>
@@ -90,16 +89,6 @@ When a client of the widget system asks
</select>
</td>
</tr>
- <tr>
- <td>Can maximize?</td>
- <td>
- <%if(isMaxable){%>
- <input type="checkbox" name="max" value="true" checked
class="ui-button ui-state-default ui-corner-all">
- <%} else { %>
- <input type="checkbox" name="max" value="true" class="ui-button
ui-state-default ui-corner-all">
- <%}%>
- </td>
- </tr>
<tr>
<td colspan="2"><div align="center"><input class="ui-button
ui-state-default ui-corner-all" type="submit" name="Submit"
value="Submit"></div>
</td>
Modified: incubator/wookie/trunk/scripts/derby/widgetdb.sql
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/scripts/derby/widgetdb.sql?rev=928861&r1=928860&r2=928861&view=diff
==============================================================================
--- incubator/wookie/trunk/scripts/derby/widgetdb.sql (original)
+++ incubator/wookie/trunk/scripts/derby/widgetdb.sql Mon Mar 29 18:43:20 2010
@@ -1,4 +1,4 @@
-INSERT INTO Widget VALUES (1,'Paul
Sharples','[email protected]','http://iec.bolton.ac.uk','http://notsupported',350,500,'f','v1.0');
+INSERT INTO Widget VALUES (1,'Paul
Sharples','[email protected]','http://iec.bolton.ac.uk','http://notsupported',350,500,'v1.0');
INSERT INTO Name VALUES(1, 'Unsupported widget
widget','Unsupported',NULL,NULL,1);
INSERT INTO Description VALUES(1, 'This widget is a placeholder for when no
corresponding widget is found for a given type',NULL,NULL,1);
INSERT INTO StartFile
VALUES(1,'/wookie/wservices/notsupported/index.htm',NULL,NULL,1);
Modified: incubator/wookie/trunk/scripts/mysql/widgetdb.sql
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/scripts/mysql/widgetdb.sql?rev=928861&r1=928860&r2=928861&view=diff
==============================================================================
--- incubator/wookie/trunk/scripts/mysql/widgetdb.sql (original)
+++ incubator/wookie/trunk/scripts/mysql/widgetdb.sql Mon Mar 29 18:43:20 2010
@@ -6,7 +6,6 @@ CREATE TABLE `Widget` (
`id` int(11) NOT NULL auto_increment,
`height` int(11) default NULL,
`width` int(11) default NULL,
- `maximize` varchar(1) default NULL,
`guid` varchar(255) NOT NULL,
`widget_author` varchar(255) default NULL,
`widget_author_email` varchar(320) default NULL,
@@ -235,7 +234,7 @@ CREATE TABLE `Token` (
);
-INSERT INTO `Widget` VALUES (1,350,500,'f','http://notsupported','Paul
Sharples','[email protected]','http://iec.bolton.ac.uk', 'v1.0');
+INSERT INTO `Widget` VALUES (1,350,500,'http://notsupported','Paul
Sharples','[email protected]','http://iec.bolton.ac.uk', 'v1.0');
INSERT INTO `Name` VALUES(1, 'Unsupported widget
widget','Unsupported',NULL,NULL,1);
INSERT INTO `Description` VALUES(1, 'This widget is a placeholder for when no
corresponding widget is found for a given type',NULL,NULL,1);
INSERT INTO `StartFile`
VALUES(1,'/wookie/wservices/notsupported/index.htm',NULL,NULL,1);
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=928861&r1=928860&r2=928861&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java Mon
Mar 29 18:43:20 2010
@@ -402,8 +402,6 @@ public class WidgetAdminServlet extends
session.setAttribute("hasValidated", Boolean.valueOf(true));
//$NON-NLS-1$
session.setAttribute("closeWindow", Boolean.valueOf(false));
//$NON-NLS-1$
String dbkey = request.getParameter("dbkey"); //$NON-NLS-1$
- boolean isMaxable =
manager.isWidgetMaximized(Integer.parseInt(dbkey));
- session.setAttribute("isMaxable", Boolean.valueOf(isMaxable));
//$NON-NLS-1$
session.setAttribute("dbkey", Integer.parseInt(dbkey));
//$NON-NLS-1$
}
@@ -493,8 +491,6 @@ public class WidgetAdminServlet extends
retrieveServices(session);
session.setAttribute("hasValidated",
Boolean.valueOf(true));
//$NON-NLS-1$
session.setAttribute("dbkey", dbkey);
//$NON-NLS-1$
- boolean isMaxable =
manager.isWidgetMaximized(dbkey);
- session.setAttribute("isMaxable",
Boolean.valueOf(isMaxable)); //$NON-NLS-1$
}
else{
// UPDATE
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=928861&r1=928860&r2=928861&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/Widget.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/Widget.java Mon Mar 29
18:43:20 2010
@@ -41,7 +41,6 @@ public class Widget extends AbstractKeyB
private String guid;
private Integer height;
private Integer width;
- private boolean maximize;
@SuppressWarnings("unchecked")
private Set widgetTypes = new HashSet();
private String version;
@@ -74,17 +73,6 @@ public class Widget extends AbstractKeyB
this.widgetTypes = widgetTypes;
}
-
- public boolean isMaximize() {
- return maximize;
- }
-
-
- public void setMaximize(boolean maximize) {
- this.maximize = maximize;
- }
-
-
public String getGuid() {
return guid;
}
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/schema.hbm.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/schema.hbm.xml?rev=928861&r1=928860&r2=928861&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/schema.hbm.xml (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/schema.hbm.xml Mon Mar
29 18:43:20 2010
@@ -16,7 +16,6 @@
<property name="guid" column="guid" type="string" />
<property name="height" column="height" />
<property name="width" column="width" />
- <property name="maximize" type="true_false" />
<set name="widgetTypes" inverse="true">
<key column="widget_id" not-null="true" />
<one-to-many class="WidgetType" />
Modified:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java?rev=928861&r1=928860&r2=928861&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java
Mon Mar 29 18:43:20 2010
@@ -50,7 +50,6 @@ public class WidgetInstanceHelper {
xml += "\t<title>"+widget.getWidgetTitle()+"</title>\n";
//$NON-NLS-1$ //$NON-NLS-2$
xml += "\t<height>"+height+"</height>\n"; //$NON-NLS-1$
//$NON-NLS-2$
xml += "\t<width>"+width+"</width>\n"; //$NON-NLS-1$
//$NON-NLS-2$
- xml += "\t<maximize>"+widget.isMaximize()+"</maximize>\n";
//$NON-NLS-1$ //$NON-NLS-2$
xml += "</widgetdata>"; //$NON-NLS-1$
return xml;
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=928861&r1=928860&r2=928861&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java
Mon Mar 29 18:43:20 2010
@@ -24,13 +24,6 @@ package org.apache.wookie.manager;
public interface IWidgetAdminManager {
/**
- * Find if this widget is maximizable, from given key
- * @param dbKey
- * @return
- */
- boolean isWidgetMaximized(int dbKey);
-
- /**
*
* @param widgetId
* @param widgetType
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=928861&r1=928860&r2=928861&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
Mon Mar 29 18:43:20 2010
@@ -63,16 +63,6 @@ public class WidgetAdminManager implemen
}
/* (non-Javadoc)
- * @see
org.apache.wookie.manager.IWidgetAdminManager#isWidgetMaximized(int)
- */
- public boolean isWidgetMaximized(int dbKey){
- Widget widget = null;
- widget = Widget.findById(dbKey);
- if (widget == null) return false;
- return widget.isMaximize();
- }
-
- /* (non-Javadoc)
* @see
org.apache.wookie.manager.IWidgetAdminManager#removeSingleWidgetType(int,
java.lang.String)
*/
public boolean removeSingleWidgetType(int widgetId, String widgetType) {
@@ -127,10 +117,6 @@ public class WidgetAdminManager implemen
@SuppressWarnings("unchecked")
public void setWidgetTypesForWidget(int dbKey, String[] widgetTypes,
boolean maximize){
Widget widget = Widget.findById(dbKey);
- if(maximize){
- widget.setMaximize(maximize);
- widget.save();
- }
WidgetType widgetType;
if (widgetTypes!=null){
