Author: solomax
Date: Sun Feb 19 07:36:07 2012
New Revision: 1290960
URL: http://svn.apache.org/viewvc?rev=1290960&view=rev
Log:
Code cleanup: compilation warnings; OPENMEETINGS-15 is fixed; login, password,
domain and save login are now persists on style change
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx?rev=1290960&r1=1290959&r2=1290960&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
Sun Feb 19 07:36:07 2012
@@ -136,8 +136,16 @@
g["usercolor"] = val;
canvas.setUserData(g);
+ var uName = parent.username.getText();
+ var uPass = parent.userpass.getText();
+ var uSave = parent._savelogindata.getValue();
+ var uDomain = parent.domain.getValue();
this.parent.close();
- new lz.checkLoginData(canvas.main_content._content.inner);
+ var login = new
lz.checkLoginData(canvas.main_content._content.inner);
+ login.username.setText(uName);
+ login.userpass.setText(uPass);
+ login._savelogindata.setValue(uSave);
+ login.domain.setValue(uDomain);
}
</handler>
<handler name="onkeyup" args="key">
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java?rev=1290960&r1=1290959&r2=1290960&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Sun Feb 19 07:36:07 2012
@@ -244,7 +244,7 @@ public class Configurationmanagement {
}
public Long saveOrUpdateConfiguration(long user_level,
- @SuppressWarnings("rawtypes") LinkedHashMap values,
Long users_id) {
+ LinkedHashMap<String, ?> values, Long users_id) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
Configuration conf = (Configuration)
CastMapToObject
@@ -313,7 +313,7 @@ public class Configurationmanagement {
}
public Long deleteConfByConfiguration(long user_level,
- @SuppressWarnings("rawtypes") LinkedHashMap values,
Long users_id) {
+ LinkedHashMap<String, ?> values, Long users_id) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
Configuration conf = (Configuration)
CastMapToObject
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java?rev=1290960&r1=1290959&r2=1290960&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java
Sun Feb 19 07:36:07 2012
@@ -55,13 +55,13 @@ public class ConfigurationService {
return
cfgManagement.getConfByConfigurationId(user_level,configuration_id);
}
- public Long saveOrUpdateConfiguration(String
SID,@SuppressWarnings("rawtypes") LinkedHashMap values){
+ public Long saveOrUpdateConfiguration(String SID, LinkedHashMap<String, ?>
values){
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- return cfgManagement.saveOrUpdateConfiguration(user_level,values,
users_id);
+ return cfgManagement.saveOrUpdateConfiguration(user_level, values,
users_id);
}
- public Long deleteConfiguration(String SID,@SuppressWarnings("rawtypes")
LinkedHashMap values){
+ public Long deleteConfiguration(String SID, LinkedHashMap<String, ?>
values){
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
return cfgManagement.deleteConfByConfiguration(user_level, values,
users_id);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java?rev=1290960&r1=1290959&r2=1290960&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java
Sun Feb 19 07:36:07 2012
@@ -23,7 +23,6 @@ import java.io.StringWriter;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
