Some of these eliminations just reduces the number of warnings on lines where messages are constructed that can/will be translated. Change-Id: I6eddb39ccc8f2488741bb58540d9ec5f5665e2c4tags/v3.5.0.201409071800-rc1
// TarArchiveEntry detects directories by checking | // TarArchiveEntry detects directories by checking | ||||
// for '/' at the end of the filename. | // for '/' at the end of the filename. | ||||
if (path.endsWith("/") && mode != FileMode.TREE) | |||||
if (path.endsWith("/") && mode != FileMode.TREE) //$NON-NLS-1$ | |||||
throw new IllegalArgumentException(MessageFormat.format( | throw new IllegalArgumentException(MessageFormat.format( | ||||
ArchiveText.get().pathDoesNotMatchMode, path, mode)); | ArchiveText.get().pathDoesNotMatchMode, path, mode)); | ||||
if (!path.endsWith("/") && mode == FileMode.TREE) | |||||
path = path + "/"; | |||||
if (!path.endsWith("/") && mode == FileMode.TREE) //$NON-NLS-1$ | |||||
path = path + "/"; //$NON-NLS-1$ | |||||
final TarArchiveEntry entry = new TarArchiveEntry(path); | final TarArchiveEntry entry = new TarArchiveEntry(path); | ||||
if (mode == FileMode.TREE) { | if (mode == FileMode.TREE) { |
throws IOException { | throws IOException { | ||||
// ZipArchiveEntry detects directories by checking | // ZipArchiveEntry detects directories by checking | ||||
// for '/' at the end of the filename. | // for '/' at the end of the filename. | ||||
if (path.endsWith("/") && mode != FileMode.TREE) | |||||
if (path.endsWith("/") && mode != FileMode.TREE) //$NON-NLS-1$ | |||||
throw new IllegalArgumentException(MessageFormat.format( | throw new IllegalArgumentException(MessageFormat.format( | ||||
ArchiveText.get().pathDoesNotMatchMode, path, mode)); | ArchiveText.get().pathDoesNotMatchMode, path, mode)); | ||||
if (!path.endsWith("/") && mode == FileMode.TREE) | |||||
path = path + "/"; | |||||
if (!path.endsWith("/") && mode == FileMode.TREE) //$NON-NLS-1$ | |||||
path = path + "/"; //$NON-NLS-1$ | |||||
final ZipArchiveEntry entry = new ZipArchiveEntry(path); | final ZipArchiveEntry entry = new ZipArchiveEntry(path); | ||||
if (mode == FileMode.TREE) { | if (mode == FileMode.TREE) { |
mode = FileMode.TREE; | mode = FileMode.TREE; | ||||
if (mode == FileMode.TREE) { | if (mode == FileMode.TREE) { | ||||
fmt.putEntry(outa, name + "/", mode, null); | |||||
fmt.putEntry(outa, name + "/", mode, null); //$NON-NLS-1$ | |||||
continue; | continue; | ||||
} | } | ||||
walk.getObjectId(idBuf, 0); | walk.getObjectId(idBuf, 0); |
*/ | */ | ||||
public DeleteTree(final String entryPath) { | public DeleteTree(final String entryPath) { | ||||
super( | super( | ||||
(entryPath.endsWith("/") || entryPath.length() == 0) ? entryPath | |||||
: entryPath + "/"); | |||||
(entryPath.endsWith("/") || entryPath.length() == 0) ? entryPath //$NON-NLS-1$ | |||||
: entryPath + "/"); //$NON-NLS-1$ | |||||
} | } | ||||
public void apply(final DirCacheEntry ent) { | public void apply(final DirCacheEntry ent) { |
private static String findRef(String ref, Repository repo) | private static String findRef(String ref, Repository repo) | ||||
throws IOException { | throws IOException { | ||||
if (!ObjectId.isId(ref)) { | if (!ObjectId.isId(ref)) { | ||||
Ref r = repo.getRef( | |||||
Constants.DEFAULT_REMOTE_NAME + "/" + ref); | |||||
Ref r = repo.getRef(Constants.DEFAULT_REMOTE_NAME + "/" + ref); //$NON-NLS-1$ | |||||
if (r != null) | if (r != null) | ||||
return r.getName(); | return r.getName(); | ||||
} | } |
throw err; | throw err; | ||||
} catch (SftpException je) { | } catch (SftpException je) { | ||||
throw new TransportException("Can't enter " + path + "/objects" | throw new TransportException("Can't enter " + path + "/objects" | ||||
+ ": " + je.getMessage(), je); | |||||
+ ": " + je.getMessage(), je); //$NON-NLS-1$ | |||||
} | } | ||||
} | } | ||||
throw err; | throw err; | ||||
} catch (SftpException je) { | } catch (SftpException je) { | ||||
throw new TransportException("Can't enter " + p + " from " | throw new TransportException("Can't enter " + p + " from " | ||||
+ parent.objectsPath + ": " + je.getMessage(), je); | |||||
+ parent.objectsPath + ": " + je.getMessage(), je); //$NON-NLS-1$ | |||||
} | } | ||||
} | } | ||||
} catch (SftpException je) { | } catch (SftpException je) { | ||||
if (je.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) | if (je.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) | ||||
throw new FileNotFoundException(path); | throw new FileNotFoundException(path); | ||||
throw new TransportException("Can't get " + objectsPath + "/" | |||||
+ path + ": " + je.getMessage(), je); | |||||
throw new TransportException("Can't get " + objectsPath + "/" //$NON-NLS-2$ | |||||
+ path + ": " + je.getMessage(), je); //$NON-NLS-1$ | |||||
} | } | ||||
} | } | ||||
if (je.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) | if (je.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) | ||||
return; | return; | ||||
throw new TransportException("Can't delete " + objectsPath | throw new TransportException("Can't delete " + objectsPath | ||||
+ "/" + path + ": " + je.getMessage(), je); | |||||
+ "/" + path + ": " + je.getMessage(), je); //$NON-NLS-1$//$NON-NLS-2$ | |||||
} | } | ||||
// Prune any now empty directories. | // Prune any now empty directories. | ||||
} | } | ||||
} | } | ||||
throw new TransportException("Can't write " + objectsPath + "/" | |||||
+ path + ": " + je.getMessage(), je); | |||||
throw new TransportException("Can't write " + objectsPath + "/" //$NON-NLS-2$ | |||||
+ path + ": " + je.getMessage(), je); //$NON-NLS-1$ | |||||
} | } | ||||
} | } | ||||
ftp.rename(lock, path); | ftp.rename(lock, path); | ||||
} catch (SftpException je) { | } catch (SftpException je) { | ||||
throw new TransportException("Can't write " + objectsPath | throw new TransportException("Can't write " + objectsPath | ||||
+ "/" + path + ": " + je.getMessage(), je); | |||||
+ "/" + path + ": " + je.getMessage(), je); //$NON-NLS-1$//$NON-NLS-2$ | |||||
} | } | ||||
} catch (IOException err) { | } catch (IOException err) { | ||||
try { | try { | ||||
return avail; | return avail; | ||||
} | } | ||||
@SuppressWarnings("unchecked") | |||||
private void readLooseRefs(final TreeMap<String, Ref> avail, | private void readLooseRefs(final TreeMap<String, Ref> avail, | ||||
final String dir, final String prefix) | final String dir, final String prefix) | ||||
throws TransportException { | throws TransportException { | ||||
try { | try { | ||||
list = ftp.ls(dir); | list = ftp.ls(dir); | ||||
} catch (SftpException je) { | } catch (SftpException je) { | ||||
throw new TransportException("Can't ls " + objectsPath + "/" | |||||
+ dir + ": " + je.getMessage(), je); | |||||
throw new TransportException("Can't ls " + objectsPath + "/" //$NON-NLS-2$ | |||||
+ dir + ": " + je.getMessage(), je); //$NON-NLS-1$ | |||||
} | } | ||||
for (final ChannelSftp.LsEntry ent : list) { | for (final ChannelSftp.LsEntry ent : list) { | ||||
} catch (FileNotFoundException noRef) { | } catch (FileNotFoundException noRef) { | ||||
return null; | return null; | ||||
} catch (IOException err) { | } catch (IOException err) { | ||||
throw new TransportException("Cannot read " + objectsPath + "/" | |||||
+ path + ": " + err.getMessage(), err); | |||||
throw new TransportException("Cannot read " + objectsPath + "/" //$NON-NLS-2$ | |||||
+ path + ": " + err.getMessage(), err); //$NON-NLS-1$ | |||||
} | } | ||||
if (line == null) | if (line == null) | ||||
return r; | return r; | ||||
} | } | ||||
throw new TransportException("Bad ref: " + name + ": " + line); | |||||
throw new TransportException("Bad ref: " + name + ": " + line); //$NON-NLS-2$ | |||||
} | } | ||||
private Storage loose(final Ref r) { | private Storage loose(final Ref r) { |
final String host = c.getURL().getHost(); | final String host = c.getURL().getHost(); | ||||
// The standard J2SE error message is not very useful. | // The standard J2SE error message is not very useful. | ||||
// | // | ||||
if ("Connection timed out: connect".equals(ce.getMessage())) | |||||
if ("Connection timed out: connect".equals(ce.getMessage())) //$NON-NLS-1$ | |||||
throw new ConnectException(MessageFormat.format(JGitText.get().connectionTimeOut, host)); | throw new ConnectException(MessageFormat.format(JGitText.get().connectionTimeOut, host)); | ||||
throw new ConnectException(ce.getMessage() + " " + host); //$NON-NLS-1$ | throw new ConnectException(ce.getMessage() + " " + host); //$NON-NLS-1$ | ||||
} | } | ||||
final String host = c.getURL().getHost(); | final String host = c.getURL().getHost(); | ||||
// The standard J2SE error message is not very useful. | // The standard J2SE error message is not very useful. | ||||
// | // | ||||
if ("Connection timed out: connect".equals(ce.getMessage())) | |||||
if ("Connection timed out: connect".equals(ce.getMessage())) //$NON-NLS-1$ | |||||
throw new ConnectException(MessageFormat.format( | throw new ConnectException(MessageFormat.format( | ||||
JGitText.get().connectionTimeOut, host)); | JGitText.get().connectionTimeOut, host)); | ||||
throw new ConnectException(ce.getMessage() + " " + host); //$NON-NLS-1$ | throw new ConnectException(ce.getMessage() + " " + host); //$NON-NLS-1$ |