Add missing Overrides annotation.
Take care of o.e.dltk.ruby.ui bundle.
Change-Id: I299e4f873a14faa79a84f15926da12ca035e8ca7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyLabelProvider.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyLabelProvider.java
index 231fd49..fa5625c 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyLabelProvider.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -39,6 +39,7 @@
fStorageLabelProvider = new StorageLabelProvider();
}
+ @Override
public Image getImage(Object element) {
if (element instanceof IStorage) {
return fStorageLabelProvider.getImage(element);
@@ -46,6 +47,7 @@
return null;
}
+ @Override
public String getText(Object element) {
if (element instanceof ISourceModule) {
final StringBuffer sb = new StringBuffer();
@@ -63,11 +65,7 @@
return super.getText(element);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.BaseLabelProvider#dispose()
- */
+ @Override
public void dispose() {
fStorageLabelProvider.dispose();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUI.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUI.java
index 638c21a..cad2605 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUI.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUI.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.ui;
@@ -40,6 +39,7 @@
plugin = this;
}
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
@@ -50,6 +50,7 @@
shutdownListeners.add(listener);
}
+ @Override
public void stop(BundleContext context) throws Exception {
Object[] listeners = shutdownListeners.getListeners();
for (int i = 0; i < listeners.length; ++i) {
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUILanguageToolkit.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUILanguageToolkit.java
index 114e350..91bb526 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUILanguageToolkit.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUILanguageToolkit.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.ui;
@@ -31,6 +30,7 @@
public class RubyUILanguageToolkit extends AbstractDLTKUILanguageToolkit {
private static ScriptElementLabels sInstance = new ScriptElementLabels() {
+ @Override
public void getElementLabel(IModelElement element, long flags,
StringBuffer buf) {
StringBuffer buffer = new StringBuffer(60);
@@ -44,6 +44,7 @@
buf.append(s);
}
+ @Override
protected void getTypeLabel(IType type, long flags, StringBuffer buf) {
StringBuffer buffer = new StringBuffer(60);
super.getTypeLabel(type, flags, buffer);
@@ -79,6 +80,7 @@
return sToolkit;
}
+ @Override
public ScriptElementLabels getScriptElementLabels() {
return sInstance;
}
@@ -95,30 +97,37 @@
return RubyUI.getDefault().getDialogSettings();
}
+ @Override
public String getPartitioningId() {
return RubyConstants.RUBY_PARTITIONING;
}
+ @Override
public String getEditorId(Object inputElement) {
return RubyEditor.EDITOR_ID;
}
+ @Override
public String getInterpreterContainerId() {
return "org.eclipse.dltk.ruby.launching.INTERPRETER_CONTAINER"; //$NON-NLS-1$
}
+ @Override
public ScriptUILabelProvider createScriptUILabelProvider() {
return null;
}
+ @Override
public boolean getProvideMembers(ISourceModule element) {
return true;
}
+ @Override
public ScriptTextTools getTextTools() {
return RubyUI.getDefault().getTextTools();
}
+ @Override
public ScriptSourceViewerConfiguration createSourceViewerConfiguration() {
return new SimpleRubySourceViewerConfiguration(getTextTools()
.getColorManager(), getPreferenceStore(), null,
@@ -134,14 +143,17 @@
"org.eclipse.dltk.ruby.preferences.templates" //$NON-NLS-1$
};
+ @Override
public String getInterpreterPreferencePage() {
return INTERPRETERS_PREFERENCE_PAGE_ID;
}
+ @Override
public String getDebugPreferencePage() {
return DEBUG_PREFERENCE_PAGE_ID;
}
+ @Override
public String[] getEditorPreferencePages() {
return EDITOR_PREFERENCE_PAGES_IDS;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUIPreferenceInitializer.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUIPreferenceInitializer.java
index 124d650..da99d43 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUIPreferenceInitializer.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyUIPreferenceInitializer.java
@@ -1,11 +1,10 @@
/*******************************************************************************
- * 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
*
-
*******************************************************************************/
package org.eclipse.dltk.ruby.internal.ui;
@@ -17,6 +16,7 @@
public class RubyUIPreferenceInitializer extends AbstractPreferenceInitializer {
+ @Override
public void initializeDefaultPreferences() {
IPreferenceStore store = RubyUI.getDefault().getPreferenceStore();
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenMethodAction.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenMethodAction.java
index 4dd39bb..222afe2 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenMethodAction.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenMethodAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -17,6 +17,7 @@
public class RubyOpenMethodAction extends OpenMethodAction {
+ @Override
protected IDLTKUILanguageToolkit getUILanguageToolkit() {
return RubyUILanguageToolkit.getInstance();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenTypeAction.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenTypeAction.java
index cfdfe40..31ebd29 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenTypeAction.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenTypeAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -14,22 +14,27 @@
import org.eclipse.dltk.ui.actions.OpenTypeAction;
public class RubyOpenTypeAction extends OpenTypeAction {
+ @Override
protected IDLTKUILanguageToolkit getUILanguageToolkit() {
return RubyUILanguageToolkit.getInstance();
}
+ @Override
protected String getOpenTypeErrorMessage() {
return Messages.RubyOpenTypeAction_anExceptionOccurredWhileOpeningTheClassModule;
}
+ @Override
protected String getOpenTypeErrorTitle() {
return Messages.RubyOpenTypeAction_openClassModule;
}
+ @Override
protected String getOpenTypeDialogMessage() {
return Messages.RubyOpenTypeAction_selectAClassModuleToOpen;
}
+ @Override
protected String getOpenTypeDialogTitle() {
return Messages.RubyOpenTypeAction_openClassModule;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenTypeInHierarchyAction.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenTypeInHierarchyAction.java
index d188a5b..d746a57 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenTypeInHierarchyAction.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/actions/RubyOpenTypeInHierarchyAction.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.ui.actions;
@@ -15,6 +14,7 @@
public class RubyOpenTypeInHierarchyAction extends OpenTypeInHierarchyAction {
+ @Override
protected IDLTKUILanguageToolkit getLanguageToolkit() {
return RubyUILanguageToolkit.getInstance();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyBracketInserter.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyBracketInserter.java
index cec6d3e..bfaa2c2 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyBracketInserter.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyBracketInserter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -30,6 +30,7 @@
super(scriptEditor);
}
+ @Override
public void verifyKey(VerifyEvent event) {
// early pruning to slow down normal typing as little as possible
if (!event.doit
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyEditor.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyEditor.java
index 1150c34..967d9c4 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyEditor.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -41,25 +41,30 @@
private org.eclipse.dltk.internal.ui.editor.BracketInserter fBracketInserter = new RubyBracketInserter(
this);
+ @Override
protected void initializeEditor() {
super.initializeEditor();
setEditorContextMenuId(EDITOR_CONTEXT);
setRulerContextMenuId(RULER_CONTEXT);
}
+ @Override
public IPreferenceStore getScriptPreferenceStore() {
return RubyUI.getDefault().getPreferenceStore();
}
+ @Override
public ScriptTextTools getTextTools() {
return RubyUI.getDefault().getTextTools();
}
+ @Override
protected ScriptOutlinePage doCreateOutlinePage() {
return new RubyOutlinePage(this, RubyUI.getDefault()
.getPreferenceStore());
}
+ @Override
protected void connectPartitioningToElement(IEditorInput input,
IDocument document) {
if (document instanceof IDocumentExtension3) {
@@ -74,6 +79,7 @@
private IFoldingStructureProvider fFoldingProvider = null;
+ @Override
protected IFoldingStructureProvider getFoldingStructureProvider() {
if (fFoldingProvider == null) {
fFoldingProvider = new RubyFoldingStructureProvider();
@@ -81,22 +87,27 @@
return fFoldingProvider;
}
+ @Override
public String getEditorId() {
return EDITOR_ID;
}
+ @Override
public IDLTKLanguageToolkit getLanguageToolkit() {
return RubyLanguageToolkit.getDefault();
}
+ @Override
public String getCallHierarchyID() {
return "org.eclipse.dltk.callhierarchy.view"; //$NON-NLS-1$
}
+ @Override
protected void initializeKeyBindingScopes() {
setKeyBindingScopes(new String[] { "org.eclipse.dltk.ui.rubyEditorScope" }); //$NON-NLS-1$
}
+ @Override
public void createPartControl(Composite parent) {
super.createPartControl(parent);
@@ -134,6 +145,7 @@
}
}
+ @Override
protected void doSetInput(IEditorInput input) throws CoreException {
super.doSetInput(input);
IModelElement element = getInputModelElement();
@@ -142,6 +154,7 @@
}
}
+ @Override
public void dispose() {
ISourceViewer sourceViewer = getSourceViewer();
if (sourceViewer instanceof ITextViewerExtension)
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyOutlinePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyOutlinePage.java
index 5d9ff62..1570fd5 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyOutlinePage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyOutlinePage.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.ui.editor;
@@ -29,6 +28,7 @@
super(editor, store);
}
+ @Override
protected void registerSpecialToolbarActions(IActionBars actionBars) {
// TODO: help support
@@ -92,6 +92,7 @@
fMemberFilterActionGroup.contributeToToolBar(toolBarManager);
}
+ @Override
protected ILabelDecorator getLabelDecorator() {
return new RubyOutlineLabelDecorator();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/infoviews/RubyDocumentationView.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/infoviews/RubyDocumentationView.java
index 81172ed..a657bf9 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/infoviews/RubyDocumentationView.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/infoviews/RubyDocumentationView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -16,10 +16,12 @@
public class RubyDocumentationView extends AbstractDocumentationView {
+ @Override
protected IPreferenceStore getPreferenceStore() {
return RubyUI.getDefault().getPreferenceStore();
}
+ @Override
protected String getNature() {
return RubyNature.NATURE_ID;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyEditorColoringConfigurationBlock.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyEditorColoringConfigurationBlock.java
index 4084dda..e430fe5 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyEditorColoringConfigurationBlock.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyEditorColoringConfigurationBlock.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -91,10 +91,12 @@
super(store);
}
+ @Override
protected String[][] getSyntaxColorListModel() {
return fSyntaxColorListModel;
}
+ @Override
protected ProjectionViewer createPreviewViewer(Composite parent,
IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
boolean showAnnotationsOverview, int styles, IPreferenceStore store) {
@@ -102,6 +104,7 @@
showAnnotationsOverview, styles, store);
}
+ @Override
protected ScriptSourceViewerConfiguration createSimpleSourceViewerConfiguration(
IColorManager colorManager, IPreferenceStore preferenceStore,
ITextEditor editor, boolean configureFormatter) {
@@ -110,15 +113,18 @@
configureFormatter);
}
+ @Override
protected void setDocumentPartitioning(IDocument document) {
RubyDocumentSetupParticipant participant = new RubyDocumentSetupParticipant();
participant.setup(document);
}
+ @Override
protected InputStream getPreviewContentReader() {
return getClass().getResourceAsStream(PREVIEW_FILE_NAME);
}
+ @Override
protected ScriptTextTools getTextTools() {
return RubyUI.getDefault().getTextTools();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyEditorSyntaxColoringPreferencePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyEditorSyntaxColoringPreferencePage.java
index 721f041..5d1a163 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyEditorSyntaxColoringPreferencePage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyEditorSyntaxColoringPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -17,18 +17,22 @@
public class RubyEditorSyntaxColoringPreferencePage extends
AbstractConfigurationBlockPreferencePage {
+ @Override
protected String getHelpId() {
return null;
}
+ @Override
protected void setDescription() {
// leave blank
}
+ @Override
protected void setPreferenceStore() {
setPreferenceStore(RubyUI.getDefault().getPreferenceStore());
}
+ @Override
protected IPreferenceConfigurationBlock createConfigurationBlock(
OverlayPreferenceStore overlayPreferenceStore) {
return new RubyEditorColoringConfigurationBlock(overlayPreferenceStore);
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyFoldingPreferencePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyFoldingPreferencePage.java
index 920a626..fc17e22 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyFoldingPreferencePage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyFoldingPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -24,16 +24,19 @@
public class RubyFoldingPreferencePage extends
AbstractConfigurationBlockPreferencePage {
+ @Override
protected IPreferenceConfigurationBlock createConfigurationBlock(
OverlayPreferenceStore overlayPreferenceStore) {
return new DefaultFoldingPreferenceConfigurationBlock(
overlayPreferenceStore, this) {
+ @Override
protected IFoldingPreferenceBlock createDocumentationBlock(
OverlayPreferenceStore store, PreferencePage page) {
return new RubyDocFoldingPreferenceBlock(store, page);
}
+ @Override
protected IFoldingPreferenceBlock createSourceCodeBlock(
OverlayPreferenceStore store, PreferencePage page) {
return new RubyFoldingPreferenceBlock(store, page);
@@ -41,14 +44,17 @@
};
}
+ @Override
protected String getHelpId() {
return null;
}
+ @Override
protected void setDescription() {
// setDescription(RubyPreferencesMessages.EditorFoldingPreferencePageDescription);
}
+ @Override
protected void setPreferenceStore() {
setPreferenceStore(RubyUI.getDefault().getPreferenceStore());
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyGlobalPreferencesPage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyGlobalPreferencesPage.java
index a92ddb9..826e17a 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyGlobalPreferencesPage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyGlobalPreferencesPage.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.ui.preferences;
@@ -22,6 +21,7 @@
public class RubyGlobalPreferencesPage extends
AbstractConfigurationBlockPreferencePage {
+ @Override
protected IPreferenceConfigurationBlock createConfigurationBlock(
OverlayPreferenceStore overlayPreferenceStore) {
return new AbstractConfigurationBlock(overlayPreferenceStore, this) {
@@ -33,14 +33,17 @@
};
}
+ @Override
protected String getHelpId() {
return null;
}
+ @Override
protected void setDescription() {
setDescription(RubyPreferencesMessages.GlobalPreferencePageDescription);
}
+ @Override
protected void setPreferenceStore() {
setPreferenceStore(RubyUI.getDefault().getPreferenceStore());
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyLibraryPreferencePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyLibraryPreferencePage.java
index 63fef95..91356ca 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyLibraryPreferencePage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyLibraryPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -17,6 +17,7 @@
public class RubyLibraryPreferencePage extends UserLibraryPreferencePage {
+ @Override
protected IDLTKLanguageToolkit getLanguageToolkit() {
return RubyLanguageToolkit.getDefault();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyPropertyPage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyPropertyPage.java
index ec80db1..b953dfa 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyPropertyPage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyPropertyPage.java
@@ -7,6 +7,7 @@
public class RubyPropertyPage extends PropertyPage {
+ @Override
protected Control createContents(Composite parent) {
return new Composite(parent, SWT.NONE);
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyTodoTaskPreferencePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyTodoTaskPreferencePage.java
index f6b5439..e743bba 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyTodoTaskPreferencePage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/RubyTodoTaskPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -24,14 +24,17 @@
public class RubyTodoTaskPreferencePage extends
AbstractConfigurationBlockPropertyAndPreferencePage {
+ @Override
protected String getHelpId() {
return null;
}
+ @Override
protected void setDescription() {
setDescription(RubyPreferencesMessages.TodoTaskDescription);
}
+ @Override
protected AbstractOptionsBlock createOptionsBlock(
IStatusChangeListener newStatusChangedListener, IProject project,
IWorkbenchPreferenceContainer container) {
@@ -39,23 +42,28 @@
container, RubyPlugin.PLUGIN_ID);
}
+ @Override
protected String getNatureId() {
return RubyNature.NATURE_ID;
}
+ @Override
protected String getProjectHelpId() {
return null;
}
+ @Override
protected void setPreferenceStore() {
setPreferenceStore(new PreferencesAdapter(RubyPlugin.getDefault()
.getPluginPreferences()));
}
+ @Override
protected String getPreferencePageId() {
return "org.eclipse.dltk.ruby.preferences.todo"; //$NON-NLS-1$
}
+ @Override
protected String getPropertyPageId() {
return "org.eclipse.dltk.ruby.propertyPage.todo"; //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/SimpleRubySourceViewerConfiguration.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/SimpleRubySourceViewerConfiguration.java
index 030c5c8..4031d9a 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/SimpleRubySourceViewerConfiguration.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/preferences/SimpleRubySourceViewerConfiguration.java
@@ -1,11 +1,10 @@
/*******************************************************************************
- * 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
*
-
*******************************************************************************/
package org.eclipse.dltk.ruby.internal.ui.preferences;
@@ -34,35 +33,42 @@
fConfigureFormatter = configureFormatter;
}
+ @Override
public IAutoEditStrategy[] getAutoEditStrategies(
ISourceViewer sourceViewer, String contentType) {
return null;
}
+ @Override
public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
return null;
}
+ @Override
public IAnnotationHover getOverviewRulerAnnotationHover(
ISourceViewer sourceViewer) {
return null;
}
+ @Override
public int[] getConfiguredTextHoverStateMasks(ISourceViewer sourceViewer,
String contentType) {
return null;
}
+ @Override
public ITextHover getTextHover(ISourceViewer sourceViewer,
String contentType, int stateMask) {
return null;
}
+ @Override
public ITextHover getTextHover(ISourceViewer sourceViewer,
String contentType) {
return null;
}
+ @Override
public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
if (fConfigureFormatter)
return super.getContentFormatter(sourceViewer);
@@ -70,16 +76,19 @@
return null;
}
+ @Override
public IInformationControlCreator getInformationControlCreator(
ISourceViewer sourceViewer) {
return null;
}
+ @Override
public IInformationPresenter getInformationPresenter(
ISourceViewer sourceViewer) {
return null;
}
+ @Override
public IInformationPresenter getOutlinePresenter(
ISourceViewer sourceViewer, boolean doCodeResolve) {
return null;
@@ -90,6 +99,7 @@
return null;
}
+ @Override
public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
return null;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/search/RubySearchPage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/search/RubySearchPage.java
index 53c5e14..f59ad77 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/search/RubySearchPage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/search/RubySearchPage.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.ui.search;
@@ -14,6 +13,7 @@
import org.eclipse.dltk.ui.search.ScriptSearchPage;
public class RubySearchPage extends ScriptSearchPage {
+ @Override
protected IDLTKLanguageToolkit getLanguageToolkit() {
return RubyLanguageToolkit.getDefault();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyCodeTemplatesPreferencePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyCodeTemplatesPreferencePage.java
index e21bf4b..a23bff6 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyCodeTemplatesPreferencePage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyCodeTemplatesPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -22,33 +22,25 @@
*/
public class RubyCodeTemplatesPreferencePage extends
ScriptTemplatePreferencePage {
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplatePreferencePage#createSourceViewerConfiguration()
- */
+ @Override
protected ScriptSourceViewerConfiguration createSourceViewerConfiguration() {
return new SimpleRubySourceViewerConfiguration(getTextTools()
.getColorManager(), getPreferenceStore(), null,
IRubyPartitions.RUBY_PARTITIONING, false);
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplatePreferencePage#getTemplateAccess()
- */
+ @Override
protected ScriptTemplateAccess getTemplateAccess() {
return RubyTemplateAccess.getInstance();
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplatePreferencePage#setDocumentParticioner(org.eclipse.jface.text.IDocument)
- */
+ @Override
protected void setDocumentPartitioner(IDocument document) {
getTextTools().setupDocumentPartitioner(document,
IRubyPartitions.RUBY_PARTITIONING);
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplatePreferencePage#setPreferenceStore()
- */
+ @Override
protected void setPreferenceStore() {
setPreferenceStore(RubyUI.getDefault().getPreferenceStore());
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateAccess.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateAccess.java
index a6459a3..f715cdd 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateAccess.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateAccess.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.ui.templates;
@@ -30,23 +29,17 @@
return instance;
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplateAccess#getPreferenceStore()
- */
+ @Override
protected IPreferenceStore getPreferenceStore() {
return RubyUI.getDefault().getPreferenceStore();
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplateAccess#getContextTypeId()
- */
+ @Override
protected String getContextTypeId() {
return RubyUniversalTemplateContextType.CONTEXT_TYPE_ID;
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplateAccess#getCustomTemplatesKey()
- */
+ @Override
protected String getCustomTemplatesKey() {
return CUSTOM_TEMPLATES_KEY;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateCompletionProcessor.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateCompletionProcessor.java
index 3959996..0fc7adf 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateCompletionProcessor.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateCompletionProcessor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -24,23 +24,17 @@
super(context);
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplateCompletionProcessor#getContextTypeId()
- */
+ @Override
protected String getContextTypeId() {
return RubyUniversalTemplateContextType.CONTEXT_TYPE_ID;
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplateCompletionProcessor#getIgnore()
- */
+ @Override
protected char[] getIgnore() {
return IGNORE;
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplateCompletionProcessor#getTemplateAccess()
- */
+ @Override
protected ScriptTemplateAccess getTemplateAccess() {
return RubyTemplateAccess.getInstance();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateContext.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateContext.java
index b8c9531..d52121d 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateContext.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplateContext.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.ui.templates;
@@ -28,9 +27,7 @@
super(type, document, completionOffset, completionLength, sourceModule);
}
- /*
- * @see org.eclipse.dltk.ui.templates.ScriptTemplateContext#getIndenter()
- */
+ @Override
protected IScriptTemplateIndenter getIndenter() {
IPreferencesLookupDelegate prefs = getPreferences();
if (TabStyle.SPACES == TabStyle.forName(prefs.getString(
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyUniversalTemplateContextType.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyUniversalTemplateContextType.java
index 656de17..415f381 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyUniversalTemplateContextType.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyUniversalTemplateContextType.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.ui.templates;
@@ -29,6 +28,7 @@
super(id, name);
}
+ @Override
public ScriptTemplateContext createContext(IDocument document, int offset,
int length, ISourceModule sourceModule) {
return new RubyTemplateContext(this, document, offset, length, sourceModule);
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RDocRule.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RDocRule.java
index 9c1df86..ee1c4bf 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RDocRule.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RDocRule.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -36,6 +36,7 @@
* the character scanner to be used
* @return <code>true</code> if the end sequence has been detected
*/
+ @Override
protected boolean endSequenceDetected(ICharacterScanner scanner) {
int readCount = 1;
int c;
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyAutoEditStrategy.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyAutoEditStrategy.java
index 8ace084..d44e33d 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyAutoEditStrategy.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyAutoEditStrategy.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -100,6 +100,7 @@
return fIsSmartMode;
}
+ @Override
public void customizeDocumentCommand(IDocument d, DocumentCommand c) {
if (c.doit == false)
return;
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyCodeScanner.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyCodeScanner.java
index 79d2b80..045addf 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyCodeScanner.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyCodeScanner.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -77,10 +77,12 @@
initialize();
}
+ @Override
protected String[] getTokenProperties() {
return fgTokenProperties;
}
+ @Override
protected List createRules() {
List/* <IRule> */rules = new ArrayList/* <IRule> */();
IToken keyword = getToken(IRubyColorConstants.RUBY_KEYWORD);
@@ -102,6 +104,7 @@
rules.add(new StartWithRule(globalVariable, '$') {
private char[] addition = new char[] { '=', '-' };
+ @Override
protected char[] getAdditional() {
return addition;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyHeuristicScanner.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyHeuristicScanner.java
index ace482c..9ad24ce 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyHeuristicScanner.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyHeuristicScanner.java
@@ -45,6 +45,7 @@
IDocument.DEFAULT_CONTENT_TYPE);
}
+ @Override
public int getToken(int pos, String s) {
Assert.isNotNull(s);
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyPairMatcher.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyPairMatcher.java
index 74ef060..71820f7 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyPairMatcher.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyPairMatcher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -32,6 +32,7 @@
}
/* @see ICharacterPairMatcher#match(IDocument, int) */
+ @Override
public IRegion match(IDocument document, int offset) {
try {
return performMatch(document, offset);
@@ -80,6 +81,7 @@
return null;
}
+ @Override
public int getAnchor() {
int superAnchor = super.getAnchor();
if (superAnchor < 0)
@@ -88,6 +90,7 @@
return superAnchor;
}
+ @Override
public void clear() {
super.clear();
fBlockAnchor = -1;
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySemanticHighlighting.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySemanticHighlighting.java
index a6678a7..91a11f4 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySemanticHighlighting.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySemanticHighlighting.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -32,26 +32,32 @@
this.enablement = enablement;
}
+ @Override
public String getPreferenceKey() {
return preferenceKey;
}
+ @Override
public String getDisplayName() {
return displayName;
}
+ @Override
public boolean isSemanticOnly() {
return displayName != null;
}
+ @Override
public String getEnabledPreferenceKey() {
return enablement ? super.getEnabledPreferenceKey() : null;
}
+ @Override
public int hashCode() {
return preferenceKey.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySemanticUpdateWorker.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySemanticUpdateWorker.java
index f95c3f7..ee3e3cf 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySemanticUpdateWorker.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySemanticUpdateWorker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -103,6 +103,7 @@
private static final boolean ACTIVE = true;
+ @Override
public boolean visitGeneral(ASTNode node) throws Exception {
if (!ACTIVE) {
return true;
@@ -175,6 +176,7 @@
return true;
}
+ @Override
public void endvisitGeneral(ASTNode node) throws Exception {
stack.pop();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySingleQuoteStringScanner.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySingleQuoteStringScanner.java
index 6ebecc8..11430c8 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySingleQuoteStringScanner.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySingleQuoteStringScanner.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.ui.text;
@@ -29,10 +28,12 @@
initialize();
}
+ @Override
protected String[] getTokenProperties() {
return fgTokenProperties;
}
+ @Override
protected List createRules() {
List rules = new ArrayList();
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySourceViewerConfiguration.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySourceViewerConfiguration.java
index 75a9ffd..5af6710 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySourceViewerConfiguration.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySourceViewerConfiguration.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -8,7 +8,6 @@
* Contributors:
* xored software, Inc. - initial API and implementation
* xored software, Inc. - fix tab handling (Bug# 200024) (Alex Panchenko)
-
*******************************************************************************/
package org.eclipse.dltk.ruby.internal.ui.text;
@@ -69,10 +68,12 @@
super(colorManager, preferenceStore, editor, partitioning);
}
+ @Override
public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
return IRubyPartitions.RUBY_PARTITION_TYPES;
}
+ @Override
protected void initializeScanners() {
Assert.isTrue(isNewSetup());
fCodeScanner = new RubyCodeScanner(getColorManager(), fPreferenceStore);
@@ -103,6 +104,7 @@
return fCommentScanner;
}
+ @Override
public IPresentationReconciler getPresentationReconciler(
ISourceViewer sourceViewer) {
PresentationReconciler reconciler = new ScriptPresentationReconciler();
@@ -157,6 +159,7 @@
* @see RubySourceViewerConfiguration#ScriptSourceViewerConfiguration(IColorManager,
* IPreferenceStore, ITextEditor, String)
*/
+ @Override
public void handlePropertyChangeEvent(PropertyChangeEvent event) {
Assert.isTrue(isNewSetup());
if (fCodeScanner.affectsBehavior(event))
@@ -180,6 +183,7 @@
* @return <code>true</code> if event causes a behavioral change
*
*/
+ @Override
public boolean affectsTextPresentation(PropertyChangeEvent event) {
return fCodeScanner.affectsBehavior(event)
|| fStringScanner.affectsBehavior(event)
@@ -200,6 +204,7 @@
};
}
+ @Override
public IInformationPresenter getHierarchyPresenter(
ScriptSourceViewer sourceViewer, boolean doCodeResolve) {
// Do not create hierarchy presenter if there's no CU.
@@ -222,6 +227,7 @@
return presenter;
}
+ @Override
public IAutoEditStrategy[] getAutoEditStrategies(
ISourceViewer sourceViewer, String contentType) {
// // TODO: check contentType. think, do we really need it? :)
@@ -229,6 +235,7 @@
return new IAutoEditStrategy[] { new RubyAutoEditStrategy(partitioning) };
}
+ @Override
protected void alterContentAssistant(ContentAssistant assistant) {
IContentAssistProcessor scriptProcessor = new RubyCompletionProcessor(
getEditor(), assistant, IDocument.DEFAULT_CONTENT_TYPE);
@@ -240,10 +247,12 @@
IRubyPartitions.RUBY_STRING);
}
+ @Override
protected ContentAssistPreference getContentAssistPreference() {
return RubyContentAssistPreference.getDefault();
}
+ @Override
protected Map getHyperlinkDetectorTargets(final ISourceViewer sourceViewer) {
final Map targets = super.getHyperlinkDetectorTargets(sourceViewer);
targets.put("org.eclipse.dltk.ruby.code", getEditor()); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyTextTools.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyTextTools.java
index e66849d..d8fa7f6 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyTextTools.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubyTextTools.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.ui.text;
@@ -29,6 +28,7 @@
autoDisposeOnDisplayDispose);
}
+ @Override
public ScriptSourceViewerConfiguration createSourceViewerConfiguraton(
IPreferenceStore preferenceStore, ITextEditor editor,
String partitioning) {
@@ -36,10 +36,12 @@
preferenceStore, editor, partitioning);
}
+ @Override
public IPartitionTokenScanner getPartitionScanner() {
return new RubyPartitionScanner();
}
+ @Override
public SemanticHighlighting[] getSemanticHighlightings() {
return new RubySemanticUpdateWorker().getSemanticHighlightings();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/ScriptHeuristicScanner.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/ScriptHeuristicScanner.java
index 36ccc7e..65091d8 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/ScriptHeuristicScanner.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/ScriptHeuristicScanner.java
@@ -48,6 +48,7 @@
* {@link Character#isWhitespace(char)}) character.
*/
protected static class NonWhitespace extends StopCondition {
+ @Override
public boolean stop(char ch, int position, boolean forward) {
return !Character.isWhitespace(ch);
}
@@ -59,11 +60,13 @@
* @see RubyHeuristicScanner.NonWhitespace
*/
protected final class NonWhitespaceDefaultPartition extends NonWhitespace {
+ @Override
public boolean stop(char ch, int position, boolean forward) {
return super.stop(ch, position, true)
&& isDefaultPartition(position);
}
+ @Override
public int nextPosition(int position, boolean forward) {
ITypedRegion partition = getPartition(position);
if (fPartition.equals(partition.getType()))
@@ -87,6 +90,7 @@
* {@link Character#isJavaIdentifierPart(char)}) character.
*/
protected class NonIdentifierPart extends StopCondition {
+ @Override
public boolean stop(char ch, int position, boolean forward) {
return !isValidIdentifierPart(ch);
}
@@ -99,11 +103,13 @@
*/
protected final class NonIdentifierPartDefaultPartition extends
NonIdentifierPart {
+ @Override
public boolean stop(char ch, int position, boolean forward) {
return super.stop(ch, position, true)
|| !isDefaultPartition(position);
}
+ @Override
public int nextPosition(int position, boolean forward) {
ITypedRegion partition = getPartition(position);
if (fPartition.equals(partition.getType()))
@@ -150,6 +156,7 @@
/*
* @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#stop(char, int)
*/
+ @Override
public boolean stop(char ch, int position, boolean forward) {
return Arrays.binarySearch(fChars, ch) >= 0 && isDefaultPartition(position);
}
@@ -157,6 +164,7 @@
/*
* @see org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner.StopCondition#nextPosition(int, boolean)
*/
+ @Override
public int nextPosition(int position, boolean forward) {
ITypedRegion partition= getPartition(position);
if (fPartition.equals(partition.getType()))
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposal.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposal.java
index 3ca659b..23930c4 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposal.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposal.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -31,6 +31,7 @@
displayString, relevance, isInDoc);
}
+ @Override
protected boolean isSmartTrigger(char trigger) {
if (trigger == '$') {
return true;
@@ -39,6 +40,7 @@
return false;
}
+ @Override
protected boolean insertCompletion() {
IPreferenceStore preference = RubyUI.getDefault().getPreferenceStore();
return preference
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposalCollector.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposalCollector.java
index 2a9af66..149f7a0 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposalCollector.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposalCollector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -24,6 +24,7 @@
protected final static char[] VAR_TRIGGER = new char[] { '\t', ' ', '=',
';', '.' };
+ @Override
protected char[] getVarTrigger() {
return VAR_TRIGGER;
}
@@ -33,6 +34,7 @@
}
// Specific proposals creation. May be use factory?
+ @Override
protected ScriptCompletionProposal createScriptCompletionProposal(
String completion, int replaceStart, int length, Image image,
String displayString, int i) {
@@ -40,6 +42,7 @@
image, displayString, i);
}
+ @Override
protected ScriptCompletionProposal createScriptCompletionProposal(
String completion, int replaceStart, int length, Image image,
String displayString, int i, boolean isInDoc) {
@@ -47,6 +50,7 @@
image, displayString, i, isInDoc);
}
+ @Override
protected ScriptCompletionProposal createOverrideCompletionProposal(
IScriptProject scriptProject, ISourceModule compilationUnit,
String name, String[] paramTypes, int start, int length,
@@ -56,6 +60,7 @@
completionProposal);
}
+ @Override
protected IScriptCompletionProposal createKeywordProposal(
CompletionProposal proposal) {
String completion = String.valueOf(proposal.getCompletion());
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposalLabelProvider.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposalLabelProvider.java
index c4df59c..a795a7c 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposalLabelProvider.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyCompletionProposalLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -23,6 +23,7 @@
private static final String SEPARATOR = RubyLabelProvider.SEPARATOR;
private static final String PACKAGE_SEPARATOR = RubyLabelProvider.PACKAGE_SEPARATOR;
+ @Override
protected String createMethodProposalLabel(CompletionProposal methodProposal) {
StringBuffer nameBuffer = new StringBuffer();
@@ -52,6 +53,7 @@
return nameBuffer.toString();
}
+ @Override
protected String createOverrideMethodProposalLabel(
CompletionProposal methodProposal) {
StringBuffer nameBuffer = new StringBuffer();
@@ -83,6 +85,7 @@
return nameBuffer.toString();
}
+ @Override
public String createTypeProposalLabel(CompletionProposal typeProposal) {
final StringBuffer nameBuffer = new StringBuffer();
final IType type = (IType) typeProposal.getModelElement();
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyContentAssistPreference.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyContentAssistPreference.java
index 8656929..44c432d 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyContentAssistPreference.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyContentAssistPreference.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -15,6 +15,7 @@
public class RubyContentAssistPreference extends ContentAssistPreference {
static RubyContentAssistPreference sDefault;
+ @Override
protected ScriptTextTools getTextTools() {
return RubyUI.getDefault().getTextTools();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyOverrideCompletionProposal.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyOverrideCompletionProposal.java
index 654f2f0..4f36ba9 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyOverrideCompletionProposal.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyOverrideCompletionProposal.java
@@ -1,11 +1,10 @@
/*******************************************************************************
- * 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
*
-
*******************************************************************************/
package org.eclipse.dltk.ruby.internal.ui.text.completion;
@@ -46,10 +45,12 @@
setReplacementString(buffer.toString());
}
+ @Override
public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
return fMethodName;
}
+ @Override
protected boolean updateReplacementString(IDocument document, char trigger, int offset) throws CoreException, BadLocationException {
final IDocument buffer= new Document(document.get());
int index= offset - 1;
@@ -64,6 +65,7 @@
return false;
}
+ @Override
public IContextInformation getContextInformation() {
return new ContextInformation(getDisplayString(), getDisplayString());
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyTypeCompletionProposalComputer.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyTypeCompletionProposalComputer.java
index 3dbdcf2..a98cc97 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyTypeCompletionProposalComputer.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/completion/RubyTypeCompletionProposalComputer.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.ui.text.completion;
@@ -21,11 +20,13 @@
public RubyTypeCompletionProposalComputer() {
}
+ @Override
protected ScriptCompletionProposalCollector createCollector(
ScriptContentAssistInvocationContext context) {
return new RubyCompletionProposalCollector(context.getSourceModule());
}
+ @Override
protected TemplateCompletionProcessor createTemplateProposalComputer(
ScriptContentAssistInvocationContext context) {
return new RubyTemplateCompletionProcessor(context);
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyDocFoldingPreferenceBlock.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyDocFoldingPreferenceBlock.java
index 5166818..2b8ba15 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyDocFoldingPreferenceBlock.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyDocFoldingPreferenceBlock.java
@@ -12,10 +12,12 @@
super(store, page);
}
+ @Override
protected String getInitiallyFoldDocsText() {
return RubyFoldingMessages.RubyFoldingPreferenceBlock_initFoldRDoc;
}
+ @Override
protected boolean supportsDocFolding() {
return true;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyFoldingPreferenceBlock.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyFoldingPreferenceBlock.java
index 1082342..d4315fe 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyFoldingPreferenceBlock.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyFoldingPreferenceBlock.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -35,6 +35,7 @@
RubyPreferenceConstants.EDITOR_FOLDING_INIT_REQUIRES));
}
+ @Override
protected void addInitiallyFoldOptions(Group group) {
super.addInitiallyFoldOptions(group);
createCheckBox(group,
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyFoldingStructureProvider.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyFoldingStructureProvider.java
index 889403c..9bc9c19 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyFoldingStructureProvider.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/folding/RubyFoldingStructureProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -34,34 +34,42 @@
public class RubyFoldingStructureProvider extends
AbstractASTFoldingStructureProvider {
+ @Override
protected String getCommentPartition() {
return IRubyPartitions.RUBY_COMMENT;
}
+ @Override
protected String getDocPartition() {
return IRubyPartitions.RUBY_DOC;
}
+ @Override
protected String getPartition() {
return IRubyPartitions.RUBY_PARTITIONING;
}
+ @Override
protected IPartitionTokenScanner getPartitionScanner() {
return new RubyPartitionScanner();
}
+ @Override
protected String[] getPartitionTypes() {
return IRubyPartitions.RUBY_PARTITION_TYPES;
}
+ @Override
protected String getNatureId() {
return RubyNature.NATURE_ID;
}
+ @Override
protected ILog getLog() {
return RubyUI.getDefault().getLog();
}
+ @Override
protected CodeBlock[] getCodeBlocks(String code, int offset) {
ModuleDeclaration decl = parse(code, offset);
if (decl instanceof FakeModuleDeclaration) {
@@ -70,11 +78,13 @@
return buildCodeBlocks(decl, offset);
}
+ @Override
protected boolean mayCollapse(ASTNode s,
FoldingStructureComputationContext ctx) {
return super.mayCollapse(s, ctx) || s instanceof CallExpression;
}
+ @Override
protected boolean initiallyCollapse(ASTNode s) {
return super.initiallyCollapse(s)
|| (s instanceof CallExpression && fInitCollapseRequires);
@@ -82,6 +92,7 @@
private boolean fInitCollapseRequires;
+ @Override
protected void initializePreferences(IPreferenceStore store) {
super.initializePreferences(store);
fInitCollapseRequires = store
@@ -114,6 +125,7 @@
return children.size();
}
+ @Override
public String toString() {
return declaration != null ? declaration.toString() : "(TOP)"; //$NON-NLS-1$
}
@@ -158,11 +170,13 @@
super(offset);
}
+ @Override
public boolean visit(ModuleDeclaration s) throws Exception {
declarations.push(new ModuleDeclarationContainer());
return visitGeneral(s);
}
+ @Override
public boolean visit(TypeDeclaration s) throws Exception {
handleRequireStatements();
final DeclarationContainer child = new DeclarationContainer(s,
@@ -172,11 +186,13 @@
return visitGeneral(s);
}
+ @Override
public boolean endvisit(TypeDeclaration s) throws Exception {
declarations.pop();
return super.endvisit(s);
}
+ @Override
public boolean visit(MethodDeclaration s) throws Exception {
handleRequireStatements();
final DeclarationContainer child = new DeclarationContainer(s, true);
@@ -185,6 +201,7 @@
return visitGeneral(s);
}
+ @Override
public boolean endvisit(MethodDeclaration s) throws Exception {
declarations.pop();
return super.endvisit(s);
@@ -209,6 +226,7 @@
}
}
+ @Override
public boolean endvisit(ModuleDeclaration s) throws Exception {
handleRequireStatements();
final DeclarationContainer container = popDeclaration();
@@ -216,6 +234,7 @@
return super.endvisit(s);
}
+ @Override
public boolean visitGeneral(ASTNode node) throws Exception {
if (declarations.size() == 1) {
if (node instanceof CallExpression) {
@@ -249,6 +268,7 @@
}
+ @Override
protected FoldingASTVisitor getFoldingVisitor(int offset) {
return new RubyFoldingASTVisitor(offset);
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/rules/RubySlashRegexpRule.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/rules/RubySlashRegexpRule.java
index d2097f3..f74ebbc 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/rules/RubySlashRegexpRule.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/rules/RubySlashRegexpRule.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.ui.text.rules;
@@ -23,6 +22,7 @@
super("/", "/", token, '\\', true, false); //$NON-NLS-1$ //$NON-NLS-2$
}
+ @Override
public IToken evaluate(ICharacterScanner scanner, boolean resume) {
IToken token = super.evaluate(scanner, resume);
if (token.isUndefined())
@@ -75,6 +75,7 @@
* the character scanner to be used
* @return <code>true</code> if the end sequence has been detected
*/
+ @Override
protected boolean endSequenceDetected(ICharacterScanner scanner) {
/*
* This method is copied from PatternRule.
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/typehierarchy/RubyHierarchyInformationControl.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/typehierarchy/RubyHierarchyInformationControl.java
index 6990257..ec8a328 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/typehierarchy/RubyHierarchyInformationControl.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/typehierarchy/RubyHierarchyInformationControl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * 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
@@ -21,6 +21,7 @@
super(parent, shellStyle, treeStyle);
}
+ @Override
protected IPreferenceStore getPreferenceStore() {
return RubyUI.getDefault().getPreferenceStore();
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewClassWizard.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewClassWizard.java
index 289aefc..cdb9aff 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewClassWizard.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewClassWizard.java
@@ -15,16 +15,20 @@
setWindowTitle(RubyWizardMessages.NewClassWizard_title);
}
+ @Override
protected NewSourceModulePage createNewSourceModulePage() {
return new RubyNewFilePage() {
+ @Override
protected String getPageTitle() {
return RubyWizardMessages.NewClassPage_title;
}
+ @Override
protected String getPageDescription() {
return RubyWizardMessages.NewClassPage_description;
}
+ @Override
protected String getFileContent() {
String text = getFileText();
String className = Character.toUpperCase(text.charAt(0))
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewFilePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewFilePage.java
index 6eda310..f8ad77d 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewFilePage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewFilePage.java
@@ -4,6 +4,7 @@
import org.eclipse.dltk.ui.wizards.NewSourceModulePage;
public abstract class RubyNewFilePage extends NewSourceModulePage {
+ @Override
protected String getRequiredNature() {
return RubyNature.NATURE_ID;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewFileWizard.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewFileWizard.java
index ab4d8a3..764f214 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewFileWizard.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewFileWizard.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.ui.wizards;
@@ -24,12 +23,15 @@
setWindowTitle(RubyWizardMessages.NewFileWizard_title);
}
+ @Override
protected NewSourceModulePage createNewSourceModulePage() {
return new RubyNewFilePage() {
+ @Override
protected String getPageTitle() {
return RubyWizardMessages.NewFilePage_title;
}
+ @Override
protected String getPageDescription() {
return RubyWizardMessages.NewFilePage_description;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewModuleWizard.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewModuleWizard.java
index 4151f88..5029e23 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewModuleWizard.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewModuleWizard.java
@@ -15,16 +15,20 @@
setWindowTitle(RubyWizardMessages.NewModuleWizard_title);
}
+ @Override
protected NewSourceModulePage createNewSourceModulePage() {
return new RubyNewFilePage() {
+ @Override
protected String getPageTitle() {
return RubyWizardMessages.NewModulePage_title;
}
+ @Override
protected String getPageDescription() {
return RubyWizardMessages.NewModulePage_description;
}
+ @Override
protected String getFileContent() {
String text = getFileText();
String className = Character.toUpperCase(text.charAt(0))
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/ui/formatter/RubyFormatterPreferencePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/ui/formatter/RubyFormatterPreferencePage.java
index 401ddb7..28915ca 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/ui/formatter/RubyFormatterPreferencePage.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/ui/formatter/RubyFormatterPreferencePage.java
@@ -22,26 +22,32 @@
private static final PreferenceKey FORMATTER = new PreferenceKey(
RubyUI.PLUGIN_ID, RubyPreferenceConstants.FORMATTER_ID);
+ @Override
protected String getNatureId() {
return RubyNature.NATURE_ID;
}
+ @Override
protected PreferenceKey getFormatterPreferenceKey() {
return FORMATTER;
}
+ @Override
protected IDialogSettings getDialogSettings() {
return RubyUI.getDefault().getDialogSettings();
}
+ @Override
protected String getPreferencePageId() {
return "org.eclipse.dltk.ruby.preferences.formatter"; //$NON-NLS-1$
}
+ @Override
protected String getPropertyPageId() {
return "org.eclipse.dltk.ruby.propertyPage.formatter"; //$NON-NLS-1$
}
+ @Override
protected ScriptSourceViewerConfiguration createSimpleSourceViewerConfiguration(
IColorManager colorManager, IPreferenceStore preferenceStore,
ITextEditor editor, boolean configureFormatter) {
@@ -50,6 +56,7 @@
configureFormatter);
}
+ @Override
protected void setPreferenceStore() {
setPreferenceStore(RubyUI.getDefault().getPreferenceStore());
}
