From d7cc6eb0020d5efda7b6954217c464e3a6ce58da Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 6 May 2013 22:59:57 +0200 Subject: Move org.eclipse.jgit.pgm's resource bundle to internal package Translatable texts aren't API and shouldn't require maintenance of @since tags to prevent API warnings. Change-Id: I228ff37f17c0e792a6bc188c463a0d19138e88ac Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/pgm/AbstractFetchCommand.java | 1 + .../src/org/eclipse/jgit/pgm/AmazonS3Client.java | 1 + .../src/org/eclipse/jgit/pgm/Archive.java | 2 +- .../src/org/eclipse/jgit/pgm/Blame.java | 1 + .../src/org/eclipse/jgit/pgm/Branch.java | 1 + .../src/org/eclipse/jgit/pgm/CLIText.java | 242 --------------------- .../src/org/eclipse/jgit/pgm/Checkout.java | 1 + .../src/org/eclipse/jgit/pgm/Clone.java | 1 + .../src/org/eclipse/jgit/pgm/CommandRef.java | 2 + .../src/org/eclipse/jgit/pgm/Commit.java | 1 + .../src/org/eclipse/jgit/pgm/Daemon.java | 1 + .../src/org/eclipse/jgit/pgm/Diff.java | 1 + .../src/org/eclipse/jgit/pgm/Glog.java | 1 + .../src/org/eclipse/jgit/pgm/Init.java | 1 + .../src/org/eclipse/jgit/pgm/Log.java | 1 + .../src/org/eclipse/jgit/pgm/Main.java | 1 + .../src/org/eclipse/jgit/pgm/Merge.java | 1 + .../src/org/eclipse/jgit/pgm/Push.java | 1 + .../src/org/eclipse/jgit/pgm/ReceivePack.java | 1 + .../org/eclipse/jgit/pgm/RevWalkTextBuiltin.java | 1 + .../src/org/eclipse/jgit/pgm/Show.java | 1 + .../src/org/eclipse/jgit/pgm/Status.java | 1 + .../src/org/eclipse/jgit/pgm/Tag.java | 1 + .../src/org/eclipse/jgit/pgm/TextBuiltin.java | 1 + .../src/org/eclipse/jgit/pgm/UploadPack.java | 1 + .../src/org/eclipse/jgit/pgm/Version.java | 2 + .../eclipse/jgit/pgm/archive/ArchiveCommand.java | 2 +- .../org/eclipse/jgit/pgm/debug/DiffAlgorithms.java | 2 +- .../org/eclipse/jgit/pgm/debug/MakeCacheTree.java | 2 +- .../org/eclipse/jgit/pgm/debug/ReadDirCache.java | 2 +- .../eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 2 +- .../org/eclipse/jgit/pgm/debug/ShowCacheTree.java | 2 +- .../org/eclipse/jgit/pgm/debug/ShowCommands.java | 2 +- .../eclipse/jgit/pgm/debug/TextHashFunctions.java | 2 +- .../org/eclipse/jgit/pgm/debug/WriteDirCache.java | 2 +- .../src/org/eclipse/jgit/pgm/internal/CLIText.java | 242 +++++++++++++++++++++ .../jgit/pgm/opt/AbstractTreeIteratorHandler.java | 2 +- .../org/eclipse/jgit/pgm/opt/CmdLineParser.java | 2 +- .../org/eclipse/jgit/pgm/opt/ObjectIdHandler.java | 2 +- .../jgit/pgm/opt/PathTreeFilterHandler.java | 2 +- .../org/eclipse/jgit/pgm/opt/RefSpecHandler.java | 2 +- .../org/eclipse/jgit/pgm/opt/RevCommitHandler.java | 2 +- .../org/eclipse/jgit/pgm/opt/RevTreeHandler.java | 2 +- .../eclipse/jgit/pgm/opt/SubcommandHandler.java | 2 +- 44 files changed, 286 insertions(+), 260 deletions(-) delete mode 100644 org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java create mode 100644 org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java (limited to 'org.eclipse.jgit.pgm/src/org') diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java index ad9a36db18..1fe39da8a6 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java @@ -57,6 +57,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.transport.FetchResult; import org.eclipse.jgit.transport.TrackingRefUpdate; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java index 365d968aa5..5e66c36012 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java @@ -57,6 +57,7 @@ import java.net.URLConnection; import java.text.MessageFormat; import java.util.Properties; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.transport.AmazonS3; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java index 5685aa4267..815c96bfe1 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java @@ -44,9 +44,9 @@ package org.eclipse.jgit.pgm; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; import org.eclipse.jgit.pgm.archive.ArchiveCommand; +import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java index 341a25b516..286710ec91 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java @@ -68,6 +68,7 @@ import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevFlag; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java index 28e30bcbc2..969a8e0c08 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java @@ -60,6 +60,7 @@ import org.eclipse.jgit.lib.RefRename; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RefUpdate.Result; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.CmdLineParser; import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java deleted file mode 100644 index faeed632ab..0000000000 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (C) 2010, 2013 Sasa Zivkov - * and other copyright owners as documented in the project's IP log. - * - * This program and the accompanying materials are made available - * under the terms of the Eclipse Distribution License v1.0 which - * accompanies this distribution, is reproduced below, and is - * available at http://www.eclipse.org/org/documents/edl-v10.php - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Eclipse Foundation, Inc. nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.eclipse.jgit.pgm; - -import java.text.MessageFormat; - -import org.eclipse.jgit.nls.NLS; -import org.eclipse.jgit.nls.TranslationBundle; - -/** - * Translation bundle for JGit command line interface - */ -public class CLIText extends TranslationBundle { - - /** - * @return an instance of this translation bundle - */ - public static CLIText get() { - return NLS.getBundleFor(CLIText.class); - } - - /** - * Format the given line for using the format defined by {@link #lineFormat} - * ("# " by default). - * - * @param line - * the line to format - * @return the formatted line - * @since 2.2 - */ - public static String formatLine(String line) { - return MessageFormat.format(get().lineFormat, line); - } - - // @formatter:off - /***/ public String alreadyOnBranch; - /***/ public String alreadyUpToDate; - /***/ public String authorInfo; - /***/ public String averageMSPerRead; - /***/ public String branchAlreadyExists; - /***/ public String branchCreatedFrom; - /***/ public String branchDetachedHEAD; - /***/ public String branchIsNotAnAncestorOfYourCurrentHEAD; - /***/ public String branchNotFound; - /***/ public String cacheTreePathInfo; - /***/ public String configFileNotFound; - /***/ public String cannotBeRenamed; - /***/ public String cannotChekoutNoHeadsAdvertisedByRemote; - /***/ public String cannotCombineSquashWithNoff; - /***/ public String cannotCreateCommand; - /***/ public String cannotCreateOutputStream; - /***/ public String cannotDeatchHEAD; - /***/ public String cannotDeleteFile; - /***/ public String cannotDeleteTheBranchWhichYouAreCurrentlyOn; - /***/ public String cannotGuessLocalNameFrom; - /***/ public String cannotLock; - /***/ public String cannotMergeDetachedHead; - /***/ public String cannotReadBecause; - /***/ public String cannotReadPackageInformation; - /***/ public String cannotRenameDetachedHEAD; - /***/ public String cannotResolve; - /***/ public String cannotSetupConsole; - /***/ public String cannotUseObjectsWithGlog; - /***/ public String cantFindGitDirectory; - /***/ public String cantWrite; - /***/ public String changesNotStagedForCommit; - /***/ public String changesToBeCommitted; - /***/ public String commitLabel; - /***/ public String conflictingUsageOf_git_dir_andArguments; - /***/ public String couldNotCreateBranch; - /***/ public String dateInfo; - /***/ public String deletedBranch; - /***/ public String deletedRemoteBranch; - /***/ public String doesNotExist; - /***/ public String dontOverwriteLocalChanges; - /***/ public String everythingUpToDate; - /***/ public String exceptionCaughtDuringExecutionOfArchiveCommand; - /***/ public String expectedNumberOfbytes; - /***/ public String exporting; - /***/ public String failedToCommitIndex; - /***/ public String failedToLockIndex; - /***/ public String failedToLockTag; - /***/ public String fatalError; - /***/ public String fatalThisProgramWillDestroyTheRepository; - /***/ public String fileIsRequired; - /***/ public String ffNotPossibleAborting; - /***/ public String forcedUpdate; - /***/ public String fromURI; - /***/ public String initializedEmptyGitRepositoryIn; - /***/ public String invalidHttpProxyOnlyHttpSupported; - /***/ public String jgitVersion; - /***/ public String lineFormat; - /***/ public String listeningOn; - /***/ public String mergeCheckoutConflict; - /***/ public String mergeConflict; - /***/ public String mergeFailed; - /***/ public String mergeCheckoutFailed; - /***/ public String mergeMadeBy; - /***/ public String mergedSquashed; - /***/ public String mergeWentWellStoppedBeforeCommitting; - /***/ public String metaVar_KEY; - /***/ public String metaVar_archiveFormat; - /***/ public String metaVar_arg; - /***/ public String metaVar_author; - /***/ public String metaVar_bucket; - /***/ public String metaVar_command; - /***/ public String metaVar_commandDetail; - /***/ public String metaVar_commitOrTag; - /***/ public String metaVar_commitPaths; - /***/ public String metaVar_commitish; - /***/ public String metaVar_configFile; - /***/ public String metaVar_connProp; - /***/ public String metaVar_diffAlg; - /***/ public String metaVar_directory; - /***/ public String metaVar_file; - /***/ public String metaVar_filepattern; - /***/ public String metaVar_gitDir; - /***/ public String metaVar_hostName; - /***/ public String metaVar_linesOfContext; - /***/ public String metaVar_message; - /***/ public String metaVar_n; - /***/ public String metaVar_name; - /***/ public String metaVar_object; - /***/ public String metaVar_op; - /***/ public String metaVar_pass; - /***/ public String metaVar_path; - /***/ public String metaVar_paths; - /***/ public String metaVar_port; - /***/ public String metaVar_ref; - /***/ public String metaVar_refs; - /***/ public String metaVar_refspec; - /***/ public String metaVar_remoteName; - /***/ public String metaVar_seconds; - /***/ public String metaVar_service; - /***/ public String metaVar_treeish; - /***/ public String metaVar_uriish; - /***/ public String metaVar_url; - /***/ public String metaVar_user; - /***/ public String metaVar_version; - /***/ public String mostCommonlyUsedCommandsAre; - /***/ public String needApprovalToDestroyCurrentRepository; - /***/ public String noGitRepositoryConfigured; - /***/ public String noSuchFile; - /***/ public String noSuchRemoteRef; - /***/ public String noTREESectionInIndex; - /***/ public String nonFastForward; - /***/ public String notABranch; - /***/ public String notACommit; - /***/ public String notAGitRepository; - /***/ public String notAJgitCommand; - /***/ public String notARevision; - /***/ public String notATree; - /***/ public String notAValidRefName; - /***/ public String notAnIndexFile; - /***/ public String notAnObject; - /***/ public String notFound; - /***/ public String notOnAnyBranch; - /***/ public String noteObjectTooLargeToPrint; - /***/ public String nothingToSquash; - /***/ public String onBranchToBeBorn; - /***/ public String onBranch; - /***/ public String onlyOneMetaVarExpectedIn; - /***/ public String onlyOneOfIncludeOnlyAllInteractiveCanBeUsed; - /***/ public String pathspecDidNotMatch; - /***/ public String pushTo; - /***/ public String pathsRequired; - /***/ public String refDoesNotExistOrNoCommit; - /***/ public String remoteMessage; - /***/ public String remoteRefObjectChangedIsNotExpectedOne; - /***/ public String remoteSideDoesNotSupportDeletingRefs; - /***/ public String repaint; - /***/ public String serviceNotSupported; - /***/ public String skippingObject; - /***/ public String statusFileListFormat; - /***/ public String statusFileListFormatWithPrefix; - /***/ public String statusFileListFormatUnmerged; - /***/ public String statusModified; - /***/ public String statusNewFile; - /***/ public String statusRemoved; - /***/ public String statusBothDeleted; - /***/ public String statusAddedByUs; - /***/ public String statusDeletedByThem; - /***/ public String statusAddedByThem; - /***/ public String statusDeletedByUs; - /***/ public String statusBothAdded; - /***/ public String statusBothModified; - /***/ public String switchedToNewBranch; - /***/ public String switchedToBranch; - /***/ public String tagAlreadyExists; - /***/ public String tagLabel; - /***/ public String taggerInfo; - /***/ public String timeInMilliSeconds; - /***/ public String tooManyRefsGiven; - /***/ public String treeIsRequired; - /***/ public char[] unknownIoErrorStdout; - /***/ public String unknownMergeStrategy; - /***/ public String unmergedPaths; - /***/ public String unsupportedOperation; - /***/ public String untrackedFiles; - /***/ public String updating; -} diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java index 953a5e02d5..8115039729 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java @@ -53,6 +53,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java index 1ec3888177..888f54da2b 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java @@ -58,6 +58,7 @@ import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.file.FileRepositoryBuilder; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java index f637abad56..52225150a5 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java @@ -47,6 +47,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.text.MessageFormat; +import org.eclipse.jgit.pgm.internal.CLIText; + /** * Description of a command (a {@link TextBuiltin} subclass. *

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java index a50e744a80..14c449a6b3 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java @@ -48,6 +48,7 @@ import org.eclipse.jgit.api.errors.NoHeadException; import org.eclipse.jgit.api.errors.NoMessageException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.util.RawParseUtils; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java index a5096b0e21..04182d6dbe 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java @@ -50,6 +50,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executors; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.storage.file.WindowCacheConfig; import org.eclipse.jgit.storage.pack.PackConfig; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java index d38c53ac50..8f051688be 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java @@ -66,6 +66,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; import org.eclipse.jgit.treewalk.AbstractTreeIterator; import org.eclipse.jgit.treewalk.CanonicalTreeParser; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java index faaf85f76e..8b35fd1751 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java @@ -59,6 +59,7 @@ import javax.swing.JScrollPane; import org.eclipse.jgit.awtui.CommitGraphPane; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revplot.PlotWalk; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevSort; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java index ab498873d9..b3e73b5d99 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java @@ -53,6 +53,7 @@ import java.text.MessageFormat; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.InitCommand; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Option; @Command(common = true, usage = "usage_CreateAnEmptyGitRepository") diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java index eaba6e5138..ae0c954157 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java @@ -68,6 +68,7 @@ import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.notes.NoteMap; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.util.GitDateFormatter; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java index 69d7d350cf..b948bc2ebb 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java @@ -59,6 +59,7 @@ import org.eclipse.jgit.awtui.AwtCredentialsProvider; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryBuilder; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.CmdLineParser; import org.eclipse.jgit.pgm.opt.SubcommandHandler; import org.eclipse.jgit.util.CachedAuthenticator; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index 24794e75f2..67b7cc8752 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -58,6 +58,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.merge.MergeStrategy; import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java index ea3cac7225..b252de8e60 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java @@ -58,6 +58,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.transport.PushResult; import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RemoteRefUpdate; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java index dd6de1d667..bc8f497164 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java @@ -49,6 +49,7 @@ import java.text.MessageFormat; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.RepositoryCache.FileKey; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.util.FS; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java index 92a22b00b3..4327403690 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java @@ -55,6 +55,7 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; import org.eclipse.jgit.revwalk.FollowFilter; import org.eclipse.jgit.revwalk.ObjectWalk; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java index 7d6a1713bc..a33a2d4dff 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java @@ -63,6 +63,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevObject; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java index c1b635ca9f..45cfd92ffd 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java @@ -56,6 +56,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.IndexDiff.StageState; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; @Command(usage = "usage_Status", common = true) class Status extends TextBuiltin { diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java index 23a16ab746..a90d4c4dad 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java @@ -58,6 +58,7 @@ import org.eclipse.jgit.api.errors.RefAlreadyExistsException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; 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 c4e89c3430..dc081439df 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 @@ -60,6 +60,7 @@ import java.util.ResourceBundle; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.CmdLineParser; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.util.io.ThrowingPrintWriter; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java index df7f1c3c8c..4ace0aacd7 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java @@ -49,6 +49,7 @@ import java.text.MessageFormat; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.RepositoryCache.FileKey; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.util.FS; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java index cd7f5116b8..2dce535d9f 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java @@ -45,6 +45,8 @@ package org.eclipse.jgit.pgm; import java.text.MessageFormat; +import org.eclipse.jgit.pgm.internal.CLIText; + @Command(common = true, usage = "usage_DisplayTheVersionOfJgit") class Version extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java index 39b07ec9ae..1235d0ae06 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java @@ -63,7 +63,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java index 663f16c6e4..3efe8845f6 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java @@ -70,8 +70,8 @@ import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryBuilder; import org.eclipse.jgit.lib.RepositoryCache; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java index 4769f1159d..5e6195e953 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java @@ -51,8 +51,8 @@ import java.text.MessageFormat; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheTree; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; class MakeCacheTree extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java index ab4ec2f72b..7cef64b037 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java @@ -48,8 +48,8 @@ import static java.lang.Long.valueOf; import java.text.MessageFormat; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; class ReadDirCache extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java index 4b0ab88df6..f25956f802 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java @@ -70,8 +70,8 @@ import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefWriter; import org.eclipse.jgit.lib.TextProgressMonitor; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java index 9fa8c69954..7b0c287575 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java @@ -51,8 +51,8 @@ import java.text.MessageFormat; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheTree; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; class ShowCacheTree extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java index a0b461d4ee..4f6d1503b3 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java @@ -46,11 +46,11 @@ package org.eclipse.jgit.pgm.debug; import java.net.URL; import org.kohsuke.args4j.Option; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.Command; import org.eclipse.jgit.pgm.CommandCatalog; import org.eclipse.jgit.pgm.CommandRef; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; @Command(usage = "usage_displayAListOfAllRegisteredJgitCommands") class ShowCommands extends TextBuiltin { diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java index aa46ea114e..e43c9a6af4 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java @@ -64,8 +64,8 @@ import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryBuilder; import org.eclipse.jgit.lib.RepositoryCache; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.util.FS; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java index 142dbeecc8..4adb27671a 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java @@ -45,8 +45,8 @@ package org.eclipse.jgit.pgm.debug; import org.eclipse.jgit.dircache.DirCache; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; class WriteDirCache extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java new file mode 100644 index 0000000000..62865d51c1 --- /dev/null +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java @@ -0,0 +1,242 @@ +/* + * Copyright (C) 2010, 2013 Sasa Zivkov + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.eclipse.jgit.pgm.internal; + +import java.text.MessageFormat; + +import org.eclipse.jgit.nls.NLS; +import org.eclipse.jgit.nls.TranslationBundle; + +/** + * Translation bundle for JGit command line interface + */ +public class CLIText extends TranslationBundle { + + /** + * @return an instance of this translation bundle + */ + public static CLIText get() { + return NLS.getBundleFor(CLIText.class); + } + + /** + * Format the given line for using the format defined by {@link #lineFormat} + * ("# " by default). + * + * @param line + * the line to format + * @return the formatted line + * @since 2.2 + */ + public static String formatLine(String line) { + return MessageFormat.format(get().lineFormat, line); + } + + // @formatter:off + /***/ public String alreadyOnBranch; + /***/ public String alreadyUpToDate; + /***/ public String authorInfo; + /***/ public String averageMSPerRead; + /***/ public String branchAlreadyExists; + /***/ public String branchCreatedFrom; + /***/ public String branchDetachedHEAD; + /***/ public String branchIsNotAnAncestorOfYourCurrentHEAD; + /***/ public String branchNotFound; + /***/ public String cacheTreePathInfo; + /***/ public String configFileNotFound; + /***/ public String cannotBeRenamed; + /***/ public String cannotChekoutNoHeadsAdvertisedByRemote; + /***/ public String cannotCombineSquashWithNoff; + /***/ public String cannotCreateCommand; + /***/ public String cannotCreateOutputStream; + /***/ public String cannotDeatchHEAD; + /***/ public String cannotDeleteFile; + /***/ public String cannotDeleteTheBranchWhichYouAreCurrentlyOn; + /***/ public String cannotGuessLocalNameFrom; + /***/ public String cannotLock; + /***/ public String cannotMergeDetachedHead; + /***/ public String cannotReadBecause; + /***/ public String cannotReadPackageInformation; + /***/ public String cannotRenameDetachedHEAD; + /***/ public String cannotResolve; + /***/ public String cannotSetupConsole; + /***/ public String cannotUseObjectsWithGlog; + /***/ public String cantFindGitDirectory; + /***/ public String cantWrite; + /***/ public String changesNotStagedForCommit; + /***/ public String changesToBeCommitted; + /***/ public String commitLabel; + /***/ public String conflictingUsageOf_git_dir_andArguments; + /***/ public String couldNotCreateBranch; + /***/ public String dateInfo; + /***/ public String deletedBranch; + /***/ public String deletedRemoteBranch; + /***/ public String doesNotExist; + /***/ public String dontOverwriteLocalChanges; + /***/ public String everythingUpToDate; + /***/ public String exceptionCaughtDuringExecutionOfArchiveCommand; + /***/ public String expectedNumberOfbytes; + /***/ public String exporting; + /***/ public String failedToCommitIndex; + /***/ public String failedToLockIndex; + /***/ public String failedToLockTag; + /***/ public String fatalError; + /***/ public String fatalThisProgramWillDestroyTheRepository; + /***/ public String fileIsRequired; + /***/ public String ffNotPossibleAborting; + /***/ public String forcedUpdate; + /***/ public String fromURI; + /***/ public String initializedEmptyGitRepositoryIn; + /***/ public String invalidHttpProxyOnlyHttpSupported; + /***/ public String jgitVersion; + /***/ public String lineFormat; + /***/ public String listeningOn; + /***/ public String mergeCheckoutConflict; + /***/ public String mergeConflict; + /***/ public String mergeFailed; + /***/ public String mergeCheckoutFailed; + /***/ public String mergeMadeBy; + /***/ public String mergedSquashed; + /***/ public String mergeWentWellStoppedBeforeCommitting; + /***/ public String metaVar_KEY; + /***/ public String metaVar_archiveFormat; + /***/ public String metaVar_arg; + /***/ public String metaVar_author; + /***/ public String metaVar_bucket; + /***/ public String metaVar_command; + /***/ public String metaVar_commandDetail; + /***/ public String metaVar_commitOrTag; + /***/ public String metaVar_commitPaths; + /***/ public String metaVar_commitish; + /***/ public String metaVar_configFile; + /***/ public String metaVar_connProp; + /***/ public String metaVar_diffAlg; + /***/ public String metaVar_directory; + /***/ public String metaVar_file; + /***/ public String metaVar_filepattern; + /***/ public String metaVar_gitDir; + /***/ public String metaVar_hostName; + /***/ public String metaVar_linesOfContext; + /***/ public String metaVar_message; + /***/ public String metaVar_n; + /***/ public String metaVar_name; + /***/ public String metaVar_object; + /***/ public String metaVar_op; + /***/ public String metaVar_pass; + /***/ public String metaVar_path; + /***/ public String metaVar_paths; + /***/ public String metaVar_port; + /***/ public String metaVar_ref; + /***/ public String metaVar_refs; + /***/ public String metaVar_refspec; + /***/ public String metaVar_remoteName; + /***/ public String metaVar_seconds; + /***/ public String metaVar_service; + /***/ public String metaVar_treeish; + /***/ public String metaVar_uriish; + /***/ public String metaVar_url; + /***/ public String metaVar_user; + /***/ public String metaVar_version; + /***/ public String mostCommonlyUsedCommandsAre; + /***/ public String needApprovalToDestroyCurrentRepository; + /***/ public String noGitRepositoryConfigured; + /***/ public String noSuchFile; + /***/ public String noSuchRemoteRef; + /***/ public String noTREESectionInIndex; + /***/ public String nonFastForward; + /***/ public String notABranch; + /***/ public String notACommit; + /***/ public String notAGitRepository; + /***/ public String notAJgitCommand; + /***/ public String notARevision; + /***/ public String notATree; + /***/ public String notAValidRefName; + /***/ public String notAnIndexFile; + /***/ public String notAnObject; + /***/ public String notFound; + /***/ public String notOnAnyBranch; + /***/ public String noteObjectTooLargeToPrint; + /***/ public String nothingToSquash; + /***/ public String onBranchToBeBorn; + /***/ public String onBranch; + /***/ public String onlyOneMetaVarExpectedIn; + /***/ public String onlyOneOfIncludeOnlyAllInteractiveCanBeUsed; + /***/ public String pathspecDidNotMatch; + /***/ public String pushTo; + /***/ public String pathsRequired; + /***/ public String refDoesNotExistOrNoCommit; + /***/ public String remoteMessage; + /***/ public String remoteRefObjectChangedIsNotExpectedOne; + /***/ public String remoteSideDoesNotSupportDeletingRefs; + /***/ public String repaint; + /***/ public String serviceNotSupported; + /***/ public String skippingObject; + /***/ public String statusFileListFormat; + /***/ public String statusFileListFormatWithPrefix; + /***/ public String statusFileListFormatUnmerged; + /***/ public String statusModified; + /***/ public String statusNewFile; + /***/ public String statusRemoved; + /***/ public String statusBothDeleted; + /***/ public String statusAddedByUs; + /***/ public String statusDeletedByThem; + /***/ public String statusAddedByThem; + /***/ public String statusDeletedByUs; + /***/ public String statusBothAdded; + /***/ public String statusBothModified; + /***/ public String switchedToNewBranch; + /***/ public String switchedToBranch; + /***/ public String tagAlreadyExists; + /***/ public String tagLabel; + /***/ public String taggerInfo; + /***/ public String timeInMilliSeconds; + /***/ public String tooManyRefsGiven; + /***/ public String treeIsRequired; + /***/ public char[] unknownIoErrorStdout; + /***/ public String unknownMergeStrategy; + /***/ public String unmergedPaths; + /***/ public String unsupportedOperation; + /***/ public String untrackedFiles; + /***/ public String updating; +} diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java index ca9710491c..087dbb0679 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java @@ -60,7 +60,7 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.treewalk.AbstractTreeIterator; import org.eclipse.jgit.treewalk.CanonicalTreeParser; import org.eclipse.jgit.treewalk.FileTreeIterator; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java index cea32099e2..c36cc2cb44 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java @@ -56,8 +56,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Setter; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java index f6550a5d88..fa24d4b02f 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java @@ -54,7 +54,7 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; /** * Custom argument handler {@link ObjectId} from string values. diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java index 50ff02aca9..122cce7dea 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java @@ -53,7 +53,7 @@ import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.treewalk.filter.PathFilter; import org.eclipse.jgit.treewalk.filter.PathFilterGroup; import org.eclipse.jgit.treewalk.filter.TreeFilter; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java index 43b727ac02..dae0c47642 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java @@ -49,7 +49,7 @@ import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.transport.RefSpec; /** diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java index 4d917dcbd3..b1be128db1 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java @@ -56,7 +56,7 @@ import org.kohsuke.args4j.spi.Setter; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevFlag; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java index 0b607ee06f..eb155af9f4 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java @@ -56,7 +56,7 @@ import org.kohsuke.args4j.spi.Setter; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevTree; /** diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java index 35ed22bd30..c62ef0d2b8 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java @@ -51,10 +51,10 @@ import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.CommandCatalog; import org.eclipse.jgit.pgm.CommandRef; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; /** * Custom Argument handler for jgit command selection. -- cgit v1.2.3