Author: tyrell
Date: Thu Apr 24 05:44:48 2008
New Revision: 16109
Log:
Removing variable duplication due to false IDE alerts.
Modified:
trunk/mashup/java/modules/www/about.jsp
trunk/mashup/java/modules/www/add_user.jsp
trunk/mashup/java/modules/www/admin_act_user.jsp
trunk/mashup/java/modules/www/ajax_profile.jsp
trunk/mashup/java/modules/www/allow_guests.jsp
trunk/mashup/java/modules/www/delete_user.jsp
trunk/mashup/java/modules/www/editor.jsp
trunk/mashup/java/modules/www/faulty_mashup.jsp
trunk/mashup/java/modules/www/header.jsp
trunk/mashup/java/modules/www/index.jsp
trunk/mashup/java/modules/www/infocardaccept.jsp
trunk/mashup/java/modules/www/log_reader.jsp
trunk/mashup/java/modules/www/manage_users.jsp
trunk/mashup/java/modules/www/mashup.jsp
trunk/mashup/java/modules/www/promote_user.jsp
trunk/mashup/java/modules/www/search.jsp
trunk/mashup/java/modules/www/stub_gen.jsp
trunk/mashup/java/modules/www/tag_cloud.jsp
trunk/mashup/java/modules/www/user.jsp
trunk/mashup/java/modules/www/validate_login.jsp
trunk/mashup/java/modules/www/welcome.jsp
Modified: trunk/mashup/java/modules/www/about.jsp
==============================================================================
--- trunk/mashup/java/modules/www/about.jsp (original)
+++ trunk/mashup/java/modules/www/about.jsp Thu Apr 24 05:44:48 2008
@@ -22,8 +22,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
Modified: trunk/mashup/java/modules/www/add_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/add_user.jsp (original)
+++ trunk/mashup/java/modules/www/add_user.jsp Thu Apr 24 05:44:48 2008
@@ -24,8 +24,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
String firstCall = request.getParameter("firstcall");
String userName = request.getParameter("username");
Modified: trunk/mashup/java/modules/www/admin_act_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/admin_act_user.jsp (original)
+++ trunk/mashup/java/modules/www/admin_act_user.jsp Thu Apr 24 05:44:48 2008
@@ -24,8 +24,7 @@
<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-
+
String bounceback = request.getParameter("bounceback");
String enable = request.getParameter("enable");
if (bounceback == null) {
Modified: trunk/mashup/java/modules/www/ajax_profile.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_profile.jsp (original)
+++ trunk/mashup/java/modules/www/ajax_profile.jsp Thu Apr 24 05:44:48 2008
@@ -28,9 +28,7 @@
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
-<%
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-
+<%
boolean success = false;
String usernameParam;
String fieldParam;
Modified: trunk/mashup/java/modules/www/allow_guests.jsp
==============================================================================
--- trunk/mashup/java/modules/www/allow_guests.jsp (original)
+++ trunk/mashup/java/modules/www/allow_guests.jsp Thu Apr 24 05:44:48 2008
@@ -24,8 +24,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
String bounceback = request.getParameter("bounceback");
String enable = request.getParameter("enable");
Modified: trunk/mashup/java/modules/www/delete_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/delete_user.jsp (original)
+++ trunk/mashup/java/modules/www/delete_user.jsp Thu Apr 24 05:44:48 2008
@@ -24,8 +24,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
String firstcall = request.getParameter("firstcall");
String reactivate = request.getParameter("reactivate");
Modified: trunk/mashup/java/modules/www/editor.jsp
==============================================================================
--- trunk/mashup/java/modules/www/editor.jsp (original)
+++ trunk/mashup/java/modules/www/editor.jsp Thu Apr 24 05:44:48 2008
@@ -27,8 +27,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
//Disabling browser caching
response.setHeader("Cache-Control", "no-cache"); //HTTP 1.1
Modified: trunk/mashup/java/modules/www/faulty_mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/faulty_mashup.jsp (original)
+++ trunk/mashup/java/modules/www/faulty_mashup.jsp Thu Apr 24 05:44:48 2008
@@ -25,8 +25,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
String bounceback = request.getParameter("bounceback");
Modified: trunk/mashup/java/modules/www/header.jsp
==============================================================================
--- trunk/mashup/java/modules/www/header.jsp (original)
+++ trunk/mashup/java/modules/www/header.jsp Thu Apr 24 05:44:48 2008
@@ -18,10 +18,6 @@
<%@ page import="java.net.URLEncoder" %>
<%@ page import="java.util.ResourceBundle" %>
-<%
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-%>
-
<script type="text/javascript" src="../wsasadmin/global_params.js"></script>
<script type="text/javascript" src="../wsasadmin/js/main.js"></script>
<script type="text/javascript" src="js/utils.js"></script>
Modified: trunk/mashup/java/modules/www/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp (original)
+++ trunk/mashup/java/modules/www/index.jsp Thu Apr 24 05:44:48 2008
@@ -27,8 +27,7 @@
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.ResourceBundle" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
if (!MashupUtils.isInitialSetupComplete() &&
MashupUtils.isFromLocalHost(request)) {
//Deleting previous user login cookies, if found
Modified: trunk/mashup/java/modules/www/infocardaccept.jsp
==============================================================================
--- trunk/mashup/java/modules/www/infocardaccept.jsp (original)
+++ trunk/mashup/java/modules/www/infocardaccept.jsp Thu Apr 24 05:44:48 2008
@@ -25,8 +25,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
boolean isLoggedIn = RegistryUtils.isLoggedIn(userRegistry);
%>
Modified: trunk/mashup/java/modules/www/log_reader.jsp
==============================================================================
--- trunk/mashup/java/modules/www/log_reader.jsp (original)
+++ trunk/mashup/java/modules/www/log_reader.jsp Thu Apr 24 05:44:48 2008
@@ -29,8 +29,7 @@
<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-
+
String bounceback = request.getParameter("bounceback");
if (bounceback == null) {
Modified: trunk/mashup/java/modules/www/manage_users.jsp
==============================================================================
--- trunk/mashup/java/modules/www/manage_users.jsp (original)
+++ trunk/mashup/java/modules/www/manage_users.jsp Thu Apr 24 05:44:48 2008
@@ -29,8 +29,7 @@
<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-
+
if (!RegistryUtils.isAdminRole(userRegistry)) {
response.sendRedirect("index.jsp");
}
Modified: trunk/mashup/java/modules/www/mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp (original)
+++ trunk/mashup/java/modules/www/mashup.jsp Thu Apr 24 05:44:48 2008
@@ -29,9 +29,7 @@
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
-<%
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-
+<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
String currentUser = RegistryUtils.getCurrentUser(userRegistry);
Modified: trunk/mashup/java/modules/www/promote_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/promote_user.jsp (original)
+++ trunk/mashup/java/modules/www/promote_user.jsp Thu Apr 24 05:44:48 2008
@@ -24,8 +24,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
String firstcall = request.getParameter("firstcall");
String demote = request.getParameter("demote");
Modified: trunk/mashup/java/modules/www/search.jsp
==============================================================================
--- trunk/mashup/java/modules/www/search.jsp (original)
+++ trunk/mashup/java/modules/www/search.jsp Thu Apr 24 05:44:48 2008
@@ -41,8 +41,7 @@
<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-
+
String currentUser = RegistryUtils.getCurrentUser(userRegistry);
// Set bounceback location
String queryString = request.getQueryString();
Modified: trunk/mashup/java/modules/www/stub_gen.jsp
==============================================================================
--- trunk/mashup/java/modules/www/stub_gen.jsp (original)
+++ trunk/mashup/java/modules/www/stub_gen.jsp Thu Apr 24 05:44:48 2008
@@ -25,8 +25,7 @@
<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-
+
String bounceback = request.getParameter("bounceback");
if (bounceback == null) {
Modified: trunk/mashup/java/modules/www/tag_cloud.jsp
==============================================================================
--- trunk/mashup/java/modules/www/tag_cloud.jsp (original)
+++ trunk/mashup/java/modules/www/tag_cloud.jsp Thu Apr 24 05:44:48 2008
@@ -27,8 +27,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
User userProfile =
RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(userRegistry),
userRegistry);
Modified: trunk/mashup/java/modules/www/user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/user.jsp (original)
+++ trunk/mashup/java/modules/www/user.jsp Thu Apr 24 05:44:48 2008
@@ -35,8 +35,7 @@
<%@ include file="validate_login.jsp" %>
<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
//Setting variables required for the taskbar.jsp
String author = "";
Modified: trunk/mashup/java/modules/www/validate_login.jsp
==============================================================================
--- trunk/mashup/java/modules/www/validate_login.jsp (original)
+++ trunk/mashup/java/modules/www/validate_login.jsp Thu Apr 24 05:44:48 2008
@@ -22,8 +22,7 @@
<%@ page import="java.util.ResourceBundle" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
+<%
UserRegistry userRegistry = RegistryUtils.getRegistry(request);
//Checking whether the user is logged in
Modified: trunk/mashup/java/modules/www/welcome.jsp
==============================================================================
--- trunk/mashup/java/modules/www/welcome.jsp (original)
+++ trunk/mashup/java/modules/www/welcome.jsp Thu Apr 24 05:44:48 2008
@@ -18,11 +18,6 @@
<%@ page import="java.util.ResourceBundle" %>
<%@ page errorPage="error.jsp" %>
-<%
- ResourceBundle bundle = ResourceBundle.getBundle("UI");
- UserRegistry userRegistry = RegistryUtils.getRegistry(request);
-%>
-
<% if (RegistryUtils.isLoggedIn(userRegistry)) { %>
<div id="welcome">
<img src="images/vOneDotOh.jpg" alt="v1.0" style="float:left; margin:2em
1em 4em 1em;"/>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
