Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Pazderski2019-05-18 14:07:38 +0000
committerPaul Pazderski2019-05-19 23:54:17 +0000
commitde3c0c5ff08c928e6d1eb4fac2704bbb2d261669 (patch)
treede6e0a11c45731a312b5e239c22387afe93fe19c /bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions
parent5e9e26b1abe5bd1df37faa91fde2d87fd79ed06b (diff)
downloadeclipse.platform.team-R4_12_maintenance.tar.gz
eclipse.platform.team-R4_12_maintenance.tar.xz
eclipse.platform.team-R4_12_maintenance.zip
This change fixes space or mixed tab/space indentations in all Java files. This also includes two or three space indentations and even fix most stray single spaces in indentations. The change includes only whitespace formatting and no code changes. Change-Id: I4149aaf4e48ccf7b49083f36d52e0c7a67433c7d
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions')
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java66
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java130
3 files changed, 100 insertions, 100 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java
index c0326ad6b..447d6d50a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/CompareRevisionAction.java
@@ -93,7 +93,7 @@ public class CompareRevisionAction extends BaseSelectionListenerAction {
}
if (file1 == null || file2 == null ||
- !file1.exists() || !file2.exists()){
+ !file1.exists() || !file2.exists()){
MessageDialog.openError(page.getSite().getShell(), TeamUIMessages.OpenRevisionAction_DeletedRevTitle, TeamUIMessages.CompareRevisionAction_DeleteCompareMessage);
return;
}
@@ -113,7 +113,7 @@ public class CompareRevisionAction extends BaseSelectionListenerAction {
}
ITypedElement right = new FileRevisionTypedElement(file2, getLocalEncoding());
- openInCompare(left, right);
+ openInCompare(left, right);
}
private String getLocalEncoding() {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java
index 21a704b83..7bfa52c38 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java
@@ -43,53 +43,53 @@ public class JobRunnableContext implements ITeamRunnableContext {
* that subclasses can do belongsTo family checking.
*/
public interface IContextJob {
- IRunnableWithProgress getRunnable();
+ IRunnableWithProgress getRunnable();
}
/*
* Class that provides a basic job (i.e. no resource specific interactions)
*/
private class BasicJob extends Job implements IContextJob {
- private final IRunnableWithProgress runnable;
- public BasicJob(String name, IRunnableWithProgress runnable) {
- super(name);
- this.runnable = runnable;
- }
- @Override
+ private final IRunnableWithProgress runnable;
+ public BasicJob(String name, IRunnableWithProgress runnable) {
+ super(name);
+ this.runnable = runnable;
+ }
+ @Override
public IStatus run(IProgressMonitor monitor) {
return JobRunnableContext.this.run(runnable, monitor);
}
@Override
public boolean belongsTo(Object family) {
- return JobRunnableContext.this.belongsTo(this, family);
+ return JobRunnableContext.this.belongsTo(this, family);
}
- @Override
+ @Override
public IRunnableWithProgress getRunnable() {
- return runnable;
- }
+ return runnable;
+ }
}
/*
* Class that provides a resource job (i.e. resource specific interactions)
*/
private class ResourceJob extends WorkspaceJob implements IContextJob {
- private final IRunnableWithProgress runnable;
- public ResourceJob(String name, IRunnableWithProgress runnable) {
- super(name);
- this.runnable = runnable;
- }
- @Override
+ private final IRunnableWithProgress runnable;
+ public ResourceJob(String name, IRunnableWithProgress runnable) {
+ super(name);
+ this.runnable = runnable;
+ }
+ @Override
public IStatus runInWorkspace(IProgressMonitor monitor) {
return JobRunnableContext.this.run(runnable, monitor);
}
@Override
public boolean belongsTo(Object family) {
- return JobRunnableContext.this.belongsTo(this, family);
+ return JobRunnableContext.this.belongsTo(this, family);
}
- @Override
+ @Override
public IRunnableWithProgress getRunnable() {
- return runnable;
- }
+ return runnable;
+ }
}
public JobRunnableContext(String jobName, IJobChangeListener listener, IWorkbenchSite site) {
this.jobName = jobName;
@@ -122,7 +122,7 @@ public class JobRunnableContext implements ITeamRunnableContext {
if (schedulingRule != null) {
job.setRule(schedulingRule);
}
- job.setUser(isUser());
+ job.setUser(isUser());
}
/**
@@ -165,19 +165,19 @@ public class JobRunnableContext implements ITeamRunnableContext {
* Return the completions status for the job.
* By default, <code>Status.OK_STATUS</code>
* is returned.
- * @return the completions status for the job
- */
- protected IStatus getCompletionStatus() {
- return Status.OK_STATUS;
- }
+ * @return the completions status for the job
+ */
+ protected IStatus getCompletionStatus() {
+ return Status.OK_STATUS;
+ }
- /**
+ /**
* Return whether the job for this context is in the given family.
* By default, <code>false</code> is returned. Subclasses may override.
- * @param family the job family being queried
- */
- protected boolean belongsTo(IContextJob job, Object family) {
- return false;
- }
+ * @param family the job family being queried
+ */
+ protected boolean belongsTo(IContextJob job, Object family) {
+ return false;
+ }
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
index bab147fd1..a4f627bca 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
@@ -228,44 +228,44 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio
}
/**
- * Return the selected resource mappins that contain resources in
- * projects that are associated with a repository of the given id.
- * @param providerId the repository provider id
- * @return the resource mappings that contain resources associated with the given provider
+ * Return the selected resource mappins that contain resources in
+ * projects that are associated with a repository of the given id.
+ * @param providerId the repository provider id
+ * @return the resource mappings that contain resources associated with the given provider
*/
- protected ResourceMapping[] getSelectedResourceMappings(String providerId) {
- Object[] elements = getSelection().toArray();
- ArrayList<ResourceMapping> providerMappings = new ArrayList<>();
- for (int i = 0; i < elements.length; i++) {
- Object object = elements[i];
- Object adapted = getResourceMapping(object);
- if (adapted instanceof ResourceMapping) {
- ResourceMapping mapping = (ResourceMapping) adapted;
- if (providerId == null || isMappedToProvider(mapping, providerId)) {
- providerMappings.add(mapping);
- }
- }
- }
- return providerMappings.toArray(new ResourceMapping[providerMappings.size()]);
- }
-
- private Object getResourceMapping(Object object) {
- if (object instanceof ResourceMapping)
- return object;
- return Utils.getResourceMapping(object);
- }
-
- private boolean isMappedToProvider(ResourceMapping element, String providerId) {
- IProject[] projects = element.getProjects();
- for (int k = 0; k < projects.length; k++) {
- IProject project = projects[k];
- RepositoryProvider provider = RepositoryProvider.getProvider(project);
- if (provider != null && provider.getID().equals(providerId)) {
- return true;
- }
- }
- return false;
- }
+ protected ResourceMapping[] getSelectedResourceMappings(String providerId) {
+ Object[] elements = getSelection().toArray();
+ ArrayList<ResourceMapping> providerMappings = new ArrayList<>();
+ for (int i = 0; i < elements.length; i++) {
+ Object object = elements[i];
+ Object adapted = getResourceMapping(object);
+ if (adapted instanceof ResourceMapping) {
+ ResourceMapping mapping = (ResourceMapping) adapted;
+ if (providerId == null || isMappedToProvider(mapping, providerId)) {
+ providerMappings.add(mapping);
+ }
+ }
+ }
+ return providerMappings.toArray(new ResourceMapping[providerMappings.size()]);
+ }
+
+ private Object getResourceMapping(Object object) {
+ if (object instanceof ResourceMapping)
+ return object;
+ return Utils.getResourceMapping(object);
+ }
+
+ private boolean isMappedToProvider(ResourceMapping element, String providerId) {
+ IProject[] projects = element.getProjects();
+ for (int k = 0; k < projects.length; k++) {
+ IProject project = projects[k];
+ RepositoryProvider provider = RepositoryProvider.getProvider(project);
+ if (provider != null && provider.getID().equals(providerId)) {
+ return true;
+ }
+ }
+ return false;
+ }
/**
* Convenience method for getting the current shell.
@@ -276,7 +276,7 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio
if (shell != null) {
return shell;
} else if (targetPart != null) {
- return targetPart.getSite().getShell();
+ return targetPart.getSite().getShell();
} else if (window != null) {
return window.getShell();
} else {
@@ -413,13 +413,13 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio
* @return IWorkbenchPart
*/
protected IWorkbenchPart getTargetPart() {
- if(targetPart == null) {
- IWorkbenchPage page = TeamUIPlugin.getActivePage();
- if (page != null) {
- targetPart = page.getActivePart();
- }
- }
- return targetPart;
+ if(targetPart == null) {
+ IWorkbenchPage page = TeamUIPlugin.getActivePage();
+ if (page != null) {
+ targetPart = page.getActivePart();
+ }
+ }
+ return targetPart;
}
@@ -478,10 +478,10 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio
targetPartListener = null;
}
// Don't hold on to anything when we are disposed to prevent memory leaks (see bug 195521)
- selection = null;
- window = null;
- targetPart = null;
- shell = null;
+ selection = null;
+ window = null;
+ targetPart = null;
+ shell = null;
}
/**
@@ -573,24 +573,24 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio
handle(e, TeamUIMessages.TeamAction_errorTitle, null);
}
- /**
- * The <code>TeamAction</code> implementation of this
- * <code>IActionDelegate2</code> method does nothing. Subclasses may
- * reimplement.
- */
- @Override
+ /**
+ * The <code>TeamAction</code> implementation of this
+ * <code>IActionDelegate2</code> method does nothing. Subclasses may
+ * reimplement.
+ */
+ @Override
public void init(IAction action) {
- }
-
- /**
- * The <code>TeamAction</code> implementation of this
- * <code>IActionDelegate2</code> method redirects to the <code>run</code>
- * method. Subclasses may reimplement.
- */
- @Override
+ }
+
+ /**
+ * The <code>TeamAction</code> implementation of this
+ * <code>IActionDelegate2</code> method redirects to the <code>run</code>
+ * method. Subclasses may reimplement.
+ */
+ @Override
final public void runWithEvent(IAction action, Event event) {
- run(action);
- }
+ run(action);
+ }
@Override
public void setEnabled(Object evaluationContext) {

Back to the top