Bug 576980 - Use LF as line endings, not CR-LF
The large majority of other files uses plain LF.
Some test resources and some forceQualifierUpdate.txt files also use
CR-LF as line endings. These files are left unchanged.
NewWizardMessage.properties and NewTypeWizardPage.java even used mixed
line endings; most lines using plain LF, but a few using CR-LF. These
are normalized to LF only.
Change-Id: I301ec44b8f24e2960b05163e1966a06a7d3c83c8
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.ui/+/187191
Tested-by: JDT Bot <jdt-bot@eclipse.org>
Reviewed-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties
index 52e00d0..7cfae53 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties
@@ -152,13 +152,13 @@
NewTypeWizardPage_error_class_SealedSuperClassInDifferentModule=Sealed superclass should be in the same module as the new class, in a modular project.
NewTypeWizardPage_error_class_SealedSuperClassInDifferentPackage=Sealed superclass should be in the same package as the new class, in a non modular project.
NewTypeWizardPage_error_class_SealedSuperClassInDifferentProject=Sealed superclass should be in the same package and project as the new class, in a non modular project.
-NewTypeWizardPage_error_SealedFinalNonSealedClass_implement_superinterface_notSelected_message=Class implementing a sealed superinterface should be a sealed or final or non-sealed class.
-NewTypeWizardPage_error_class_SealedSuperInterfaceInDifferentModule=Sealed superinterface should be in the same module as the new class, in a modular project.
-NewTypeWizardPage_error_class_SealedSuperInterfaceInDifferentPackage=Sealed superinterface should be in the same package as the new class, in a non modular project.
+NewTypeWizardPage_error_SealedFinalNonSealedClass_implement_superinterface_notSelected_message=Class implementing a sealed superinterface should be a sealed or final or non-sealed class.
+NewTypeWizardPage_error_class_SealedSuperInterfaceInDifferentModule=Sealed superinterface should be in the same module as the new class, in a modular project.
+NewTypeWizardPage_error_class_SealedSuperInterfaceInDifferentPackage=Sealed superinterface should be in the same package as the new class, in a non modular project.
NewTypeWizardPage_error_class_SealedSuperInterfaceInDifferentProject=Sealed superinterface should be in the same package and project as the new class, in a non modular project.
-NewTypeWizardPage_error_SealedFinalNonSealedInterface_extend_superinterface_notSelected_message=Interface extending a sealed superinterface should be a sealed or non-sealed Interface.
-NewTypeWizardPage_error_interface_SealedSuperInterfaceInDifferentModule=Sealed superinterface should be in the same module as the new interface, in a modular project.
-NewTypeWizardPage_error_interface_SealedSuperInterfaceInDifferentPackage=Sealed superinterface should be in the same package as the new interface, in a non modular project.
+NewTypeWizardPage_error_SealedFinalNonSealedInterface_extend_superinterface_notSelected_message=Interface extending a sealed superinterface should be a sealed or non-sealed Interface.
+NewTypeWizardPage_error_interface_SealedSuperInterfaceInDifferentModule=Sealed superinterface should be in the same module as the new interface, in a modular project.
+NewTypeWizardPage_error_interface_SealedSuperInterfaceInDifferentPackage=Sealed superinterface should be in the same package as the new interface, in a non modular project.
NewTypeWizardPage_error_interface_SealedSuperInterfaceInDifferentProject=Sealed superinterface should be in the same package and project as the new interface, in a non modular project.
NewTypeWizardPage_error_ModifiersFinalAndAbstract=Class cannot be both final and abstract
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenNewRecordWizardAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenNewRecordWizardAction.java
index 6339224..841f826 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenNewRecordWizardAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenNewRecordWizardAction.java
@@ -1,89 +1,89 @@
-/*******************************************************************************
- * Copyright (c) 2020 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
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.ui.wizards.NewRecordWizardPage;
-
-import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.actions.ActionMessages;
-import org.eclipse.jdt.internal.ui.wizards.NewRecordCreationWizard;
-
-/**
-* <p>Action that opens the new enum wizard. The action initialized the wizard with either the selection
- * as configured by {@link #setSelection(IStructuredSelection)} or takes a preconfigured
- * new enum wizard page, see {@link #setConfiguredWizardPage(NewRecordWizardPage)}.
- * </p>
- *
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- *
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noreference This class is not intended to be referenced by clients.
- */
-public class OpenNewRecordWizardAction extends AbstractOpenWizardAction {
-
- private NewRecordWizardPage fPage;
- private boolean fOpenEditorOnFinish;
-
- /**
- * Creates an instance of the <code>OpenNewRecordWizardAction</code>.
- */
- public OpenNewRecordWizardAction() {
- setText(ActionMessages.OpenNewRecordWizardAction_text);
- setDescription(ActionMessages.OpenNewRecordWizardAction_description);
- setToolTipText(ActionMessages.OpenNewRecordWizardAction_tooltip);
- setImageDescriptor(JavaPluginImages.DESC_WIZBAN_NEWRECORD);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IJavaHelpContextIds.OPEN_RECORD_WIZARD_ACTION);
-
- fPage= null;
- fOpenEditorOnFinish= true;
- }
-
- /**
- * Sets a page to be used by the wizard or <code>null</code> to use a page initialized with values
- * from the current selection (see {@link #getSelection()} and {@link #setSelection(IStructuredSelection)}).
- * @param page the page to use or <code>null</code>
- */
- public void setConfiguredWizardPage(NewRecordWizardPage page) {
- fPage= page;
- }
-
- /**
- * Specifies if the wizard will open the created type with the default editor. The default behaviour is to open
- * an editor.
- *
- * @param openEditorOnFinish if set, the wizard will open the created type with the default editor
- *
- * @since 3.3
- */
- public void setOpenEditorOnFinish(boolean openEditorOnFinish) {
- fOpenEditorOnFinish= openEditorOnFinish;
- }
-
- @Override
- protected final INewWizard createWizard() throws CoreException {
- return new NewRecordCreationWizard(fPage, fOpenEditorOnFinish);
- }
-}
+/*******************************************************************************
+ * Copyright (c) 2020 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
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jdt.ui.actions;
+
+import org.eclipse.core.runtime.CoreException;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.jdt.ui.wizards.NewRecordWizardPage;
+
+import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
+import org.eclipse.jdt.internal.ui.JavaPluginImages;
+import org.eclipse.jdt.internal.ui.actions.ActionMessages;
+import org.eclipse.jdt.internal.ui.wizards.NewRecordCreationWizard;
+
+/**
+* <p>Action that opens the new enum wizard. The action initialized the wizard with either the selection
+ * as configured by {@link #setSelection(IStructuredSelection)} or takes a preconfigured
+ * new enum wizard page, see {@link #setConfiguredWizardPage(NewRecordWizardPage)}.
+ * </p>
+ *
+ * <p>
+ * This class may be instantiated; it is not intended to be subclassed.
+ * </p>
+ *
+ *
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noreference This class is not intended to be referenced by clients.
+ */
+public class OpenNewRecordWizardAction extends AbstractOpenWizardAction {
+
+ private NewRecordWizardPage fPage;
+ private boolean fOpenEditorOnFinish;
+
+ /**
+ * Creates an instance of the <code>OpenNewRecordWizardAction</code>.
+ */
+ public OpenNewRecordWizardAction() {
+ setText(ActionMessages.OpenNewRecordWizardAction_text);
+ setDescription(ActionMessages.OpenNewRecordWizardAction_description);
+ setToolTipText(ActionMessages.OpenNewRecordWizardAction_tooltip);
+ setImageDescriptor(JavaPluginImages.DESC_WIZBAN_NEWRECORD);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IJavaHelpContextIds.OPEN_RECORD_WIZARD_ACTION);
+
+ fPage= null;
+ fOpenEditorOnFinish= true;
+ }
+
+ /**
+ * Sets a page to be used by the wizard or <code>null</code> to use a page initialized with values
+ * from the current selection (see {@link #getSelection()} and {@link #setSelection(IStructuredSelection)}).
+ * @param page the page to use or <code>null</code>
+ */
+ public void setConfiguredWizardPage(NewRecordWizardPage page) {
+ fPage= page;
+ }
+
+ /**
+ * Specifies if the wizard will open the created type with the default editor. The default behaviour is to open
+ * an editor.
+ *
+ * @param openEditorOnFinish if set, the wizard will open the created type with the default editor
+ *
+ * @since 3.3
+ */
+ public void setOpenEditorOnFinish(boolean openEditorOnFinish) {
+ fOpenEditorOnFinish= openEditorOnFinish;
+ }
+
+ @Override
+ protected final INewWizard createWizard() throws CoreException {
+ return new NewRecordCreationWizard(fPage, fOpenEditorOnFinish);
+ }
+}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
index a7f371b..ca453e4 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
@@ -356,9 +356,9 @@
this(interfaceName, null);
}
- public InterfaceWrapper(String interfaceName, IType type) {
- this.interfaceName= interfaceName;
- this.type= type;
+ public InterfaceWrapper(String interfaceName, IType type) {
+ this.interfaceName= interfaceName;
+ this.type= type;
}
@Override
@@ -585,37 +585,37 @@
fAccMdfButtons.setSelection(0, true);
String[] buttonNames2;
- if (fTypeKind == CLASS_TYPE) {
- buttonNames2= new String[] {
- NewWizardMessages.NewTypeWizardPage_modifiers_abstract,
- NewWizardMessages.NewTypeWizardPage_modifiers_final,
- NewWizardMessages.NewTypeWizardPage_modifiers_static
- };
- } else {
- if (fTypeKind == ENUM_TYPE || fTypeKind == ANNOTATION_TYPE) {
- buttonNames2= new String[] {
- NewWizardMessages.NewTypeWizardPage_modifiers_abstract,
- NewWizardMessages.NewTypeWizardPage_modifiers_static
- };
- }
- else {
- if (fTypeKind == RECORD_TYPE) {
- buttonNames2= new String[] {NewWizardMessages.NewTypeWizardPage_modifiers_static};
- } else
- buttonNames2= new String[] {};
- }
- }
-
- fOtherMdfButtons= new SelectionButtonDialogFieldGroup(SWT.CHECK, buttonNames2, 4);
- fOtherMdfButtons.setDialogFieldListener(fTypeFieldAdapter);
-
- fAccMdfButtons.enableSelectionButton(PRIVATE_INDEX, false);
- fAccMdfButtons.enableSelectionButton(PROTECTED_INDEX, false);
- fOtherMdfButtons.enableSelectionButton(STATIC_INDEX, false);
-
- if (fTypeKind == ENUM_TYPE || fTypeKind == ANNOTATION_TYPE) {
- fOtherMdfButtons.enableSelectionButton(ABSTRACT_INDEX, false);
- fOtherMdfButtons.enableSelectionButton(ENUM_ANNOT_STATIC_INDEX, false);
+ if (fTypeKind == CLASS_TYPE) {
+ buttonNames2= new String[] {
+ NewWizardMessages.NewTypeWizardPage_modifiers_abstract,
+ NewWizardMessages.NewTypeWizardPage_modifiers_final,
+ NewWizardMessages.NewTypeWizardPage_modifiers_static
+ };
+ } else {
+ if (fTypeKind == ENUM_TYPE || fTypeKind == ANNOTATION_TYPE) {
+ buttonNames2= new String[] {
+ NewWizardMessages.NewTypeWizardPage_modifiers_abstract,
+ NewWizardMessages.NewTypeWizardPage_modifiers_static
+ };
+ }
+ else {
+ if (fTypeKind == RECORD_TYPE) {
+ buttonNames2= new String[] {NewWizardMessages.NewTypeWizardPage_modifiers_static};
+ } else
+ buttonNames2= new String[] {};
+ }
+ }
+
+ fOtherMdfButtons= new SelectionButtonDialogFieldGroup(SWT.CHECK, buttonNames2, 4);
+ fOtherMdfButtons.setDialogFieldListener(fTypeFieldAdapter);
+
+ fAccMdfButtons.enableSelectionButton(PRIVATE_INDEX, false);
+ fAccMdfButtons.enableSelectionButton(PROTECTED_INDEX, false);
+ fOtherMdfButtons.enableSelectionButton(STATIC_INDEX, false);
+
+ if (fTypeKind == ENUM_TYPE || fTypeKind == ANNOTATION_TYPE) {
+ fOtherMdfButtons.enableSelectionButton(ABSTRACT_INDEX, false);
+ fOtherMdfButtons.enableSelectionButton(ENUM_ANNOT_STATIC_INDEX, false);
}
fAddCommentButton= new SelectionButtonDialogField(SWT.CHECK);
@@ -1749,15 +1749,15 @@
return fSuperInterfacesDialogField.addElement(new InterfaceWrapper(superInterface));
}
- /**
- * Adds a super interface to the end of the list and selects it if it is not in the list yet.
- *
+ /**
+ * Adds a super interface to the end of the list and selects it if it is not in the list yet.
+ *
* @param superInterface the fully qualified type name of the interface.
- * @param type IType java element of the interface.
- * @return returns <code>true</code>if the interfaces has been added, <code>false</code>
- * if the interface already is in the list.
- * @since 3.25
- */
+ * @param type IType java element of the interface.
+ * @return returns <code>true</code>if the interfaces has been added, <code>false</code>
+ * if the interface already is in the list.
+ * @since 3.25
+ */
public boolean addSuperInterface(String superInterface, IType type) {
return fSuperInterfacesDialogField.addElement(new InterfaceWrapper(superInterface, type));
}
