Return-Path: X-Original-To: apmail-poi-commits-archive@minotaur.apache.org Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3A13B9D29 for ; Fri, 19 Dec 2014 14:36:42 +0000 (UTC) Received: (qmail 10046 invoked by uid 500); 19 Dec 2014 14:36:42 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 10012 invoked by uid 500); 19 Dec 2014 14:36:42 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 10002 invoked by uid 99); 19 Dec 2014 14:36:42 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Dec 2014 14:36:42 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id F3562AC08CC; Fri, 19 Dec 2014 14:36:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1646736 - in /poi/trunk/src: excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Date: Fri, 19 Dec 2014 14:36:41 -0000 To: commits@poi.apache.org From: centic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141219143641.F3562AC08CC@hades.apache.org> Author: centic Date: Fri Dec 19 14:36:41 2014 New Revision: 1646736 URL: http://svn.apache.org/r1646736 Log: Remove unused members, Fix an Eclipse warning Modified: poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Modified: poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java?rev=1646736&r1=1646735&r2=1646736&view=diff ============================================================================== --- poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java (original) +++ poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java Fri Dec 19 14:36:41 2014 @@ -36,87 +36,84 @@ import org.apache.tools.ant.Task; * */ public class ExcelAntTest extends Task{ + private LinkedList evaluators; - private LinkedList setters ; - private LinkedListevaluators ; + private LinkedList testTasks; - private LinkedList testTasks ; + private String name; - private String name ; + private double globalPrecision; - private double globalPrecision ; + private boolean showSuccessDetails = false; - private boolean showSuccessDetails = false ; - - private boolean showFailureDetail = false ; - LinkedList failureMessages ; + private boolean showFailureDetail = false; + LinkedList failureMessages; - private ExcelAntWorkbookUtil workbookUtil ; + private ExcelAntWorkbookUtil workbookUtil; - private boolean passed = true ; + private boolean passed = true; public ExcelAntTest() { - setters = new LinkedList() ; - evaluators = new LinkedList() ; - failureMessages = new LinkedList() ; - testTasks = new LinkedList() ; + evaluators = new LinkedList(); + failureMessages = new LinkedList(); + testTasks = new LinkedList(); } public void setPrecision( double precision ) { - globalPrecision = precision ; + globalPrecision = precision; } public void setWorkbookUtil( ExcelAntWorkbookUtil wbUtil ) { - workbookUtil = wbUtil ; + workbookUtil = wbUtil; } public void setShowFailureDetail( boolean value ) { - showFailureDetail = value ; + showFailureDetail = value; } public void setName( String nm ) { - name = nm ; + name = nm; } public String getName() { - return name ; + return name; } public void setShowSuccessDetails( boolean details ) { - showSuccessDetails = details ; + showSuccessDetails = details; } public boolean showSuccessDetails() { - return showSuccessDetails ; + return showSuccessDetails; } public void addSetDouble( ExcelAntSetDoubleCell setter ) { - addSetter( setter ) ; + addSetter( setter ); } public void addSetString( ExcelAntSetStringCell setter ){ - addSetter( setter ) ; + addSetter( setter ); } public void addSetFormula( ExcelAntSetFormulaCell setter ) { - addSetter( setter ) ; + addSetter( setter ); } public void addHandler( ExcelAntHandlerTask handler ) { - testTasks.add( handler ) ; + testTasks.add( handler ); } private void addSetter( ExcelAntSet setter ) { // setters.add( setter ); - testTasks.add( setter ) ; + testTasks.add( setter ); } public void addEvaluate( ExcelAntEvaluateCell evaluator ) { -// evaluators.add( evaluator ) ; - testTasks.add( evaluator ) ; +// evaluators.add( evaluator ); + testTasks.add( evaluator ); } // public LinkedList getSetters() { @@ -129,42 +126,42 @@ public class ExcelAntTest extends Task{ public void execute() throws BuildException { - Iterator taskIt = testTasks.iterator() ; + Iterator taskIt = testTasks.iterator(); - int testCount = evaluators.size() ; - int failureCount = 0 ; + int testCount = evaluators.size(); + int failureCount = 0; // roll over all sub task elements in one loop. This allows the // ordering of the sub elements to be considered. while( taskIt.hasNext() ) { - Task task = taskIt.next() ; + Task task = taskIt.next(); - // log( task.getClass().getName(), Project.MSG_INFO ) ; + // log( task.getClass().getName(), Project.MSG_INFO ); if( task instanceof ExcelAntSet ) { - ExcelAntSet set = (ExcelAntSet) task ; - set.setWorkbookUtil(workbookUtil) ; - set.execute() ; + ExcelAntSet set = (ExcelAntSet) task; + set.setWorkbookUtil(workbookUtil); + set.execute(); } if( task instanceof ExcelAntHandlerTask ) { - ExcelAntHandlerTask handler = (ExcelAntHandlerTask)task ; - handler.setEAWorkbookUtil(workbookUtil ) ; - handler.execute() ; + ExcelAntHandlerTask handler = (ExcelAntHandlerTask)task; + handler.setEAWorkbookUtil(workbookUtil ); + handler.execute(); } if (task instanceof ExcelAntEvaluateCell ) { - ExcelAntEvaluateCell eval = (ExcelAntEvaluateCell)task ; - eval.setWorkbookUtil( workbookUtil ) ; + ExcelAntEvaluateCell eval = (ExcelAntEvaluateCell)task; + eval.setWorkbookUtil( workbookUtil ); if( globalPrecision > 0 ) { - log( "setting globalPrecision to " + globalPrecision + " in the evaluator", Project.MSG_VERBOSE ) ; - eval.setGlobalPrecision( globalPrecision ) ; + log( "setting globalPrecision to " + globalPrecision + " in the evaluator", Project.MSG_VERBOSE ); + eval.setGlobalPrecision( globalPrecision ); } try { - eval.execute() ; - ExcelAntEvaluationResult result = eval.getResult() ; + eval.execute(); + ExcelAntEvaluationResult result = eval.getResult(); if( result.didTestPass() && result.evaluationCompleteWithError() == false ) { if( showSuccessDetails == true ) { @@ -172,7 +169,7 @@ public class ExcelAntTest extends Task{ result.getCellName() + ". It evaluated to " + result.getReturnValue() + " when the value of " + eval.getExpectedValue() + " with precision of " + - eval.getPrecision(), Project.MSG_INFO ) ; + eval.getPrecision(), Project.MSG_INFO ); } } else { if( showFailureDetail == true ) { @@ -180,25 +177,25 @@ public class ExcelAntTest extends Task{ result.getCellName() + ". It evaluated to " + result.getReturnValue() + " when the value of " + eval.getExpectedValue() + " with precision of " + - eval.getPrecision() + " was expected." ) ; + eval.getPrecision() + " was expected." ); } - passed = false ; - failureCount++ ; + passed = false; + failureCount++; if( eval.requiredToPass() == true ) { throw new BuildException( "\tFailed to evaluate cell " + result.getCellName() + ". It evaluated to " + result.getReturnValue() + " when the value of " + eval.getExpectedValue() + " with precision of " + - eval.getPrecision() + " was expected." ) ; + eval.getPrecision() + " was expected." ); } } } catch( NullPointerException npe ) { // this means the cell reference in the test is bad. log( "Cell assignment " + eval.getCell() + " in test " + getName() + " appears to point to an empy cell. Please check the " + - " reference in the ant script.", Project.MSG_ERR ) ; + " reference in the ant script.", Project.MSG_ERR ); } } } @@ -207,11 +204,11 @@ public class ExcelAntTest extends Task{ log( "Test named " + name + " failed because " + failureCount + " of " + testCount + " evaluations failed to " + "evaluate correctly.", - Project.MSG_ERR ) ; + Project.MSG_ERR ); if( showFailureDetail == true && failureMessages.size() > 0 ) { - Iterator failures = failureMessages.iterator() ; + Iterator failures = failureMessages.iterator(); while( failures.hasNext() ) { - log( failures.next(), Project.MSG_ERR ) ; + log( failures.next(), Project.MSG_ERR ); } } } @@ -219,6 +216,6 @@ public class ExcelAntTest extends Task{ public boolean didTestPass() { - return passed ; + return passed; } } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1646736&r1=1646735&r2=1646736&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Fri Dec 19 14:36:41 2014 @@ -1592,7 +1592,6 @@ public class XSSFSheet extends POIXMLDoc * @param index of the region to unmerge */ @Override - @SuppressWarnings("deprecation") public void removeMergedRegion(int index) { if (!worksheet.isSetMergeCells()) return; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org