Skip to content

Commit e711dc5

Browse files
ptzieglerptziegler
committed
Harmonize use of Windows and Linux line-breaks across files
Within the source code, 3721 files use the Windows line-break (\r\n), while 117 files use the Linux line-break (\n). However, some files use both. This PR replaces all occurrences of "\r\n" in Linux-encoded files with "\n" and all occurrences of "\n" in Windows-encoded files with "\r\n".
1 parent 475d0dd commit e711dc5

File tree

654 files changed

+7913
-7913
lines changed

Some content is hidden

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

654 files changed

+7913
-7913
lines changed

‎org.eclipse.wb.core.java/src/org/eclipse/wb/core/model/JavaInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ public final JavaEventListener getBroadcastJava() {
401401
/**
402402
* Is <code>true</code> if this {@link JavaInfo} already initialized. We check this flag in
403403
* {@link #setObject(Object)} and do initialization if needed. This is required for newly created
404-
* {@link JavaInfo
404+
* {@link JavaInfo
405405
* }'s.
406406
*/
407407
private boolean m_initialized;

‎org.eclipse.wb.core.java/src/org/eclipse/wb/core/model/association/Association.java

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -33,48 +33,48 @@
3333

3434
import javax.swing.JPanel;
3535

36-
/**
37-
* {@link Association} is presentation of parent/child link. It can be wrapper for
38-
* {@link ClassInstanceCreation} (for example in SWT all widgets accept parent in constructor
39-
* argument), or {@link MethodInvocation} (for example
40-
* {@link Container#add(java.awt.Component, Object) in Swing, or factory method invocation in SWT).
41-
* <p> But in theory association can be something more complex, than just single
42-
*
43-
* @link ClassInstanceCreation} or {@link MethodInvocation}, for example some object that should be
44-
* created and configured initially, and only as one of the invocation parent/child link is
45-
* established. For this reason and just to separate various variants of associations (so be
46-
* more OOP), we introduce {@link Association} as class.
47-
*
48-
*
49-
* <p>
50-
* Here is list of possible associations and their implementations:
51-
* <ol>
52-
*
53-
* <li>{@link ConstructorParentAssociation} - {@link ClassInstanceCreation} with
54-
* <em>parent</em> argument. Association established on child creation. Child created after
55-
* parent. This is usual association in SWT.</li>
56-
*
57-
* <li>{@link ConstructorChildAssociation} - {@link ClassInstanceCreation} with <em>child</em>
58-
* argument. Association established on parent creation. Child created before parent. This is
59-
* rarely used association, for example {@link JPanel} accepts {@link LayoutManager} in
60-
* constructor.</li>
61-
*
62-
* <li>{@link FactoryParentAssociation} - factory {@link MethodInvocation} with
63-
* <em>parent</em> argument. Used for factories, i.e. this is association on creation, it is
64-
* different than separate association using for example invocation of child method with
65-
* parent argument (like {@link Control#setParent(org.eclipse.swt.widgets.Composite)}).</li>
66-
*
67-
* <li>{@link InvocationChildAssociation} - {@link MethodInvocation} of parent with
68-
* <em>child</em> argument. Often used in Swing -
69-
* {@link Container#add(java.awt.Component, Object)}.</li>
70-
*
71-
* <li>{@link InvocationSecondaryAssociation} - {@link MethodInvocation} with both,
72-
* <em>parent and child</em> arguments, marked as secondary. Can be used to establish some
73-
* special parent/child link, used method that does not belong to parent or child, but just
74-
* separate method (sometimes used for {@link GridBagLayout}).</li> </ul>
75-
*
76-
* @author scheglov_ke
77-
* @coverage core.model.association
36+
/**
37+
* {@link Association} is presentation of parent/child link. It can be wrapper for
38+
* {@link ClassInstanceCreation} (for example in SWT all widgets accept parent in constructor
39+
* argument), or {@link MethodInvocation} (for example
40+
* {@link Container#add(java.awt.Component, Object) in Swing, or factory method invocation in SWT).
41+
* <p> But in theory association can be something more complex, than just single
42+
*
43+
* @link ClassInstanceCreation} or {@link MethodInvocation}, for example some object that should be
44+
* created and configured initially, and only as one of the invocation parent/child link is
45+
* established. For this reason and just to separate various variants of associations (so be
46+
* more OOP), we introduce {@link Association} as class.
47+
*
48+
*
49+
* <p>
50+
* Here is list of possible associations and their implementations:
51+
* <ol>
52+
*
53+
* <li>{@link ConstructorParentAssociation} - {@link ClassInstanceCreation} with
54+
* <em>parent</em> argument. Association established on child creation. Child created after
55+
* parent. This is usual association in SWT.</li>
56+
*
57+
* <li>{@link ConstructorChildAssociation} - {@link ClassInstanceCreation} with <em>child</em>
58+
* argument. Association established on parent creation. Child created before parent. This is
59+
* rarely used association, for example {@link JPanel} accepts {@link LayoutManager} in
60+
* constructor.</li>
61+
*
62+
* <li>{@link FactoryParentAssociation} - factory {@link MethodInvocation} with
63+
* <em>parent</em> argument. Used for factories, i.e. this is association on creation, it is
64+
* different than separate association using for example invocation of child method with
65+
* parent argument (like {@link Control#setParent(org.eclipse.swt.widgets.Composite)}).</li>
66+
*
67+
* <li>{@link InvocationChildAssociation} - {@link MethodInvocation} of parent with
68+
* <em>child</em> argument. Often used in Swing -
69+
* {@link Container#add(java.awt.Component, Object)}.</li>
70+
*
71+
* <li>{@link InvocationSecondaryAssociation} - {@link MethodInvocation} with both,
72+
* <em>parent and child</em> arguments, marked as secondary. Can be used to establish some
73+
* special parent/child link, used method that does not belong to parent or child, but just
74+
* separate method (sometimes used for {@link GridBagLayout}).</li> </ul>
75+
*
76+
* @author scheglov_ke
77+
* @coverage core.model.association
7878
*/
7979
public abstract class Association {
8080
protected JavaInfo m_javaInfo;
@@ -188,13 +188,13 @@ public void move(StatementTarget target) throws Exception {
188188
* <p>
189189
* Sequence of operations during is following:
190190
*
191-
* <pre>
192-
* oldAssociation.remove();
193-
* if (oldAssociation.isStillActive()) {
194-
* oldAssociation.setParent(newParent);
195-
* } else {
196-
* newAssociation.add(...);
197-
* }
191+
* <pre>
192+
* oldAssociation.remove();
193+
* if (oldAssociation.isStillActive()) {
194+
* oldAssociation.setParent(newParent);
195+
* } else {
196+
* newAssociation.add(...);
197+
* }
198198
* </pre>
199199
*
200200
* @param parent

‎org.eclipse.wb.core.java/src/org/eclipse/wb/core/model/association/SuperConstructorArgumentAssociation.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
* Implementation of {@link Association} for {@link JavaInfo} passed as argument of
2020
* {@link SuperConstructorInvocation}.
2121
* <p>
22-
* For example: <code><pre>
23-
* public class Test extends JPanel {
24-
* public Test() {
25-
* this(new BorderLayout());
26-
* }
27-
* }
22+
* For example: <code><pre>
23+
* public class Test extends JPanel {
24+
* public Test() {
25+
* this(new BorderLayout());
26+
* }
27+
* }
2828
* </pre><code>
2929
*
3030
* @author scheglov_ke

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/policy/OpenListenerEditPolicy.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
* {@link EditPolicy} which adds listener code by handling "Open" request (double-clicking on its
2828
* {@link EditPart}). Component description should have lines like this:
2929
*
30-
* <pre><code>
31-
* &lt;parameters&gt;
32-
* &lt;parameter name="x.double-click.listener" value="selectionListener/widgetSelected"/&gt;
30+
* <pre><code>
31+
* &lt;parameters&gt;
32+
* &lt;parameter name="x.double-click.listener" value="selectionListener/widgetSelected"/&gt;
3333
* &lt;/parameters&gt; </code></pre>
3434
*
3535
* Where parameter <code>double-click.listener</code> is '/' separated name of listener method to be

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/creation/ThisCreationSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Google, Inc. - initial API and implementation
1010
*******************************************************************************/
1111
package org.eclipse.wb.internal.core.model.creation;
12-
12+
1313
import org.eclipse.wb.core.eval.AstEvaluationEngine;
1414
import org.eclipse.wb.core.eval.EvaluationContext;
1515
import org.eclipse.wb.core.eval.ExecutionFlowDescription;

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/creation/factory/InstanceFactoryCreationSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ private InstanceFactoryInfo getFactory(JavaInfo rootObject, Class<?> factoryClas
172172
* <p>
173173
* We use here special trick - instead of real source code for {@link InstanceFactoryInfo} access
174174
* we use casted {@link NullLiteral}, and then evaluate it as
175-
* <em>already existing<em> object of factory! This object
176-
* exists because "live" works when we already show some GUI for user, so there are objects for all {@link JavaInfo}'s,
175+
* <em>already existing<em> object of factory! This object
176+
* exists because "live" works when we already show some GUI for user, so there are objects for all {@link JavaInfo}'s,
177177
* including {@link InstanceFactoryInfo}.
178178
*/
179179
private final class LiveCreationSupport extends AbstractExplicitFactoryCreationSupport {

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/description/MorphingTargetDescription.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
* <p>
2222
* Before:
2323
*
24-
* <pre>
25-
* Button button = new Button(parent, SWT.NONE);
26-
* button.setText("my button");
27-
* button.setSelection(true);
24+
* <pre>
25+
* Button button = new Button(parent, SWT.NONE);
26+
* button.setText("my button");
27+
* button.setSelection(true);
2828
* </pre>
2929
*
3030
* <p>
3131
* After:
3232
*
33-
* <pre>
34-
* Text button = new Text(parent, SWT.NONE);
35-
* button.setText("my button");
33+
* <pre>
34+
* Text button = new Text(parent, SWT.NONE);
35+
* button.setText("my button");
3636
* </pre>
3737
*
3838
* Note that <code>setSelection(true)</code> was removed because in <code>Text</code> this method

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/editor/InnerClassPropertyEditor.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,24 @@
5252
* instance of selected external {@link Class}. Source for class generated class is configured as
5353
* template.
5454
*
55-
* <pre><xmp>
56-
<property id="setLabelProvider(org.eclipse.jface.viewers.IBaseLabelProvider)">
57-
<editor id="innerClass">
58-
<parameter name="mode">inner</parameter>
59-
<parameter name="name">TableLabelProvider</parameter>
60-
<parameter name="class">org.eclipse.jface.viewers.ITableLabelProvider</parameter>
61-
<parameter name="source"><![CDATA[
62-
private class ${name} extends org.eclipse.jface.viewers.LabelProvider implements org.eclipse.jface.viewers.ITableLabelProvider {
63-
public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
64-
return null;
65-
}
66-
public String getColumnText(Object element, int columnIndex) {
67-
return element.toString();
68-
}
69-
}
70-
]]></parameter>
71-
</editor>
72-
</property>
55+
* <pre><xmp>
56+
<property id="setLabelProvider(org.eclipse.jface.viewers.IBaseLabelProvider)">
57+
<editor id="innerClass">
58+
<parameter name="mode">inner</parameter>
59+
<parameter name="name">TableLabelProvider</parameter>
60+
<parameter name="class">org.eclipse.jface.viewers.ITableLabelProvider</parameter>
61+
<parameter name="source"><![CDATA[
62+
private class ${name} extends org.eclipse.jface.viewers.LabelProvider implements org.eclipse.jface.viewers.ITableLabelProvider {
63+
public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
64+
return null;
65+
}
66+
public String getColumnText(Object element, int columnIndex) {
67+
return element.toString();
68+
}
69+
}
70+
]]></parameter>
71+
</editor>
72+
</property>
7373
* </xmp></pre>
7474
*
7575
* @author scheglov_ke

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/editor/ObjectPropertyEditor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Google, Inc. - initial API and implementation
1010
*******************************************************************************/
1111
package org.eclipse.wb.internal.core.model.property.editor;
12-
12+
1313
import org.eclipse.wb.core.model.JavaInfo;
1414
import org.eclipse.wb.core.model.ObjectInfo;
1515
import org.eclipse.wb.internal.core.DesignerPlugin;

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/util/generic/CopyPropertyTopChildSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
* <p>
2727
* Format:
2828
*
29-
* <code><pre>
30-
* &lt;parameter name="copyChildPropertyTop from=Association/stackText to=StackText category=system(7)"/&gt;
29+
* <code><pre>
30+
* &lt;parameter name="copyChildPropertyTop from=Association/stackText to=StackText category=system(7)"/&gt;
3131
* </pre></code>
3232
*
3333
* @author scheglov_ke

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/util/generic/CopyPropertyTopSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
* <p>
2424
* Format:
2525
*
26-
* <code><pre>
27-
* &lt;parameter name="copyPropertyTop from=Constructor/columnWidth to=width category=system(7)"/&gt;
26+
* <code><pre>
27+
* &lt;parameter name="copyPropertyTop from=Constructor/columnWidth to=width category=system(7)"/&gt;
2828
* </pre></code>
2929
*
3030
* @author scheglov_ke

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/variable/EmptyInvocationVariableSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
* {@link MethodInvocation} in {@link ExpressionStatement}. For example in can be used to set
2828
* <code>Layout</code> using single {@link MethodInvocation} without any variables:
2929
*
30-
* <pre>
31-
* composite.setLayout(new GridLayout(1, false));
30+
* <pre>
31+
* composite.setLayout(new GridLayout(1, false));
3232
* </pre>
3333
*
3434
* @author scheglov_ke

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/variable/EmptyPureVariableSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
* Specific sub-class of {@link EmptyVariableSupport} that adds new {@link JavaInfo} using just
2525
* creation source as {@link ExpressionStatement}. For example for {@link JButton}:
2626
*
27-
* <pre>
28-
* new JButton("My button");
27+
* <pre>
28+
* new JButton("My button");
2929
* </pre>
3030
*
3131
* Note that there are no assignment to variable, just pure {@link Expression}.

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/variable/EmptyVariableSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
* {@link VariableSupport} implementation for case when it is possible to have variable for this
3838
* component, but currently there are no variable. For example:
3939
*
40-
* <pre>
41-
* add(new JButton("My button"), BorderLayout.NORTH);
40+
* <pre>
41+
* add(new JButton("My button"), BorderLayout.NORTH);
4242
* </pre>
4343
*
4444
* Here expression/initializer for JButton is <code>new JButton("My button")</code>.

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/variable/NamesManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@ public static String getAcronym(JavaInfo javaInfo) {
293293
/**
294294
* @return the default acronym of the given component class.
295295
*
296-
* <pre>
297-
* org.eclipse.swt.widgets.Button = btn
298-
* javax.swing.JButton = btn
299-
* org.eclipse.swt.custom.StyledText = stldtxt
296+
* <pre>
297+
* org.eclipse.swt.widgets.Button = btn
298+
* javax.swing.JButton = btn
299+
* org.eclipse.swt.custom.StyledText = stldtxt
300300
* </pre>
301301
*/
302302
private static String getDefaultAcronym(String qualifiedClassName) {

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/variable/VariableSupport.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,13 @@ public boolean hasExpression(NodeTarget target) {
217217
* NOTE: in some cases it may change the {@link VariableSupport} instance of the {@link JavaInfo}.
218218
* So the example code below is wrong:
219219
*
220-
* <pre>
221-
* <code>
222-
* VariableSupport variableSupport = javaInfo.getVariableSupport();
223-
* StatementTarget statementTarget = variableSupport.getStatementTarget();
224-
* // it's possible here that variableSupport != javaInfo.getVariableSupport()
225-
* return variableSupport.getReferenceExpression(new NodeTarget(statementTarget));
226-
* </code>
220+
* <pre>
221+
* <code>
222+
* VariableSupport variableSupport = javaInfo.getVariableSupport();
223+
* StatementTarget statementTarget = variableSupport.getStatementTarget();
224+
* // it's possible here that variableSupport != javaInfo.getVariableSupport()
225+
* return variableSupport.getReferenceExpression(new NodeTarget(statementTarget));
226+
* </code>
227227
* </pre>
228228
*
229229
* @return the {@link StatementTarget} that describes default location for new {@link Statement}.

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/parser/AbstractParseFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ protected void initializeClassLoader_parent(AstEditor editor,
759759
// add class loader for ByteBuddy enhancement
760760
parentClassLoader.add(
761761
new BundleClassLoader("org.eclipse.wb.core.java"),
762-
List.of("net.bytebuddy.", "org.eclipse.wb.internal.core.model.creation"));
762+
List.of("net.bytebuddy.", "org.eclipse.wb.internal.core.model.creation"));
763763
// add class loader for MVEL2 (issue 533)
764764
// MVEL is internally using this class-loader to construct an
765765
// instance of Accessor, even though it was executed from within

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/utils/ast/AstEditor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,9 +725,9 @@ public String getSourceBeginEnd(int begin, int end) {
725725
/**
726726
* Examples:
727727
*
728-
* <pre>
729-
* SWT.NONE = org.eclipse.swt.SWT.NONE
730-
* new JButton() = new javax.swing.JButton()
728+
* <pre>
729+
* SWT.NONE = org.eclipse.swt.SWT.NONE
730+
* new JButton() = new javax.swing.JButton()
731731
* </pre>
732732
*
733733
* @param theNode

‎org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/utils/jdt/core/CodeUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,10 @@ private static IJavaSearchScope prepareSearchScope(IJavaElement element) {
298298
/**
299299
* Returns the short name of fully qualified class name, or same name for simple type name.
300300
*
301-
* <pre>
302-
* CodeUtils.getShortClass("javax.swing.JPanel") = "JPanel"
303-
* CodeUtils.getShortClass("test.MyPanel$Inner") = "Inner"
304-
* CodeUtils.getShortClass("boolean") = "boolean"
301+
* <pre>
302+
* CodeUtils.getShortClass("javax.swing.JPanel") = "JPanel"
303+
* CodeUtils.getShortClass("test.MyPanel$Inner") = "Inner"
304+
* CodeUtils.getShortClass("boolean") = "boolean"
305305
* </pre>
306306
*
307307
* @param className

‎org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/selection/TopResizeFigure.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected void paintClientArea(Graphics graphics) {
6868
.setHeight(16) //
6969
.setStyle(SWT.NONE) //
7070
.createFont(null);
71-
graphics.setFont(newFont);
71+
graphics.setFont(newFont);
7272
Dimension textExtent = TextUtilities.INSTANCE.getTextExtents(m_sizeText, graphics.getFont());
7373
int x = area.x + (area.width - textExtent.width) / 2;
7474
int y = area.y + (area.height - textExtent.height) / 2;

‎org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/generic/ContainerObjectValidators.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Google, Inc. - initial API and implementation
1010
*******************************************************************************/
1111
package org.eclipse.wb.internal.core.model.generic;
12-
12+
1313
import org.eclipse.wb.internal.core.model.description.IComponentDescription;
1414
import org.eclipse.wb.internal.core.model.util.ScriptUtils;
1515
import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils;

0 commit comments

Comments
 (0)