Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/language/lams/ApplicationResources.properties,v diff -u -r1.2 -r1.3 --- lams_tool_gmap/conf/language/lams/ApplicationResources.properties 2 Jun 2008 07:51:10 -0000 1.2 +++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties 6 Jun 2008 00:24:20 -0000 1.3 @@ -28,10 +28,16 @@ button.fitMarkers =Fit Markers button.go =Go! +label.createdBy =Created By: +label.latitudeLongitude =Latitude-Longitude: +label.newInfoWindowText =New Info Window Text: +button.edit =Edit +button.remove =Remove + advanced.editingOptions =Editing Options advanced.lockOnFinished =Lock when finished -advanced.allowEditMarkers =Allow users to edit their own saved markers -advanced.allowShowAllMarkers =Allow users to see markers from other users +advanced.allowEditMarkers =Allow learners to edit their own saved markers +advanced.allowShowAllMarkers =Allow learners to see markers from other learners advanced.limitMarkers =Marker Limits advanced.markerLimitsMessage =Limit the number of markers advanced.mapOptions =Map Options Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/Attic/IGmapAttachmentDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java 23 May 2008 06:29:09 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java 23 May 2008 06:29:09 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * @@ -20,6 +20,7 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ + /* $$Id$$ */ package org.lamsfoundation.lams.tool.gmap.dao; Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java 30 May 2008 03:42:57 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,3 +1,27 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ +/* $$Id$$ */ + package org.lamsfoundation.lams.tool.gmap.dao; import java.util.List; Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java 23 May 2008 06:29:09 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java 23 May 2008 06:29:09 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/Attic/GmapAttachmentDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java 6 Jun 2008 00:24:18 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/Attic/GmapAttachmentDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java,v diff -u -r1.4 -r1.5 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java 4 Jun 2008 05:54:41 -0000 1.4 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java 6 Jun 2008 00:24:19 -0000 1.5 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * @@ -28,6 +28,7 @@ import java.util.Iterator; import java.util.Set; import java.util.TreeSet; +import java.util.HashSet; import org.apache.log4j.Logger; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; @@ -81,7 +82,7 @@ public String mapType; - public Set gmapMarkers = new TreeSet(); + public Set gmapMarkers = new HashSet(); public Set onlineInstructionsFiles; Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java 4 Jun 2008 05:54:41 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,3 +1,27 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ +/* $$Id$$ */ + package org.lamsfoundation.lams.tool.gmap.dto; import java.util.Date; Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/Attic/NotebookEntryDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,3 +1,27 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ +/* $$Id$$ */ + package org.lamsfoundation.lams.tool.gmap.dto; import java.util.Date; Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Attic/GmapAttachment.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java,v diff -u -r1.4 -r1.5 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java 4 Jun 2008 05:54:41 -0000 1.4 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java 6 Jun 2008 00:24:19 -0000 1.5 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.gmap.model; import java.util.Date; Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java,v diff -u -r1.3 -r1.4 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java 2 Jun 2008 07:51:10 -0000 1.3 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java 6 Jun 2008 00:24:19 -0000 1.4 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapServiceProxy.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapServiceProxy.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapServiceProxy.java 23 May 2008 06:29:10 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapServiceProxy.java 6 Jun 2008 00:24:19 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java,v diff -u -r1.2 -r1.3 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java 30 May 2008 03:42:57 -0000 1.2 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java 6 Jun 2008 00:24:19 -0000 1.3 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java,v diff -u -r1.2 -r1.3 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java 4 Jun 2008 05:54:41 -0000 1.2 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java 6 Jun 2008 00:24:19 -0000 1.3 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapToolContentHandler.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapToolContentHandler.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapToolContentHandler.java 23 May 2008 06:29:10 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapToolContentHandler.java 6 Jun 2008 00:24:20 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java,v diff -u -r1.5 -r1.6 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java 4 Jun 2008 05:54:42 -0000 1.5 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java 6 Jun 2008 00:24:18 -0000 1.6 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * @@ -466,40 +466,34 @@ Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue()); String markerState = markerNode.getNamedItem("state").getNodeValue(); + + if (markerState.equals("remove")) + { + gmap.removeMarker(uid); + return; + } + + GmapMarker marker = null; if (markerState.equals("save")) { - GmapMarker marker = new GmapMarker(); - marker.setTitle(markerTitle); - marker.setInfoWindowMessage(infoMessage); - marker.setLatitude(latitude); - marker.setLongitude(longitude); - marker.setGmap(gmap); - marker.setCreated(new Date()); - marker.setUpdated(new Date()); - marker.setAuthored(true); + marker = new GmapMarker(); marker.setCreatedBy(guser); - marker.setUpdatedBy(guser); - gmapService.saveOrUpdateGmapMarker(marker); - + marker.setCreated(new Date()); } else if (markerState.equals("update")) { - - GmapMarker marker = gmap.getMarkerByUid(uid); - marker.setTitle(markerTitle); - marker.setInfoWindowMessage(infoMessage); - marker.setLatitude(latitude); - marker.setLongitude(longitude); - marker.setGmap(gmap); - marker.setUpdated(new Date()); - marker.setUpdatedBy(guser); - marker.setAuthored(true); - gmapService.saveOrUpdateGmapMarker(marker); + marker = gmap.getMarkerByUid(uid); } - else if (markerState.equals("remove")) - { - gmap.removeMarker(uid); - } + + marker.setTitle(markerTitle); + marker.setInfoWindowMessage(infoMessage); + marker.setLatitude(latitude); + marker.setLongitude(longitude); + marker.setGmap(gmap); + marker.setUpdated(new Date()); + marker.setUpdatedBy(guser); + marker.setAuthored(true); + gmapService.saveOrUpdateGmapMarker(marker); } } catch (Exception e) Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java 6 Jun 2008 00:24:18 -0000 1.2 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java,v diff -u -r1.4 -r1.5 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java 4 Jun 2008 05:54:42 -0000 1.4 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java 6 Jun 2008 00:24:18 -0000 1.5 @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * @@ -25,9 +25,14 @@ package org.lamsfoundation.lams.tool.gmap.web.actions; import java.io.IOException; +import java.io.StringReader; +import java.util.Date; +import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; @@ -42,6 +47,7 @@ import org.lamsfoundation.lams.tool.gmap.dto.GmapDTO; import org.lamsfoundation.lams.tool.gmap.dto.GmapUserDTO; import org.lamsfoundation.lams.tool.gmap.model.Gmap; +import org.lamsfoundation.lams.tool.gmap.model.GmapMarker; import org.lamsfoundation.lams.tool.gmap.model.GmapSession; import org.lamsfoundation.lams.tool.gmap.model.GmapUser; import org.lamsfoundation.lams.tool.gmap.service.IGmapService; @@ -54,6 +60,11 @@ import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; /** * @author @@ -202,19 +213,29 @@ gmapUser.setFinishedActivity(true); gmapService.saveOrUpdateGmapUser(gmapUser); + + + // Retrieve the session and content. + GmapSession gmapSession = gmapService.getSessionBySessionId(toolSessionID); + if (gmapSession == null) { + throw new GmapException("Cannot retreive session with toolSessionID"+ toolSessionID); + } + + // update the marker list + Gmap gmap = gmapSession.getGmap(); + updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser); + } else { log.error("finishActivity(): couldn't find GmapUser with id: " + gmapUser.getUserId() + "and toolSessionID: " + toolSessionID); } - ToolSessionManager sessionMgrService = GmapServiceProxy - .getGmapSessionManager(getServlet().getServletContext()); + ToolSessionManager sessionMgrService = GmapServiceProxy.getGmapSessionManager(getServlet().getServletContext()); String nextActivityUrl; try { - nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID, - gmapUser.getUserId()); + nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID,gmapUser.getUserId()); response.sendRedirect(nextActivityUrl); } catch (DataMissingException e) { throw new GmapException(e); @@ -226,4 +247,69 @@ return null; // TODO need to return proper page. } + + private void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser) + { + //Set newMarkers = new HashSet(); + Set existingMarkers = gmap.getGmapMarkers(); + try + { + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + DocumentBuilder db = dbf.newDocumentBuilder(); + Document document = db.parse(new InputSource(new StringReader(markerXML))); + NodeList list = document.getElementsByTagName("marker"); + + for (int i =0; i - + + <%@ include file="/includes/jsp/mapFunctions.jsp"%> + + + + + + + + + + \ No newline at end of file Index: lams_tool_gmap/web/pages/authoring/basic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/authoring/basic.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_gmap/web/pages/authoring/basic.jsp 4 Jun 2008 05:54:41 -0000 1.6 +++ lams_tool_gmap/web/pages/authoring/basic.jsp 6 Jun 2008 00:24:20 -0000 1.7 @@ -1,10 +1,7 @@ <%@ include file="/common/taglibs.jsp"%> - - + - @@ -33,17 +30,14 @@ -
+
- -
- + + - + + @@ -56,30 +50,36 @@ - + - - - - - - Index: lams_tool_gmap/web/pages/authoring/headItems.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/authoring/headItems.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_gmap/web/pages/authoring/headItems.jsp 4 Jun 2008 05:54:41 -0000 1.6 +++ lams_tool_gmap/web/pages/authoring/headItems.jsp 6 Jun 2008 00:24:20 -0000 1.7 @@ -5,21 +5,34 @@ - - +<%@ include file="/includes/jsp/mapFunctions.jsp"%> + + + Index: lams_tool_gmap/web/pages/learning/gmap.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/learning/gmap.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_gmap/web/pages/learning/gmap.jsp 3 Jun 2008 03:53:16 -0000 1.2 +++ lams_tool_gmap/web/pages/learning/gmap.jsp 6 Jun 2008 00:24:20 -0000 1.3 @@ -48,7 +48,7 @@ - +

${gmapDTO.instructions}

@@ -76,7 +76,7 @@
- + button.finish
@@ -93,14 +93,6 @@ initLearnerGmap(); //--> - - - -