Author: solomax
Date: Wed Aug 1 08:37:02 2012
New Revision: 1367885
URL: http://svn.apache.org/viewvc?rev=1367885&view=rev
Log:
OPENMEETINGS-387 is implemented; compilation warnings are fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebServiceFacade.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
Wed Aug 1 08:37:02 2012
@@ -4561,4 +4561,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
Wed Aug 1 08:37:02 2012
@@ -4559,4 +4559,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml Wed Aug 1 08:37:02 2012
@@ -4572,4 +4572,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
Wed Aug 1 08:37:02 2012
@@ -4559,4 +4559,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
Wed Aug 1 08:37:02 2012
@@ -6027,4 +6027,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
Wed Aug 1 08:37:02 2012
@@ -4556,4 +4556,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
Wed Aug 1 08:37:02 2012
@@ -6003,4 +6003,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
Wed Aug 1 08:37:02 2012
@@ -4559,4 +4559,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
Wed Aug 1 08:37:02 2012
@@ -4559,4 +4559,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
Wed Aug 1 08:37:02 2012
@@ -4633,4 +4633,7 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml Wed Aug 1 08:37:02 2012
@@ -4561,4 +4561,7 @@ Details
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
Wed Aug 1 08:37:02 2012
@@ -4568,4 +4568,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Wed
Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
Wed Aug 1 08:37:02 2012
@@ -4559,4 +4559,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
Wed Aug 1 08:37:02 2012
@@ -4560,4 +4560,7 @@ see http://incubator.apache.org/openmeet
<string id="1508" name="my_room_tooltip">
<value>Rooms of the current user</value>
</string>
+ <string id="1509" name="create_new_room">
+ <value>Create/Modify appointment special room</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Wed Aug 1 08:37:02 2012
@@ -1054,6 +1054,7 @@
<netRemoteCallHib name="clientregisterRoom"
funcname="clientregisterRoom">
<handler name="ondata" args="value">
+ if ($debug) Debug.write("**** clientregisterRoom::ondata ",
value);
</handler>
</netRemoteCallHib>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
Wed Aug 1 08:37:02 2012
@@ -345,7 +345,7 @@
]]>
</method>
- <wrappinglayout axis="y" spacing="2" inset="2" />
+ <wrappinglayout axis="y" spacing="2" xinset="2" />
</view>
<om_vscrollbar />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
Wed Aug 1 08:37:02 2012
@@ -22,7 +22,7 @@
<class name="lzEditCalendarEvent" extends="labelExplorerBox"
labelid="815" allowDragging="true"
x="$once{ parent.width/2 - 300 }" y="100" docking="false"
resizeable="false"
- closable="true" width="600" height="550"
+ closable="true" width="600" height="602"
showWindowEffect="true" annimationStartStyle="mouse">
<attribute name="reminderTypeId" value="0" type="number" />
@@ -39,6 +39,7 @@
<attribute name="updateObj" value="null" />
<attribute name="appointmentId" value="0" type="number" />
+ <attribute name="roomId" value="0" type="number" />
<attribute name="isConnectedEvent" value="false" type="boolean"
/>
@@ -77,6 +78,8 @@
this.eventDS.setAttribute("data", this.dataElement.childNodes);
this.appointmentId =
this.eventDS.getPointer().xpathQuery('appointmentId/text()');
+ this.roomId =
this.eventDS.getPointer().xpathQuery('roomId/text()');
+ this._room.getRoomsPublicWithoutType.doCall();
if ($debug) Debug.write("this.eventDS ",this.eventDS);
if ($debug) Debug.write("this.appointmentId
",this.appointmentId);
@@ -138,11 +141,9 @@
updateObj.roomType = this._roomType.getValue();
updateObj.isPasswordProtected =
this._ispasswordProtected.getValue();
updateObj.password = this._password.getText();
+ updateObj.roomId = (!this._createNewRoom.getValue() ?
this._room.getValue() : -1);
- if ($debug) Debug.write("appointmentId:
",updateObj.appointmentId);
-
- if ($debug) Debug.write("appointmentstart:
",updateObj.appointmentstart);
- if ($debug) Debug.write("appointmentstart:
",updateObj.appointmentend);
+ if ($debug) Debug.write("updateObj: ", updateObj);
if ($debug) Debug.write("appointmentstart:
",parseDateToStringTimeSeconds(updateObj.appointmentstart));
if ($debug) Debug.write("appointmentstart:
",parseDateToStringTimeSeconds(updateObj.appointmentend));
@@ -177,6 +178,7 @@
<netparam><method name="getValue">return
hib.userlang;</method></netparam>
<netparam><method name="getValue">return
parent.parent.updateObj.isPasswordProtected;</method></netparam>
<netparam><method name="getValue">return
parent.parent.updateObj.password;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.updateObj.roomId;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("saveAppointment
",value);
@@ -207,6 +209,7 @@
<netparam><method name="getValue">return
hib.userlang;</method></netparam>
<netparam><method name="getValue">return
parent.parent.updateObj.isPasswordProtected;</method></netparam>
<netparam><method name="getValue">return
parent.parent.updateObj.password;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.updateObj.roomId;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("updateAppointment
",value);
@@ -296,15 +299,28 @@
</handler>
<textlistitem
datapath="local:classroot.getAppointmentReminderTypList:/getAppointmentReminderTypListResponse/return"
text="$path{'name/text()'}"
value="$path{'typId/text()'}" />
- </resetCombobox>
+ </resetCombobox>
+
+ <!-- New/Existent room selector -->
+ <labelCheckbox name="_createNewRoom" y="102" fontsize="11"
x="10" labelid="1509"
+ datapath="local:classroot.eventDS:/roomId">
+ <handler name="ondata" args="d">
+ if ($debug) Debug.write("ondata _createNewRoom
", d.childNodes[0].data, (d.childNodes[0].data == "0"));
+ var val = (d.childNodes[0].data == "0");
+ this.setValue(val);
+ if (!val) {
+ this.setAttribute("enabled", false);
+ }
+ </handler>
+ </labelCheckbox>
<!-- Roomtype -->
- <labelText name="_roomTypeLabel" x="4" y="102" labelid="619"
fontstyle="bold" />
+ <labelText name="_roomTypeLabel" x="4" y="128" labelid="619"
fontstyle="bold" />
- <resetCombobox name="_roomType" width="$once{ parent.width-110
}" y="102" x="100" editable="false"
-
datapath="local:classroot.eventDS:/roomTypeId">
+ <resetCombobox name="_roomType" width="$once{ parent.width-110
}" y="128" x="100" editable="false"
+
datapath="local:classroot.eventDS:/roomTypeId" enabled="${
parent._createNewRoom.value }">
<handler name="ondata" args="roomTypeIdNode">
- if ($debug) Debug.write("remindtype ondata 1:
", roomTypeIdNode.childNodes[0].data);
+ if ($debug) Debug.write("_roomType ondata 1: ",
roomTypeIdNode.childNodes[0].data);
var remTypeId =
Number(roomTypeIdNode.childNodes[0].data);
if (remTypeId > 0) {
this.selectItem(remTypeId);
@@ -320,32 +336,93 @@
</handler>
</resetCombobox>
+ <!-- Room list -->
+ <labelText name="_roomLabel" x="4" y="154" labelid="406"
fontstyle="bold" />
+
+ <resetCombobox name="_room" width="$once{ parent.width-110 }"
y="154" x="100" editable="false"
+ enabled="${ !parent._createNewRoom.value }">
+ <attribute name="appointmentRoomInList" type="boolean"
value="false" />
+
+ <netRemoteCallHib name="getRoomsPublicWithoutType"
funcname="conferenceservice.getRoomsPublicWithoutType"
+ remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug)
Debug.write("getRoomsPublicWithoutType: ", value);
+ for (var i = 0; value != null && i <
value.length; ++i) {
+ parent.addItem(value[i].name,
value[i].rooms_id);
+ if (parent.parent.roomId == value[i].rooms_id) {
+ parent.appointmentRoomInList = true;
+ }
+ }
+
parent.getRoomsByOrganisationWithoutType.doCall();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <netRemoteCallHib
name="getRoomsByOrganisationWithoutType"
funcname="conferenceservice.getRoomsByOrganisationWithoutType"
remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return
hib.currentdomainObj.organisation_id;</method></netparam>
+
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug)
Debug.write("getRoomsByOrganisationWithoutType ",value);
+ for (var i = 0; value != null && i <
value.length; ++i) {
+ parent.addItem(value[i].room.name,
value[i].room.rooms_id);
+ if (parent.parent.roomId ==
value[i].room.rooms_id) {
+ parent.appointmentRoomInList = true;
+ }
+ }
+ parent.selectRoom();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <method name="selectRoom">
+ if ($debug) Debug.write("parent.roomId != 0 ?
", parent.roomId != 0);
+ if (parent.roomId != 0) {
+ if(!this.appointmentRoomInList) {
+
this.addItem(parent._title.getText(), parent.roomId);
+
parent._createNewRoom.setAttribute("enabled", true);
+
parent._createNewRoom.setValue(true);
+ }
+ this.selectItem(parent.roomId);
+ }
+ </method>
+
+ <handler name="onvalue" args="v">
+ <![CDATA[
+ if ($debug) Debug.write("_room:: onvalue ",
parent.roomId, v, this.getValue(), (!this.appointmentRoomInList &&
parent.roomId == v));
+ if (parent.roomId != 0 && v) {
+
parent._createNewRoom.setAttribute("enabled", !this.appointmentRoomInList &&
parent.roomId == v);
+ }
+ ]]>
+ </handler>
+ </resetCombobox>
+
<!-- password protected -->
- <labelCheckbox name="_ispasswordProtected" y="128"
fontsize="11" x="10" labelid="524"
+ <labelCheckbox name="_ispasswordProtected" y="180"
fontsize="11" x="10" labelid="524"
datapath="local:classroot.eventDS:/isPasswordProtected">
<handler name="ondata" args="d">
- //if ($debug) Debug.write("ondata
_ispasswordProtected ",d.childNodes[0].data);
- if (d.childNodes[0].data == "true") {
- this.setValue(true);
- } else {
- this.setValue(false);
- }
+ if ($debug) Debug.write("ondata
_ispasswordProtected ", d.childNodes[0].data);
+ this.setValue(d.childNodes[0].data == "true");
</handler>
</labelCheckbox>
<!-- password -->
- <labelText labelid="525" y="154" x="4" fontstyle="bold"
+ <labelText labelid="525" y="206" x="4" fontstyle="bold"
fgcolor="${
((!parent._ispasswordProtected.value) ? 0xCCCCCC : 0x000000 ) }" />
<customEdittext name="_password" enabled="${
parent._ispasswordProtected.value }" password="true"
- width="$once{ parent.width-110
}" x="100" y="154" />
+ width="$once{ parent.width-110
}" x="100" y="206" />
- <view resource="messagebox_info_rsc" x="4" y="180" />
+ <view resource="messagebox_info_rsc" x="4" y="226" />
- <labelText name="password_info" labelid="1445" x="24" y="180"
+ <labelText name="password_info" labelid="1445" x="24" y="226"
multiline="true"
width="$once{ parent.width-34 }" />
<!-- participents -->
- <view name="_participentsIconBar" layout="axis:x" x="$once{
parent.width-50 }" y="230">
+ <view name="_participentsIconBar" layout="axis:x" x="$once{
parent.width-50 }" y="282">
<baseChooseIconView labelid="812" height="20" width="19"
bgcolor="$once{
canvas.getThemeColor('secondBorderColor') }"
resourceN="calendar_add_user_rsc">
@@ -363,9 +440,9 @@
<view bgcolor="$once{ canvas.getThemeColor('secondBorderColor')
}" height="20" width="1" />
</view>
- <labelText name="_participentLabel" x="4" y="250" labelid="803"
fontstyle="bold" />
+ <labelText name="_participentLabel" x="4" y="302" labelid="803"
fontstyle="bold" />
- <view name="_participentList" x="100" y="250" height="100"
+ <view name="_participentList" x="100" y="302" height="100"
bgcolor="$once{
canvas.getThemeColor('secondBorderColor') }"
width="$once{ parent.width-110 }">
@@ -443,16 +520,16 @@
</view>
<!-- Location -->
- <labelText name="_locationLabel" x="4" y="354" labelid="569"
fontstyle="bold" />
+ <labelText name="_locationLabel" x="4" y="406" labelid="569"
fontstyle="bold" />
<customEdittext name="_location"
datapath="local:classroot.eventDS:/location"
text="$path{'text()'}"
- width="$once{ parent.width-110 }" x="100" y="354" />
+ width="$once{ parent.width-110 }" x="100" y="406" />
<!-- Comment -->
- <labelText name="_descrLabel" x="4" y="380" labelid="573"
fontstyle="bold" />
+ <labelText name="_descrLabel" x="4" y="432" labelid="573"
fontstyle="bold" />
- <customScrollEdittext name="_descr" y="380" x="100"
+ <customScrollEdittext name="_descr" y="432" x="100"
datapath="local:classroot.eventDS:/comment"
text="$path{'text()'}"
width="$once{ parent.width-110 }" height="124"
/>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
Wed Aug 1 08:37:02 2012
@@ -192,7 +192,7 @@
newAppointment.comment = "";
newAppointment.reminderId = 3;
- newAppointment.roomsId = 0;
+ newAppointment.roomId = 0;
newAppointment.location = "";
newAppointment.isPasswordProtected = false;
newAppointment.roomTypeId = 1;
Modified: incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html
(original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html Wed Aug
1 08:37:02 2012
@@ -427,6 +427,8 @@ limitations under the License.
Boolean isPasswordProtected
,
String password
+
,
+ long roomId
)
</i><br/>
<p>
@@ -436,6 +438,8 @@ limitations under the License.
Return Type: java.lang.Long
</p>
<p>Params:</p>
+ <b>Warning:</b><i>
Params in this method do not seem to be correctly documentated</i>
+ <br/><br/>
<table rules="all"
border="1">
<thead>
@@ -605,7 +609,7 @@ limitations under the License.
</table>
<br/>
REST Sample Call/URL:<br/>
-
<a
href="http://localhost:5080/openmeetings/services/CalendarService/saveAppointment?SID=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&baseUrl=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE";>http://localhost:5080/openmeetings/services/CalendarService/saveAppointment?&&&&&&&&&&&&&&&&&</a>
+
<a
href="http://localhost:5080/openmeetings/services/CalendarService/saveAppointment?SID=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&baseUrl=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE&roomId=VALUE";>http://localhost:5080/openmeetings/services/CalendarService/saveAppointment?&&&&&&&&&&&&&&&&&&</a
>
</div>
<div
class="method">
<div class="method_header">
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Wed Aug 1 08:37:02 2012
@@ -144,7 +144,7 @@ public class AppointmentLogic {
Boolean isYearly, Long categoryId, Long remind,
@SuppressWarnings("rawtypes") List mmClient, Long
roomType,
String baseUrl, Long language_id, Boolean
isPasswordProtected,
- String password) {
+ String password, long roomId) {
log.debug("Appointmentlogic.saveAppointment");
@@ -158,7 +158,7 @@ public class AppointmentLogic {
// Adding creator as MeetingMember
Users user = userManagement.getUserById(userId);
- Long room_id = roommanagement.addRoom(3, // user level
+ Long room_id = roomId > 0 ? roomId :
roommanagement.addRoom(3, // user level
appointmentName, // name
roomType, // RoomType
"", // Comment
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
Wed Aug 1 08:37:02 2012
@@ -362,43 +362,4 @@ public class MeetingMemberLogic {
return null;
}
//
--------------------------------------------------------------------------------------------
-
- /*
- * public List<Appointment> getAppointmentByRange(Long userId ,Date
- * starttime, Date endtime){ try { return
- * AppointmentDaoImpl.getInstance().getAppointmentsByRange(userId,
- * starttime, endtime); }catch(Exception err){
- * log.error("[getAppointmentByRange]",err); } return null; } //next
- * appointment to current date public Appointment getNextAppointment(){
try{
- * return AppointmentDaoImpl.getInstance().getNextAppointment(new
Date());
- * }catch(Exception err){ log.error("[getNextAppointmentById]",err); }
- * return null; }
- *
- * public List<Appointment> searchAppointmentByName(String
appointmentName){
- * try{ return
- *
AppointmentDaoImpl.getInstance().searchAppointmentsByName(appointmentName
- * ) ; }catch(Exception err){
log.error("[searchAppointmentByName]",err); }
- * return null; }
- *
- *
- *
- * public Long deleteAppointment(Long appointmentId){ try{
- * AppointmentDaoImpl.getInstance().deleteAppointement(appointmentId);
- * return appointmentId; }catch(Exception err){
- * log.error("[deleteAppointment]",err); } return null;
- *
- * }
- *
- * public Long updateAppointment(Long appointmentId, String
- * appointmentName,Long userId, String appointmentDescription, Date
- * appointmentstart, Date appointmentend, Boolean isDaily, Boolean
isWeekly,
- * Boolean isMonthly, Boolean isYearly, Long categoryId ){
- *
- * try { return
- * AppointmentDaoImpl.getInstance().updateAppointment(appointmentId,
- * appointmentName, userId, appointmentDescription, appointmentstart,
- * appointmentend, isDaily, isWeekly, isMonthly, isYearly, categoryId);
}
- * catch (Exception err) { log.error("[updateAppointment]",err); }
return
- * null; }
- */
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/CalendarService.java
Wed Aug 1 08:37:02 2012
@@ -126,7 +126,7 @@ public class CalendarService {
Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
Long categoryId, Long remind,
@SuppressWarnings("rawtypes") List mmClient, Long roomType,
String baseUrl, Long language_id, Boolean
isPasswordProtected,
- String password) {
+ String password, long roomId) {
log.debug("saveAppointMent SID:" + SID + ", baseUrl : " +
baseUrl);
@@ -158,7 +158,7 @@ public class CalendarService {
users_id, appointmentLocation,
appointmentDescription,
appointmentstart,
appointmentend, isDaily, isWeekly,
isMonthly, isYearly,
categoryId, remind, mmClient,
- roomType, baseUrl, language_id,
isPasswordProtected, password);
+ roomType, baseUrl, language_id,
isPasswordProtected, password, roomId);
return id;
} else {
@@ -225,7 +225,7 @@ public class CalendarService {
Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
Long categoryId, Long remind,
@SuppressWarnings("rawtypes") List mmClient, Long roomType,
String baseUrl, Long language_id, Boolean
isPasswordProtected,
- String password) {
+ String password, long roomId) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -234,21 +234,25 @@ public class CalendarService {
log.debug("updateAppointment");
- RoomTypes rt =
roommanagement.getRoomTypesById(roomType);
-
- Appointment app = appointmentLogic
-
.getAppointMentById(appointmentId);
-
+ Appointment app =
appointmentLogic.getAppointMentById(appointmentId);
Rooms room = app.getRoom();
- if (room != null) {
-
- room.setComment(appointmentDescription);
- room.setName(appointmentName);
- room.setRoomtype(rt);
-
- roommanagement.updateRoomObject(room);
+ if (roomId > 0) {
+ if ( room.getRooms_id() != roomId) {
+
app.setRoom(roommanagement.getRoomById(roomId));
+
appointmentDao.updateAppointment(app);
+ }
+ } else {
+ RoomTypes rt =
roommanagement.getRoomTypesById(roomType);
+
+ if (room != null) {
+
+
room.setComment(appointmentDescription);
+ room.setName(appointmentName);
+ room.setRoomtype(rt);
+
+
roommanagement.updateRoomObject(room);
+ }
}
-
Users user =
userManagement.getUserById(users_id);
// Refactor the given time ignoring the Date is
always UTC!
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebService.java?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebService.java
Wed Aug 1 08:37:02 2012
@@ -279,7 +279,7 @@ public class CalendarWebService {
Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
Boolean isYearly, Long categoryId, Long remind,
String[] mmClient,
Long roomType, String baseUrl, Long languageId,
- Boolean isPasswordProtected, String password) {
+ Boolean isPasswordProtected, String password, long
roomId) {
log.debug("saveAppointMent SID:" + SID + ", baseUrl : " +
baseUrl);
@@ -310,7 +310,7 @@ public class CalendarWebService {
appointmentstart.getTime(),
appointmentend.getTime(),
isDaily, isWeekly, isMonthly,
isYearly, categoryId,
remind, newList, roomType,
baseUrl, languageId,
- isPasswordProtected, password);
+ isPasswordProtected, password,
roomId);
return id;
} else {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebServiceFacade.java?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebServiceFacade.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/CalendarWebServiceFacade.java
Wed Aug 1 08:37:02 2012
@@ -93,12 +93,12 @@ public class CalendarWebServiceFacade {
Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
Boolean isYearly, Long categoryId, Long remind,
String[] mmClient,
Long roomType, String baseUrl, Long languageId,
- Boolean isPasswordProtected, String password) throws
AxisFault {
+ Boolean isPasswordProtected, String password, long
roomId) throws AxisFault {
return getCalendarServiceProxy().saveAppointment(SID,
appointmentName,
appointmentLocation, appointmentDescription,
appointmentstart,
appointmentend, isDaily, isWeekly, isMonthly,
isYearly,
categoryId, remind, mmClient, roomType,
baseUrl, languageId,
- isPasswordProtected, password);
+ isPasswordProtected, password, roomId);
}
public Long updateAppointmentTimeOnly(String SID, Long appointmentId,
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1367885&r1=1367884&r2=1367885&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java
Wed Aug 1 08:37:02 2012
@@ -86,7 +86,7 @@ public class TestAppointmentAddAppointme
users_id, appointmentLocation,
appointmentDescription,
appointmentstart, appointmentend,
isDaily, isWeekly,
isMonthly, isYearly, categoryId,
remind, mmClient,
- roomType, baseUrl, language_id, false,
"");
+ roomType, baseUrl, language_id, false,
"", -1);
Thread.sleep(3000);
