[DS-707] Remove unused local variables

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5535 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java

@@ -638,7 +638,6 @@ public class ItemImport
             String oldHandle = mapEntry.getValue();
 
             Item oldItem = null;
-            Item newItem = null;
 
             if (oldHandle.indexOf('/') != -1)
             {
@@ -674,9 +673,7 @@ public class ItemImport
             handleOut.close();
 
             deleteItem(c, oldItem);
-
+            addItem(c, mycollections, sourceDir, newItemName, null, template);
-            newItem = addItem(c, mycollections, sourceDir, newItemName, null, template);
-
         }
     }
 
@@ -1020,7 +1017,6 @@ public class ItemImport
             String filename)
     {
         String filePath = path + File.separatorChar + filename;
-        String line = "";
         String result = null;
 
         System.out.println("Processing handle file: " + filename);

dspace-api/src/main/java/org/dspace/app/launcher/ScriptLauncher.java

@@ -208,7 +208,7 @@ public class ScriptLauncher
                         System.out.println("");**/
 
                         Method main = target.getMethod("main", argTypes);
-                        Object output = main.invoke(null, arguments);
+                        main.invoke(null, arguments);
 
                         // ensure we close out the request (happy request)
                         requestService.endRequest(null);

dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java

@@ -583,7 +583,6 @@ public class MediaFilterManager
                 {
                 	String handle = myItem.getHandle();
                 	Bundle[] bundles = myBitstream.getBundles();
-                	String name = myBitstream.getName();
                 	long size = myBitstream.getSize();
                 	String checksum = myBitstream.getChecksum() + " ("+myBitstream.getChecksumAlgorithm()+")";
                 	int assetstore = myBitstream.getStoreNumber();

dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java

@@ -283,10 +283,6 @@ public class ReportGenerator
         // set the parameters for this analysis
         setParameters(myInput);
         
-        // pre prepare our standard file readers and buffered readers
-        FileReader fr = null;
-        BufferedReader br = null;
-        
         // read the input file
         readInput(input);
         

dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java

@@ -372,7 +372,6 @@ public class SubmissionConfigReader
     private void processStepDefinition(Node e) throws SAXException,
             ServletException
     {
-        int numStepDefns = 0;
         stepDefns = new HashMap<String, Map>();
 
         NodeList nl = e.getChildNodes();
@@ -383,7 +382,6 @@ public class SubmissionConfigReader
             // process each step definition
             if (nd.getNodeName().equals("step"))
             {
-                numStepDefns++;
                 String stepID = getAttribute(nd, "id");
                 if (stepID == null)
                 {
@@ -475,13 +473,11 @@ public class SubmissionConfigReader
                 submitDefns.put(submitName, steps);
 
                 // loop through all the 'step' nodes of the 'submission-process'
-                int stepNum = 0;
                 NodeList pl = nd.getChildNodes();
                 int lenStep = pl.getLength();
                 for (int j = 0; j < lenStep; j++)
                 {
                     Node nStep = pl.item(j);
-                    stepNum++;
 
                     // process each 'step' definition
                     if (nStep.getNodeName().equals("step"))

dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java

@@ -181,7 +181,6 @@ public class LDAPAuthentication
         catch (SQLException e)
         {
         }
-        boolean loggedIn = false;
         SpeakerToLDAP ldap = new SpeakerToLDAP(log);
 
         // if they entered a netid that matches an eperson

dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java

@@ -316,13 +316,6 @@ public class BrowseEngine
 
                 log.debug("browsing using focus: " + focusValue);
 
-                // Now we have a value to focus on, we need to find out where it is
-                String focusField = browseIndex.getSortField(scope.isSecondLevel());
-                if (scope.getSortBy() > 0)
-                {
-                    focusField = "sort_" + Integer.toString(scope.getSortBy());
-                }
-
                 // Convert the focus value into an offset
                 offset = getOffsetForValue(focusValue);
             }
@@ -656,11 +649,6 @@ public class BrowseEngine
     private int getOffsetForValue(String value)
         throws BrowseException
     {
-        // get the table name.  We don't really need to care about whether we are in a
-        // community or collection at this point.  This is only for full or second
-        // level browse, so there is no need to worry about distinct value browsing
-        String tableName = browseIndex.getTableName();
-
         // we need to make sure that we select from the correct column.  If the sort option
         // is the 0th option then we use sort_value, but if it is one of the others we have
         // to select from that column instead.  Otherwise, we end up missing the focus value
@@ -697,11 +685,6 @@ public class BrowseEngine
         if (!browseIndex.isMetadataIndex())
             throw new IllegalArgumentException("getOffsetForDistinctValue called when not a metadata index");
 
-        // get the table name.  We don't really need to care about whether we are in a
-        // community or collection at this point.  This is only for full or second
-        // level browse, so there is no need to worry about distinct value browsing
-        String tableName = browseIndex.getTableName();
-
         // now get the DAO to do the query for us, returning the highest
         // string value in the given column in the given table for the
         // item (I think)
@@ -826,9 +809,6 @@ public class BrowseEngine
             return 0;
         }
 
-        // get the table name that we are going to be getting our data from
-        String tableName = browseIndex.getTableName(distinct, scope.inCommunity(), scope.inCollection());
-
         // ensure that the select is set to "*"
         String[] select = { "*" };
         dao.setCountValues(select);

dspace-api/src/main/java/org/dspace/content/Item.java

@@ -667,7 +667,6 @@ public class Item extends DSpaceObject
     {
         List<DCValue> dublinCore = getMetadata();
         MetadataAuthorityManager mam = MetadataAuthorityManager.getManager();        
-        ChoiceAuthorityManager cam = ChoiceAuthorityManager.getManager();
         boolean authorityControlled = mam.isAuthorityControlled(schema, element, qualifier);
         boolean authorityRequired = mam.isAuthorityRequired(schema, element, qualifier);
         String fieldName = schema+"."+element+((qualifier==null)? "": "."+qualifier);
@@ -2135,8 +2134,6 @@ public class Item extends DSpaceObject
 
             for (int j = 0; j < bs.length; j++)
             {
-                Bitstream mybitstream = bs[j];
-
                 // remove bitstream policies
                 AuthorizeManager.removeGroupPolicies(ourContext, bs[j], g);
             }

dspace-api/src/main/java/org/dspace/content/authority/ChoicesXMLGenerator.java

@@ -39,7 +39,6 @@ package org.dspace.content.authority;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
-import org.xml.sax.Attributes;
 import org.xml.sax.helpers.AttributesImpl;
 
 
@@ -59,7 +58,6 @@ public class ChoicesXMLGenerator
     public static void generate(Choices result, String format, ContentHandler contentHandler)
         throws SAXException
     {
-        Attributes noAtts = new AttributesImpl();
         AttributesImpl resultAtts = new AttributesImpl();
         if (result.more)
             resultAtts.addAttribute("", "more", "more", "boolean", "true");

dspace-api/src/main/java/org/dspace/content/authority/LCNameAuthority.java

@@ -122,10 +122,12 @@ public class LCNameAuthority implements ChoiceAuthority
      */
     public Choices getMatches(String text, int collection, int start, int limit, String locale)
     {
-        boolean error = false;
         Choices result = queryPerson(text, start, limit);
         if (result == null)
+        {
             result = new Choices(true);
+        }
+        
         return result;
     }
 
@@ -144,7 +146,9 @@ public class LCNameAuthority implements ChoiceAuthority
     {
         // punt if there is no query text
         if (text == null || text.trim().length() == 0)
+        {
             return new Choices(true);
+        }
 
         // 1. build CQL query
         DCPersonName pn = new DCPersonName(text);

dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java

@@ -155,12 +155,8 @@ public class OREIngestionCrosswalk
 		nf.setGroupingUsed(false);
 		nf.setMinimumIntegerDigits(4);  
 		
-    	int countInt=0;
-    	String count;
         for (Element resource : aggregatedResources) 
         {
-        	countInt++;
-        	count = nf.format((long)countInt);
         	String href = resource.getAttributeValue("href");
         	log.debug("ORE processing: " + href);
         	

dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java

@@ -345,7 +345,6 @@ public class PDFPackager
                log.debug("PDF Info dict title=\""+title+"\"");
             item.addDC("title", null, "en", title);
             String value;
-            Calendar date;
             if ((value = docinfo.getAuthor()) != null)
             {
                 item.addDC("contributor", "author", null, value);

dspace-api/src/main/java/org/dspace/core/PluginManager.java

@@ -519,8 +519,10 @@ public class PluginManager
     {
         try
         {
-            Class intf = Class.forName(iname);
+            if (Class.forName(iname) != null)
-            return true;
+            {
+                return true;
+            }
         }
         catch (ClassNotFoundException ce)
         {

dspace-api/src/main/java/org/dspace/search/DSIndexer.java

@@ -944,8 +944,6 @@ public class DSIndexer
         log.debug("Building Item: " + handle);
 
         int j;
-        int k = 0;
-
         if (indexConfigArr.length > 0)
         {
             DCValue[] mydc;

dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java

@@ -1083,7 +1083,7 @@ public class DatabaseManager
                 {
                     // Use execute, not executeQuery (which expects results) or
                     // executeUpdate
-                    boolean succeeded = statement.execute(SQL);
+                    statement.execute(SQL);
                 }
                 catch (SQLWarning sqlw)
                 {
@@ -1776,6 +1776,7 @@ public class DatabaseManager
         try
         {
             Connection connection = DatabaseManager.getConnection();
+            connection.close();
         }
         catch (SQLException sqle)
         {

dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java

@@ -470,7 +470,7 @@ public class WorkflowManager
                 + e.getID()));
 
         // convert into personal workspace
-        WorkspaceItem wsi = returnToWorkspace(c, wi);
+        returnToWorkspace(c, wi);
     }
 
     // returns true if archived

dspace-discovery/dspace-discovery-provider/src/main/java/org/dspace/discovery/SolrServiceImpl.java

@@ -586,11 +586,12 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         Community[] communities = target.getCommunities();
 
         // now put those into strings
-        String location = "";
         int i = 0;
 
         for (i = 0; i < communities.length; i++)
-            locations.add(new String("m" + communities[i].getID()));
+        {
+            locations.add("m" + communities[i].getID());
+        }
 
         return locations;
     }
@@ -1017,8 +1018,6 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             while (iter.hasNext()) {
                 SolrDocument doc = (SolrDocument) iter.next();
 
-                String handle = (String) doc.getFieldValue("handle");
-
                 DSpaceObject o = DSpaceObject.find(context, (Integer) doc.getFirstValue("search.resourcetype"), (Integer) doc.getFirstValue("search.resourceid"));
 
                 if (o != null) {

dspace-discovery/dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/AbstractSearch.java

@@ -148,7 +148,6 @@ public abstract class AbstractSearch extends AbstractFiltersTransformer {
             String key = "";
 
             // Page Parameter
-            Request request = ObjectModelHelper.getRequest(objectModel);
             key += "-" + getParameterPage();
             key += "-" + getParameterRpp();
             key += "-" + getParameterSortBy();
@@ -291,9 +290,6 @@ public abstract class AbstractSearch extends AbstractFiltersTransformer {
             // Look for any communities or collections in the mix
             ReferenceSet referenceSet = null;
 
-
-            boolean resultsContainsBothContainersAndItems = false;
-
             for (SolrDocument doc : solrResults) {
 
                 DSpaceObject resultDSO =
@@ -306,8 +302,6 @@ public abstract class AbstractSearch extends AbstractFiltersTransformer {
                                 ReferenceSet.TYPE_SUMMARY_LIST, null, "repository-search-results");
                         // Set a heading showing that we will be listing containers that matched:
                         referenceSet.setHead(T_head2);
-                        resultsContainsBothContainersAndItems = true;
-
                     }
                     referenceSet.addReference(resultDSO);
                 }

dspace-discovery/dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/BrowseFacet.java

@@ -373,8 +373,6 @@ public class BrowseFacet extends AbstractDSpaceTransformer implements CacheableP
 
         DSpaceObject dso = HandleUtil.obtainHandle(objectModel);
 
-        java.util.List fqs = Arrays.asList(getParameterFacetQueries());
-
         // Set up the major variables
         //Collection collection = (Collection) dso;
 

dspace-discovery/dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/CommunityRecentSubmissions.java

@@ -88,13 +88,9 @@ public class CommunityRecentSubmissions extends AbstractFiltersTransformer
         if (!(dso instanceof Community))
             return;
 
-        // Set up the major variables
-        Community community = (Community) dso;
-
         // Build the community viewer division.
         Division home = body.addDivision("community-home", "primary repository community");
 
-
         performSearch(dso);
 
         Division lastSubmittedDiv = home

dspace-discovery/dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/Navigation.java

@@ -115,7 +115,7 @@ public class Navigation extends AbstractDSpaceTransformer implements CacheablePr
     public void addOptions(Options options) throws SAXException, WingException,
             UIException, SQLException, IOException, AuthorizeException
     {
-        DSpaceObject dso = HandleUtil.obtainHandle(objectModel);
+//        DSpaceObject dso = HandleUtil.obtainHandle(objectModel);
 
 //        List test = options.addList("browse");
 

dspace-discovery/dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/RelatedItems.java

@@ -137,8 +137,6 @@ public class RelatedItems extends AbstractFiltersTransformer
                 List<DSpaceObject> dsos = new ArrayList<DSpaceObject>();
                 for(Map.Entry<String,SolrDocumentList> entry : mlt)
                 {
-                    String key = entry.getKey();
-
                     //org.dspace.app.xmlui.wing.element.List mltList = mltDiv.addList(key);
 
                     //mltList.setHead(key);
@@ -175,7 +173,7 @@ public class RelatedItems extends AbstractFiltersTransformer
                             null, "related-items");
 
                     for (DSpaceObject dso : dsos) {
-                        Reference ref = set.addReference(dso);
+                        set.addReference(dso);
                     }
                 }
             }

dspace-discovery/dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/SimpleSearch.java

@@ -137,7 +137,6 @@ public class SimpleSearch extends AbstractSearch implements CacheableProcessingC
         search.addHidden("solr-search-url").setValue(searchUrl);
         search.addHidden("contextpath").setValue(contextPath);
 
-        Request request = ObjectModelHelper.getRequest(objectModel);
         String[] fqs = getParameterFilterQueries();
 
         Division query = search.addInteractiveDivision("general-query",

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java

@@ -260,9 +260,7 @@ public class ItemTag extends TagSupport
         for (int i = 1; null != (urn = ConfigurationManager.getProperty("webui.resolver."+i+".urn")); i++){
             String baseurl = ConfigurationManager.getProperty("webui.resolver."+i+".baseurl");
             if (baseurl != null){
-            urn2baseurl.put(ConfigurationManager
+                urn2baseurl.put(urn, baseurl);
-                    .getProperty("webui.resolver."+i+".urn"),
-                    baseurl);
             } else {
                 log.warn("Wrong webui.resolver configuration, you need to specify both webui.resolver.<n>.urn and webui.resolver.<n>.baseurl: missing baseurl for n = "+i);
             }

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ControlledVocabularySearchServlet.java

@@ -37,7 +37,6 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
@@ -151,9 +150,6 @@ public class ControlledVocabularySearchServlet extends DSpaceServlet
         // String query = request.getParameter("query");
         int start = UIUtil.getIntParameter(request, "start");
         String advanced = request.getParameter("advanced");
-        String fromAdvanced = request.getParameter("from_advanced");
-        String advancedQuery = "";
-        HashMap queryHash = new HashMap();
 
         // can't start earlier than 0 in the results!
         if (start < 0)
@@ -177,7 +173,6 @@ public class ControlledVocabularySearchServlet extends DSpaceServlet
         if (advanced != null)
         {
             query = qArgs.buildQuery(request);
-            advancedQuery = qArgs.buildHTTPQuery(request);
         }
 
         // Ensure the query is non-null
@@ -186,10 +181,6 @@ public class ControlledVocabularySearchServlet extends DSpaceServlet
             query = "";
         }
 
-        // Get the location parameter, if any
-        String location = request.getParameter("location");
-        String newURL;
-
         // Build log information
         String logInfo = "";
 

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/EditProfileServlet.java

@@ -102,8 +102,6 @@ public class EditProfileServlet extends DSpaceServlet
             request.setAttribute("missing.fields", Boolean.TRUE);
         }
 
-        String passwordProblem = null;
-
         if (ok && settingPassword)
         {
             // They want to set a new password.

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/RegisterServlet.java

@@ -116,7 +116,6 @@ public class RegisterServlet extends DSpaceServlet
          * will go to the "enter personal info" or "enter new password" page as
          * appropriate.
          */
-        boolean updated = false;
 
         // Get the token
         String token = request.getParameter("token");

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/SimpleSearchServlet.java

@@ -177,7 +177,6 @@ public class SimpleSearchServlet extends DSpaceServlet
 
         // Get the location parameter, if any
         String location = request.getParameter("location");
-        String newURL;
 
         // If there is a location parameter, we should redirect to
         // do the search with the correct location.

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/CollectionWizardServlet.java

@@ -289,8 +289,6 @@ public class CollectionWizardServlet extends DSpaceServlet
             Collection collection) throws SQLException, ServletException,
             IOException, AuthorizeException
     {
-        Group anonymousGroup = Group.find(context, 0);
-
         // "Public read" checkbox. Only need to do anything
         // if it's not checked (only system admin can uncheck this!).
         if (!UIUtil.getBoolParameter(request, "public_read")
@@ -307,7 +305,7 @@ public class CollectionWizardServlet extends DSpaceServlet
         if (UIUtil.getBoolParameter(request, "submitters"))
         {
             // Create submitters group
-            Group g = collection.createSubmitters();
+            collection.createSubmitters();
         }
 
         // Check for the workflow steps
@@ -316,7 +314,7 @@ public class CollectionWizardServlet extends DSpaceServlet
             if (UIUtil.getBoolParameter(request, "workflow" + i))
             {
                 // should have workflow step i
-                Group g = collection.createWorkflowGroup(i);
+                collection.createWorkflowGroup(i);
             }
         }
 
@@ -324,7 +322,7 @@ public class CollectionWizardServlet extends DSpaceServlet
         if (UIUtil.getBoolParameter(request, "admins"))
         {
             // Create administrators group
-            Group g = collection.createAdministrators();
+            collection.createAdministrators();
         }
 
         // Default item stuff?
@@ -367,7 +365,6 @@ public class CollectionWizardServlet extends DSpaceServlet
         if (UIUtil.getBoolParameter(request, "mitgroup"))
         {
             Group mitGroup = Group.findByName(context, "MIT Users");
-            int action;
 
             if (permission == PERM_READ)
             {

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/submit/step/JSPSampleStep.java

@@ -252,14 +252,14 @@ public class JSPSampleStep extends JSPStep
 
         // This function retrieves the path of the JSP which just submitted its
         // form to this class (e.g. "/submit/sample-step.jsp", in this case)
-        String lastJSPDisplayed = JSPStepManager.getLastJSPDisplayed(request);
+        // String lastJSPDisplayed = JSPStepManager.getLastJSPDisplayed(request);
 
         // This function retrieves the number of the current "page"
         // within this Step. This is useful if your step actually
         // has more than one "page" within the Progress Bar. It can
         // help you determine which Page the user just came from,
         // as well as determine which JSP to load in doPreProcessing()
-        int currentPageNum = SampleStep.getCurrentPage(request);
+        // int currentPageNum = SampleStep.getCurrentPage(request);
 
         // This function returns the NAME of the button the user
         // just pressed in order to submit the form.

dspace-lni/dspace-lni-client/src/main/java/org/dspace/app/dav/client/DSpaceLNISoapBindingStub.java

@@ -129,17 +129,8 @@ public class DSpaceLNISoapBindingStub extends org.apache.axis.client.Stub implem
         ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
             java.lang.Class cls;
             javax.xml.namespace.QName qName;
-            javax.xml.namespace.QName qName2;
             java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
             java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
-            java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
-            java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
-            java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
-            java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
-            java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
-            java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
-            java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
-            java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
             qName = new javax.xml.namespace.QName("http://dspace.org/xmlns/lni", "LNIRemoteException");
             cachedSerQNames.add(qName);
             cls = org.dspace.app.dav.client.LNIRemoteException.class;

dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVItem.java

@@ -482,7 +482,6 @@ class DAVItem extends DAVDSpaceObject
 
         String packageType = this.request.getParameter("package");
         Bundle[] original = this.item.getBundles("ORIGINAL");
-        int bsid;
 
         if (packageType == null)
         {

dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java

@@ -192,7 +192,7 @@ public class DIDLCrosswalk extends Crosswalk
                                     BufferedInputStream bis = new BufferedInputStream(is);
                                     try
                                     {
-                                        int size=bis.read(buffer);
+                                        bis.read(buffer);
                                     }
                                     finally
                                     {

dspace-stats/src/main/java/org/dspace/statistics/SolrLogger.java

@@ -531,7 +531,6 @@ public class SolrLogger
             List<String> fieldNames, List<List<Object>> fieldValuesList)
             throws SolrServerException, IOException
     {
-        long start = new Date().getTime();
         // Since there is NO update
         // We need to get our documents
         // QueryResponse queryResponse = solr.query()//query(query, null, -1,

dspace-stats/src/main/java/org/dspace/statistics/util/ClassicDSpaceLogConverter.java

@@ -377,15 +377,14 @@ public class ClassicDSpaceLogConverter {
                 String out = line.getOptionValue('o') +
                              (dir.getAbsolutePath() +
                               System.getProperty("file.separator") + in).substring(line.getOptionValue('i').length());
-                int count = converter.convert(dir.getAbsolutePath() + System.getProperty("file.separator") + in,
+
-                                              out);
+                converter.convert(dir.getAbsolutePath() + System.getProperty("file.separator") + in, out);
             }
         }
         else
         {
             // Just convert the one file
-            int count = converter.convert(line.getOptionValue('i'),
+            converter.convert(line.getOptionValue('i'), line.getOptionValue('o'));
-                                          line.getOptionValue('o'));
         }
 
         // Clean everything up

dspace-stats/src/main/java/org/dspace/statistics/util/DnsLookup.java

@@ -24,7 +24,6 @@ import java.io.IOException;
 public class DnsLookup {
 
     public static String reverseDns(String hostIp) throws IOException {
-         Record opt = null;
          Resolver res = new ExtendedResolver();
          
          // set the timeout, defaults to 200 milliseconds

dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsDataGenerator.java

@@ -164,7 +164,6 @@ public class StatisticsDataGenerator {
 			String ip = "";
 			Date time;
 			String continent;
-			String country = "";
 			String countryCode;
 			float longitude;
 			float latitude;
@@ -196,7 +195,6 @@ public class StatisticsDataGenerator {
 			}
 
 			city = location.city;
-			country = location.countryName;
 			countryCode = location.countryCode;
 			longitude = location.longitude;
 			latitude = location.latitude;

dspace-stats/src/main/java/org/dspace/statistics/util/StatisticsImporter.java

@@ -183,7 +183,7 @@ public class StatisticsImporter
             BufferedReader input =  new BufferedReader(new FileReader(new File(filename)));
 
             String line;
-            String uuid;
+//            String uuid;
             String action;
             String id;
             Date date;
@@ -210,7 +210,7 @@ public class StatisticsImporter
                 errors++;
                 if (verbose) System.out.println("Line:" + line);
                 String[] parts = line.split(",");
-                uuid = parts[0];
+//                uuid = parts[0];
                 action = parts[1];
                 id = parts[2];
                 date = dateFormat.parse(parts[3]);

dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/CollectionCollectionGenerator.java

@@ -106,10 +106,6 @@ public class CollectionCollectionGenerator extends ATOMCollectionGenerator
 		// we just do support mediation
 		boolean mediation = swordConfig.isMediated();
 
-		// the list of mime types that we accept
-		// for the time being, we just take a zip, and we have to trust what's in it
-		String zip = "application/zip";
-
 		// load up the sword collection
 		scol.setLocation(location);
 

dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/ItemEntryGenerator.java

@@ -222,8 +222,6 @@ public class ItemEntryGenerator extends DSpaceATOMEntry
 				return;
 			}
 
-			String base = ConfigurationManager.getProperty("dspace.url");
-
 			// link to all the files in the item
 			Bundle[] bundles = item.getBundles("ORIGINAL");
 			for (int i = 0; i < bundles.length ; i++)

dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/SWORDAuthenticator.java

@@ -496,7 +496,6 @@ public class SWORDAuthenticator
 	{
 		try
 		{
-			Context context = swordContext.getContext();
 			EPerson authenticated = swordContext.getAuthenticated();
 			if (authenticated != null)
 			{
@@ -523,7 +522,6 @@ public class SWORDAuthenticator
 	public boolean isOnBehalfOfAdmin(SWORDContext swordContext)
 		throws DSpaceSWORDException
 	{
-		Context context = swordContext.getContext();
 		EPerson onBehalfOf = swordContext.getOnBehalfOf();
 		try
 		{
@@ -733,7 +731,6 @@ public class SWORDAuthenticator
 		try
 		{
 			Community[] comms = community.getSubcommunities();
-			Context context = swordContext.getContext();
 			List<Community> allowed = new ArrayList<Community>();
 
 			for (int i = 0; i < comms.length; i++)

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/WithdrawnItems.java

@@ -234,9 +234,6 @@ public class WithdrawnItems extends AbstractDSpaceTransformer implements
     {
         BrowseInfo info = getBrowseInfo();
 
-        // Get the name of the index
-        String type = info.getBrowseIndex().getName();
-
         pageMeta.addMetadata("title").addContent(getTitleMessage(info));
 
         DSpaceObject dso = HandleUtil.obtainHandle(objectModel);
@@ -356,9 +353,6 @@ public class WithdrawnItems extends AbstractDSpaceTransformer implements
     private void addBrowseJumpNavigation(Division div, BrowseInfo info, BrowseParams params)
             throws WingException
     {
-        // Get the name of the index
-        String type = info.getBrowseIndex().getName();
-
         // Prepare a Map of query parameters required for all links
         Map<String, String> queryParams = new HashMap<String, String>();
         queryParams.putAll(params.getCommonParameters());

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/collection/EditCollectionHarvestingForm.java

@@ -40,8 +40,6 @@
 package org.dspace.app.xmlui.aspect.administrative.collection;
 
 import java.sql.SQLException;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
 import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.wing.Message;
 import org.dspace.app.xmlui.wing.WingException;
@@ -124,7 +122,6 @@ public class EditCollectionHarvestingForm extends AbstractDSpaceTransformer
 		int collectionID = parameters.getParameterAsInteger("collectionID", -1);
 		Collection thisCollection = Collection.find(context, collectionID);
 		HarvestedCollection hc = HarvestedCollection.find(context, collectionID);
-		Request request = ObjectModelHelper.getRequest(objectModel);
 				
 		String baseURL = contextPath + "/admin/collection?administrative-continue=" + knot.getId();
 		

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/metadataimport/MetadataImportConfirm.java

@@ -128,7 +128,6 @@ public class MetadataImportConfirm extends AbstractDSpaceTransformer {
 
 
                     // Display the changes
-                    int changeCounter = 0;
                     for (BulkEditChange change : changes)
                     {
                         // Get the changes
@@ -155,7 +154,6 @@ public class MetadataImportConfirm extends AbstractDSpaceTransformer {
                               headerrow.addCellContent(T_new_item);
                             }
                             headerrow.addCell();
-                            changeCounter++;
                         }
 
                         // Show new owning collection

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/metadataimport/MetadataImportUpload.java

@@ -129,7 +129,6 @@ public class MetadataImportUpload extends AbstractDSpaceTransformer {
             Table mdchanges = div.addTable("metadata-changes", num_changes, 2);
 
             // Display the changes
-            int changeCounter = 0;
             for (BulkEditChange change : changes)
             {
                 // Get the changes
@@ -157,7 +156,6 @@ public class MetadataImportUpload extends AbstractDSpaceTransformer {
                       headerrow.addCellContent(T_new_item);
                     }
                     headerrow.addCell();
-                    changeCounter++;
                 }
 
                 // Show new owning collection

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java

@@ -153,7 +153,6 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer
             String key = "";
             
             // Page Parameter
-            Request request = ObjectModelHelper.getRequest(objectModel);
             key += "-" + getParameterPage();
             key += "-" + getParameterRpp();
             key += "-" + getParameterSortBy();

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java

@@ -162,10 +162,8 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache
 	            Stack<TreeNode> stack = new Stack<TreeNode>();
 	            stack.push(root);
 	            
-	            int objectCount = 0;
 	            while (!stack.empty())
 	            {
-	            	objectCount++;
 	                TreeNode node = stack.pop();
 	                
 	                validity.add(node.getDSO());

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java

@@ -245,9 +245,6 @@ public class ConfigurableBrowse extends AbstractDSpaceTransformer implements
     {
         BrowseInfo info = getBrowseInfo();
 
-        // Get the name of the index
-        String type = info.getBrowseIndex().getName();
-        
         pageMeta.addMetadata("title").addContent(getTitleMessage(info));
 
         DSpaceObject dso = HandleUtil.obtainHandle(objectModel);
@@ -370,9 +367,6 @@ public class ConfigurableBrowse extends AbstractDSpaceTransformer implements
     private void addBrowseJumpNavigation(Division div, BrowseInfo info, BrowseParams params)
             throws WingException
     {
-        // Get the name of the index
-        String type = info.getBrowseIndex().getName();
-
         // Prepare a Map of query parameters required for all links
         Map<String, String> queryParamsGET = new HashMap<String, String>();
         queryParamsGET.putAll(params.getCommonParametersEncoded());

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/searchArtifacts/Navigation.java

@@ -49,7 +49,6 @@ import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.utils.HandleUtil;
 import org.dspace.app.xmlui.utils.UIException;
 import org.dspace.app.xmlui.wing.WingException;
-import org.dspace.app.xmlui.wing.element.List;
 import org.dspace.app.xmlui.wing.element.Options;
 import org.dspace.app.xmlui.wing.element.PageMeta;
 import org.dspace.authorize.AuthorizeException;
@@ -99,7 +98,7 @@ public class Navigation extends AbstractDSpaceTransformer implements CacheablePr
         /* Create skeleton menu structure to ensure consistent order between aspects,
          * even if they are never used
          */
-        List browse = options.addList("browse");
+        options.addList("browse");
         options.addList("account");
         options.addList("context");
         options.addList("administrative");

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/UploadStep.java

@@ -391,7 +391,6 @@ public class UploadStep extends AbstractSubmissionStep
         {
             BitstreamFormat bitstreamFormat = bitstream.getFormat();
             
-            int id = item.getID();
             String name = bitstream.getName();
             String url = makeBitstreamLink(item, bitstream);
             String format = bitstreamFormat.getShortDescription();

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/viewArtifacts/Navigation.java

@@ -50,7 +50,6 @@ import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.utils.HandleUtil;
 import org.dspace.app.xmlui.utils.UIException;
 import org.dspace.app.xmlui.wing.WingException;
-import org.dspace.app.xmlui.wing.element.List;
 import org.dspace.app.xmlui.wing.element.Options;
 import org.dspace.app.xmlui.wing.element.PageMeta;
 import org.dspace.authorize.AuthorizeException;
@@ -113,7 +112,7 @@ public class Navigation extends AbstractDSpaceTransformer implements CacheablePr
         /* Create skeleton menu structure to ensure consistent order between aspects,
          * even if they are never used
          */
-        List browse = options.addList("browse");
+        options.addList("browse");
         options.addList("account");
         options.addList("context");
         options.addList("administrative");

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceCocoonServletFilter.java

@@ -120,7 +120,6 @@ public class DSpaceCocoonServletFilter implements Filter
          * Previous stages moved to shared ServletListener available in dspace-api
          */
         String dspaceConfig = null;
-        String log4jConfig  = null;
         
         /**
          * Stage 1

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceOREGenerator.java

@@ -111,9 +111,6 @@ public class DSpaceOREGenerator extends AbstractGenerator
 	
 	private Item getItem(Context context) throws SQLException, CrosswalkException 
 	{			
-		Request request = ObjectModelHelper.getRequest(objectModel);
-        String contextPath = request.getContextPath();
-
         // Determine the correct adatper to use for this item
         String handle = parameters.getParameter("handle",null);
         String internal = parameters.getParameter("internal",null);

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/OpenURLReader.java

@@ -290,14 +290,11 @@ public class OpenURLReader extends AbstractReader implements Recyclable {
 
 		Enumeration<String> e = request.getParameterNames();
 
-		boolean error = true;
-		
 		while (e.hasMoreElements()) {
 			String name = e.nextElement();
 			if (name.startsWith("rft.")) {
 				for (String value : request.getParameterValues(name)) {
 					queryBuilder.append(value).append(" ");
-					error = false;
 				}
 			}
 		}