From 35338f28a30afe0e0162313883ac75646a164d67 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 28 Oct 2019 12:17:20 -0400 Subject: [PATCH] [releng] Cleanup code that has been misformatted and update to SDK 4.13 The check-code-cleanliness CI jobs have not been running recently, so this commit is to the code up to those minor changes Change-Id: I9fb4b0213dec558f58c5ca718b3d2685564ef456 --- .gitattributes | 2 + .../META-INF/MANIFEST.MF | 2 +- .../ui/editors/parser/AutoconfParser.java | 10 ++--- .../cdt/make/ui/MakeContentProvider.java | 2 +- .../core/ManagedBuildManager.java | 42 +++++++++---------- .../META-INF/MANIFEST.MF | 2 +- .../param/IProblemPreferenceDescriptor.java | 1 + .../parser/tests/rewrite/RewriteTester.java | 2 +- .../formatter/CommentsTabPage.java | 3 +- .../eclipse/cdt/ui/newui/AbstractPage.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../cdt/debug/dap/gdbjtag/Activator.java | 2 +- .../dom/lrparser/BaseExtensibleLanguage.java | 2 +- releng/scripts/check_code_cleanliness.sh | 2 +- .../.settings/org.eclipse.jdt.launching.prefs | 3 ++ .../.settings/org.eclipse.pde.prefs | 2 +- 16 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 windows/org.eclipse.cdt.msw.build.tests/.settings/org.eclipse.jdt.launching.prefs diff --git a/.gitattributes b/.gitattributes index 8bd9401822f..195fe440a7f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -64,6 +64,8 @@ package-list text *.xml text *.xsd text *.xsl text +yarn.lock text +*.lock text # Images *.gif binary diff --git a/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF index 9508e0dbfb3..1b73fcc4edb 100644 --- a/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.cdt.autotools.ui;singleton:=true -Bundle-Version: 2.0.200.qualifier +Bundle-Version: 2.0.300.qualifier Bundle-Activator: org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin Bundle-Localization: plugin Bundle-Vendor: %provider diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java index 02e26ddfa96..19fce55b7c9 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java @@ -409,7 +409,7 @@ public class AutoconfParser { } throw new BlockEndCondition(token); - // 1. Check for end of statement + // 1. Check for end of statement case ITokenConstants.EOL: case ITokenConstants.SEMI: return; @@ -462,7 +462,7 @@ public class AutoconfParser { INVALID_FI); throw new BlockEndCondition(token); - // 4. Look for for/while loops + // 4. Look for for/while loops case ITokenConstants.SH_FOR: checkLineStart(token, atStart); parseBlock(parent, token, new AutoconfForElement()); @@ -489,7 +489,7 @@ public class AutoconfParser { AutoconfUntilElement.class, AutoconfSelectElement.class }, INVALID_DONE); throw new BlockEndCondition(token); - // 5. Look for case statements + // 5. Look for case statements case ITokenConstants.SH_CASE: checkLineStart(token, atStart); parseCaseBlock(parent, token, new AutoconfCaseElement()); @@ -507,7 +507,7 @@ public class AutoconfParser { new Class[] { AutoconfCaseElement.class, AutoconfCaseConditionElement.class }, INVALID_ESAC); throw new BlockEndCondition(token); - // 6. Check for HERE documents + // 6. Check for HERE documents case ITokenConstants.SH_HERE: case ITokenConstants.SH_HERE_DASH: @@ -584,7 +584,7 @@ public class AutoconfParser { case ITokenConstants.EOF: throw new BlockEndCondition(token); - // 2. Check macro expansions + // 2. Check macro expansions case ITokenConstants.WORD: token = checkMacro(parent, token); break; diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java index 19ed970c915..be6f23c2921 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java @@ -422,7 +422,7 @@ public class MakeContentProvider implements ITreeContentProvider, IMakeTargetLis /** * Check if the resource is in the list of source entries. - + * @param rc - resource to check. * @return {@code true} if the resource is a source folder, {@code false} otherwise. * diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java index 8186fc07b92..a59d13da68d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java @@ -858,7 +858,7 @@ public class ManagedBuildManager extends AbstractCExtension { return; } } catch (BuildException e) {return;} - + // Figure out if there is a listener for this change IResource resource = config.getOwner(); List listeners = (List) getBuildModelListeners().get(resource); @@ -1363,10 +1363,10 @@ public class ManagedBuildManager extends AbstractCExtension { try { DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); Document doc = builder.newDocument(); - + // Get the build information for the project ManagedBuildInfo buildInfo = (ManagedBuildInfo) getBuildInfo(project); - + // Save the build info if (buildInfo != null && !buildInfo.isReadOnly() && @@ -1381,7 +1381,7 @@ public class ManagedBuildManager extends AbstractCExtension { Element rootElement = doc.createElement(ROOT_NODE_NAME); doc.appendChild(rootElement); buildInfo.serialize(doc, rootElement); - + // Transform the document to something we can save in a file ByteArrayOutputStream stream = new ByteArrayOutputStream(); Transformer transformer = TransformerFactory.newInstance().newTransformer(); @@ -1391,11 +1391,11 @@ public class ManagedBuildManager extends AbstractCExtension { DOMSource source = new DOMSource(doc); StreamResult result = new StreamResult(stream); transformer.transform(source, result); - + // Save the document IFile projectFile = project.getFile(SETTINGS_FILE_NAME); String utfString = stream.toString("UTF-8"); //$NON-NLS-1$ - + if (projectFile.exists()) { if (projectFile.isReadOnly()) { // If we are not running headless, and there is a UI Window around, grab it @@ -1429,7 +1429,7 @@ public class ManagedBuildManager extends AbstractCExtension { } else { projectFile.create(new ByteArrayInputStream(utfString.getBytes("UTF-8")), IResource.FORCE, new NullProgressMonitor()); //$NON-NLS-1$ } - + // Close the streams stream.close(); } @@ -1450,7 +1450,7 @@ public class ManagedBuildManager extends AbstractCExtension { // Save to IFile failed err = e; } - + if (err != null) { // Put out an error message indicating that the attempted write to the .cdtbuild project file failed IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); @@ -1458,7 +1458,7 @@ public class ManagedBuildManager extends AbstractCExtension { IWorkbenchWindow windows[] = PlatformUI.getWorkbench().getWorkbenchWindows(); window = windows[0]; } - + final Shell shell = window.getShell(); if (shell != null) { final String exceptionMsg = err.getMessage(); @@ -1536,9 +1536,9 @@ public class ManagedBuildManager extends AbstractCExtension { for (int i=0; i < configs.length; i++) { ManagedBuildManager.performValueHandlerEvent(configs[i], IManagedOptionValueHandler.EVENT_CLOSE); } - + info.setValid(false); - + try { resource.setSessionProperty(buildInfoProperty, null); } catch (CoreException e) { @@ -1819,7 +1819,7 @@ public class ManagedBuildManager extends AbstractCExtension { return Status.OK_STATUS; /* ManagedBuildInfo buildInfo = null; - + // Get the build info associated with this project for this session try { buildInfo = findBuildInfo(resource.getProject(), true); @@ -2729,7 +2729,7 @@ public class ManagedBuildManager extends AbstractCExtension { } catch (Exception e) { // TODO: Issue error reagarding not being able to load the project file (.cdtbuild) } - + try { // Check if the project needs its container initialized initBuildInfoContainer(buildInfo); @@ -2811,7 +2811,7 @@ public class ManagedBuildManager extends AbstractCExtension { */ /* synchronized private static ManagedBuildInfo findBuildInfoSynchronized(IProject project, boolean forceLoad) { ManagedBuildInfo buildInfo = null; - + // Check if there is any build info associated with this project for this session try { buildInfo = (ManagedBuildInfo)project.getSessionProperty(buildInfoProperty); @@ -2822,7 +2822,7 @@ public class ManagedBuildManager extends AbstractCExtension { } catch (CoreException e) { // return null; } - + if(buildInfo == null && forceLoad){ // Make sure the extension information is loaded first try { @@ -2831,11 +2831,11 @@ public class ManagedBuildManager extends AbstractCExtension { e.printStackTrace(); return null; } - - + + // Check weather getBuildInfo is called from converter buildInfo = UpdateManagedProjectManager.getConvertedManagedBuildInfo(project); - + // Nothing in session store, so see if we can load it from cdtbuild if (buildInfo == null) { try { @@ -2852,7 +2852,7 @@ public class ManagedBuildManager extends AbstractCExtension { IWorkbenchWindow windows[] = PlatformUI.getWorkbench().getWorkbenchWindows(); window = windows[0]; } - + final Shell shell = window.getShell(); final String exceptionMsg = e.getMessage(); //using syncExec could cause a dead-lock @@ -2866,7 +2866,7 @@ public class ManagedBuildManager extends AbstractCExtension { } } ); } - + if (buildInfo != null && !buildInfo.isContainerInited()) { // NOTE: If this is called inside the above rule, then an IllegalArgumentException can // occur when the CDT project file is saved - it uses the Workspace Root as the scheduling rule. @@ -2880,7 +2880,7 @@ public class ManagedBuildManager extends AbstractCExtension { } } } - + return buildInfo; } */ diff --git a/codan/org.eclipse.cdt.codan.core/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.core/META-INF/MANIFEST.MF index e352f79968f..fc5928b29f4 100644 --- a/codan/org.eclipse.cdt.codan.core/META-INF/MANIFEST.MF +++ b/codan/org.eclipse.cdt.codan.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.cdt.codan.core;singleton:=true -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.200.qualifier Bundle-Activator: org.eclipse.cdt.codan.core.CodanCorePlugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/IProblemPreferenceDescriptor.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/IProblemPreferenceDescriptor.java index 0f79abb2b1a..36d60f28da6 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/IProblemPreferenceDescriptor.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/IProblemPreferenceDescriptor.java @@ -65,6 +65,7 @@ public interface IProblemPreferenceDescriptor extends Cloneable { * Custom type, represented by string input field by default */ TYPE_CUSTOM("custom"); //$NON-NLS-1$ + private String literal; private PreferenceType(String literal) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTester.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTester.java index 544f98fe686..1d4bbdeaba7 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTester.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTester.java @@ -120,7 +120,7 @@ public class RewriteTester extends TestSuite { private static RewriteBaseTest createTestClass(String className, String testName, List files) throws Exception { - try { + try { Class refClass = Class.forName(className); Constructor ct = refClass.getConstructor(new Class[] { String.class, List.class }); RewriteBaseTest test = (RewriteBaseTest) ct.newInstance(new Object[] { testName, files }); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CommentsTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CommentsTabPage.java index 92960a4e20d..c6af2150502 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CommentsTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CommentsTabPage.java @@ -99,8 +99,7 @@ public class CommentsTabPage extends FormatterTabPage { // createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_do_not_join_lines, DefaultCodeFormatterConstants.FORMATTER_JOIN_LINES_IN_COMMENTS, true); // Line comment group - final Group commentGroup = createGroup(numColumns, composite, - FormatterMessages.CommentsTabPage_group1_title); + final Group commentGroup = createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group1_title); // final CheckboxPreference singleLineCommentsOnFirstColumn= createPrefFalseTrue(lineCommentGroup, numColumns, FormatterMessages.CommentsTabPage_format_line_comments_on_first_column, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT_STARTING_ON_FIRST_COLUMN, false); // ((GridData) singleLineCommentsOnFirstColumn.getControl().getLayoutData()).horizontalIndent= indent; createPrefFalseTrue(commentGroup, numColumns, FormatterMessages.CommentsTabPage_block_comment, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java index 7d04e8e2872..8de06a776fd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java @@ -567,7 +567,7 @@ public abstract class AbstractPage extends PropertyPage implements IPreferencePa * which do not share ICProjectDescription instance. * But some changes may be saved wrong if they are affected * by data from another property pages (Discovery options etc). - + * To enable 2nd mode, just create the following file: * /.metadata/.plugins/org.eclipse.cdt.ui/apply_mode */ diff --git a/jtag/org.eclipse.cdt.debug.dap.gdbjtag/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.dap.gdbjtag/META-INF/MANIFEST.MF index 98eedcba27c..000958c0c1d 100644 --- a/jtag/org.eclipse.cdt.debug.dap.gdbjtag/META-INF/MANIFEST.MF +++ b/jtag/org.eclipse.cdt.debug.dap.gdbjtag/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-SymbolicName: org.eclipse.cdt.debug.dap.gdbjtag;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.100.0.qualifier Bundle-Activator: org.eclipse.cdt.debug.dap.gdbjtag.Activator Require-Bundle: org.apache.commons.io, org.eclipse.core.runtime, diff --git a/jtag/org.eclipse.cdt.debug.dap.gdbjtag/src/org/eclipse/cdt/debug/dap/gdbjtag/Activator.java b/jtag/org.eclipse.cdt.debug.dap.gdbjtag/src/org/eclipse/cdt/debug/dap/gdbjtag/Activator.java index b66d075a721..475c7f3ea00 100644 --- a/jtag/org.eclipse.cdt.debug.dap.gdbjtag/src/org/eclipse/cdt/debug/dap/gdbjtag/Activator.java +++ b/jtag/org.eclipse.cdt.debug.dap.gdbjtag/src/org/eclipse/cdt/debug/dap/gdbjtag/Activator.java @@ -13,7 +13,7 @@ public class Activator extends AbstractUIPlugin { // The shared instance private static Activator plugin; - + /** * The constructor */ diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java index 0d8f81a0349..20996aa3a99 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java @@ -216,7 +216,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage { if(e instanceof TemplateIDErrorException){ //IScanner completePreprocessor = new CPreprocessor(reader, scanInfo, pl, log, config, fileCreator); //IParser completeParser = getCompleteParser(preprocessor, index, parserProperties); - + ISecondaryParser completeParser = getCompleteParser((ITokenStream)parser, preprocessor, index, parserProperties); //completeParser.setAction(parser.getAction()); //((ISecondaryParser)completeParser).setTokenMap((ITokenStream)parser); diff --git a/releng/scripts/check_code_cleanliness.sh b/releng/scripts/check_code_cleanliness.sh index c83b4d9e843..306d74fe744 100755 --- a/releng/scripts/check_code_cleanliness.sh +++ b/releng/scripts/check_code_cleanliness.sh @@ -15,7 +15,7 @@ set -e ## # Format code ## -: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.9/eclipse} +: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.13/eclipse} test ! -e check_code_cleanliness_workspace ${ECLIPSE} \ -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \ diff --git a/windows/org.eclipse.cdt.msw.build.tests/.settings/org.eclipse.jdt.launching.prefs b/windows/org.eclipse.cdt.msw.build.tests/.settings/org.eclipse.jdt.launching.prefs new file mode 100644 index 00000000000..f8a131b56e0 --- /dev/null +++ b/windows/org.eclipse.cdt.msw.build.tests/.settings/org.eclipse.jdt.launching.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning +org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning diff --git a/windows/org.eclipse.cdt.msw.build.tests/.settings/org.eclipse.pde.prefs b/windows/org.eclipse.cdt.msw.build.tests/.settings/org.eclipse.pde.prefs index d2dc703ba9e..51a63ec9988 100644 --- a/windows/org.eclipse.cdt.msw.build.tests/.settings/org.eclipse.pde.prefs +++ b/windows/org.eclipse.cdt.msw.build.tests/.settings/org.eclipse.pde.prefs @@ -19,7 +19,7 @@ compilers.p.missing-version-import-package=2 compilers.p.missing-version-require-bundle=2 compilers.p.no-required-att=0 compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=1 +compilers.p.not-externalized-att=2 compilers.p.service.component.without.lazyactivation=1 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1