FAQ
remove unused throws clauses

https://bz.apache.org/bugzilla/attachment.cgi?id=33898

Patch-by: Dave Brosius <dbrosius@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1be6cf50
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1be6cf50
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1be6cf50

Branch: refs/heads/master
Commit: 1be6cf50a85e1fcd6bfd66e3a1e0fa7b0797fc78
Parents: a4381a6
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Fri May 27 15:59:00 2016 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Fri May 27 15:59:00 2016 +0200

----------------------------------------------------------------------
  src/main/org/apache/tools/ant/launch/Locator.java | 14 +++++---------
  .../apache/tools/ant/taskdefs/ManifestClassPath.java | 7 ++-----
  2 files changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/1be6cf50/src/main/org/apache/tools/ant/launch/Locator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java
index 4640e70..2e8c37d 100644
--- a/src/main/org/apache/tools/ant/launch/Locator.java
+++ b/src/main/org/apache/tools/ant/launch/Locator.java
@@ -23,6 +23,7 @@ import java.io.FilenameFilter;
  import java.io.UnsupportedEncodingException;
  import java.net.MalformedURLException;
  import java.net.URL;
+import java.nio.charset.StandardCharsets;
  import java.text.CharacterIterator;
  import java.text.StringCharacterIterator;
  import java.util.Locale;
@@ -59,10 +60,6 @@ public final class Locator {
      private static final int SPACE = 0x20;
      private static final int DEL = 0x7F;

- /**
- * encoding used to represent URIs
- */
- public static final String URI_ENCODING = "UTF-8";
      // stolen from org.apache.xerces.impl.XMLEntityManager#getUserDir()
      // of the Xerces-J team
      // which ASCII characters need to be escaped
@@ -315,11 +312,11 @@ public final class Locator {
              } else if (c >= 0x0000 && c < 0x0080) {
                  sb.write(c);
              } else { // #50543
- byte[] bytes = String.valueOf(c).getBytes(URI_ENCODING);
+ byte[] bytes = String.valueOf(c).getBytes(StandardCharsets.UTF_8);
                  sb.write(bytes, 0, bytes.length);
              }
          }
- return sb.toString(URI_ENCODING);
+ return sb.toString(StandardCharsets.UTF_8.name());
      }

      /**
@@ -327,10 +324,9 @@ public final class Locator {
       * The URI is escaped
       * @param path String to encode.
       * @return The encoded string, according to URI norms
- * @throws UnsupportedEncodingException if UTF-8 is not available
       * @since Ant 1.7
       */
- public static String encodeURI(String path) throws UnsupportedEncodingException {
+ public static String encodeURI(String path) {
          int i = 0;
          int len = path.length();
          int ch = 0;
@@ -362,7 +358,7 @@ public final class Locator {
              // get UTF-8 bytes for the remaining sub-string
              byte[] bytes = null;
              byte b;
- bytes = path.substring(i).getBytes(URI_ENCODING);
+ bytes = path.substring(i).getBytes(StandardCharsets.UTF_8);
              len = bytes.length;

              // for each byte

http://git-wip-us.apache.org/repos/asf/ant/blob/1be6cf50/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java b/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
index 4a4f231..f605bd5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
@@ -115,11 +115,8 @@ public class ManifestClassPath extends Task {
              if (pathEntry.isDirectory() && !relPath.endsWith("/")) {
                  relPath = relPath + '/';
              }
- try {
- relPath = Locator.encodeURI(relPath);
- } catch (UnsupportedEncodingException exc) {
- throw new BuildException(exc);
- }
+ relPath = Locator.encodeURI(relPath);
+
              // Manifest's ClassPath: attribute always uses forward
              // slashes '/', and is space-separated. Ant will properly
              // format it on 72 columns with proper line continuation

Search Discussions

Discussion Posts

Previous

Follow ups

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 2 of 4 | next ›
Discussion Overview
groupnotifications @
categoriesant
postedMay 27, '16 at 1:57p
activeMay 27, '16 at 1:59p
posts4
users1
websiteant.apache.org

1 user in discussion

Bodewig: 4 posts

People

Translate

site design / logo © 2017 Grokbase