From 39b1ed1b979042eec3f0179ef57e3a6e7206cd48 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Thu, 20 Nov 2014 11:05:08 -0500 Subject: [PATCH] Setting preferences for standalone debugger plugin. Signed-off-by: Marc Khouzam --- .../.settings/org.eclipse.jdt.core.prefs | 64 ++++++++++++++++++- .../ApplicationWorkbenchWindowAdvisor.java | 36 +++++------ .../debug/application/DebugExecutable.java | 6 +- 3 files changed, 82 insertions(+), 24 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.application/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.cdt.debug.application/.settings/org.eclipse.jdt.core.prefs index 8000cd6ca61..8e782bb1250 100644 --- a/debug/org.eclipse.cdt.debug.application/.settings/org.eclipse.jdt.core.prefs +++ b/debug/org.eclipse.cdt.debug.application/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,69 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationWorkbenchWindowAdvisor.java b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationWorkbenchWindowAdvisor.java index 7e3bb8c3009..603201a588c 100644 --- a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationWorkbenchWindowAdvisor.java +++ b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationWorkbenchWindowAdvisor.java @@ -143,26 +143,26 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { try { for (int i = 0; i < args.length; ++i) { - if ("-application".equals(args[i])) + if ("-application".equals(args[i])) //$NON-NLS-1$ i++; // ignore the application specifier - else if ("-product".equals(args[i])) + else if ("-product".equals(args[i])) //$NON-NLS-1$ i++; // ignore the product specifier - else if ("-b".equals(args[i])) { + else if ("-b".equals(args[i])) { //$NON-NLS-1$ ++i; if (i < args.length) buildLog = args[i]; } - else if ("-a".equals(args[i])) { + else if ("-a".equals(args[i])) { //$NON-NLS-1$ attachExecutable = true; } - else if ("-c".equals(args[i])) { + else if ("-c".equals(args[i])) { //$NON-NLS-1$ ++i; - corefile = ""; - executable = ""; + corefile = ""; //$NON-NLS-1$ + executable = ""; //$NON-NLS-1$ if (i < args.length) corefile = args[i]; } - else if ("-e".equals(args[i])) { + else if ("-e".equals(args[i])) { //$NON-NLS-1$ ++i; if (i < args.length) executable = findExecutable(args[i]); @@ -172,7 +172,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { if (i < args.length) argBuffer.append(args[i++]); while (i < args.length) { - argBuffer.append(" "); + argBuffer.append(" "); //$NON-NLS-1$ argBuffer.append(args[i++]); } arguments = argBuffer.toString(); @@ -188,7 +188,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { File coreFile = new File(corefile); corefile = coreFile.getCanonicalPath(); if (executable == null || !executableFile.exists() || !coreFile.exists()) { - final CoreFileInfo info = new CoreFileInfo("", "", ""); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ + final CoreFileInfo info = new CoreFileInfo("", "", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ $NON-NLS-2$ $NON-NLS-3$ final IStatus errorStatus = new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, Messages.GdbDebugNewExecutableCommand_Binary_file_does_not_exist, null); final String executablePath = executable; @@ -214,7 +214,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { } }); // Check and see if we failed above and if so, quit - if (info.getHostPath().equals("")) { + if (info.getHostPath().equals("")) { //$NON-NLS-1$ monitor.done(); // throw internal exception which will be caught below throw new StartupException(errorStatus.getMessage()); @@ -231,7 +231,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { buildLog = buildLogFile.getCanonicalPath(); } if (!executableFile.exists() || (buildLog != null && !buildLogFile.exists())) { - final NewExecutableInfo info = new NewExecutableInfo("", "", "", ""); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ + final NewExecutableInfo info = new NewExecutableInfo("", "", "", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ $NON-NLS-2$ $NON-NLS-3$ final IStatus errorStatus = new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, Messages.GdbDebugNewExecutableCommand_Binary_file_does_not_exist, null); final String executablePath = executable; @@ -258,7 +258,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { } }); // Check and see if we failed above and if so, quit - if (info.getHostPath().equals("")) { + if (info.getHostPath().equals("")) { //$NON-NLS-1$ monitor.done(); // throw internal exception which will be caught below throw new StartupException(errorStatus.getMessage()); @@ -281,15 +281,15 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { String memento = ResourcesPlugin.getWorkspace().getRoot().getPersistentProperty(new QualifiedName(STANDALONE_QUALIFIER, LAST_LAUNCH)); if (memento != null) config = DebugExecutable.getLaunchManager().getLaunchConfiguration(memento); - String oldExecutable = ""; - String oldArguments = ""; - String oldBuildLog = ""; + String oldExecutable = ""; //$NON-NLS-1$ + String oldArguments = ""; //$NON-NLS-1$ + String oldBuildLog = ""; //$NON-NLS-1$ if (config != null) { oldExecutable = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, ""); //$NON-NLS-1$ oldArguments = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$ oldBuildLog = config.getAttribute(ICDTStandaloneDebugLaunchConstants.BUILD_LOG_LOCATION, ""); //$NON-NLS-1$ } - final NewExecutableInfo info = new NewExecutableInfo("", "", "", ""); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ + final NewExecutableInfo info = new NewExecutableInfo("", "", "", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ $NON-NLS-2$ $NON-NLS-3$ final IStatus errorStatus = new Status(IStatus.WARNING, Activator.PLUGIN_ID, 0, Messages.GdbDebugNewExecutableCommand_Binary_file_does_not_exist, null); final String executablePath = oldExecutable; @@ -318,7 +318,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { } }); // Check and see if we failed above and if so, quit - if (info.getHostPath().equals("")) { + if (info.getHostPath().equals("")) { //$NON-NLS-1$ monitor.done(); // throw internal exception which will be caught below throw new StartupException(errorStatus.getMessage()); diff --git a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/DebugExecutable.java b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/DebugExecutable.java index 04b68505984..2ca1f22a963 100644 --- a/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/DebugExecutable.java +++ b/debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/internal/debug/application/DebugExecutable.java @@ -115,7 +115,7 @@ public class DebugExecutable { // Delete all launch configurations that specify the project we are about to delete ILaunchConfiguration lconfigs[] = getLaunchManager().getLaunchConfigurations(); for (ILaunchConfiguration lconfig : lconfigs) { - if (lconfig.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(proj.getName())) + if (lconfig.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(proj.getName())) //$NON-NLS-1$ lconfig.delete(); } @@ -234,7 +234,7 @@ public class DebugExecutable { monitor.worked(1); - if (!("".equals(executable))) + if (!("".equals(executable))) //$NON-NLS-1$ // We need to parse the macro compile options if they exist. We need to lock the // workspace when we do this so we don't have multiple copies of our GCCCompilerOptionsParser // LanguageSettingsProvider and we end up filling in the wrong one. @@ -267,7 +267,7 @@ public class DebugExecutable { } monitor.worked(1); } else { - System.out.println("Import job failed"); + System.out.println("Import job failed"); //$NON-NLS-1$ return null; } return config;