Perform clean code of team/bundles/org.eclipse.team.core

Author: eclipse-platform-bot

team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java

@@ -247,28 +247,32 @@ protected IProject[] confirmOverwrite(
 				existingProjects.add(eachProj);
 			}
 		}
-		if (existingProjects.isEmpty())
+		if (existingProjects.isEmpty()) {
 			return projects;
+		}
 
 		// Confirm the overwrite
 
 		IProject[] confirmed =
 			context.confirmOverwrite(
 				existingProjects.toArray(
 					new IProject[existingProjects.size()]));
-		if (confirmed == null)
+		if (confirmed == null) {
 			return null;
-		if (existingProjects.size() == confirmed.length)
+		}
+		if (existingProjects.size() == confirmed.length) {
 			return projects;
+		}
 
 		// Return the amended list of projects to be loaded
 
 		Collection<IProject> result = new ArrayList<>(projects.length);
 		result.addAll(Arrays.asList(projects));
 		result.removeAll(existingProjects);
 		for (IProject eachProj : confirmed) {
-			if (existingProjects.contains(eachProj))
+			if (existingProjects.contains(eachProj)) {
 				result.add(eachProj);
+			}
 		}
 		return result.toArray(new IProject[result.size()]);
 	}

team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java

@@ -131,16 +131,18 @@ public static void map(IProject project, String id) throws TeamException {
 				mappingLock.acquire();
 				RepositoryProvider existingProvider = null;
 
-				if(project.getPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY) != null)
+				if(project.getPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY) != null) {
 					existingProvider = getProvider(project);	// get the real one, not the nature one
+				}
 
 				//if we already have a provider, and its the same ID, we're ok
 				//if the ID's differ, unmap the existing.
 				if(existingProvider != null) {
-					if(existingProvider.getID().equals(id))
+					if(existingProvider.getID().equals(id)) {
 						return;	//nothing to do
-					else
+					} else {
 						unmap(project);
+					}
 				}
 
 				// Create the provider as a session property before adding the persistent
@@ -196,9 +198,10 @@ public static void map(IProject project, String id) throws TeamException {
 	private static RepositoryProvider mapNewProvider(final IProject project, final String id) throws TeamException {
 		final RepositoryProvider provider = newProvider(id); 	// instantiate via extension point
 
-		if(provider == null)
+		if(provider == null) {
 			throw new TeamException(
 					NLS.bind(Messages.RepositoryProvider_couldNotInstantiateProvider, project.getName(), id));
+		}
 
 		// validate that either the provider supports linked resources or the project has no linked resources
 		if (!provider.canHandleLinkedResourceURI()) {
@@ -207,17 +210,17 @@ private static RepositoryProvider mapNewProvider(final IProject project, final S
 					if (proxy.isLinked()) {
 						if (!provider.canHandleLinkedResources() ||
 								proxy.requestFullPath().segmentCount() > 2 ||
-								!EFS.SCHEME_FILE.equals(proxy.requestResource().getLocationURI().getScheme()))
+								!EFS.SCHEME_FILE.equals(proxy.requestResource().getLocationURI().getScheme())) {
 							throw new TeamException(new Status(IStatus.ERROR, TeamPlugin.ID,
 									IResourceStatus.LINKING_NOT_ALLOWED,
 									NLS.bind(Messages.RepositoryProvider_linkedURIsExist, project.getName(), id),
 									null));
+						}
 					}
 					return true;
 				}, IResource.NONE);
 			} catch (CoreException e) {
-				if (e instanceof TeamException) {
-					TeamException te = (TeamException) e;
+				if (e instanceof TeamException te) {
 					throw te;
 				}
 				throw new TeamException(e);
@@ -308,12 +311,16 @@ public static void unmap(IProject project) throws TeamException {
 							null);
 				}
 
-				if (provider != null) provider.deconfigure();
+				if (provider != null) {
+					provider.deconfigure();
+				}
 
 				project.setSessionProperty(TeamPlugin.PROVIDER_PROP_KEY, null);
 				project.setPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY, null);
 
-				if (provider != null) provider.deconfigured();
+				if (provider != null) {
+					provider.deconfigured();
+				}
 
 				//removing the nature would've caused project description delta, so trigger one
 				project.touch(null);
@@ -440,8 +447,9 @@ public IFileModificationValidator getFileModificationValidator() {
 	 */
 	public FileModificationValidator getFileModificationValidator2() {
 		final IFileModificationValidator fileModificationValidator = getFileModificationValidator();
-		if (fileModificationValidator == null)
+		if (fileModificationValidator == null) {
 			return null;
+		}
 		return new FileModificationValidator() {
 			@Override
 			public IStatus validateSave(IFile file) {
@@ -452,10 +460,11 @@ public IStatus validateEdit(IFile[] files,
 					FileModificationValidationContext context) {
 				// Extract the shell from the context in order to invoke the old API
 				Object shell;
-				if (context == null)
+				if (context == null) {
 					shell = null;
-				else
+				} else {
 					shell = context.getShell();
+				}
 				return fileModificationValidator.validateEdit(files, shell);
 			}
 		};
@@ -538,18 +547,21 @@ final public static RepositoryProvider getProvider(IProject project) {
 				//-----------------------------
 				//First, look for the session property
 				RepositoryProvider provider = lookupProviderProp(project);
-				if(provider != null)
+				if(provider != null) {
 					return provider;
+				}
 				// Do a quick check to see it the project is known to be unshared.
 				// This is done to avoid accessing the persistent property store
-				if (isMarkedAsUnshared(project))
+				if (isMarkedAsUnshared(project)) {
 					return null;
+				}
 
 				// -----------------------------
 				//Next, check if it has the ID as a persistent property, if yes then instantiate provider
 				String id = project.getPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY);
-				if(id != null)
+				if(id != null) {
 					return mapExistingProvider(project, id);
+				}
 
 				//Couldn't find using new method, fall back to lookup using natures for backwards compatibility
 				//-----------------------------
@@ -613,8 +625,9 @@ final public static RepositoryProvider getProvider(IProject project, String id)
 				}
 				// Do a quick check to see it the project is known to be unshared.
 				// This is done to avoid accessing the persistent property store
-				if (isMarkedAsUnshared(project))
+				if (isMarkedAsUnshared(project)) {
 					return null;
+				}
 
 				// There isn't one so check the persistent property
 				String existingID = project.getPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY);
@@ -635,8 +648,9 @@ final public static RepositoryProvider getProvider(IProject project, String id)
 				// if the nature id given is not in the team set then return
 				// null.
 				IProjectNatureDescriptor desc = ResourcesPlugin.getWorkspace().getNatureDescriptor(id);
-				if(desc == null) //for backwards compatibility, may not have any nature by that ID
+				if(desc == null) { //for backwards compatibility, may not have any nature by that ID
 					return null;
+				}
 
 				String[] setIds = desc.getNatureSetIds();
 				for (String setId : setIds) {
@@ -671,16 +685,22 @@ final public static RepositoryProvider getProvider(IProject project, String id)
 	 * @since 2.1
 	 */
 	public static boolean isShared(IProject project) {
-		if (!project.isAccessible()) return false;
+		if (!project.isAccessible()) {
+			return false;
+		}
 		try {
-			if (lookupProviderProp(project) != null) return true;
+			if (lookupProviderProp(project) != null) {
+				return true;
+			}
 			// Do a quick check to see it the project is known to be unshared.
 			// This is done to avoid accessing the persistent property store
-			if (isMarkedAsUnshared(project))
+			if (isMarkedAsUnshared(project)) {
 				return false;
+			}
 			boolean shared = project.getPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY) != null;
-			if (!shared)
+			if (!shared) {
 				markAsUnshared(project);
+			}
 			return shared;
 		} catch (CoreException e) {
 			TeamPlugin.log(e);
@@ -907,8 +927,9 @@ public IResourceRuleFactory getRuleFactory() {
 	 */
 	public final Subscriber getSubscriber() {
 		RepositoryProviderType type = RepositoryProviderType.getProviderType(getID());
-		if (type != null)
+		if (type != null) {
 			return type.getSubscriber();
+		}
 		return null;
 	}
 }

team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java

@@ -87,8 +87,9 @@ public RepositoryProviderType() {
 	public static RepositoryProviderType getProviderType(String id) {
 		RepositoryProviderType type = allProviderTypes.get(id);
 
-		if(type != null)
+		if(type != null) {
 			return type;
+		}
 
 		//If there isn't one in the table, we'll try to create one from the extension point
 		//Its possible that newProviderType() will return null, but in that case it will have also logged the error	so just return the result
@@ -107,8 +108,9 @@ public static RepositoryProviderType getProviderType(String id) {
 	 */
 	public static RepositoryProviderType getTypeForScheme(String scheme) {
 		for (RepositoryProviderType type : allProviderTypes.values()) {
-			if (type.getFileSystemScheme() != null && type.getFileSystemScheme().equals(scheme))
+			if (type.getFileSystemScheme() != null && type.getFileSystemScheme().equals(scheme)) {
 				return type;
+			}
 		}
 		return findProviderForScheme(scheme);
 	}

team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java

@@ -138,7 +138,9 @@ public static int getType(IStorage storage) {
 	 * @return whether the file should be ignored
 	 */
 	public static boolean isIgnoredHint(IResource resource) {
-		if (resource.isDerived()) return true;
+		if (resource.isDerived()) {
+			return true;
+		}
 		return matchesEnabledIgnore(resource);
 	}
 
@@ -150,7 +152,9 @@ public static boolean isIgnoredHint(IResource resource) {
 	 */
 	@Deprecated
 	public static boolean isIgnoredHint(IFile file) {
-		if (file.isDerived()) return true;
+		if (file.isDerived()) {
+			return true;
+		}
 		return matchesEnabledIgnore(file);
 	}
 
@@ -400,22 +404,29 @@ private static String collectContributingExtentionsToDisplay(
 	 * Reads global ignore preferences and populates globalIgnore
 	 */
 	private static void readIgnoreState() throws TeamException {
-		if (readBackwardCompatibleIgnoreState()) return;
+		if (readBackwardCompatibleIgnoreState()) {
+			return;
+		}
 		Preferences pref = TeamPlugin.getPlugin().getPluginPreferences();
-		if (!pref.contains(PREF_TEAM_IGNORES)) return;
+		if (!pref.contains(PREF_TEAM_IGNORES)) {
+			return;
+		}
 		pref.addPropertyChangeListener(event -> {
 			// when a property is changed, invalidate our cache so that
 			// properties will be recalculated.
-			if(event.getProperty().equals(PREF_TEAM_IGNORES))
+			if(event.getProperty().equals(PREF_TEAM_IGNORES)) {
 				globalIgnore = null;
+			}
 		});
 		String prefIgnores = pref.getString(PREF_TEAM_IGNORES);
 		StringTokenizer tok = new StringTokenizer(prefIgnores, PREF_TEAM_SEPARATOR);
 		String pattern, enabled;
 		try {
 			while (true) {
 				pattern = tok.nextToken();
-				if (pattern.length()==0) return;
+				if (pattern.length()==0) {
+					return;
+				}
 				enabled = tok.nextToken();
 				globalIgnore.put(pattern, Boolean.valueOf(enabled));
 			}
@@ -431,7 +442,9 @@ private static boolean readBackwardCompatibleIgnoreState() throws TeamException
 		String GLOBALIGNORE_FILE = ".globalIgnores"; //$NON-NLS-1$
 		IPath pluginStateLocation = TeamPlugin.getPlugin().getStateLocation().append(GLOBALIGNORE_FILE);
 		File f = pluginStateLocation.toFile();
-		if (!f.exists()) return false;
+		if (!f.exists()) {
+			return false;
+		}
 		try {
 			try (DataInputStream dis = new DataInputStream(new FileInputStream(f))) {
 				int ignoreCount = 0;

team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/Diff.java

@@ -89,10 +89,10 @@ public int hashCode() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj == this)
+		if (obj == this) {
 			return true;
-		if (obj instanceof Diff) {
-			Diff other = (Diff) obj;
+		}
+		if (obj instanceof Diff other) {
 			return other.getPath().equals(getPath()) && getStatus() == other.getStatus();
 		}
 		return false;

team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java

@@ -90,8 +90,9 @@ public void removeDiffChangeListener(IDiffChangeListener listener) {
 	public void accept(IPath path, IDiffVisitor visitor, int depth) {
 		IDiff delta = getDiff(path);
 		if (delta == null || visitor.visit(delta)) {
-			if (depth == IResource.DEPTH_ZERO)
+			if (depth == IResource.DEPTH_ZERO) {
 				return;
+			}
 			IPath[] children = getChildren(path);
 			for (IPath child : children) {
 				accept(child, visitor, depth == IResource.DEPTH_ONE ? IResource.DEPTH_ZERO : IResource.DEPTH_INFINITE);
@@ -241,7 +242,9 @@ private void fireChanges(final IProgressMonitor monitor) {
 		final Map<Integer, Set<IPath>> propertyChanges = this.propertyChanges;
 		this.propertyChanges = new HashMap<>();
 
-		if(event.isEmpty() && ! event.isReset() && propertyChanges.isEmpty()) return;
+		if(event.isEmpty() && ! event.isReset() && propertyChanges.isEmpty()) {
+			return;
+		}
 		Object[] listeners = this.listeners.getListeners();
 		for (Object l : listeners) {
 			final IDiffChangeListener listener = (IDiffChangeListener) l;
@@ -254,8 +257,9 @@ public void handleException(Throwable exception) {
 				public void run() throws Exception {
 					try {
 						lockedForModification = true;
-						if (!event.isEmpty() || event.isReset())
+						if (!event.isEmpty() || event.isReset()) {
 							listener.diffsChanged(event, Policy.subMonitorFor(monitor, 100));
+						}
 						for (Integer key : propertyChanges.keySet()) {
 							Set<IPath> paths = propertyChanges.get(key);
 							listener.propertyChanged(DiffTree.this, key.intValue(), paths.toArray(new IPath[paths
@@ -294,8 +298,7 @@ private void internalAdd(IDiff delta) {
 			statistics.add(delta);
 		}
 		boolean isConflict = false;
-		if (delta instanceof IThreeWayDiff) {
-			IThreeWayDiff twd = (IThreeWayDiff) delta;
+		if (delta instanceof IThreeWayDiff twd) {
 			isConflict = twd.getDirection() == IThreeWayDiff.CONFLICTING;
 		}
 		setPropertyToRoot(delta, P_HAS_DESCENDANT_CONFLICTS, isConflict);
@@ -342,8 +345,9 @@ public IDiff[] getDiffs() {
 
 	@Override
 	public long countFor(int state, int mask) {
-		if (state == 0)
+		if (state == 0) {
 			return size();
+		}
 		return statistics.countFor(state, mask);
 	}
 
@@ -414,8 +418,9 @@ public boolean hasMatchingDiffs(IPath path, final FastDiffFilter filter) {
 				return false;
 			}, IResource.DEPTH_INFINITE);
 		} catch (RuntimeException e) {
-			if (e == found)
+			if (e == found) {
 				return true;
+			}
 			throw e;
 		}
 		return false;