Author: echatellier Date: 2011-10-27 16:13:39 +0200 (Thu, 27 Oct 2011) New Revision: 387 Url: http://nuiton.org/repositories/revision/nuiton-matrix/387 Log: Remove use of commons io and commons lang Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2011-10-27 13:52:22 UTC (rev 386) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2011-10-27 14:13:39 UTC (rev 387) @@ -27,8 +27,6 @@ import static org.nuiton.i18n.I18n._; -import org.apache.commons.lang.StringUtils; - import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.GridLayout; @@ -253,7 +251,7 @@ // compute dimension name String dimensionName = _(matrix.getDimensionName(index)); - if (StringUtils.isBlank(dimensionName)) { + if (dimensionName == null || dimensionName.isEmpty()) { dimensionName = _("nuitonmatrix.viewer.dimnameindex", index); } Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2011-10-27 13:52:22 UTC (rev 386) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2011-10-27 14:13:39 UTC (rev 387) @@ -39,7 +39,6 @@ import javax.swing.JButton; import javax.swing.JPanel; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -153,7 +152,15 @@ } } finally { - IOUtils.closeQuietly(writer); + if (writer != null) { + try { + writer.close(); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't close writer", ex); + } + } + } } } }