You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/11 13:39:10 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/velocity VelocityActionEvent.java
henning 2003/04/11 04:39:10
Modified: src/java/org/apache/turbine/modules ActionEvent.java
src/java/org/apache/turbine/modules/navigations
DefaultBottomNavigation.java
src/java/org/apache/turbine/modules/screens Error.java
src/java/org/apache/turbine/om/security TurbineGroup.java
TurbineRole.java
src/java/org/apache/turbine/om/security/peer GroupPeer.java
PermissionPeer.java TurbineUserPeer.java
src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java
TurbineRunDataService.java
src/java/org/apache/turbine/services/security/db
DBSecurityService.java
src/java/org/apache/turbine/services/security/ldap
LDAPSecurityService.java
src/java/org/apache/turbine/util DynamicURI.java
src/java/org/apache/turbine/util/parser
DefaultParameterParser.java
src/java/org/apache/turbine/util/security
TurbineAccessControlList.java
src/java/org/apache/turbine/util/velocity
VelocityActionEvent.java
Log:
Remove the usage of deprecated methods and replace them with the suggested
replacement methods
Revision Changes Path
1.10 +4 -4 jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionEvent.java
Index: ActionEvent.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionEvent.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ActionEvent.java 20 Mar 2003 16:15:01 -0000 1.9
+++ ActionEvent.java 11 Apr 2003 11:39:09 -0000 1.10
@@ -55,7 +55,7 @@
*/
import java.lang.reflect.Method;
-import java.util.Enumeration;
+import java.util.Iterator;
import org.apache.commons.lang.StringUtils;
@@ -167,9 +167,9 @@
String button = pp.convert(BUTTON);
// Loop through and find the button.
- for (Enumeration e = pp.keys(); e.hasMoreElements();)
+ for (Iterator it = pp.keySet().iterator(); it.hasNext();)
{
- String key = (String) e.nextElement();
+ String key = (String) it.next();
if (key.startsWith(button))
{
theButton = formatString(key);
1.10 +7 -5 jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java
Index: DefaultBottomNavigation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultBottomNavigation.java 18 Mar 2003 14:17:44 -0000 1.9
+++ DefaultBottomNavigation.java 11 Apr 2003 11:39:09 -0000 1.10
@@ -73,6 +73,7 @@
import org.apache.ecs.html.TD;
import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table;
+
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.modules.Navigation;
import org.apache.turbine.om.security.Permission;
@@ -160,10 +161,11 @@
// a <PRE></PRE> tag so that they can be displayed on the
// page. This is of course only for example purposes.
PRE pre = new PRE();
- Enumeration keys = data.getParameters().keys();
- while (keys.hasMoreElements())
+
+ for (Iterator it = data.getParameters().keySet().iterator();
+ it.hasNext();)
{
- String key = (String) keys.nextElement();
+ String key = (String) it.next();
String[] values = data.getParameters().getStrings(key);
if (values.length == 1)
{
@@ -185,7 +187,7 @@
.addElement(pre);
Table table2 = new Table().setBorder(0);
- Map varDebug = data.getVarDebug();
+ Map varDebug = data.getDebugVariables();
boolean hasValues2 = false;
1.6 +5 -8 jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/Error.java
Index: Error.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/Error.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Error.java 18 Mar 2003 14:18:05 -0000 1.5
+++ Error.java 11 Apr 2003 11:39:09 -0000 1.6
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.Map;
@@ -92,10 +89,10 @@
Table table = new Table().setBorder(0);
boolean hasValues = false;
- Enumeration keys = data.getParameters().keys();
- while (keys.hasMoreElements())
+ for (Iterator it = data.getParameters().keySet().iterator();
+ it.hasNext();)
{
- String key = (String) keys.nextElement();
+ String key = (String) it.next();
String value = data.getParameters().getString(key);
TR tr =
new TR().addElement(
@@ -106,7 +103,7 @@
}
Table table2 = new Table().setBorder(0);
- Map varDebug = data.getVarDebug();
+ Map varDebug = data.getDebugVariables();
boolean hasValues2 = false;
for (Iterator i = varDebug.keySet().iterator(); i.hasNext();)
1.6 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineGroup.java
Index: TurbineGroup.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineGroup.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineGroup.java 9 Mar 2003 02:45:15 -0000 1.5
+++ TurbineGroup.java 11 Apr 2003 11:39:09 -0000 1.6
@@ -176,7 +176,7 @@
public void grant(User user, RoleSet roleSet)
throws TurbineSecurityException
{
- for(Iterator roles = roleSet.elements(); roles.hasNext();)
+ for (Iterator roles = roleSet.iterator(); roles.hasNext();)
{
TurbineSecurity.grant(user, this, (Role) roles.next());
}
@@ -206,7 +206,7 @@
public void revoke(User user, RoleSet roleSet)
throws TurbineSecurityException
{
- for(Iterator roles = roleSet.elements(); roles.hasNext();)
+ for (Iterator roles = roleSet.iterator(); roles.hasNext();)
{
TurbineSecurity.revoke(user, this, (Role) roles.next());
}
1.5 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineRole.java
Index: TurbineRole.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineRole.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineRole.java 9 Mar 2003 02:45:15 -0000 1.4
+++ TurbineRole.java 11 Apr 2003 11:39:09 -0000 1.5
@@ -213,7 +213,7 @@
public void grant(PermissionSet permissionSet)
throws TurbineSecurityException
{
- for(Iterator permissions = permissionSet.elements(); permissions.hasNext();)
+ for (Iterator permissions = permissionSet.iterator(); permissions.hasNext();)
{
TurbineSecurity.grant(this, (Permission) permissions.next());
}
@@ -242,7 +242,7 @@
public void revoke(PermissionSet permissionSet)
throws TurbineSecurityException
{
- for(Iterator permissions = permissionSet.elements(); permissions.hasNext();)
+ for (Iterator permissions = permissionSet.iterator(); permissions.hasNext();)
{
TurbineSecurity.revoke(this, (Permission) permissions.next());
}
1.7 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
Index: GroupPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/GroupPeer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GroupPeer.java 9 Mar 2003 02:45:15 -0000 1.6
+++ GroupPeer.java 11 Apr 2003 11:39:09 -0000 1.7
@@ -171,7 +171,7 @@
// Populate the object(s).
for (int i = 0; i < rows.size(); i++)
{
- Group obj = TurbineSecurity.getNewGroup(null);
+ Group obj = TurbineSecurity.getGroupInstance(null);
Record row = (Record) rows.get(i);
((SecurityObject) obj).setPrimaryKey(
new NumberKey(row.getValue(1).asInt()));
1.7 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
Index: PermissionPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PermissionPeer.java 9 Mar 2003 02:45:16 -0000 1.6
+++ PermissionPeer.java 11 Apr 2003 11:39:09 -0000 1.7
@@ -188,7 +188,7 @@
// Populate the object(s).
for (int i = 0; i < rows.size(); i++)
{
- Permission obj = TurbineSecurity.getNewPermission(null);
+ Permission obj = TurbineSecurity.getPermissionInstance(null);
Record row = (Record) rows.get(i);
((SecurityObject) obj).setPrimaryKey(
new NumberKey(row.getValue(1).asInt()));
1.10 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineUserPeer.java 9 Mar 2003 02:45:16 -0000 1.9
+++ TurbineUserPeer.java 11 Apr 2003 11:39:09 -0000 1.10
@@ -538,12 +538,12 @@
{
Criteria criteria = new Criteria();
criteria.addSelectColumn(USER_ID);
- criteria.add(USERNAME, user.getUserName());
+ criteria.add(USERNAME, user.getName());
List results = BasePeer.doSelect(criteria);
if (results.size() > 1)
{
throw new DataBackendException("Multiple users named '"
- + user.getUserName() + "' exist!");
+ + user.getName() + "' exist!");
}
return (results.size() == 1);
}
1.13 +4 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultTurbineRunData.java 20 Mar 2003 00:13:14 -0000 1.12
+++ DefaultTurbineRunData.java 11 Apr 2003 11:39:09 -0000 1.13
@@ -905,7 +905,7 @@
*/
public void setUser(User user)
{
- log.debug("user set: " + user.getUserName());
+ log.debug("user set: " + user.getName());
this.user = user;
}
@@ -954,7 +954,9 @@
{
// Check to see if null first.
if (this.out == null)
+ {
setOut(res.getWriter());
+ }
pageSet = false;
outSet = true;
return this.out;
1.11 +1 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Index: TurbineRunDataService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineRunDataService.java 20 Mar 2003 00:13:51 -0000 1.10
+++ TurbineRunDataService.java 11 Apr 2003 11:39:09 -0000 1.11
@@ -267,9 +267,6 @@
data.setRequest(req);
data.setResponse(res);
- // Set the session object.
- data.setSession(data.getRequest().getSession(true));
-
// Set the servlet configuration.
data.setServletConfig(config);
1.20 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBSecurityService.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DBSecurityService.java 10 Apr 2003 16:41:36 -0000 1.19
+++ DBSecurityService.java 11 Apr 2003 11:39:09 -0000 1.20
@@ -148,7 +148,7 @@
// construct the snapshot:
// foreach group in the system
- for (Iterator groupsIterator = getAllGroups().elements();
+ for (Iterator groupsIterator = getAllGroups().iterator();
groupsIterator.hasNext();)
{
Group group = (Group) groupsIterator.next();
@@ -159,7 +159,7 @@
// collect all permissions in this group
PermissionSet groupPermissions = new PermissionSet();
// foreach role in Set
- for (Iterator rolesIterator = groupRoles.elements();
+ for (Iterator rolesIterator = groupRoles.iterator();
rolesIterator.hasNext();)
{
Role role = (Role) rolesIterator.next();
1.15 +7 -7 jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityService.java
Index: LDAPSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LDAPSecurityService.java 10 Apr 2003 16:41:36 -0000 1.14
+++ LDAPSecurityService.java 11 Apr 2003 11:39:10 -0000 1.15
@@ -142,7 +142,7 @@
// construct the snapshot:
// foreach group in the system
- Iterator groupsIterator = getAllGroups().elements();
+ Iterator groupsIterator = getAllGroups().iterator();
while (groupsIterator.hasNext())
{
@@ -156,7 +156,7 @@
// collect all permissoins in this group
PermissionSet groupPermissions = new PermissionSet();
// foreach role in Set
- Iterator rolesIterator = groupRoles.elements();
+ Iterator rolesIterator = groupRoles.iterator();
while (rolesIterator.hasNext())
{
@@ -1159,11 +1159,11 @@
public void revokeAll(User user)
throws DataBackendException, UnknownEntityException
{
- Iterator groupsIterator = getAllGroups().elements();
+ Iterator groupsIterator = getAllGroups().iterator();
while (groupsIterator.hasNext())
{
Group group = (Group) groupsIterator.next();
- Iterator rolesIterator = getRoles(user, group).elements();
+ Iterator rolesIterator = getRoles(user, group).iterator();
while (rolesIterator.hasNext())
{
Role role = (Role) rolesIterator.next();
@@ -1182,7 +1182,7 @@
throws DataBackendException, UnknownEntityException
{
PermissionSet permissions = getPermissions(role);
- Iterator permIterator = permissions.elements();
+ Iterator permIterator = permissions.iterator();
while (permIterator.hasNext())
{
Permission perm = (Permission) permIterator.next();
@@ -1202,7 +1202,7 @@
User[] users = getUsers(new Criteria());
for (int i = 0; i < users.length; i++)
{
- Iterator rolesIterator = getRoles(users[i], group).elements();
+ Iterator rolesIterator = getRoles(users[i], group).iterator();
while (rolesIterator.hasNext())
{
Role role = (Role) rolesIterator.next();
1.18 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/util/DynamicURI.java
Index: DynamicURI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/DynamicURI.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DynamicURI.java 31 Mar 2003 19:32:18 -0000 1.17
+++ DynamicURI.java 11 Apr 2003 11:39:10 -0000 1.18
@@ -1049,9 +1049,9 @@
output.append(URIConstants.URI_SCHEME_SEPARATOR);
output.append(data.getServerName());
- if ((data.getServerScheme().equals(HTTP) &&
+ if ((data.getServerScheme().equals(URIConstants.HTTP) &&
data.getServerPort() != URIConstants.HTTP_PORT) ||
- (data.getServerScheme().equals(HTTPS) &&
+ (data.getServerScheme().equals(URIConstants.HTTPS) &&
data.getServerPort() != URIConstants.HTTPS_PORT))
{
output.append(":");
1.18 +4 -3 jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
Index: DefaultParameterParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultParameterParser.java 10 Apr 2003 09:29:35 -0000 1.17
+++ DefaultParameterParser.java 11 Apr 2003 11:39:10 -0000 1.18
@@ -58,6 +58,7 @@
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
@@ -277,9 +278,9 @@
if (log.isDebugEnabled())
{
log.debug("Parameters found in the Request:");
- for (Enumeration e = keys(); e.hasMoreElements(); )
+ for (Iterator it = keySet().iterator(); it.hasNext();)
{
- String key = (String) e.nextElement();
+ String key = (String) it.next();
log.debug("Key: " + key + " -> " + getString(key));
}
}
1.8 +5 -5 jakarta-turbine-2/src/java/org/apache/turbine/util/security/TurbineAccessControlList.java
Index: TurbineAccessControlList.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/security/TurbineAccessControlList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineAccessControlList.java 8 Apr 2003 13:15:32 -0000 1.7
+++ TurbineAccessControlList.java 11 Apr 2003 11:39:10 -0000 1.8
@@ -212,7 +212,7 @@
{
return false;
}
- for (Iterator groups = groupset.elements(); groups.hasNext();)
+ for (Iterator groups = groupset.iterator(); groups.hasNext();)
{
Group group = (Group) groups.next();
RoleSet roles = getRoles(group);
@@ -271,7 +271,7 @@
{
return false;
}
- for (Iterator groups = groupset.elements(); groups.hasNext();)
+ for (Iterator groups = groupset.iterator(); groups.hasNext();)
{
Group group = (Group) groups.next();
RoleSet roles = getRoles(group);
@@ -347,7 +347,7 @@
{
return false;
}
- for (Iterator groups = groupset.elements(); groups.hasNext();)
+ for (Iterator groups = groupset.iterator(); groups.hasNext();)
{
Group group = (Group) groups.next();
PermissionSet permissions = getPermissions(group);
@@ -426,7 +426,7 @@
{
return false;
}
- for (Iterator groups = groupset.elements(); groups.hasNext();)
+ for (Iterator groups = groupset.iterator(); groups.hasNext();)
{
Group group = (Group) groups.next();
PermissionSet permissions = getPermissions(group);
1.9 +4 -4 jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
Index: VelocityActionEvent.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VelocityActionEvent.java 25 Mar 2003 17:15:31 -0000 1.8
+++ VelocityActionEvent.java 11 Apr 2003 11:39:10 -0000 1.9
@@ -56,7 +56,7 @@
import java.lang.reflect.Method;
-import java.util.Enumeration;
+import java.util.Iterator;
import org.apache.turbine.modules.ActionEvent;
import org.apache.turbine.services.velocity.TurbineVelocity;
@@ -133,9 +133,9 @@
String button = pp.convert(BUTTON);
// Loop through and find the button.
- for (Enumeration e = pp.keys(); e.hasMoreElements();)
+ for (Iterator it = pp.keySet().iterator(); it.hasNext();)
{
- String key = (String) e.nextElement();
+ String key = (String) it.next();
if (key.startsWith(button))
{
theButton = formatString(key);
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org