[Webical-commits] SF.net SVN: webical: [653] trunk

[<mat...@us...>]

Revision: 653
          http://webical.svn.sourceforge.net/webical/?rev=653&view=rev
Author:   mattijshoitink
Date:     2008-01-11 06:41:20 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
user settings panel updated, installation script updated

Modified Paths:
--------------
    trunk/doc/DB_setup.sql
    trunk/webical-core/src/main/java/org/webical/web/component/settings/UserSettingsPanel.java

Modified: trunk/doc/DB_setup.sql
===================================================================
--- trunk/doc/DB_setup.sql	2008-01-11 13:59:43 UTC (rev 652)
+++ trunk/doc/DB_setup.sql	2008-01-11 14:41:20 UTC (rev 653)
@@ -92,6 +92,7 @@
   `transp` mediumtext,
   `uid` mediumtext,
   `url` mediumtext,
+  `allDay` bit(1) default NULL,
   `created` datetime default NULL,
   `dtStart` datetime default NULL,
   `lastMod` datetime default NULL,
@@ -101,7 +102,7 @@
   `duration` varchar(255) default NULL,
   PRIMARY KEY  (`eventId`),
   KEY `FK5C6729A5DB02C36` (`calendarId`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 -- --------------------------------------------------------
 

Modified: trunk/webical-core/src/main/java/org/webical/web/component/settings/UserSettingsPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/settings/UserSettingsPanel.java	2008-01-11 13:59:43 UTC (rev 652)
+++ trunk/webical-core/src/main/java/org/webical/web/component/settings/UserSettingsPanel.java	2008-01-11 14:41:20 UTC (rev 653)
@@ -69,18 +69,9 @@
 	 */
 	public void setupCommonComponents() {
 
-		try {
-			this.user = userManager.getUser(WebicalSession.getWebicalSession().getUser().getUserId());
-		} catch (WebicalException ue) {
-			throw new WebicalWebAplicationException(ue);
-		}
-
-		try {
-			this.userSettings = settingsManager.getUserSettings(this.user);
-		} catch (WebicalException se) {
-			throw new WebicalWebAplicationException(se);
-		}
-
+		this.user = WebicalSession.getWebicalSession().getUser();
+		this.userSettings = WebicalSession.getWebicalSession().getUserSettings();
+		
 		userSettingsForm = new UserSettingsForm(USER_SETTINGS_FORM_MARKUP_ID, user, userSettings) {
 			private static final long serialVersionUID = 1L;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.