diff options
| author | Jonathan Nieder <jrn@google.com> | 2015-06-03 12:26:54 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2015-06-03 12:27:17 -0700 |
| commit | 6227b340d33700bd3afe33cb0beacc286c0d4105 (patch) | |
| tree | 1157afa1302415eaa966723f8f16549ba6f3c631 /org.eclipse.jgit.pgm | |
| parent | dd22bc831a0ec47ecc999eb19be1bd8fad899e9b (diff) | |
| parent | fb21fb10fc76ffa886338a08d2a09cd76d339f2d (diff) | |
| download | jgit-6227b340d33700bd3afe33cb0beacc286c0d4105.tar.gz jgit-6227b340d33700bd3afe33cb0beacc286c0d4105.zip | |
Merge branch 'stable-4.0'
* stable-4.0:
Revert "Fix unchecked conversion warning in MergeFormatter"
Delete deprecated TemporaryBuffer.LocalFile constructors
Delete deprecated FileUtils.setExecute(File, boolean)
Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)
Delete deprecated UploadPackMayNotContinueException
Delete deprecated TransferConfig.isFsckObjects()
Delete deprecated TextBuiltin.out
Delete deprecated Merger.getBaseCommit()
Change-Id: Id23a39cc6a3cd122ff1738cb85b7451bbfd8af5f
Signed-off-by: Jonathan Nieder <jrn@google.com>
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java index 8e8b82fe07..56cfc7e8ef 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java @@ -56,7 +56,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.PrintWriter; import java.text.MessageFormat; import java.util.ResourceBundle; @@ -108,14 +107,6 @@ public abstract class TextBuiltin { protected OutputStream outs; /** - * Stream to output to, typically this is standard output. - * - * @deprecated Use outw instead - */ - @Deprecated - protected PrintWriter out; - - /** * Error writer, typically this is standard error. * * @since 3.4 @@ -172,7 +163,6 @@ public abstract class TextBuiltin { outputEncoding)); else outbufw = new BufferedWriter(new OutputStreamWriter(outs)); - out = new PrintWriter(outbufw); outw = new ThrowingPrintWriter(outbufw); BufferedWriter errbufw; if (outputEncoding != null) |