From 20c829838ac101cf595ee9d4575d6b95a6d2c99d Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Thu, 15 Nov 2012 00:53:53 +0100 Subject: [PATCH] Make an exception for the formatting rules (turn off) for some files Our rule to enforce javodocs for public members gives us a problem because there are some patterns where javadoc make little sense so we make the comments as small as possible, which our formatting rules do not like, so disable it for those source files. Change-Id: I6e3edb1e650ed45428b89cf41e6151b6536bca8a Signed-off-by: Chris Aniszczyk --- .../src/org/eclipse/jgit/console/ConsoleText.java | 1 + .../src/org/eclipse/jgit/http/server/HttpServerText.java | 1 + org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java | 1 + org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java | 1 + org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java | 1 + org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java | 1 + org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsText.java | 1 + 7 files changed, 7 insertions(+) diff --git a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java index 3f1734b01..281d9379f 100644 --- a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java +++ b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java @@ -58,6 +58,7 @@ public static ConsoleText get() { return NLS.getBundleFor(ConsoleText.class); } + // @formatter:off /***/ public String answerNo; /***/ public String answerYes; /***/ public String noSystemConsoleAvailable; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java index 9bf9ad6c5..a8dd1b10c 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java @@ -58,6 +58,7 @@ public static HttpServerText get() { return NLS.getBundleFor(HttpServerText.class); } + // @formatter:off /***/ public String alreadyInitializedByContainer; /***/ public String cannotGetLengthOf; /***/ public String clientHas175ChunkedEncodingBug; diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java index 2067c5f63..a7a4fd918 100644 --- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java +++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java @@ -58,6 +58,7 @@ public static IpLogText get() { return NLS.getBundleFor(IpLogText.class); } + // @formatter:off /***/ public String CQString; /***/ public String CSVParsingError; /***/ public String cannotLock; 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 index b784c37bd..2fe46c4a5 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java @@ -73,6 +73,7 @@ public static String formatLine(String line) { return MessageFormat.format(get().lineFormat, line); } + // @formatter:off /***/ public String IPZillaPasswordPrompt; /***/ public String alreadyOnBranch; /***/ public String alreadyUpToDate; diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java index e1acbcd16..d9b6d9c1b 100644 --- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java +++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java @@ -58,6 +58,7 @@ public static UIText get() { return NLS.getBundleFor(UIText.class); } + // @formatter:off /***/ public String authenticationRequired; /***/ public String author; /***/ public String date; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index e115a73ce..6a55ccef9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -58,6 +58,7 @@ public static JGitText get() { return NLS.getBundleFor(JGitText.class); } + // @formatter:off /***/ public String abbreviationLengthMustBeNonNegative; /***/ public String abortingRebase; /***/ public String abortingRebaseFailed; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsText.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsText.java index 499b75a34..76afa5deb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsText.java @@ -53,6 +53,7 @@ public static DfsText get() { return NLS.getBundleFor(DfsText.class); } + // @formatter:off /***/ public String cannotReadIndex; /***/ public String shortReadOfBlock; /***/ public String shortReadOfIndex;