cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/4] cxf git commit: Fixing backmerge
Date Mon, 28 Nov 2016 15:40:31 GMT
Fixing backmerge


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

Branch: refs/heads/3.1.x-fixes
Commit: f335e1b9f932347f2450c9026313203302b4e3de
Parents: 7cd1f5f
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Nov 28 15:07:43 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Nov 28 15:07:43 2016 +0000

----------------------------------------------------------------------
 .../toolspec/parser/CommandLineParser.java      | 22 --------------------
 1 file changed, 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f335e1b9/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
index f134d7a..7da11ef 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
@@ -208,13 +208,8 @@ public class CommandLineParser {
     public String getUsage() throws TransformerException {
         // REVISIT: style usage document into a form more readily output as a
         // usage message
-<<<<<<< HEAD
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         InputStream in = getClass().getResourceAsStream("usage.xsl");
-=======
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            InputStream in = getClass().getResourceAsStream("usage.xsl")) {
->>>>>>> 0398758... Some improvements in the tooling code
 
         toolspec.transform(in, baos);
         return baos.toString();
@@ -223,7 +218,6 @@ public class CommandLineParser {
     public String getDetailedUsage() throws TransformerException {
         // REVISIT: style usage document into a form more readily output as a
         // usage message
-<<<<<<< HEAD
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         toolspec.transform(getClass().getResourceAsStream("detailedUsage.xsl"), baos);
         return baos.toString();
@@ -233,22 +227,6 @@ public class CommandLineParser {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         toolspec.transform(getClass().getResourceAsStream("detailedUsage.xsl"), baos);
         String usage = baos.toString();
-=======
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            InputStream is = getClass().getResourceAsStream("detailedUsage.xsl")) {
-            toolspec.transform(is, baos);
-            return baos.toString();
-        }
-    }
-
-    public String getFormattedDetailedUsage() throws TransformerException, IOException {
-        String usage = null;
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            InputStream is = getClass().getResourceAsStream("detailedUsage.xsl")) {
-            toolspec.transform(is, baos);
-            usage = baos.toString();
-        }
->>>>>>> 0398758... Some improvements in the tooling code
         // we use the following pattern to format usage
         // |-------|-options|------|description-----------------|
         // before option white space size is 7


Mime
View raw message