Move o.e.dltk.ruby.debug.ui to Java 1.6.
* Bump BREE to 1.6.
* Add missing @Override.
* Move Eclips-LazyStart to Bundle-ActivationPolicy
* Generify adapters.
Change-Id: I9b8acb76ec698684d3151870f6a39a67996d5011
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/.classpath b/plugins/org.eclipse.dltk.ruby.debug.ui/.classpath
index 64c5e31..ad32c83 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/.classpath
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/.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.debug.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.ruby.debug.ui/.settings/org.eclipse.jdt.core.prefs
index 9da9c28..c537b63 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Thu Oct 15 12:35:25 NOVST 2009
eclipse.preferences.version=1
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.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.ruby.debug.ui/META-INF/MANIFEST.MF
index 0ad60ca..f679e52 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/META-INF/MANIFEST.MF
@@ -23,10 +23,10 @@
org.eclipse.dltk.ruby.debug;bundle-version="0.0.0",
org.eclipse.dltk.ruby.ui;bundle-version="0.0.0",
org.eclipse.core.filesystem
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.dltk.ruby.internal.debug.ui,
org.eclipse.dltk.ruby.internal.debug.ui.console,
org.eclipse.dltk.ruby.internal.debug.ui.interpreters,
org.eclipse.dltk.ruby.internal.debug.ui.launchConfigurations,
org.eclipse.dltk.ruby.internal.debug.ui.launcher
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/RubySmartStepEvaluator.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/RubySmartStepEvaluator.java
index e192b72..98124fc 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/RubySmartStepEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/RubySmartStepEvaluator.java
@@ -12,6 +12,7 @@
public RubySmartStepEvaluator() {
}
+ @Override
public boolean isFiltered(String[] filters, IScriptThread thread) {
try {
final IStackFrame topFrame = thread.getTopStackFrame();
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyAdapterFactory.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyAdapterFactory.java
index eab00f0..04d7f24 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyAdapterFactory.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyAdapterFactory.java
@@ -12,23 +12,26 @@
private static final IElementLabelProvider labelProvider = new RubyVariableLabelProvider();
- public Object getAdapter(Object adaptableObject, Class adapterType) {
+ @Override
+ @SuppressWarnings("unchecked")
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adaptableObject instanceof IScriptStackFrame) {
if (IColumnPresentationFactory.class.equals(adapterType)) {
- return columnPresentation;
+ return (T) columnPresentation;
}
}
if (adaptableObject instanceof IScriptVariable) {
if (IElementLabelProvider.class.equals(adapterType)) {
- return labelProvider;
+ return (T) labelProvider;
}
}
return null;
}
- public Class[] getAdapterList() {
+ @Override
+ public Class<?>[] getAdapterList() {
return new Class[] { IColumnPresentationFactory.class,
IElementLabelProvider.class };
}
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyDebugHover.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyDebugHover.java
index ad2b894..918053c 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyDebugHover.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyDebugHover.java
@@ -11,6 +11,7 @@
return new RubyDebugModelPresentation();
}
+ @Override
public void setPreferenceStore(IPreferenceStore store) {
}
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyDebugUILanguageToolkit.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyDebugUILanguageToolkit.java
index 37359e1..0aef521 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyDebugUILanguageToolkit.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyDebugUILanguageToolkit.java
@@ -6,16 +6,12 @@
public class RubyDebugUILanguageToolkit extends AbstractDebugUILanguageToolkit {
- /*
- * @see org.eclipse.dltk.debug.ui.IDLTKDebugUILanguageToolkit#getDebugModelId()
- */
+ @Override
public String getDebugModelId() {
return RubyDebugConstants.DEBUG_MODEL_ID;
}
- /*
- * @see org.eclipse.dltk.debug.ui.IDLTKDebugUILanguageToolkit#getPreferenceStore()
- */
+ @Override
public IPreferenceStore getPreferenceStore() {
return RubyDebugUIPlugin.getDefault().getPreferenceStore();
}
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyToggleBreakpointAdapter.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyToggleBreakpointAdapter.java
index fd56871..26f277b 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyToggleBreakpointAdapter.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyToggleBreakpointAdapter.java
@@ -22,31 +22,37 @@
return validator;
}
+ @Override
public void toggleMethodBreakpoints(IWorkbenchPart part,
ISelection selection) throws CoreException {
// Not implemented for ruby yet
}
+ @Override
public boolean canToggleMethodBreakpoints(IWorkbenchPart part,
ISelection selection) {
return false;
}
+ @Override
public void toggleWatchpoints(IWorkbenchPart part, ISelection selection)
throws CoreException {
// Not implemented for ruby yet
}
+ @Override
public boolean canToggleWatchpoints(IWorkbenchPart part,
ISelection selection) {
return false;
}
+ @Override
public void toggleBreakpoints(IWorkbenchPart part, ISelection selection)
throws CoreException {
toggleLineBreakpoints(part, selection);
}
+ @Override
public boolean canToggleBreakpoints(IWorkbenchPart part,
ISelection selection) {
return canToggleLineBreakpoints(part, selection);
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyVariableColumnPresentationFactory.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyVariableColumnPresentationFactory.java
index 62cf290..b4508fe 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyVariableColumnPresentationFactory.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyVariableColumnPresentationFactory.java
@@ -9,6 +9,7 @@
public class RubyVariableColumnPresentationFactory implements IColumnPresentationFactory {
+ @Override
public IColumnPresentation createColumnPresentation(IPresentationContext context, Object element) {
if (isApplicable(context, element)) {
return new RubyVariableColumnPresentation();
@@ -16,6 +17,7 @@
return null;
}
+ @Override
public String getColumnPresentationId(IPresentationContext context, Object element) {
if (isApplicable(context, element)) {
return RubyVariableColumnPresentation.RUBY_VARIABLE_COLUMN_PRESENTATION;
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyVariableLabelProvider.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyVariableLabelProvider.java
index 84f307f..5cdeba3 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyVariableLabelProvider.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/RubyVariableLabelProvider.java
@@ -91,6 +91,7 @@
return super.getColumnText(variable, value, context, columnId);
}
+ @Override
public void propertyChange(PropertyChangeEvent event) {
// TODO Auto-generated method stub
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/console/RubyConsoleTracker.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/console/RubyConsoleTracker.java
index 9cd0595..f6c9e63 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/console/RubyConsoleTracker.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/console/RubyConsoleTracker.java
@@ -1,12 +1,12 @@
/*******************************************************************************
- * 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
*
* Contributors:
- * xored software, Inc. - Ñompleted initial version (Alex Panchenko)
+ * xored software, Inc. - �ompleted initial version (Alex Panchenko)
*******************************************************************************/
package org.eclipse.dltk.ruby.internal.debug.ui.console;
@@ -22,10 +22,12 @@
private TextConsole fConsole;
+ @Override
public void connect(TextConsole console) {
fConsole = console;
}
+ @Override
public void disconnect() {
fConsole = null;
}
@@ -37,6 +39,7 @@
// private static final String FROM = "from "; //$NON-NLS-1$
// private static final String FROM_E = "from -e"; //$NON-NLS-1$
+ @Override
public void matchFound(PatternMatchEvent event) {
try {
int offset = event.getOffset();
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/console/RubyFileHyperlink.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/console/RubyFileHyperlink.java
index d0686d3..43742b1 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/console/RubyFileHyperlink.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/console/RubyFileHyperlink.java
@@ -1,12 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 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
*
* Contributors:
- * xored software, Inc. - Ñompleted initial version (Alex Panchenko)
+ * xored software, Inc. - �ompleted initial version (Alex Panchenko)
*******************************************************************************/
package org.eclipse.dltk.ruby.internal.debug.ui.console;
@@ -54,12 +54,15 @@
fConsole = console;
}
+ @Override
public void linkEntered() {
}
+ @Override
public void linkExited() {
}
+ @Override
public void linkActivated() {
final String fileName;
int lineNumber;
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/launchConfigurations/RubyRemoteTabGroup.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/launchConfigurations/RubyRemoteTabGroup.java
index 9325842..cf8f2bc 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/launchConfigurations/RubyRemoteTabGroup.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/launchConfigurations/RubyRemoteTabGroup.java
@@ -7,10 +7,7 @@
public class RubyRemoteTabGroup extends AbstractLaunchConfigurationTabGroup {
- /*
- * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog,
- * java.lang.String)
- */
+ @Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new RubyRemoteLaunchConfigurationTab(mode), new CommonTab() };
diff --git a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/launchConfigurations/RubyTabGroup.java b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/launchConfigurations/RubyTabGroup.java
index 2f89ece..95ab063 100644
--- a/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/launchConfigurations/RubyTabGroup.java
+++ b/plugins/org.eclipse.dltk.ruby.debug.ui/src/org/eclipse/dltk/ruby/internal/debug/ui/launchConfigurations/RubyTabGroup.java
@@ -1,11 +1,10 @@
/*******************************************************************************
- * 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.internal.debug.ui.launchConfigurations;
@@ -18,6 +17,7 @@
import org.eclipse.dltk.debug.ui.launchConfigurations.ScriptArgumentsTab;
public class RubyTabGroup extends AbstractLaunchConfigurationTabGroup {
+ @Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
RubyMainLaunchConfigurationTab main = new RubyMainLaunchConfigurationTab(mode);
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
