[cvs] epoll commit by mtraum: fix deprecated
JCorporate Ltd
jcorp at jcorp2.servlets.net
Thu Nov 11 08:58:22 PST 2004
Log Message:
-----------
fix deprecated
Modified Files:
--------------
epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj:
Question.java
PollSecurity.java
CategorySecurity.java
VotingRecord.java
Vote.java
Category.java
Choice.java
Poll.java
epoll/src/WEB-INF/src/com/jcorporate/epoll/controller:
PollManager.java
CategoryManager.java
Booth.java
Revision Data
-------------
Index: Category.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj/Category.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Category.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Category.java -u -r1.4 -r1.5
--- src/WEB-INF/src/com/jcorporate/epoll/dbobj/Category.java
+++ src/WEB-INF/src/com/jcorporate/epoll/dbobj/Category.java
@@ -48,7 +48,7 @@
//We want to avoid DBObject security, since ePoll controllers have own security
//We therefore do not set the uid
super(SecuredDBObject.SYSTEM_ACCOUNT);
- setDBName(request.getDBName());
+ setDBName(request.getDataContext());
}
/**
* The number of children polls for this Category object
Index: Choice.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj/Choice.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Choice.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Choice.java -u -r1.4 -r1.5
--- src/WEB-INF/src/com/jcorporate/epoll/dbobj/Choice.java
+++ src/WEB-INF/src/com/jcorporate/epoll/dbobj/Choice.java
@@ -43,7 +43,7 @@
//We want to avoid DBObject security, since ePoll controllers have own security
//We therefore do not set the uid
super(SecuredDBObject.SYSTEM_ACCOUNT);
- setDBName(request.getDBName());
+ setDBName(request.getDataContext());
}
/**
* This method returns the number of votes associated with this choice.
Index: Question.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj/Question.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Question.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Question.java -u -r1.4 -r1.5
--- src/WEB-INF/src/com/jcorporate/epoll/dbobj/Question.java
+++ src/WEB-INF/src/com/jcorporate/epoll/dbobj/Question.java
@@ -45,7 +45,7 @@
//We want to avoid DBObject security, since ePoll controllers have own security
//We therefore do not set the uid
super(SecuredDBObject.SYSTEM_ACCOUNT);
- setDBName(request.getDBName());
+ setDBName(request.getDataContext());
}
/**
Index: Vote.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj/Vote.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Vote.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Vote.java -u -r1.3 -r1.4
--- src/WEB-INF/src/com/jcorporate/epoll/dbobj/Vote.java
+++ src/WEB-INF/src/com/jcorporate/epoll/dbobj/Vote.java
@@ -35,7 +35,7 @@
//We want to avoid DBObject security, since ePoll controllers have own security
//We therefore do not set the uid
super(SecuredDBObject.SYSTEM_ACCOUNT);
- setDBName(request.getDBName());
+ setDBName(request.getDataContext());
}
/**
Index: VotingRecord.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj/VotingRecord.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/VotingRecord.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/VotingRecord.java -u -r1.3 -r1.4
--- src/WEB-INF/src/com/jcorporate/epoll/dbobj/VotingRecord.java
+++ src/WEB-INF/src/com/jcorporate/epoll/dbobj/VotingRecord.java
@@ -43,7 +43,7 @@
//We want to avoid DBObject security, since ePoll controllers have own security
//We therefore do not set the uid
super(SecuredDBObject.SYSTEM_ACCOUNT);
- setDBName(request.getDBName());
+ setDBName(request.getDataContext());
}
/**
* Override the standard DBObject add() method to do one or more of:
Index: CategorySecurity.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj/CategorySecurity.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/CategorySecurity.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/CategorySecurity.java -u -r1.3 -r1.4
--- src/WEB-INF/src/com/jcorporate/epoll/dbobj/CategorySecurity.java
+++ src/WEB-INF/src/com/jcorporate/epoll/dbobj/CategorySecurity.java
@@ -51,7 +51,7 @@
//We want to avoid DBObject security, since ePoll controllers have own security
//We therefore do not set the uid
super(SecuredDBObject.SYSTEM_ACCOUNT);
- setDBName(request.getDBName());
+ setDBName(request.getDataContext());
}
/**
* Override the method getValues to provide specific values for our
Index: Poll.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj/Poll.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Poll.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/Poll.java -u -r1.7 -r1.8
--- src/WEB-INF/src/com/jcorporate/epoll/dbobj/Poll.java
+++ src/WEB-INF/src/com/jcorporate/epoll/dbobj/Poll.java
@@ -54,7 +54,7 @@
//We want to avoid DBObject security, since ePoll controllers have own security
//We therefore do not set the uid
super(SecuredDBObject.SYSTEM_ACCOUNT);
- setDBName(request.getDBName());
+ setDBName(request.getDataContext());
}
/**
* Override the standard DBObject add() method to do one or more of:
Index: PollSecurity.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/dbobj/PollSecurity.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/PollSecurity.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/dbobj/PollSecurity.java -u -r1.3 -r1.4
--- src/WEB-INF/src/com/jcorporate/epoll/dbobj/PollSecurity.java
+++ src/WEB-INF/src/com/jcorporate/epoll/dbobj/PollSecurity.java
@@ -45,7 +45,7 @@
//We want to avoid DBObject security, since ePoll controllers have own security
//We therefore do not set the uid
super(SecuredDBObject.SYSTEM_ACCOUNT);
- setDBName(request.getDBName());
+ setDBName(request.getDataContext());
}
/**
* Initializes the PollSecurity object with the user's context
Index: CategoryManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/controller/CategoryManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/controller/CategoryManager.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/controller/CategoryManager.java -u -r1.4 -r1.5
--- src/WEB-INF/src/com/jcorporate/epoll/controller/CategoryManager.java
+++ src/WEB-INF/src/com/jcorporate/epoll/controller/CategoryManager.java
@@ -86,7 +86,7 @@
c.add();
GroupMembers gm = new GroupMembers(SecuredDBObject.SYSTEM_ACCOUNT);
- gm.setDBName(param.getDBName());
+ gm.setDBName(param.getDataContext());
gm.setField("ExpUid", param.getUid());
gm.find();
Index: PollManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/controller/PollManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/controller/PollManager.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/controller/PollManager.java -u -r1.4 -r1.5
--- src/WEB-INF/src/com/jcorporate/epoll/controller/PollManager.java
+++ src/WEB-INF/src/com/jcorporate/epoll/controller/PollManager.java
@@ -364,7 +364,7 @@
p.add();
GroupMembers gm = new GroupMembers(SecuredDBObject.SYSTEM_ACCOUNT);
- gm.setDBName(param.getDBName());
+ gm.setDBName(param.getDataContext());
gm.setField("ExpUid", param.getUid());
gm.find();
@@ -460,7 +460,7 @@
}
Category category = new Category();
- category.setDBName(param.getDBName());
+ category.setDBName(param.getDataContext());
category.setField("CategoryId", categoryId);
if (!category.find()) {
@@ -487,7 +487,7 @@
}
Choice choice = new Choice();
- choice.setDBName(param.getDBName());
+ choice.setDBName(param.getDataContext());
choice.setField("ChoiceId", choiceId);
if (!choice.find()) {
@@ -514,7 +514,7 @@
}
Poll poll = new Poll();
- poll.setDBName(param.getDBName());
+ poll.setDBName(param.getDataContext());
poll.setField("PollId", pollId);
if (!poll.find()) {
@@ -541,7 +541,7 @@
}
Question question = new Question();
- question.setDBName(param.getDBName());
+ question.setDBName(param.getDataContext());
question.setField("QuestionId", questionId);
if (!question.find()) {
@@ -571,13 +571,13 @@
//
try {
GroupMembers gm = new GroupMembers(SecuredDBObject.SYSTEM_ACCOUNT);
- gm.setDBName(param.getDBName());
+ gm.setDBName(param.getDataContext());
gm.setField("ExpUid", param.getUid());
gm.find();
ControllerSecurity cs =
new ControllerSecurity(SecuredDBObject.SYSTEM_ACCOUNT);
- cs.setDBName(param.getDBName());
+ cs.setDBName(param.getDataContext());
cs.setField("GroupName", gm.getField("GroupName"));
cs.setField(
"ControllerClass",
@@ -1531,7 +1531,7 @@
}
Category category = new Category();
- category.setDBName(param.getDBName());
+ category.setDBName(param.getDataContext());
category.setField("CategoryId", categoryId);
if (!category.find()) {
@@ -1570,7 +1570,7 @@
}
Choice choice = new Choice();
- choice.setDBName(param.getDBName());
+ choice.setDBName(param.getDataContext());
choice.setField("ChoiceId", choiceId);
if (!choice.find()) {
@@ -1614,7 +1614,7 @@
}
Poll poll = new Poll();
- poll.setDBName(param.getDBName());
+ poll.setDBName(param.getDataContext());
poll.setField("PollId", pollId);
if (!poll.find()) {
@@ -1654,7 +1654,7 @@
}
Question question = new Question();
- question.setDBName(param.getDBName());
+ question.setDBName(param.getDataContext());
question.setField("QuestionId", questionId);
if (!question.find()) {
@@ -1712,7 +1712,7 @@
groupValidValue.add(new ValidValue("", "(select to allow...)"));
UserGroup ug = new UserGroup(SecuredDBObject.SYSTEM_ACCOUNT);
- ug.setDBName(param.getDBName());
+ ug.setDBName(param.getDataContext());
UserGroup oneGroup = null;
Index: Booth.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/epoll/src/WEB-INF/src/com/jcorporate/epoll/controller/Booth.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/WEB-INF/src/com/jcorporate/epoll/controller/Booth.java -Lsrc/WEB-INF/src/com/jcorporate/epoll/controller/Booth.java -u -r1.6 -r1.7
--- src/WEB-INF/src/com/jcorporate/epoll/controller/Booth.java
+++ src/WEB-INF/src/com/jcorporate/epoll/controller/Booth.java
@@ -170,7 +170,7 @@
// Retireve and iterate through all questions for this poll
Question qList = new Question(param);
- qList.setDBName(param.getDBName());
+ qList.setDBName(param.getDataContext());
qList.setField("PollId", pollId);
for (Iterator e =
@@ -288,7 +288,7 @@
// Make sure the poll whose results are requested does actually exist
Poll poll = new Poll(SecuredDBObject.SYSTEM_ACCOUNT);
- poll.setDBName(param.getDBName());
+ poll.setDBName(param.getDataContext());
poll.setField("PollId", pollId);
if (!poll.find()) {
More information about the cvs
mailing list