[simal] r2229 committed - Enable the possibility to force a new connection to the Wookie server....

[si...@googlecode.com]

Revision: 2229
Author: sander.v...@oucs.ox.ac.uk
Date: Thu Mar 17 09:54:23 2011
Log: Enable the possibility to force a new connection to the Wookie
server. Needed when new widgets are deployed on Wookie and a connection was
already present.
http://code.google.com/p/simal/source/detail?r=2229

Modified:

/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/BasePage.java

/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/ToolsPage.java

/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/UserApplication.java

/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java

/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WidgetInstancePage.java

/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieWidgetGalleryPanel.java

=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/BasePage.java
Wed Feb 9 14:35:16 2011
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/BasePage.java
Thu Mar 17 09:54:23 2011
@@ -82,7 +82,7 @@
*/
private Link<? extends BasePage> getAddProjectLink() {
Link<? extends BasePage> link;
- WidgetInstance instance = UserApplication.getWookieServerConnection()
+ WidgetInstance instance =
UserApplication.getWookieServerConnection(false)
.getInstance(getAddProjectWidgetName());
if (instance != null) {
link = WidgetInstancePage.getPageLink("addProjectLink", instance);
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/ToolsPage.java
Thu Feb 24 03:00:01 2011
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/ToolsPage.java
Thu Mar 17 09:54:23 2011
@@ -198,7 +198,7 @@
private void populateWookiePanel() {

WookieServerConnection wookieServerConnection = UserApplication
- .getWookieServerConnection();
+ .getWookieServerConnection(true);

// Trick to (re)connect to Wookie server in case it has
// been (re)started after Simal's initial connection setup.
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/UserApplication.java
Wed Feb 9 13:43:35 2011
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/UserApplication.java
Thu Mar 17 09:54:23 2011
@@ -95,8 +95,7 @@
}

@Override
- @SuppressWarnings("unchecked")
- public Class getHomePage() {
+ public Class<UserHomePage> getHomePage() {
return UserHomePage.class;
}

@@ -203,10 +202,11 @@

/**
* Get a connection to the Wookie Server used for gadget rendering.
+ * @param forceNew to indicate if always a new connection should be made.
* @return
*/
- public static WookieServerConnection getWookieServerConnection() {
- if (wookieServerConnection == null) {
+ public static WookieServerConnection getWookieServerConnection(boolean
forceNew) {
+ if (wookieServerConnection == null || forceNew) {
wookieServerConnection = new WookieServerConnection();
}
return wookieServerConnection;
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java
Thu Jun 10 08:06:49 2010
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java
Thu Mar 17 09:54:23 2011
@@ -41,7 +41,7 @@
public InstantiateWidgetPage(Widget widget) {
WidgetInstance instance;
try {
- instance =
UserApplication.getWookieServerConnection().getOrCreateInstance(widget);
+ instance =
UserApplication.getWookieServerConnection(false).getOrCreateInstance(widget);
populatePage(instance);
} catch (SimalException e) {
UserReportableException error = new UserReportableException(
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WidgetInstancePage.java
Thu Jun 10 08:06:49 2010
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WidgetInstancePage.java
Thu Mar 17 09:54:23 2011
@@ -54,7 +54,7 @@

if (parameters.containsKey(WIDGET_KEY)) {
String id = parameters.getString(WIDGET_KEY);
- WidgetInstance instance = UserApplication.getWookieServerConnection()
+ WidgetInstance instance =
UserApplication.getWookieServerConnection(false)
.getInstance(id);
populatePage(instance);
} else {
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieWidgetGalleryPanel.java
Thu Jun 10 08:06:49 2010
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieWidgetGalleryPanel.java
Thu Mar 17 09:54:23 2011
@@ -48,7 +48,7 @@
*/
public WookieWidgetGalleryPanel(String id) throws SimalException {
super(id);
-
populatePanel(UserApplication.getWookieServerConnection().getAvailableWidgets());
+
populatePanel(UserApplication.getWookieServerConnection(false).getAvailableWidgets());
}

/**