Skip to content

Commit afd1827

Browse files
vogellavogella
committed
Clean-up whitespace in team
Using the JDT clean-up action to run the whitespace clean-up in team.
1 parent 7062098 commit afd1827

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+492
-492
lines changed

‎team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.eclipse.jface.viewers.Viewer;
4545

4646
/**
47-
* Abstract class that caches any remote contents in local so that external
47+
* Abstract class that caches any remote contents in local so that external
4848
* tools can be used to show a comparison.
4949
*/
5050
public abstract class AbstractMergeViewer extends Viewer {
@@ -108,14 +108,14 @@ protected boolean isOneSided() {
108108
}
109109
return false;
110110
}
111-
111+
112112
protected File getFileForSingleSide() throws CoreException {
113113
File file = getFileForLeft();
114114
if (file != null && file.exists())
115115
return file;
116116
return getFileForRight();
117117
}
118-
118+
119119
protected File getFileForRight() throws CoreException {
120120
if (rightFile != null)
121121
return rightFile;
@@ -147,7 +147,7 @@ protected File getFileForLeft() throws CoreException {
147147
}
148148
return null;
149149
}
150-
150+
151151
protected File getResultFile() throws IOException {
152152
if (resultFile != null)
153153
return resultFile;
@@ -157,7 +157,7 @@ protected File getResultFile() throws IOException {
157157
resultFile.delete();
158158
return resultFile;
159159
}
160-
160+
161161
protected boolean hasResultFile() {
162162
return resultFile != null;
163163
}
@@ -198,7 +198,7 @@ private File createTempFile(InputStream contents) throws IOException {
198198

199199
protected ICompareInput getCompareInput() {
200200
if (input instanceof ICompareInput) {
201-
return (ICompareInput) input;
201+
return (ICompareInput) input;
202202
}
203203
return null;
204204
}
@@ -214,7 +214,7 @@ protected File getLocalFile(ITypedElement left) throws CoreException {
214214
}
215215
return null;
216216
}
217-
217+
218218
protected IFile getEclipseFile(Object element) {
219219
if (element instanceof IResourceProvider) {
220220
IResourceProvider rp = (IResourceProvider) element;
@@ -235,7 +235,7 @@ protected IFile getEclipseFile(Object element) {
235235
}
236236
return null;
237237
}
238-
238+
239239
protected IEditableContent getSaveTarget() {
240240
IEditableContent left = getEditableLeft();
241241
IEditableContent right = getEditableRight();
@@ -247,30 +247,30 @@ protected IEditableContent getSaveTarget() {
247247
}
248248
return null;
249249
}
250-
250+
251251
private IEditableContent getEditableLeft() {
252252
ICompareInput compareInput = getCompareInput();
253253
if (compareInput != null) {
254254
ITypedElement left = compareInput.getLeft();
255255
if (left instanceof IEditableContent && configuration.isLeftEditable()) {
256256
return (IEditableContent) left;
257-
}
258-
}
257+
}
258+
}
259259
return null;
260260
}
261-
261+
262262
private IEditableContent getEditableRight() {
263263
ICompareInput compareInput = getCompareInput();
264264
if (compareInput != null) {
265265
ITypedElement right = compareInput.getRight();
266266
if (right instanceof IEditableContent && configuration.isRightEditable()) {
267267
return (IEditableContent) right;
268-
269-
}
270-
}
268+
269+
}
270+
}
271271
return null;
272272
}
273-
273+
274274
protected byte[] asBytes(File file) throws IOException {
275275
try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
276276
ByteArrayOutputStream out = new ByteArrayOutputStream();

‎team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors:
1212
* IBM Corporation - initial API and implementation
1313
*******************************************************************************/
@@ -25,7 +25,7 @@ public class Activator extends Plugin {
2525

2626
// The shared instance
2727
private static Activator plugin;
28-
28+
2929
/**
3030
* The constructor
3131
*/
@@ -60,11 +60,11 @@ public void stop(BundleContext context) throws Exception {
6060
public static Activator getDefault() {
6161
return plugin;
6262
}
63-
63+
6464
public static void log(Throwable e) {
65-
log(new Status(IStatus.ERROR, PLUGIN_ID, 0, "Internal error", e));
65+
log(new Status(IStatus.ERROR, PLUGIN_ID, 0, "Internal error", e));
6666
}
67-
67+
6868
public static void log(IStatus status) {
6969
getDefault().getLog().log(status);
7070
}

‎team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class WordComparison {
4141
private OleClientSite site;
4242
private boolean inplace;
4343
private OleAutomation document;
44-
44+
4545
public WordComparison(Composite composite) {
4646
frame = new OleFrame(composite, SWT.NONE);
4747
}
@@ -86,7 +86,7 @@ private static OleAutomation getAutomationProperty(OleAutomation auto, String na
8686
}
8787
throw new SWTException(NLS.bind(CompareWin32Messages.WordComparison_1, name));
8888
}
89-
89+
9090
private static OleAutomation getAutomationResult(OleAutomation auto, String command, int value) {
9191
Variant varResult = invoke(auto, command, value);
9292
if (varResult != null) {
@@ -100,7 +100,7 @@ private static OleAutomation getAutomationResult(OleAutomation auto, String comm
100100
}
101101
throw new SWTException(NLS.bind(CompareWin32Messages.WordComparison_2, command, Integer.toString(value)));
102102
}
103-
103+
104104
private static OleAutomation getAutomationResult(OleAutomation auto, String command, String value) {
105105
Variant varResult = invoke(auto, command, value);
106106
if (varResult != null) {
@@ -156,7 +156,7 @@ private static boolean setProperty(OleAutomation auto, String name, boolean valu
156156

157157
/**
158158
* Open the file at the given path as a document in Word.
159-
*
159+
*
160160
* @param filePath
161161
* the path of the file containing the document
162162
* @param inplace
@@ -184,7 +184,7 @@ public void openDocument(String filePath, boolean inplace) throws SWTException {
184184
* Compares the base document with the revised document and saves the
185185
* comparison in the working copy which can then be opened using
186186
* openDocument.
187-
*
187+
*
188188
* @param baseDocument
189189
* the base document
190190
* @param revisedDocument
@@ -231,7 +231,7 @@ public void createWorkingCopy(String baseDocument, String revisedDocument, Strin
231231
}
232232
}
233233
}
234-
234+
235235
private void closeDocument(OleAutomation document, OleAutomation reference) {
236236
// Close the first document: destination.Close()
237237
try {
@@ -255,7 +255,7 @@ private void compareDocument(OleAutomation document, String baseDocument, String
255255
throw new SWTException(NLS.bind(CompareWin32Messages.WordComparison_9, baseDocument, revisedDocument));
256256
varResult.dispose();
257257
}
258-
258+
259259
private boolean getDocumentDirty(OleAutomation document) {
260260
// word.document.Saved
261261
if (document != null) {
@@ -270,7 +270,7 @@ private boolean getDocumentDirty(OleAutomation document) {
270270
}
271271
return false;
272272
}
273-
273+
274274
private void setDocumentVisible(OleAutomation document, boolean visible) {
275275
// Hide it: destination.Windows[0].Visible=0|1
276276
OleAutomation windows = getAutomationProperty(document, "Windows"); //$NON-NLS-1$
@@ -299,7 +299,7 @@ private OleAutomation openDocument(OleAutomation application, String doc) {
299299
documents.dispose();
300300
}
301301
}
302-
302+
303303
private OleAutomation getActiveDocument(OleAutomation application) {
304304
return getAutomationProperty(application, "ActiveDocument"); //$NON-NLS-1$
305305
}
@@ -312,7 +312,7 @@ private OleAutomation createApplication() {
312312
}
313313

314314
/*
315-
* When opening a new comparison, we want to close any existing site
315+
* When opening a new comparison, we want to close any existing site
316316
* and create a new one.
317317
*/
318318
private void resetSite(String filePath) {
@@ -385,7 +385,7 @@ public void saveAsDocument(String doc) {
385385
public OleFrame getFrame() {
386386
return frame;
387387
}
388-
388+
389389
/**
390390
* Dispose of the comparison.
391391
*/
@@ -400,15 +400,15 @@ public void dispose() {
400400
}
401401

402402
/**
403-
* Return whether the comparison document is dirty. This method handles
403+
* Return whether the comparison document is dirty. This method handles
404404
* both an in-place document and a document opened in a separate window.
405405
* @return weather the comparison document is dirty
406406
*/
407407
public boolean isDirty() {
408408
return (inplace && site != null && !site.isDisposed() && site.isDirty())
409409
|| (!inplace && getDocumentDirty(document));
410410
}
411-
411+
412412
/**
413413
* Initialize the workbench menus for proper menu merging
414414
* Copied from org.eclipse.ui.internal.editorsupport.win32OleEditor
@@ -477,6 +477,6 @@ public boolean isOpen() {
477477
public void close() {
478478
if (isOpen()) {
479479
disposeSite();
480-
}
480+
}
481481
}
482482
}

0 commit comments

Comments
 (0)