diff --git a/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/GitArtifact.java b/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/GitArtifact.java index 650c6e5..e78f2ae 100644 --- a/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/GitArtifact.java +++ b/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/GitArtifact.java @@ -82,8 +82,8 @@ public InputStream getContents() throws CoreException { .openStream(); } catch (Exception e) { e.printStackTrace(); - throw new CoreException(new Status(IStatus.ERROR, GitConnector.PLUGIN_ID, - e.getMessage())); + throw new CoreException( + new Status(IStatus.ERROR, GitConnector.PLUGIN_ID, e.getMessage())); } } }; diff --git a/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/LazyChangeSet.java b/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/LazyChangeSet.java index 5cdfd9b..700ac46 100644 --- a/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/LazyChangeSet.java +++ b/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/LazyChangeSet.java @@ -66,8 +66,8 @@ private void fetchChanges() { Repository repository = scmRepository.getRepository(); RevWalk walk = new RevWalk(repository); - delegate.addAll(((GitConnector) scmRepository.getConnector()).diffCommit(scmRepository, repository, walk, - commit)); + delegate.addAll( + ((GitConnector) scmRepository.getConnector()).diffCommit(scmRepository, repository, walk, commit)); } catch (IOException e) { e.printStackTrace(); // TODO: handle exception diff --git a/org.eclipse.mylyn.git.ui/src/org/eclipse/mylyn/internal/git/ui/GetChangeSetDialog.java b/org.eclipse.mylyn.git.ui/src/org/eclipse/mylyn/internal/git/ui/GetChangeSetDialog.java index 817361c..26fcb76 100644 --- a/org.eclipse.mylyn.git.ui/src/org/eclipse/mylyn/internal/git/ui/GetChangeSetDialog.java +++ b/org.eclipse.mylyn.git.ui/src/org/eclipse/mylyn/internal/git/ui/GetChangeSetDialog.java @@ -307,8 +307,9 @@ protected void populateNextChangeSets() { } if (repoProject != null && repoProject.equals(inputProject.getName())) { String[] tokens = updatedChangeSet.getMessage().split(GIT_NEWLINE, 2); - commitList.add((tokens[0].length() > DIALOG_COMBO_MAX_CHARACTERS) ? tokens[0].substring(0, - DIALOG_COMBO_MAX_CHARACTERS - 3) + "..." : tokens[0]); + commitList.add((tokens[0].length() > DIALOG_COMBO_MAX_CHARACTERS) + ? tokens[0].substring(0, DIALOG_COMBO_MAX_CHARACTERS - 3) + "..." + : tokens[0]); filteredChangeSets.add(updatedChangeSet); currentCommitListIndex++; @@ -379,9 +380,8 @@ public void expansionStateChanged(ExpansionEvent e) { // Author Name final Label authorNameLabel = aToolkit.createLabel(basicSectionClient, "Author Name: ", SWT.WRAP); authorNameLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false)); - authorNameText = aToolkit.createLabel(basicSectionClient, selectedChangeSet == null - ? "" - : selectedChangeSet.getAuthor().getName(), SWT.NONE); + authorNameText = aToolkit.createLabel(basicSectionClient, + selectedChangeSet == null ? "" : selectedChangeSet.getAuthor().getName(), SWT.NONE); textGridData = new GridData(GridData.FILL, GridData.FILL, true, false); textGridData.horizontalSpan = 3; authorNameText.setLayoutData(textGridData); @@ -389,9 +389,8 @@ public void expansionStateChanged(ExpansionEvent e) { // Author Email final Label authorEmailLabel = aToolkit.createLabel(basicSectionClient, "Author Email: ", SWT.WRAP); authorEmailLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false)); - authorEmailText = aToolkit.createLabel(basicSectionClient, selectedChangeSet == null - ? "" - : selectedChangeSet.getAuthor().getEmail(), SWT.NONE); + authorEmailText = aToolkit.createLabel(basicSectionClient, + selectedChangeSet == null ? "" : selectedChangeSet.getAuthor().getEmail(), SWT.NONE); textGridData = new GridData(GridData.FILL, GridData.FILL, true, false); textGridData.horizontalSpan = 3; authorEmailText.setLayoutData(textGridData); @@ -408,9 +407,8 @@ public void expansionStateChanged(ExpansionEvent e) { // Repository Name final Label messageLabel = aToolkit.createLabel(basicSectionClient, "Repository: ", SWT.WRAP); messageLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false)); - repositoryNameText = aToolkit.createLabel(basicSectionClient, selectedChangeSet == null - ? "" - : selectedChangeSet.getRepository().getName(), SWT.NONE); + repositoryNameText = aToolkit.createLabel(basicSectionClient, + selectedChangeSet == null ? "" : selectedChangeSet.getRepository().getName(), SWT.NONE); textGridData = new GridData(GridData.FILL, GridData.FILL, true, false); textGridData.horizontalSpan = 3; repositoryNameText.setLayoutData(textGridData); diff --git a/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseArtifact.java b/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseArtifact.java index 4ef3e3f..26ad254 100644 --- a/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseArtifact.java +++ b/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseArtifact.java @@ -208,7 +208,8 @@ private ISVNRemoteResource resolveRemoteResource(IProgressMonitor monitor, ISVNR return resource; } - private IStorage resolveStorage(IProgressMonitor monitor, Long revNo, ISVNRepositoryLocation location, String path) { + private IStorage resolveStorage(IProgressMonitor monitor, Long revNo, ISVNRepositoryLocation location, + String path) { try { final SVNRevision revision = new SVNRevision.Number(revNo.longValue()); diff --git a/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseConnector.java b/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseConnector.java index 1b57a21..7c69ed3 100644 --- a/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseConnector.java +++ b/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseConnector.java @@ -208,8 +208,8 @@ private List buildChanges(SubclipseRepository repository, ISVNLogMessage oldArtifact = resolveBaseArtifact(repository, newArtifact.getRepositoryURL(), sRevision, isvnLogMessageChangePath, ctype); } catch (MalformedURLException e) { - logger.log(new Status(IStatus.ERROR, SubclipseCorePlugin.PLUGIN_ID, - "Error resolving an artifact url" //$NON-NLS-1$ + logger.log( + new Status(IStatus.ERROR, SubclipseCorePlugin.PLUGIN_ID, "Error resolving an artifact url" //$NON-NLS-1$ + isvnLogMessageChangePath.getPath(), e)); } @@ -237,8 +237,8 @@ public List getChangeSets(ScmRepository repository, IProgressMonitor //TODO: retrieving all revisions per project repository can take really long time, //need to discuss API to narrow down the list e.g. return an iterator //For the time being we limit the possibility to review commits within the last 20 - ISVNLogMessage[] messages = resolveChangeSets(repo, repo.getProjectSVNFolder(), SVNRevision.HEAD, - firstRevision, false, 20L); + ISVNLogMessage[] messages = resolveChangeSets(repo, repo.getProjectSVNFolder(), SVNRevision.HEAD, firstRevision, + false, 20L); //Convert the messages to ChangeSet List changeSets = new ArrayList(messages.length); @@ -412,7 +412,8 @@ private SubclipseArtifact resolveBaseArtifact(SubclipseRepository repo, SVNUrl p //Resolve the previous commit where this file took part ISVNLogMessage[] filePreviousCommits = null; boolean fetchChangePaths = true; - filePreviousCommits = resolveChangeSets(repo, pathUrl, sRevision, eRevision, fetchChangePaths, Long.valueOf(2L)); + filePreviousCommits = resolveChangeSets(repo, pathUrl, sRevision, eRevision, fetchChangePaths, + Long.valueOf(2L)); String revisionId = null; if (filePreviousCommits != null && filePreviousCommits.length > 1) { @@ -569,8 +570,8 @@ public void run() { try { //Resolve the changes for the max chunk size - msgList = resolveChangeSets(repo, repo.getProjectSVNFolder(), startRevision, earliestRevision, - true, CHUNKSIZE); + msgList = resolveChangeSets(repo, repo.getProjectSVNFolder(), startRevision, earliestRevision, true, + CHUNKSIZE); //adapt to ChangeSet int size = msgList.length; diff --git a/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseRepository.java b/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseRepository.java index e490bde..e98f368 100644 --- a/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseRepository.java +++ b/org.eclipse.mylyn.subclipse.core/src/org/eclipse/mylyn/internal/subclipse/core/SubclipseRepository.java @@ -26,7 +26,8 @@ public class SubclipseRepository extends ScmRepository { private final SVNUrl folderUrlStr; - public SubclipseRepository(SubclipseConnector connector, ISVNRepositoryLocation location, IProject aSelectedProject) { + public SubclipseRepository(SubclipseConnector connector, ISVNRepositoryLocation location, + IProject aSelectedProject) { this.location = location; setName(location.getLocation()); setUrl(location.getUrl().toString()); diff --git a/org.eclipse.mylyn.subclipse.ui/src/org/eclipse/mylyn/internal/subclipse/ui/GetChangeSetDialog.java b/org.eclipse.mylyn.subclipse.ui/src/org/eclipse/mylyn/internal/subclipse/ui/GetChangeSetDialog.java index 9a88824..6c941ab 100644 --- a/org.eclipse.mylyn.subclipse.ui/src/org/eclipse/mylyn/internal/subclipse/ui/GetChangeSetDialog.java +++ b/org.eclipse.mylyn.subclipse.ui/src/org/eclipse/mylyn/internal/subclipse/ui/GetChangeSetDialog.java @@ -258,8 +258,8 @@ public void widgetSelected(SelectionEvent e) { try { populateNextChangeSets(); } catch (CoreException e1) { - StatusHandler.log(new Status(IStatus.ERROR, SVNConnectorUi.ID_PLUGIN, IStatus.OK, - e.toString(), e1)); + StatusHandler.log( + new Status(IStatus.ERROR, SVNConnectorUi.ID_PLUGIN, IStatus.OK, e.toString(), e1)); return; } commitList.select(selectedIndex); @@ -317,8 +317,9 @@ protected void populateNextChangeSets() throws CoreException { } if (repoProject != null && repoProject.equals(inputProject.getName())) { String[] tokens = updatedChangeSet.getMessage().split(NEWLINE, 2); - commitList.add((tokens[0].length() > DIALOG_COMBO_MAX_CHARACTERS) ? tokens[0].substring(0, - DIALOG_COMBO_MAX_CHARACTERS - 3) + "..." : tokens[0]); + commitList.add((tokens[0].length() > DIALOG_COMBO_MAX_CHARACTERS) + ? tokens[0].substring(0, DIALOG_COMBO_MAX_CHARACTERS - 3) + "..." + : tokens[0]); filteredChangeSets.add(updatedChangeSet); addedCount++; diff --git a/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/ProjectSetConverter.java b/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/ProjectSetConverter.java index 0ae3d32..40fe704 100644 --- a/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/ProjectSetConverter.java +++ b/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/ProjectSetConverter.java @@ -108,8 +108,8 @@ public int compare(IProject o1, IProject o2) { xmlMemento.save(writer); return output; } catch (Exception e) { - throw new CoreException(new Status(IStatus.ERROR, ScmInternal.ID_PLUGIN, - "Unexpected error exporting project sets.", e)); //$NON-NLS-1$ + throw new CoreException( + new Status(IStatus.ERROR, ScmInternal.ID_PLUGIN, "Unexpected error exporting project sets.", e)); //$NON-NLS-1$ } finally { if (writer != null) { try { @@ -142,8 +142,8 @@ public static List readProjectReferences(InputStream input, RepositoryPr } return referenceStrings; } catch (Exception e) { - throw new CoreException(new Status(IStatus.ERROR, ScmInternal.ID_PLUGIN, - "Unexpected error reading project sets.", e)); //$NON-NLS-1$ + throw new CoreException( + new Status(IStatus.ERROR, ScmInternal.ID_PLUGIN, "Unexpected error reading project sets.", e)); //$NON-NLS-1$ } } @@ -155,14 +155,14 @@ private static XmlMemento getXMLMementoRoot() throws ParserConfigurationExceptio return new XmlMemento(document, element); } - private static XmlMemento[] importProjectSet(InputStream input) throws UnsupportedEncodingException, - InvocationTargetException { + private static XmlMemento[] importProjectSet(InputStream input) + throws UnsupportedEncodingException, InvocationTargetException { XmlMemento xmlMemento = parseStream(input); return xmlMemento.getChildren("provider"); //$NON-NLS-1$ } - private static XmlMemento parseStream(InputStream input) throws InvocationTargetException, - UnsupportedEncodingException { + private static XmlMemento parseStream(InputStream input) + throws InvocationTargetException, UnsupportedEncodingException { InputStreamReader reader = new InputStreamReader(input, "UTF-8"); //$NON-NLS-1$ try { return XmlMemento.createReadRoot(reader); diff --git a/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/ScmCore.java b/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/ScmCore.java index f7789eb..149f26b 100644 --- a/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/ScmCore.java +++ b/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/ScmCore.java @@ -117,19 +117,15 @@ private static ScmConnector loadConnector(String id) { if (object instanceof ScmConnector) { return (ScmConnector) object; } else { - result.add(new Status( - IStatus.ERROR, - ScmInternal.ID_PLUGIN, - NLS.bind( - "Connector core ''{0}'' does not extend expected class for extension contributed by {1}", //$NON-NLS-1$ - object.getClass().getCanonicalName(), element.getContributor().getName()))); + result.add(new Status(IStatus.ERROR, ScmInternal.ID_PLUGIN, NLS.bind( + "Connector core ''{0}'' does not extend expected class for extension contributed by {1}", //$NON-NLS-1$ + object.getClass().getCanonicalName(), element.getContributor().getName()))); } } catch (Throwable e) { - result.add(new Status( - IStatus.ERROR, - ScmInternal.ID_PLUGIN, - NLS.bind( - "Connector core failed to load for extension contributed by {0}", element.getContributor().getName()), e)); //$NON-NLS-1$ + result.add(new Status(IStatus.ERROR, ScmInternal.ID_PLUGIN, + NLS.bind("Connector core failed to load for extension contributed by {0}", //$NON-NLS-1$ + element.getContributor().getName()), + e)); } } } diff --git a/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/spi/ScmResourceArtifact.java b/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/spi/ScmResourceArtifact.java index 68186e5..bae0277 100644 --- a/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/spi/ScmResourceArtifact.java +++ b/org.eclipse.mylyn.versions.core/src/org/eclipse/mylyn/versions/core/spi/ScmResourceArtifact.java @@ -48,8 +48,8 @@ public IFileRevision getFileRevision(IProgressMonitor monitor) { public IFileHistory getFileHistory(IProgressMonitor monitor) { RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject(), connector.getProviderId()); - IFileHistory history = provider.getFileHistoryProvider().getFileHistoryFor(resource, IFileHistoryProvider.NONE, - monitor); + IFileHistory history = provider.getFileHistoryProvider() + .getFileHistoryFor(resource, IFileHistoryProvider.NONE, monitor); return history; } diff --git a/org.eclipse.mylyn.versions.tests/src/org/eclipse/mylyn/versions/core/ScmCoreTest.java b/org.eclipse.mylyn.versions.tests/src/org/eclipse/mylyn/versions/core/ScmCoreTest.java index 0fc4437..7cb0685 100644 --- a/org.eclipse.mylyn.versions.tests/src/org/eclipse/mylyn/versions/core/ScmCoreTest.java +++ b/org.eclipse.mylyn.versions.tests/src/org/eclipse/mylyn/versions/core/ScmCoreTest.java @@ -70,12 +70,10 @@ public void testGetResourcePathChild() throws Exception { .getRoot() .findMember("/project1/src/org/eclipse/mylar/tests/project1/Project1Plugin.java"); - assertEquals( - expectedResource, - ScmCore.findResource("/root/level1/level2/project1/src/org/eclipse/mylar/tests/project1/Project1Plugin.java")); - assertEquals( - expectedResource, - ScmCore.findResource("root/level1/level2/project1/src/org/eclipse/mylar/tests/project1/Project1Plugin.java")); + assertEquals(expectedResource, ScmCore + .findResource("/root/level1/level2/project1/src/org/eclipse/mylar/tests/project1/Project1Plugin.java")); + assertEquals(expectedResource, ScmCore + .findResource("root/level1/level2/project1/src/org/eclipse/mylar/tests/project1/Project1Plugin.java")); } @@ -88,7 +86,8 @@ public void testGetResourceFromProject() throws Exception { assertEquals(expectedResource, ScmCore.findResource("/src/org/eclipse/mylar/tests/project2/Project2Plugin.java")); - assertEquals(expectedResource, ScmCore.findResource("src/org/eclipse/mylar/tests/project2/Project2Plugin.java")); + assertEquals(expectedResource, + ScmCore.findResource("src/org/eclipse/mylar/tests/project2/Project2Plugin.java")); } @Test diff --git a/org.eclipse.mylyn.versions.ui/src/org/eclipse/mylyn/versions/ui/ScmUi.java b/org.eclipse.mylyn.versions.ui/src/org/eclipse/mylyn/versions/ui/ScmUi.java index c5693f7..bc9da05 100644 --- a/org.eclipse.mylyn.versions.ui/src/org/eclipse/mylyn/versions/ui/ScmUi.java +++ b/org.eclipse.mylyn.versions.ui/src/org/eclipse/mylyn/versions/ui/ScmUi.java @@ -182,19 +182,15 @@ private static ScmConnectorUi loadConnector(String id) { if (object instanceof ScmConnectorUi) { return (ScmConnectorUi) object; } else { - result.add(new Status( - IStatus.ERROR, - ScmUi.ID_PLUGIN, - NLS.bind( - "Connector ui ''{0}'' does not extend expected class for extension contributed by {1}", //$NON-NLS-1$ - object.getClass().getCanonicalName(), element.getContributor().getName()))); + result.add(new Status(IStatus.ERROR, ScmUi.ID_PLUGIN, NLS.bind( + "Connector ui ''{0}'' does not extend expected class for extension contributed by {1}", //$NON-NLS-1$ + object.getClass().getCanonicalName(), element.getContributor().getName()))); } } catch (Throwable e) { - result.add(new Status( - IStatus.ERROR, - ScmUi.ID_PLUGIN, - NLS.bind( - "Connector core failed to load for extension contributed by {0}", element.getContributor().getName()), e)); //$NON-NLS-1$ + result.add(new Status(IStatus.ERROR, ScmUi.ID_PLUGIN, + NLS.bind("Connector core failed to load for extension contributed by {0}", //$NON-NLS-1$ + element.getContributor().getName()), + e)); } } }