Modernize o.e.dltk.ruby.activestatedebugger.
* Bump BREE to Java 1.6.
* Enable project specific compiler warnings and fix the enabled ones.
* Add missing @Override and remove useless non-javadoc comments.
Change-Id: Ib3eacc1da1859ad19a6bd2bd45923adb6e6d7cf5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/org.eclipse.dltk.ruby.activestatedebugger/.classpath b/plugins/org.eclipse.dltk.ruby.activestatedebugger/.classpath
index 64c5e31..ad32c83 100644
--- a/plugins/org.eclipse.dltk.ruby.activestatedebugger/.classpath
+++ b/plugins/org.eclipse.dltk.ruby.activestatedebugger/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.dltk.ruby.activestatedebugger/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.ruby.activestatedebugger/.settings/org.eclipse.jdt.core.prefs
index af0f20f..dfdb304 100644
--- a/plugins/org.eclipse.dltk.ruby.activestatedebugger/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.ruby.activestatedebugger/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,106 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+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=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+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.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=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.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+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.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.dltk.ruby.activestatedebugger/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.ruby.activestatedebugger/META-INF/MANIFEST.MF
index cdd4b30..61b9a25 100644
--- a/plugins/org.eclipse.dltk.ruby.activestatedebugger/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.ruby.activestatedebugger/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@
org.eclipse.dltk.ruby.launching,
org.eclipse.dltk.ruby.core
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerPlugin.java b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerPlugin.java
index edfa164..1b42309 100644
--- a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerPlugin.java
+++ b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerPlugin.java
@@ -1,13 +1,11 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
-
*******************************************************************************/
-
package org.eclipse.dltk.ruby.activestatedebugger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -30,11 +28,13 @@
public RubyActiveStateDebuggerPlugin() {
}
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerRunner.java b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerRunner.java
index eecf3c9..687451b 100644
--- a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerRunner.java
+++ b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerRunner.java
@@ -35,6 +35,7 @@
super(install);
}
+ @Override
protected InterpreterConfig alterConfig(InterpreterConfig config,
PreferencesLookupDelegate delegate) {
@@ -61,53 +62,40 @@
return config;
}
+ @Override
protected String getDebuggingEngineId() {
return ENGINE_ID;
}
+ @Override
protected String getDebuggingEnginePreferenceKey() {
return RubyActiveStateDebuggerConstants.DEBUGGING_ENGINE_PATH_KEY;
}
+ @Override
protected String getDebuggingEnginePreferenceQualifier() {
return RubyActiveStateDebuggerPlugin.PLUGIN_ID;
}
- /*
- * @see
- * org.eclipse.dltk.launching.DebuggingEngineRunner#getDebugPreferenceQualifier
- * ()
- */
+ @Override
protected String getDebugPreferenceQualifier() {
return RubyDebugPlugin.PLUGIN_ID;
}
- /*
- * @seeorg.eclipse.dltk.launching.DebuggingEngineRunner#
- * getLoggingEnabledPreferenceKey()
- */
protected String getLoggingEnabledPreferenceKey() {
return RubyActiveStateDebuggerConstants.ENABLE_LOGGING;
}
- /*
- * @see
- * org.eclipse.dltk.launching.DebuggingEngineRunner#getLogFileNamePreferenceKey
- * ()
- */
+ @Override
protected String getLogFileNamePreferenceKey() {
return RubyActiveStateDebuggerConstants.LOG_FILE_NAME;
}
- /*
- * @see
- * org.eclipse.dltk.launching.DebuggingEngineRunner#getLogFilePathPreferenceKey
- * ()
- */
protected String getLogFilePathPreferenceKey() {
return RubyActiveStateDebuggerConstants.LOG_FILE_PATH;
}
+ @Override
protected String getProcessType() {
return RubyLaunchConfigurationConstants.ID_RUBY_PROCESS_TYPE;
}
diff --git a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerRunnerFactory.java b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerRunnerFactory.java
index c8ccde7..e0c3adf 100644
--- a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerRunnerFactory.java
+++ b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/RubyActiveStateDebuggerRunnerFactory.java
@@ -1,13 +1,11 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
-
*******************************************************************************/
-
package org.eclipse.dltk.ruby.activestatedebugger;
import org.eclipse.dltk.launching.IInterpreterInstall;
@@ -21,6 +19,7 @@
public class RubyActiveStateDebuggerRunnerFactory implements
IInterpreterRunnerFactory {
+ @Override
public IInterpreterRunner createRunner(IInterpreterInstall install) {
return new RubyActiveStateDebuggerRunner(install);
}
diff --git a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/preferences/RubyActiveStateDebuggerPreferenceInitializer.java b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/preferences/RubyActiveStateDebuggerPreferenceInitializer.java
index 3c1213a..11dd2af 100644
--- a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/preferences/RubyActiveStateDebuggerPreferenceInitializer.java
+++ b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/preferences/RubyActiveStateDebuggerPreferenceInitializer.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Jae Gangemi and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Jae Gangemi - initial API and implementation
+ *******************************************************************************/
package org.eclipse.dltk.ruby.activestatedebugger.preferences;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
@@ -10,9 +20,7 @@
public class RubyActiveStateDebuggerPreferenceInitializer extends
AbstractPreferenceInitializer {
- /*
- * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
- */
+ @Override
public void initializeDefaultPreferences() {
IPreferenceStore store = RubyActiveStateDebuggerPlugin.getDefault()
.getPreferenceStore();
diff --git a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/preferences/RubyActiveStateDebuggerPreferencePage.java b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/preferences/RubyActiveStateDebuggerPreferencePage.java
index 8a1b6d5..a369245 100644
--- a/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/preferences/RubyActiveStateDebuggerPreferencePage.java
+++ b/plugins/org.eclipse.dltk.ruby.activestatedebugger/src/org/eclipse/dltk/ruby/activestatedebugger/preferences/RubyActiveStateDebuggerPreferencePage.java
@@ -1,13 +1,11 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
-
*******************************************************************************/
-
package org.eclipse.dltk.ruby.activestatedebugger.preferences;
import org.eclipse.core.resources.IProject;
@@ -44,11 +42,7 @@
private static final String PREFERENCE_PAGE_ID = "org.eclipse.dltk.ruby.preferences.debug.engines.activestatedebugger"; //$NON-NLS-1$
private static final String PROPERTY_PAGE_ID = "org.eclipse.dltk.ruby.propertyPage.debug.engines.activestatedebugger"; //$NON-NLS-1$
- /*
- * @see org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPropertyAndPreferencePage#createOptionsBlock(org.eclipse.dltk.ui.util.IStatusChangeListener,
- * org.eclipse.core.resources.IProject,
- * org.eclipse.ui.preferences.IWorkbenchPreferenceContainer)
- */
+ @Override
protected AbstractOptionsBlock createOptionsBlock(
IStatusChangeListener newStatusChangedListener, IProject project,
IWorkbenchPreferenceContainer container) {
@@ -57,6 +51,7 @@
ENGINE_PATH, ENABLE_LOGGING, LOG_FILE_PATH,
LOG_FILE_NAME }, container) {
+ @Override
protected void createLoggingBlock(Composite composite) {
/*
* remove once the python active state debug runner supports
@@ -64,69 +59,62 @@
*/
}
+ @Override
protected PreferenceKey getDebuggingEnginePathKey() {
return ENGINE_PATH;
}
+ @Override
protected PreferenceKey getEnableLoggingPreferenceKey() {
return ENABLE_LOGGING;
}
+ @Override
protected PreferenceKey getLogFileNamePreferenceKey() {
return LOG_FILE_NAME;
}
+ @Override
protected PreferenceKey getLogFilePathPreferenceKey() {
return LOG_FILE_PATH;
}
};
}
- /*
- * @see org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPropertyAndPreferencePage#getHelpId()
- */
+ @Override
protected String getHelpId() {
// TODO Auto-generated method stub
return null;
}
+ @Override
protected String getNatureId() {
return RubyNature.NATURE_ID;
}
- /*
- * @see org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPropertyAndPreferencePage#getProjectHelpId()
- */
+ @Override
protected String getProjectHelpId() {
// TODO Auto-generated method stub
return null;
}
- /*
- * @see org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPropertyAndPreferencePage#setDescription()
- */
+ @Override
protected void setDescription() {
setDescription(PreferenceMessages.PreferencesDescription);
}
- /*
- * @see org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPropertyAndPreferencePage#setPreferenceStore()
- */
+ @Override
protected void setPreferenceStore() {
setPreferenceStore(RubyActiveStateDebuggerPlugin.getDefault()
.getPreferenceStore());
}
- /*
- * @see org.eclipse.dltk.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageId()
- */
+ @Override
protected String getPreferencePageId() {
return PREFERENCE_PAGE_ID;
}
- /*
- * @see org.eclipse.dltk.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageId()
- */
+ @Override
protected String getPropertyPageId() {
return PROPERTY_PAGE_ID;
}
