Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

remove redundant nullcheck

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-10-30 08:15:57 +01:00
parent 61361f8b87
commit 9e7e8a3f40
1 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
View File

@@ -30,6 +30,7 @@
*/ */
package sonia.scm.repository; package sonia.scm.repository;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
@@ -92,7 +93,7 @@ public abstract class AbstactImportHandler implements ImportHandler
*/ */
@Override @Override
public List<String> importRepositories(RepositoryManager manager) public List<String> importRepositories(RepositoryManager manager)
throws IOException, RepositoryException throws IOException, RepositoryException
{ {
List<String> imported = new ArrayList<String>(); List<String> imported = new ArrayList<String>();
@@ -116,10 +117,8 @@ public abstract class AbstactImportHandler implements ImportHandler
if (repository == null) if (repository == null)
{ {
if (importRepository(manager, repositoryName)) importRepository(manager, repositoryName);
{ imported.add(repositoryName);
imported.add(repositoryName);
}
} }
else if (logger.isDebugEnabled()) else if (logger.isDebugEnabled())
{ {
@@ -143,8 +142,8 @@ public abstract class AbstactImportHandler implements ImportHandler
* @throws RepositoryException * @throws RepositoryException
*/ */
protected Repository createRepository(File repositoryDirectory, protected Repository createRepository(File repositoryDirectory,
String repositoryName) String repositoryName)
throws IOException, RepositoryException throws IOException, RepositoryException
{ {
Repository repository = new Repository(); Repository repository = new Repository();
@@ -167,31 +166,20 @@ public abstract class AbstactImportHandler implements ImportHandler
* @throws IOException * @throws IOException
* @throws RepositoryException * @throws RepositoryException
*/ */
private boolean importRepository(RepositoryManager manager, private void importRepository(RepositoryManager manager,
String repositoryName) String repositoryName)
throws IOException, RepositoryException throws IOException, RepositoryException
{ {
boolean result = false;
Repository repository = Repository repository =
createRepository(getRepositoryDirectory(repositoryName), repositoryName); createRepository(getRepositoryDirectory(repositoryName), repositoryName);
if (repository != null) if (logger.isInfoEnabled())
{ {
if (logger.isInfoEnabled()) logger.info("import repository {} of type {}", repositoryName,
{ getTypeName());
logger.info("import repository {} of type {}", repositoryName,
getTypeName());
}
manager.importRepository(repository);
result = true;
}
else if (logger.isWarnEnabled())
{
logger.warn("could not create repository object for {}", repositoryName);
} }
return result; manager.importRepository(repository);
} }
//~--- get methods ---------------------------------------------------------- //~--- get methods ----------------------------------------------------------
@@ -207,8 +195,8 @@ public abstract class AbstactImportHandler implements ImportHandler
private File getRepositoryDirectory(String repositoryName) private File getRepositoryDirectory(String repositoryName)
{ {
return new File( return new File(
getRepositoryHandler().getConfig().getRepositoryDirectory(), getRepositoryHandler().getConfig().getRepositoryDirectory(),
repositoryName); repositoryName);
} }
/** /**