Index: lams_central/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/build.xml,v diff -u -r1.44.4.2 -r1.44.4.3 --- lams_central/build.xml 18 Jun 2009 19:43:36 -0000 1.44.4.2 +++ lams_central/build.xml 19 Jun 2009 04:32:19 -0000 1.44.4.3 @@ -186,10 +186,6 @@ - - - - @@ -299,6 +295,10 @@ + + + + @@ -312,8 +312,8 @@ - - + + Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v diff -u -r1.71.2.15 -r1.71.2.16 --- lams_central/conf/language/lams/ApplicationResources.properties 18 Jun 2009 19:43:37 -0000 1.71.2.15 +++ lams_central/conf/language/lams/ApplicationResources.properties 19 Jun 2009 04:32:10 -0000 1.71.2.16 @@ -357,11 +357,6 @@ label.planner.export.sequence=Export sequence error.planner.export.template=There was an error while exporting the template. -label.planner.tutorial.video=Introduction to Pedagogical Planner -label.tutorial.video.never.show.again=Do not show this again -label.planner.tutorial.video.show=Show tutorial video: Introduction to Pedagogical Planner -label.tutorial.enabled=Automatically open help assistants. If this option is No, then no online help assistants will be opened. -label.tutorial.disable.single=You have chosen not to show this video again. You can always play it using the video icon in the right upper corner of the page. -label.tutorial.disable.all=Welcome to LAMS! As a new user, you might want to spend a few minutes looking at the new online assistant animations and videos to help you get the most out of LAMS. You can turn this option off if you are an experience LAMS user. If you are new to LAMS, we recommend that you leave this on to get contextual help. Do you want to to leave this option on? + #======= End labels: Exported 266 labels for en AU ===== Index: lams_central/conf/xdoclet/struts-forms.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/struts-forms.xml,v diff -u -r1.8.4.2 -r1.8.4.3 --- lams_central/conf/xdoclet/struts-forms.xml 18 Jun 2009 19:43:37 -0000 1.8.4.2 +++ lams_central/conf/xdoclet/struts-forms.xml 19 Jun 2009 04:32:10 -0000 1.8.4.3 @@ -37,7 +37,6 @@ - Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v diff -u -r1.49.4.2 -r1.49.4.3 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 18 Jun 2009 19:43:36 -0000 1.49.4.2 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 19 Jun 2009 04:32:10 -0000 1.49.4.3 @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -42,13 +41,10 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.web.session.SessionManager; -import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -96,19 +92,6 @@ setHeaderLinks(request); setAdminLinks(request); - // check if this is user's first login; some action (like displaying a dialog for disabling tutorials) can be - // taken based on that parameter; immediatelly, the value in DB is updated - HttpSession ss = SessionManager.getSession(); - UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); - if (userDTO.isFirstLogin()) { - request.setAttribute("firstLogin", true); - User user = getUserManagementService().getUserByLogin(userDTO.getLogin()); - user.setFirstLogin(false); - getUserManagementService().save(user); - ss.removeAttribute(AttributeNames.USER); - ss.setAttribute(AttributeNames.USER, user.getUserDTO()); - } - // check if user is flagged as needing to change their password User loggedInUser = getUserManagementService().getUserByLogin(request.getRemoteUser()); if (loggedInUser.getChangePassword() != null) { @@ -135,7 +118,7 @@ } else if (StringUtils.equals(tab, "lessons")) { return mapping.findForward("lessons"); } else if (StringUtils.equals(tab, "community")) { - + String comLoginUrl = Configuration.get(ConfigurationKeys.SERVER_URL) + "/lamsCommunityLogin.do"; request.setAttribute("comLoginUrl", comLoginUrl); request.setAttribute("tab", tab); @@ -172,9 +155,10 @@ headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()")); } headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?tab=profile")); - + + Registration reg = Configuration.getRegistration(); - if (reg != null) { + if (reg != null) { if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN) || request.isUserInRole(Role.GROUP_MANAGER) || request.isUserInRole(Role.AUTHOR) || request.isUserInRole(Role.AUTHOR_ADMIN) || request.isUserInRole(Role.MONITOR)) { Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java,v diff -u -r1.18.2.2 -r1.18.2.3 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 18 Jun 2009 19:43:37 -0000 1.18.2.2 +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 19 Jun 2009 04:32:10 -0000 1.18.2.3 @@ -220,9 +220,6 @@ private static final Map filterLanguageMap = new TreeMap(); private static final Map filterStopWordsMap = new TreeMap(); - // Tutorial video page string for recognising which page the video was started from - private static final String PAGE_STRING_START_PLANNER = "StPed"; - static { PedagogicalPlannerAction.filterLanguageMap.put("en", "English"); PedagogicalPlannerAction.filterLanguageMap.put("nl", "Dutch"); @@ -249,19 +246,6 @@ */ public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { - - // First we check if a tutorial video should be displayed - HttpSession session = SessionManager.getSession(); - UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER); - - boolean doNotShowAgain = userDto.getPagesWithDisabledTutorials() != null - && userDto.getPagesWithDisabledTutorials().contains(PedagogicalPlannerAction.PAGE_STRING_START_PLANNER); - boolean showTutorial = !(userDto.getTutorialsDisabled() || doNotShowAgain); - - request.setAttribute(AttributeNames.ATTR_PAGE_STR, PedagogicalPlannerAction.PAGE_STRING_START_PLANNER); - request.setAttribute(AttributeNames.ATTR_SHOW_TUTORIAL, showTutorial); - request.setAttribute(AttributeNames.ATTR_DO_NOT_SHOW_AGAIN, doNotShowAgain); - return openSequenceNode(mapping, form, request, response); } @@ -577,8 +561,9 @@ getMonitoringService().startLesson(lesson.getLessonId(), userDto.getUserID()); String newPath = mapping.findForward(PedagogicalPlannerAction.FORWARD_PREVIEW).getPath(); newPath = newPath + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_LESSON_ID - + PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId() + PedagogicalPlannerAction.CHAR_AMPERSAND - + AttributeNames.PARAM_MODE + PedagogicalPlannerAction.CHAR_EQUALS + "preview"; + + PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId() + + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_MODE + + PedagogicalPlannerAction.CHAR_EQUALS + "preview"; return new ActionForward(newPath, true); } Index: lams_central/web/editprofile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v diff -u -r1.14.4.2 -r1.14.4.3 --- lams_central/web/editprofile.jsp 18 Jun 2009 19:43:36 -0000 1.14.4.2 +++ lams_central/web/editprofile.jsp 19 Jun 2009 04:32:10 -0000 1.14.4.3 @@ -139,20 +139,6 @@ - - : - - - - - - - - - @@ -283,18 +269,6 @@ - - : - - - - - - - Index: lams_central/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v diff -u -r1.40.2.1 -r1.40.2.2 --- lams_central/web/main.jsp 18 Jun 2009 19:43:36 -0000 1.40.2.1 +++ lams_central/web/main.jsp 19 Jun 2009 04:32:10 -0000 1.40.2.2 @@ -49,15 +49,6 @@ initLoadGroup(this, 13, display); }); - <%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%> - - - - - if (!confirm("")){ - $.get("${disableAllTutorialVideosUrl}"); - } - }); function getEnableSortingText() { Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `lams_central/web/tutorialVideo.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/css/pedagogicalPlanner.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/pedagogicalPlanner.css,v diff -u -r1.10.2.2 -r1.10.2.3 --- lams_central/web/css/pedagogicalPlanner.css 18 Jun 2009 19:43:37 -0000 1.10.2.2 +++ lams_central/web/css/pedagogicalPlanner.css 19 Jun 2009 04:32:10 -0000 1.10.2.3 @@ -170,19 +170,3 @@ border-bottom: 0px; } -a#tutorialVideoHref { - margin: 5px; - border: none; - color: inherit; - float: right; -} - -a#tutorialVideoHref:hover { - border: none; - color: inherit; - cursor: pointer; -} - -img#tutorialVideoImg { - border: none; -} \ No newline at end of file Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v diff -u -r1.27.4.2 -r1.27.4.3 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml 18 Jun 2009 19:43:10 -0000 1.27.4.2 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml 19 Jun 2009 04:32:09 -0000 1.27.4.3 @@ -543,37 +543,7 @@ not-null="false" - - - @hibernate.property - column="tutorials_disabled" - length="1" - - - - - @hibernate.property - column="first_login" - length="1" - - - - - - - - Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v diff -u -r1.138.2.5 -r1.138.2.6 --- lams_common/db/sql/create_lams_11_tables.sql 18 Jun 2009 19:43:10 -0000 1.138.2.5 +++ lams_common/db/sql/create_lams_11_tables.sql 19 Jun 2009 04:32:09 -0000 1.138.2.6 @@ -322,8 +322,6 @@ , lams_community_token VARCHAR(255) , lams_community_username VARCHAR(255) , timezone TINYINT - , tutorials_disabled TINYINT(1) DEFAULT 0 - , first_login TINYINT(1) DEFAULT 1 , PRIMARY KEY (user_id) , INDEX (authentication_method_id) , CONSTRAINT FK_lams_user_1 FOREIGN KEY (authentication_method_id) @@ -1137,10 +1135,3 @@ , PRIMARY KEY (uid) )TYPE=InnoDB; -CREATE TABLE lams_user_disabled_tutorials ( - user_id BIGINT(20) NOT NULL - , page_str CHAR(5) NOT NULL - , CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id) - REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE - , PRIMARY KEY (user_id,page_str) -)TYPE=InnoDB; \ No newline at end of file Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v diff -u -r1.36.4.4 -r1.36.4.5 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 18 Jun 2009 19:43:10 -0000 1.36.4.4 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 19 Jun 2009 04:32:09 -0000 1.36.4.5 @@ -162,21 +162,12 @@ /** persistent field */ private String lamsCommunityUsername; - /** persistent field */ - private Boolean tutorialsDisabled; - - /** persistent field */ - private Set pagesWithDisabledTutorials = new HashSet(); - - /** persistent field - latch */ - private Boolean firstLogin; - // ------- TIMEZONES (hardcoded, there is no need to put them into database -------------- public static String[] timezoneList = new String[] { "GMT-12", "GMT-11", "GMT-10", "GMT-9", "GMT-8", "GMT-7", - "GMT-6", "GMT-5", "GMT-4", "GMT-3:30", "GMT-3", "GMT-2", "GMT-1", "GMT", "GMT+1", "GMT+2", "GMT+3", - "GMT+3:30", "GMT+4", "GMT+4:30", "GMT+5", "GMT+5:30", "GMT+5:45", "GMT+6", "GMT+7", "GMT+8", "GMT+9", - "GMT+9:30", "GMT+10", "GMT+11", "GMT+12" }; + "GMT-6", "GMT-5", "GMT-4", "GMT-3:30", "GMT-3", "GMT-2", "GMT-1", "GMT", "GMT+1", "GMT+2", + "GMT+3", "GMT+3:30", "GMT+4", "GMT+4:30", "GMT+5", "GMT+5:30", "GMT+5:45", "GMT+6", "GMT+7", + "GMT+8", "GMT+9", "GMT+9:30", "GMT+10", "GMT+11", "GMT+12" }; /** full constructor */ public User(String login, String password, String title, String firstName, String lastName, String addressLine1, @@ -680,14 +671,11 @@ TimeZone tz = TimeZone.getTimeZone(User.timezoneList[getTimeZone()]); - Set tutorialPages = pagesWithDisabledTutorials == null || pagesWithDisabledTutorials.isEmpty() ? null - : pagesWithDisabledTutorials; - return new UserDTO(userId, firstName, lastName, login, languageIsoCode, countryIsoCode, direction, email, new CSSThemeBriefDTO(flashTheme), new CSSThemeBriefDTO(htmlTheme), // TimeZone.getTimeZone("Australia/Sydney"), tz, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, enableFlash, - lamsCommunityToken, lamsCommunityUsername, tutorialsDisabled, tutorialPages, firstLogin); + lamsCommunityToken, lamsCommunityUsername); } public UserFlashDTO getUserFlashDTO() { @@ -860,40 +848,4 @@ this.timeZone = timeZone; } - /** - * @hibernate.property column="tutorials_disabled" length="1" - * - */ - public Boolean getTutorialsDisabled() { - return tutorialsDisabled; - } - - public void setTutorialsDisabled(Boolean tutorialsDisabled) { - this.tutorialsDisabled = tutorialsDisabled; - } - - /** - * @hibernate.set lazy="false" cascade="all-delete-orphan" - * @hibernate.collection-key column="user_id" - * @hibernate.collection-element column="page_str" type="string" length="5" not-null="true" - */ - public Set getPagesWithDisabledTutorials() { - return pagesWithDisabledTutorials; - } - - public void setPagesWithDisabledTutorials(Set pagesWithDisabledTutorials) { - this.pagesWithDisabledTutorials = pagesWithDisabledTutorials; - } - - /** - * @hibernate.property column="first_login" length="1" - * - */ - public Boolean isFirstLogin() { - return firstLogin; - } - - public void setFirstLogin(Boolean firstLogin) { - this.firstLogin = firstLogin; - } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java,v diff -u -r1.19.4.2 -r1.19.4.3 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java 18 Jun 2009 19:43:10 -0000 1.19.4.2 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java 19 Jun 2009 04:32:09 -0000 1.19.4.3 @@ -23,7 +23,6 @@ /* $$Id$$ */ package org.lamsfoundation.lams.usermanagement.dto; -import java.util.Set; import java.util.TimeZone; import org.apache.commons.lang.builder.ToStringBuilder; @@ -52,25 +51,21 @@ private String lamsCommunityToken; private String lamsCommunityUsername; private Boolean loggedIntoLamsCommunity; - private Boolean tutorialsDisabled; - private Set pagesWithDisabledTutorials; - private Boolean firstLogin; - // public UserDTO(Integer userID, String firstName, String lastName, - // String login, String email, CSSThemeVisualElement theme) { - // this.userID = userID; - // this.firstName = firstName; - // this.lastName = lastName; - // this.login = login; - // this.email = email; - // this.theme = theme; - // } + // public UserDTO(Integer userID, String firstName, String lastName, + // String login, String email, CSSThemeVisualElement theme) { + // this.userID = userID; + // this.firstName = firstName; + // this.lastName = lastName; + // this.login = login; + // this.email = email; + // this.theme = theme; + // } public UserDTO(Integer userID, String firstName, String lastName, String login, String localeLanguage, String localeCountry, String direction, String email, CSSThemeBriefDTO flashTheme, CSSThemeBriefDTO htmlTheme, TimeZone timezone, Integer authenticationMethodId, String fckLanguageMapping, - Boolean enableFlash, String lamsCommunityToken, String lamsCommunityUsername, Boolean tutorialsDisabled, - Set pagesWithDisabledTutorials, Boolean firstLogin) { + Boolean enableFlash, String lamsCommunityToken, String lamsCommunityUsername) { this.userID = userID; this.firstName = firstName; this.lastName = lastName; @@ -81,24 +76,20 @@ this.email = email; this.flashTheme = flashTheme; this.htmlTheme = htmlTheme; - timeZone = timezone; + this.timeZone = timezone; this.authenticationMethodId = authenticationMethodId; this.fckLanguageMapping = fckLanguageMapping; this.enableFlash = enableFlash; this.lamsCommunityToken = lamsCommunityToken; this.lamsCommunityUsername = lamsCommunityUsername; - this.tutorialsDisabled = tutorialsDisabled; - this.pagesWithDisabledTutorials = pagesWithDisabledTutorials; - this.firstLogin = firstLogin; } /** * Equality test of UserDTO objects */ - @Override public boolean equals(Object o) { - if (o != null && o.getClass() == this.getClass()) { - return ((UserDTO) o).userID == userID; + if ((o != null) && (o.getClass() == this.getClass())) { + return ((UserDTO) o).userID == this.userID; } else { return false; } @@ -107,9 +98,8 @@ /** * Returns the hash code value for this object. */ - @Override public int hashCode() { - // TODO this might be an ineffcient implementation since userIDs are likely to be sequential, + // TODO this might be an ineffcient implementation since userIDs are likely to be sequential, // hence we dont get a good spread of values return userID.intValue(); } @@ -184,7 +174,6 @@ return authenticationMethodId; } - @Override public String toString() { return new ToStringBuilder(this).append("userID", getUserID()).append("firstName", getFirstName()).append( "lastName", getLastName()).append("login", getLogin()).append("localeLanguage", getLocaleLanguage()) @@ -194,8 +183,7 @@ .append("fckLanguageMapping", getFckLanguageMapping()).append("enableFlash", getEnableFlash()).append( "lamsCommunityUser", this.getLamsCommunityUsername()).append("lamsCommunityToken", this.getLamsCommunityToken()).append("loggedIntoLamsCommunity", - "" + this.getLoggedIntoLamsCommunity()) - .append("tutorialsDisabled", "" + getTutorialsDisabled()).toString(); + "" + this.getLoggedIntoLamsCommunity()).toString(); } public String getFckLanguageMapping() { @@ -234,32 +222,12 @@ this.loggedIntoLamsCommunity = loggedIntoLamsCommunity; } - public Boolean getTutorialsDisabled() { - return tutorialsDisabled; - } - - public void setTutorialsDisabled(Boolean tutorialsDisabled) { - this.tutorialsDisabled = tutorialsDisabled; - } - - public Set getPagesWithDisabledTutorials() { - return pagesWithDisabledTutorials; - } - - public void setPagesWithDisabledTutorials(Set pagesWithDisabledTutorials) { - this.pagesWithDisabledTutorials = pagesWithDisabledTutorials; - } - - public Boolean isFirstLogin() { - return firstLogin; - } - - // public CSSThemeVisualElement getTheme() { - // return theme; - // } + // public CSSThemeVisualElement getTheme() { + // return theme; + // } // - // public void setTheme(CSSThemeVisualElement theme) { - // this.theme = theme; - // } + // public void setTheme(CSSThemeVisualElement theme) { + // this.theme = theme; + // } } Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java,v diff -u -r1.28.2.1 -r1.28.2.2 --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java 18 Jun 2009 19:43:09 -0000 1.28.2.1 +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java 19 Jun 2009 04:32:09 -0000 1.28.2.2 @@ -88,9 +88,4 @@ public static final String COMMAND_GET_EDITING_ADVICE = "getEditingAdvice"; public static final String COMMAND_CHECK_EDITING_ADVICE = "checkEditingAdvice"; public static final String PARAM_ACTIVITY_INDEX = "activityIndex"; - - // for tutorial videos - public static final String ATTR_PAGE_STR = "pageString"; - public static final String ATTR_DO_NOT_SHOW_AGAIN = "doNotShowAgain"; - public static final String ATTR_SHOW_TUTORIAL = "showTutorial"; -} \ No newline at end of file +}