From 7b1d7ac90e86b058596a7d2996fdf186db5a59c6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 12 Dec 2012 08:31:45 +0100 Subject: [PATCH] Fix empty control block warnings Change-Id: I7c546fa89f5e1933cff6648b2e03e07db61273e8 Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/pgm/Archive.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 b886be853..7a2d5de75 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 @@ -115,7 +115,7 @@ static private void warnArchiveEntryModeIgnored(String name) { public enum Format { ZIP, TAR - }; + } private static interface Archiver { ArchiveOutputStream createArchiveOutputStream(OutputStream s); @@ -137,13 +137,14 @@ public void putEntry(String path, FileMode mode, // 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 @@ public void putEntry(String path, FileMode mode, // 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;