[cvs] expresso commit by mtraum: removed unused local variables
JCorporate Ltd
jcorp at jcorporate.com
Sun Feb 13 23:23:00 UTC 2005
Log Message:
-----------
removed unused local variables
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib:
IfLoggedIn.java
IfMemberOfGroup.java
ExpressoLink.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib:
ControllerUtils.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/taglib:
FormActionTag.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db:
TableCreator.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache:
OrderedCache.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
ServeTextFile.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj:
CacheUtils.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
DefaultForm.java
Revision Data
-------------
Index: ExpressoLink.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/ExpressoLink.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/ExpressoLink.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/ExpressoLink.java -u -r1.7 -r1.8
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/ExpressoLink.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/ExpressoLink.java
@@ -64,14 +64,13 @@
package com.jcorporate.expresso.ext.taglib;
-import com.jcorporate.expresso.core.controller.Transition;
-
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.Tag;
+import com.jcorporate.expresso.core.controller.Transition;
+
/**
* Create an a href for an Expresso Transition
@@ -142,7 +141,6 @@
//Also, add a hidden form field with the "cmd=button" pair.
//This does not hurt to duplicate...
//writer.print(oneTransition.getParamString());
- HttpServletResponse hr = (HttpServletResponse) pageContext.getResponse();
StringBuffer buffer = new StringBuffer();
if (getHref() != null) {
buffer.append("<a href=");
Index: IfLoggedIn.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfLoggedIn.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfLoggedIn.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfLoggedIn.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfLoggedIn.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfLoggedIn.java
@@ -69,13 +69,11 @@
*/
package com.jcorporate.expresso.ext.taglib;
+import javax.servlet.jsp.JspTagException;
+
import com.jcorporate.expresso.core.misc.CurrentLogin;
import com.jcorporate.expresso.core.security.User;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspTagException;
-
/**
* @author Shash Chatterjee
@@ -100,8 +98,6 @@
// Get the current user from the servlet session
try {
- HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
- HttpServletResponse response = (HttpServletResponse) pageContext.getResponse();
// CheckLogin chk = CheckLogin.getInstance();
// chk.checkLogin(request, response);
CurrentLogin myLogin = (CurrentLogin) pageContext.getSession().getAttribute(CurrentLogin.LOGIN_KEY);
Index: IfMemberOfGroup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfMemberOfGroup.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfMemberOfGroup.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfMemberOfGroup.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfMemberOfGroup.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/IfMemberOfGroup.java
@@ -69,15 +69,14 @@
*/
package com.jcorporate.expresso.ext.taglib;
+import java.util.StringTokenizer;
+
+import javax.servlet.jsp.JspTagException;
+
import com.jcorporate.expresso.core.misc.CurrentLogin;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.services.dbobj.GroupMembers;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspTagException;
-import java.util.StringTokenizer;
-
/**
* This tag checks the currently logged in user for membership into
@@ -123,8 +122,6 @@
try {
// Get the current user from the servlet session
- HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
- HttpServletResponse response = (HttpServletResponse) pageContext.getResponse();
// CheckLogin chk = CheckLogin.getInstance();
// chk.checkLogin(request, response);
CurrentLogin myLogin = (CurrentLogin) pageContext.getSession().getAttribute(CurrentLogin.LOGIN_KEY);
Index: ControllerUtils.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/ControllerUtils.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/ControllerUtils.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/ControllerUtils.java -u -r1.24 -r1.25
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/ControllerUtils.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/ControllerUtils.java
@@ -520,7 +520,6 @@
ControllerResponse controllerResponse = getResponse( pageContext );
ControllerElement element = null;
- ControllerElement rootElement = null;
int pos = beanExpr.indexOf(':');
if ( pos >= 0 ) {
String scope = beanExpr.substring( 0, pos );
Index: FormActionTag.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/taglib/FormActionTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/taglib/FormActionTag.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/taglib/FormActionTag.java -u -r1.4 -r1.5
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/taglib/FormActionTag.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/taglib/FormActionTag.java
@@ -142,7 +142,6 @@
}
ELTagSupport support = ELTagSupport.getInstance();
- Exception ex = null;
boolean tryDefault = false;
String result = "";
try {
@@ -158,7 +157,6 @@
throw new JspException("Received wrong type back for parameter 'value'. Expected java.lang.String");
} catch (JspException ex1) {
log.info("Failed to resolve value: " + this.getValue(), ex1);
- ex = ex1;
tryDefault = true;
}
Index: TableCreator.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java -u -r1.21 -r1.22
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java
@@ -590,7 +590,6 @@
DBConnectionPool myPool = null;
DBConnection myConnection = null;
- boolean addComma = false;
try {
Index: OrderedCache.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache/OrderedCache.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache/OrderedCache.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache/OrderedCache.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache/OrderedCache.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/cache/OrderedCache.java
@@ -114,7 +114,6 @@
/* from the cache */
if ((maxSize > 0) && (cacheContents.size() >= maxSize)) {
long minUsed = java.lang.Long.MAX_VALUE;
- CacheEntry leastUsedItem = null;
CacheEntry oneItem = null;
synchronized (cacheContents) {
@@ -128,7 +127,6 @@
break;
}
if (oneItem.getUsedCount() < minUsed) {
- leastUsedItem = oneItem;
minUsed = oneItem.getUsedCount();
}
}
Index: ServeTextFile.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ServeTextFile.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ServeTextFile.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ServeTextFile.java -u -r1.9 -r1.10
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ServeTextFile.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ServeTextFile.java
@@ -290,7 +290,6 @@
HttpServletResponse res = (HttpServletResponse) servRequest.getServletResponse();
Servlet servlet = servRequest.getCallingServlet();
- String fileSep = System.getProperty("file.separator");
String inputFilename = req.getParameter("filename");
try {
@@ -443,9 +442,7 @@
HttpServletRequest req = (HttpServletRequest) servRequest.getServletRequest();
HttpSession session = req.getSession(true);
HttpServletResponse res = (HttpServletResponse) servRequest.getServletResponse();
- Servlet servlet = servRequest.getCallingServlet();
- String fileSep = System.getProperty("file.separator");
String inputFilename = req.getParameter("filename");
try {
Index: CacheUtils.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java
@@ -128,7 +128,6 @@
prepareCache(cs,cacheSize,theClassName);
DBObject newObj = null;
if (cs.existsCache(theDBObj.getClass().getName())) {
- DBObject oldDBObj = (DBObject) cs.getItem(theDBObj.getClass().getName(), theDBObj.getKey());
cs.removeItem(theDBObj.getClass().getName(), theDBObj);
// newObj = prepareUpdateFieldsForStorage(oldDBObj, theDBObj, metadata);
} else {
Index: DefaultForm.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -u -r1.21 -r1.22
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
@@ -272,12 +272,9 @@
log.debug("Adding button parameters");
String oneParamName = null;
- Object oneParamValue = null;
- boolean gotControllerFromButton = false;
for (Enumeration e = request.getParameterNames(); e.hasMoreElements();) {
oneParamName = (String) e.nextElement();
- oneParamValue = StringUtil.notNull(request.getParameter(oneParamName));
if (oneParamName.startsWith("button_")) {
@@ -355,9 +352,6 @@
}
}
- if (paramName.equals(Controller.CONTROLLER_PARAM_KEY)) {
- gotControllerFromButton = true;
- }
if (log.isDebugEnabled()) {
log.debug("Parameter '" + paramName + "', value '"
+ paramValue + "'");
More information about the cvs
mailing list