Merge "Fix empty control block warnings" into stable-2.2

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java

@@ -115,7 +115,7 @@ class Archive extends TextBuiltin {
 	public enum Format {
 		ZIP,
 		TAR
-	};
+	}
 
 	private static interface Archiver {
 		ArchiveOutputStream createArchiveOutputStream(OutputStream s);
@@ -137,13 +137,14 @@ class Archive extends TextBuiltin {
 					throws IOException {
 				final ZipArchiveEntry entry = new ZipArchiveEntry(path);
 
-				if (mode == FileMode.REGULAR_FILE)
-					; // ok
-				else if (mode == FileMode.EXECUTABLE_FILE ||
-					 mode == FileMode.SYMLINK)
+				if (mode == FileMode.REGULAR_FILE) {
+					// ok
+				} else if (mode == FileMode.EXECUTABLE_FILE
+						|| mode == FileMode.SYMLINK) {
 					entry.setUnixMode(mode.getBits());
-				else
+				} else {
 					warnArchiveEntryModeIgnored(path);
+				}
 				entry.setSize(loader.getSize());
 				out.putArchiveEntry(entry);
 				loader.copyTo(out);
@@ -162,7 +163,7 @@ class Archive extends TextBuiltin {
 					final TarArchiveEntry entry = new TarArchiveEntry( //
 							path, TarConstants.LF_SYMLINK);
 					entry.setLinkName(new String( //
-						loader.getCachedBytes(100), "UTF-8"));
+							loader.getCachedBytes(100), "UTF-8")); //$NON-NLS-1$
 					out.putArchiveEntry(entry);
 					out.closeArchiveEntry();
 					return;