diff options
author | Paul Pazderski | 2019-05-17 11:10:34 +0000 |
---|---|---|
committer | Paul Pazderski | 2019-05-18 12:52:49 +0000 |
commit | 5e9e26b1abe5bd1df37faa91fde2d87fd79ed06b (patch) | |
tree | 8e5ee9064468d7d051715dcb67637b08e0c01ad0 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs | |
parent | 47b1fa3fbb58588f218c6138e4bcd9ecbcc5d036 (diff) | |
download | eclipse.platform.team-5e9e26b1abe5bd1df37faa91fde2d87fd79ed06b.tar.gz eclipse.platform.team-5e9e26b1abe5bd1df37faa91fde2d87fd79ed06b.tar.xz eclipse.platform.team-5e9e26b1abe5bd1df37faa91fde2d87fd79ed06b.zip |
Bug 547304 - [cleanup] Fix wrong line delimiters
This updates all Java files with wrong or mixed line delimiters to use
Unix style delimiters.
The change includes only whitespace formatting and no code changes.
Change-Id: I1f6bc53b2a6827208b42ec562a855874d9ce69ae
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RegexSyncInfoFilter.java | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RegexSyncInfoFilter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RegexSyncInfoFilter.java index 21576c8d1..f5d8d1666 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RegexSyncInfoFilter.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RegexSyncInfoFilter.java @@ -1,70 +1,70 @@ -/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+/******************************************************************************* + * Copyright (c) 2011 IBM Corporation and others. * - * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
+ * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * - * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.internal.ccvs.ui.subscriber;
-
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.team.core.synchronize.SyncInfo;
-import org.eclipse.team.core.synchronize.SyncInfoFilter;
-import org.eclipse.team.core.variants.IResourceVariant;
-import org.eclipse.team.internal.core.subscribers.AbstractContentComparator;
-import org.eclipse.team.internal.ui.synchronize.RegexDiffComparator;
-
-/**
- * Selects <code>SyncInfo</code> whose all diffs match the given pattern.
- * This filter makes use of the <code>IStorage</code> provided by
- * an <code>IResourceVariant</code> to obtain the remote contents.
- * This means that the comparison may contact the server unless the contents
- * were cached locally by a previous operation. The caching of remote
- * contents is subscriber specific.
- * <p>
- * For folders, the comparison always returns <code>true</code>.
- *
- * @since 3.6
- */
-public class RegexSyncInfoFilter extends SyncInfoFilter {
-
- AbstractContentComparator criteria;
-
- boolean ignoreWhiteSpace;
-
- /**
- * Create a filter that does not ignore whitespace.
- *
- * @param pattern
- * regex pattern
- */
- public RegexSyncInfoFilter(String pattern) {
- this(false, pattern);
- }
-
- public RegexSyncInfoFilter(boolean ignoreWhitespace, String pattern) {
- criteria = new RegexDiffComparator(Pattern.compile(pattern,
- Pattern.DOTALL), ignoreWhitespace);
- }
-
- public boolean select(SyncInfo info, IProgressMonitor monitor) {
- IResourceVariant remote = info.getRemote();
- IResource local = info.getLocal();
- if (local.getType() != IResource.FILE)
- return true;
- if (remote == null)
- return !local.exists();
- if (!local.exists())
- return false;
- return criteria.compare(local, remote, monitor);
- }
-}
+ * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.team.internal.ccvs.ui.subscriber; + +import java.util.regex.Pattern; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.team.core.synchronize.SyncInfo; +import org.eclipse.team.core.synchronize.SyncInfoFilter; +import org.eclipse.team.core.variants.IResourceVariant; +import org.eclipse.team.internal.core.subscribers.AbstractContentComparator; +import org.eclipse.team.internal.ui.synchronize.RegexDiffComparator; + +/** + * Selects <code>SyncInfo</code> whose all diffs match the given pattern. + * This filter makes use of the <code>IStorage</code> provided by + * an <code>IResourceVariant</code> to obtain the remote contents. + * This means that the comparison may contact the server unless the contents + * were cached locally by a previous operation. The caching of remote + * contents is subscriber specific. + * <p> + * For folders, the comparison always returns <code>true</code>. + * + * @since 3.6 + */ +public class RegexSyncInfoFilter extends SyncInfoFilter { + + AbstractContentComparator criteria; + + boolean ignoreWhiteSpace; + + /** + * Create a filter that does not ignore whitespace. + * + * @param pattern + * regex pattern + */ + public RegexSyncInfoFilter(String pattern) { + this(false, pattern); + } + + public RegexSyncInfoFilter(boolean ignoreWhitespace, String pattern) { + criteria = new RegexDiffComparator(Pattern.compile(pattern, + Pattern.DOTALL), ignoreWhitespace); + } + + public boolean select(SyncInfo info, IProgressMonitor monitor) { + IResourceVariant remote = info.getRemote(); + IResource local = info.getLocal(); + if (local.getType() != IResource.FILE) + return true; + if (remote == null) + return !local.exists(); + if (!local.exists()) + return false; + return criteria.compare(local, remote, monitor); + } +} |