Fixed: [Issue 137] Make protobuf-dt require Java 6.
Added missing @Override.
diff --git a/com.google.eclipse.protobuf.ui/.settings/org.eclipse.jdt.core.prefs b/com.google.eclipse.protobuf.ui/.settings/org.eclipse.jdt.core.prefs
index eacd4ef..6653164 100644
--- a/com.google.eclipse.protobuf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/com.google.eclipse.protobuf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Oct 18 02:14:44 PDT 2011
+#Tue Oct 18 10:59:50 PDT 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -33,7 +33,7 @@
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
@@ -47,6 +47,7 @@
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/CodeGenerationErrorParser.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/CodeGenerationErrorParser.java
index e9cfbe1..b0c74e3 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/CodeGenerationErrorParser.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/CodeGenerationErrorParser.java
@@ -27,6 +27,7 @@
*/
private static final Pattern ERROR_PATTERN = Pattern.compile("(.*):\\s*(--.*)");
+ @Override
public boolean parseAndAddMarkerIfNecessary(String line, ProtocMarkerFactory markerFactory) throws CoreException {
Matcher errorMatcher = ERROR_PATTERN.matcher(line);
if (!errorMatcher.matches()) return false;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/CompoundParser.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/CompoundParser.java
index af6acdf..913a372 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/CompoundParser.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/CompoundParser.java
@@ -15,6 +15,7 @@
private static final List<ProtocOutputParser> PARSERS = asList(new LineSpecificErrorParser(), new CodeGenerationErrorParser());
+ @Override
public boolean parseAndAddMarkerIfNecessary(String line, ProtocMarkerFactory markerFactory) throws CoreException {
for (ProtocOutputParser parser: PARSERS)
if (parser.parseAndAddMarkerIfNecessary(line, markerFactory)) return true;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/LineSpecificErrorParser.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/LineSpecificErrorParser.java
index 233729f..aab727b 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/LineSpecificErrorParser.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/LineSpecificErrorParser.java
@@ -31,6 +31,7 @@
*/
private static final Pattern ERROR_PATTERN = Pattern.compile("(.*):(\\d+):(\\d+):\\s*(.*)");
+ @Override
public boolean parseAndAddMarkerIfNecessary(String line, ProtocMarkerFactory markerFactory) throws CoreException {
Matcher errorMatcher = ERROR_PATTERN.matcher(line);
if (!errorMatcher.matches()) return false;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/ProtobufBuildParticipant.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/ProtobufBuildParticipant.java
index 0ae6304..8de58ae 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/ProtobufBuildParticipant.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/ProtobufBuildParticipant.java
@@ -43,7 +43,7 @@
@Inject private ProtocOutputParser outputParser;
@Inject private ProtoDescriptorPathFinder protoDescriptorPathFinder;
- public void build(IBuildContext context, IProgressMonitor monitor) throws CoreException {
+ @Override public void build(IBuildContext context, IProgressMonitor monitor) throws CoreException {
IProject project = context.getBuiltProject();
CompilerPreferences preferences = compilerPreferencesFactory.preferences(project);
if (!preferences.shouldCompileProtoFiles()) return;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/CommentNodesFinder.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/CommentNodesFinder.java
index 0a456c1..1649f88 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/CommentNodesFinder.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/CommentNodesFinder.java
@@ -58,7 +58,7 @@
List<Pattern> compiled = new ArrayList<Pattern>();
for (final String s : patterns) {
Pattern p = cache.get(s, target.eResource(), new Provider<Pattern>() {
- public Pattern get() {
+ @Override public Pattern get() {
return Pattern.compile(MATCH_ANYTHING + s + MATCH_ANYTHING, CASE_INSENSITIVE);
}
});
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartInsertHandler.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartInsertHandler.java
index 0891218..30dace2 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartInsertHandler.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartInsertHandler.java
@@ -23,7 +23,7 @@
public abstract class SmartInsertHandler extends AbstractHandler {
/** {@inheritDoc} */
- public final Object execute(ExecutionEvent event) {
+ @Override public final Object execute(ExecutionEvent event) {
XtextEditor activeEditor = getActiveXtextEditor();
if (activeEditor != null) insertContent(activeEditor, styledTextFrom(activeEditor));
return null;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartSemicolonHandler.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartSemicolonHandler.java
index 552c6bd..2491e5a 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartSemicolonHandler.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/commands/SmartSemicolonHandler.java
@@ -87,7 +87,7 @@
final IXtextDocument document = editor.getDocument();
try {
return document.modify(new IUnitOfWork<ContentToInsert, XtextResource>() {
- public ContentToInsert exec(XtextResource resource) {
+ @Override public ContentToInsert exec(XtextResource resource) {
int offset = styledText.getCaretOffset();
ContentAssistContext[] context = contextFactory.create(editor.getInternalSourceViewer(), offset, resource);
for (ContentAssistContext c : context) {
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ImportHyperlink.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ImportHyperlink.java
index 89459ad..3022d5a 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ImportHyperlink.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ImportHyperlink.java
@@ -35,7 +35,7 @@
this.fileOpener = fileOpener;
}
- public void open() {
+ @Override public void open() {
try {
if (importUri.isPlatformResource()) {
fileOpener.openProtoFileInWorkspace(importUri);
@@ -51,15 +51,15 @@
}
}
- public String getTypeLabel() {
+ @Override public String getTypeLabel() {
return null;
}
- public IRegion getHyperlinkRegion() {
+ @Override public IRegion getHyperlinkRegion() {
return region;
}
- public String getHyperlinkText() {
+ @Override public String getHyperlinkText() {
return null;
}
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ProtobufHyperlinkDetector.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ProtobufHyperlinkDetector.java
index f95f1ef..b655570 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ProtobufHyperlinkDetector.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/hyperlinking/ProtobufHyperlinkDetector.java
@@ -47,7 +47,7 @@
IHyperlink[] importHyperlinks = importHyperlinks(document, region);
if (importHyperlinks != NO_HYPERLINKS) return importHyperlinks;
return document.readOnly(new IUnitOfWork<IHyperlink[], XtextResource>() {
- public IHyperlink[] exec(XtextResource resource) {
+ @Override public IHyperlink[] exec(XtextResource resource) {
return getHelper().createHyperlinksByOffset(resource, region.getOffset(), canShowMultipleHyperlinks);
}
});
@@ -55,7 +55,7 @@
private IHyperlink[] importHyperlinks(final IXtextDocument document, final IRegion region) {
return document.readOnly(new IUnitOfWork<IHyperlink[], XtextResource>() {
- public IHyperlink[] exec(XtextResource resource) {
+ @Override public IHyperlink[] exec(XtextResource resource) {
EObject resolved = eObjectAtOffsetHelper.resolveElementAt(resource, region.getOffset());
if (!(resolved instanceof Import)) return NO_HYPERLINKS;
Import anImport = (Import) resolved;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/model/FileStoreDocumentContentsFactory.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/model/FileStoreDocumentContentsFactory.java
index aa924f5..f6bb366 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/model/FileStoreDocumentContentsFactory.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/model/FileStoreDocumentContentsFactory.java
@@ -31,7 +31,7 @@
@Inject private UriEditorInputs files;
@Inject private XtextResourceFactory resourceFactory;
- public void createContents(XtextDocument document, Object element) throws CoreException {
+ @Override public void createContents(XtextDocument document, Object element) throws CoreException {
FileStoreEditorInput input = supportedEditorInputType().cast(element);
File file = files.fileFrom(input);
try {
@@ -54,7 +54,7 @@
}
}
- public boolean supportsEditorInputType(IEditorInput input) {
+ @Override public boolean supportsEditorInputType(IEditorInput input) {
return supportedEditorInputType().isInstance(input);
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/model/UriDocumentContentsFactory.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/model/UriDocumentContentsFactory.java
index 089a50f..2780f39 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/model/UriDocumentContentsFactory.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/model/UriDocumentContentsFactory.java
@@ -33,7 +33,7 @@
@Inject private ContentReader contentReader;
@Inject private XtextResourceFactory resourceFactory;
- public void createContents(XtextDocument document, Object element) throws CoreException {
+ @Override public void createContents(XtextDocument document, Object element) throws CoreException {
UriEditorInput input = supportedEditorInputType().cast(element);
URI uri = input.getFileUri();
try {
@@ -57,7 +57,7 @@
}
}
- public boolean supportsEditorInputType(IEditorInput input) {
+ @Override public boolean supportsEditorInputType(IEditorInput input) {
return supportedEditorInputType().isInstance(input);
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/syntaxcoloring/ProtobufSemanticHighlightingCalculator.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/syntaxcoloring/ProtobufSemanticHighlightingCalculator.java
index 386fb4a..0eb70ad 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/syntaxcoloring/ProtobufSemanticHighlightingCalculator.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/syntaxcoloring/ProtobufSemanticHighlightingCalculator.java
@@ -32,7 +32,7 @@
@Inject private INodes nodes;
@Inject private Options options;
- public void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor) {
+ @Override public void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor) {
if (resource == null) return;
EList<EObject> contents = resource.getContents();
if (contents == null || contents.isEmpty()) return;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlinePage.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlinePage.java
index b828c8e..fe0d9b5 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlinePage.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/outline/ProtobufOutlinePage.java
@@ -46,7 +46,7 @@
private Collection<IOutlineNode> childrenToExpand(IOutlineNode parent) {
if (parent instanceof DocumentRootNode) {
return filter(parent.getChildren(), new Predicate<IOutlineNode>() {
- public boolean apply(IOutlineNode node) {
+ @Override public boolean apply(IOutlineNode node) {
return !(node instanceof SimpleOutlineNode);
}
});
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/PreferenceStoreAccess.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/PreferenceStoreAccess.java
index b864651..721e93f 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/PreferenceStoreAccess.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/PreferenceStoreAccess.java
@@ -36,13 +36,13 @@
private String qualifier;
- public IPreferenceStore getContextPreferenceStore(Object context) {
+ @Override public IPreferenceStore getContextPreferenceStore(Object context) {
lazyInitialize();
return new ChainedPreferenceStore(new IPreferenceStore[] { getWritablePreferenceStore(context),
ProtobufActivator.getInstance().getPreferenceStore(), EditorsUI.getPreferenceStore()});
}
- public IPreferenceStore getPreferenceStore() {
+ @Override public IPreferenceStore getPreferenceStore() {
lazyInitialize();
return new ChainedPreferenceStore(new IPreferenceStore[] { getWritablePreferenceStore(),
ProtobufActivator.getInstance().getPreferenceStore(), EditorsUI.getPreferenceStore()});
@@ -52,14 +52,14 @@
return qualifier;
}
- public IPreferenceStore getWritablePreferenceStore() {
+ @Override public IPreferenceStore getWritablePreferenceStore() {
lazyInitialize();
ScopedPreferenceStore result = new ScopedPreferenceStore(InstanceScope.INSTANCE, getQualifier());
result.setSearchContexts(new IScopeContext[] { InstanceScope.INSTANCE, ConfigurationScope.INSTANCE });
return result;
}
- public IPreferenceStore getWritablePreferenceStore(Object context) {
+ @Override public IPreferenceStore getWritablePreferenceStore(Object context) {
lazyInitialize();
Object finalContext = context;
if (finalContext instanceof IFileEditorInput) {
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToButtonSelection.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToButtonSelection.java
index fc63b69..f415648 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToButtonSelection.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToButtonSelection.java
@@ -39,12 +39,12 @@
}
/** {@inheritDoc} */
- public void applyPreferenceValueToTarget() {
+ @Override public void applyPreferenceValueToTarget() {
apply(preference.value());
}
/** {@inheritDoc} */
- public void applyDefaultPreferenceValueToTarget() {
+ @Override public void applyDefaultPreferenceValueToTarget() {
apply(preference.defaultValue());
}
@@ -53,7 +53,7 @@
}
/** {@inheritDoc} */
- public void savePreferenceValue() {
+ @Override public void savePreferenceValue() {
preference.value(button.getSelection());
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToListItems.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToListItems.java
index af074e7..2bf06d4 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToListItems.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToListItems.java
@@ -43,12 +43,12 @@
}
/** {@inheritDoc} */
- public void applyPreferenceValueToTarget() {
+ @Override public void applyPreferenceValueToTarget() {
apply(preference.value());
}
/** {@inheritDoc} */
- public void applyDefaultPreferenceValueToTarget() {
+ @Override public void applyDefaultPreferenceValueToTarget() {
apply(preference.defaultValue());
}
@@ -58,7 +58,7 @@
}
/** {@inheritDoc} */
- public void savePreferenceValue() {
+ @Override public void savePreferenceValue() {
preference.value(asList(list.getItems()));
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToTextValue.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToTextValue.java
index b3f3114..170b0a1 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToTextValue.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/binding/BindingToTextValue.java
@@ -39,12 +39,12 @@
}
/** {@inheritDoc} */
- public void applyPreferenceValueToTarget() {
+ @Override public void applyPreferenceValueToTarget() {
apply(preference.value());
}
/** {@inheritDoc} */
- public void applyDefaultPreferenceValueToTarget() {
+ @Override public void applyDefaultPreferenceValueToTarget() {
apply(preference.defaultValue());
}
@@ -53,7 +53,7 @@
}
/** {@inheritDoc} */
- public void savePreferenceValue() {
+ @Override public void savePreferenceValue() {
preference.value(text.getText());
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/PreferenceAndPropertyPage.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/PreferenceAndPropertyPage.java
index 48d1831..830506a 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/PreferenceAndPropertyPage.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/PreferenceAndPropertyPage.java
@@ -151,7 +151,7 @@
* Returns the <code>{@link IProject}</code> that owns the properties shown in this page.
* @return the project that owns the properties shown in this page.
*/
- public final IAdaptable getElement() {
+ @Override public final IAdaptable getElement() {
return project;
}
@@ -159,7 +159,7 @@
* Sets the <code>{@link IProject}</code> that owns the properties shown in this page.
* @param element the {@code IAdaptable} associated with the project that owns the properties shown in this page.
*/
- public final void setElement(IAdaptable element) {
+ @Override public final void setElement(IAdaptable element) {
this.project = (IProject) element.getAdapter(IProject.class);
}
@@ -215,7 +215,7 @@
}
/** {@inheritDoc} */
- public void init(IWorkbench workbench) {}
+ @Override public void init(IWorkbench workbench) {}
@Override public final boolean performOk() {
preferenceBinder.saveValues();
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/BindingToCodeGeneration.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/BindingToCodeGeneration.java
index 2985002..65fe246 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/BindingToCodeGeneration.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/BindingToCodeGeneration.java
@@ -31,19 +31,19 @@
}
/** {@inheritDoc} */
- public void applyPreferenceValueToTarget() {
+ @Override public void applyPreferenceValueToTarget() {
codeGeneration.enabled(enabled.value());
codeGeneration.outputDirectory(outputDirectory.value());
}
/** {@inheritDoc} */
- public void applyDefaultPreferenceValueToTarget() {
+ @Override public void applyDefaultPreferenceValueToTarget() {
codeGeneration.enabled(enabled.defaultValue());
codeGeneration.outputDirectory(outputDirectory.defaultValue());
}
/** {@inheritDoc} */
- public void savePreferenceValue() {
+ @Override public void savePreferenceValue() {
enabled.value(codeGeneration.isEnabled());
outputDirectory.value(codeGeneration.outputDirectory());
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/CompilerPreferencePage.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/CompilerPreferencePage.java
index bf50a71..2550347 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/CompilerPreferencePage.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/CompilerPreferencePage.java
@@ -186,7 +186,7 @@
}
});
codeGenerationEditor.setDataChangedListener(new DataChangedListener() {
- public void dataChanged() {
+ @Override public void dataChanged() {
checkState();
}
});
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/CompilerPreferenceStoreInitializer.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/CompilerPreferenceStoreInitializer.java
index 23d49f7..f54e452 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/CompilerPreferenceStoreInitializer.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/CompilerPreferenceStoreInitializer.java
@@ -23,7 +23,7 @@
private static final String DEFAULT_OUTPUT_DIRECTORY = "src-gen";
/** {@inheritDoc} */
- public void initialize(IPreferenceStoreAccess access) {
+ @Override public void initialize(IPreferenceStoreAccess access) {
IPreferenceStore store = access.getWritablePreferenceStore();
enableProjectSettings(store).defaultValue(false);
RawPreferences preferences = new RawPreferences(store);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/EditCodeGenerationDialog.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/EditCodeGenerationDialog.java
index b76af82..960ad2e 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/EditCodeGenerationDialog.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/compiler/EditCodeGenerationDialog.java
@@ -88,7 +88,7 @@
}
});
txtOutputDirectory.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
+ @Override public void modifyText(ModifyEvent e) {
checkState();
}
});
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/EditorPreferencePage.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/EditorPreferencePage.java
index 13a3cca..f262274 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/EditorPreferencePage.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/EditorPreferencePage.java
@@ -35,7 +35,7 @@
link.setLayoutData(gridData);
link.setText(header);
link.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event event) {
+ @Override public void handleEvent(Event event) {
String u = event.text;
createPreferenceDialogOn(getShell(), u, null, null);
}
@@ -43,5 +43,5 @@
return contents;
}
- public void init(IWorkbench workbench) {}
+ @Override public void init(IWorkbench workbench) {}
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/numerictag/AddOrEditPatternDialog.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/numerictag/AddOrEditPatternDialog.java
index 2dcfafd..6f5c77c 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/numerictag/AddOrEditPatternDialog.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/numerictag/AddOrEditPatternDialog.java
@@ -95,7 +95,7 @@
private void addEventListeners() {
txtPattern.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
+ @Override public void modifyText(ModifyEvent e) {
String regex = enteredPattern();
if (isEmpty(regex)) {
clearTestErrorText();
@@ -115,7 +115,7 @@
}
});
txtTest.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
+ @Override public void modifyText(ModifyEvent e) {
testPattern();
}
});
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/numerictag/NumericTagPreferenceStoreInitializer.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/numerictag/NumericTagPreferenceStoreInitializer.java
index 8ca44a0..add22e0 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/numerictag/NumericTagPreferenceStoreInitializer.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/numerictag/NumericTagPreferenceStoreInitializer.java
@@ -21,7 +21,7 @@
public class NumericTagPreferenceStoreInitializer implements IPreferenceStoreInitializer {
/** {@inheritDoc} */
- public void initialize(IPreferenceStoreAccess access) {
+ @Override public void initialize(IPreferenceStoreAccess access) {
IPreferenceStore store = access.getWritablePreferenceStore();
RawPreferences preferences = new RawPreferences(store);
preferences.patterns().defaultValue(singletonList("Next[\\s]+Id:[\\s]+[\\d]+"));
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/save/SaveActionsPreferencePage.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/save/SaveActionsPreferencePage.java
index 5aeec05..73fd622 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/save/SaveActionsPreferencePage.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/save/SaveActionsPreferencePage.java
@@ -42,7 +42,7 @@
private Button btnInAllLines;
/** {@inheritDoc} */
- public void init(IWorkbench workbench) {}
+ @Override public void init(IWorkbench workbench) {}
@Override protected Control createContents(Composite parent) {
Composite contents = new Composite(parent, NONE);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/save/SaveActionsPreferenceStoreInitializer.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/save/SaveActionsPreferenceStoreInitializer.java
index 4d3a0b8..62f71c3 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/save/SaveActionsPreferenceStoreInitializer.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/editor/save/SaveActionsPreferenceStoreInitializer.java
@@ -19,7 +19,7 @@
public class SaveActionsPreferenceStoreInitializer implements IPreferenceStoreInitializer {
/** {@inheritDoc} */
- public void initialize(IPreferenceStoreAccess access) {
+ @Override public void initialize(IPreferenceStoreAccess access) {
IPreferenceStore store = access.getWritablePreferenceStore();
RawPreferences preferences = new RawPreferences(store);
preferences.removeTrailingWhitespace().defaultValue(true);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/general/GeneralPreferenceStoreInitializer.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/general/GeneralPreferenceStoreInitializer.java
index 7151133..887192e 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/general/GeneralPreferenceStoreInitializer.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/general/GeneralPreferenceStoreInitializer.java
@@ -21,7 +21,7 @@
public class GeneralPreferenceStoreInitializer implements IPreferenceStoreInitializer {
/** {@inheritDoc} */
- public void initialize(IPreferenceStoreAccess access) {
+ @Override public void initialize(IPreferenceStoreAccess access) {
IPreferenceStore store = access.getWritablePreferenceStore();
enableProjectSettings(store).defaultValue(false);
RawPreferences preferences = new RawPreferences(store);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/AddDirectoryDialog.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/AddDirectoryDialog.java
index 61beda5..1749c5c 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/AddDirectoryDialog.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/AddDirectoryDialog.java
@@ -117,7 +117,7 @@
}
});
txtPath.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
+ @Override public void modifyText(ModifyEvent e) {
boolean hasText = !isEmpty(enteredPathText());
getButton(OK_ID).setEnabled(hasText);
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectoryPathsEditor.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectoryPathsEditor.java
index e829c89..d2f3674 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectoryPathsEditor.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectoryPathsEditor.java
@@ -210,7 +210,7 @@
return getColumnImage(element, 0);
}
- public Image getColumnImage(Object element, int columnIndex) {
+ @Override public Image getColumnImage(Object element, int columnIndex) {
DirectoryPath path = (DirectoryPath) element;
String imageName = (path.isWorkspacePath()) ? "workspace.gif" : "folder.gif";
return imageHelper.getImage(imageName);
@@ -220,7 +220,7 @@
return getColumnText(element, 0);
}
- public String getColumnText(Object element, int columnIndex) {
+ @Override public String getColumnText(Object element, int columnIndex) {
DirectoryPath path = (DirectoryPath) element;
return path.value();
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectorySelectionDialogs.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectorySelectionDialogs.java
index 855aff0..c48e0cd 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectorySelectionDialogs.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/DirectorySelectionDialogs.java
@@ -51,7 +51,7 @@
}
dialog.setInitialSelection(container);
dialog.setValidator(new ISelectionStatusValidator() {
- public IStatus validate(Object[] selection) {
+ @Override public IStatus validate(Object[] selection) {
if (selection != null && selection.length > 0 && selection[0] instanceof IFile)
return new Status(ERROR, PLUGIN_ID, errorElementIsNotDirectory);
return OK_STATUS;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/PathsPreferencePage.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/PathsPreferencePage.java
index 4370e07..93e9168 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/PathsPreferencePage.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/PathsPreferencePage.java
@@ -97,7 +97,7 @@
}
}, asList(btnOneDirectoryOnly, btnMultipleDirectories));
directoryPathsEditor.setDataChangedListener(new DataChangedListener() {
- public void dataChanged() {
+ @Override public void dataChanged() {
checkState();
}
});
@@ -122,15 +122,15 @@
bindSelectionOf(btnMultipleDirectories).to(preferences.filesInMultipleDirectories()));
final StringPreference directoryPaths = preferences.directoryPaths();
preferenceBinder.add(new Binding() {
- public void applyPreferenceValueToTarget() {
+ @Override public void applyPreferenceValueToTarget() {
setDirectoryPaths(directoryPaths.value());
}
- public void applyDefaultPreferenceValueToTarget() {
+ @Override public void applyDefaultPreferenceValueToTarget() {
setDirectoryPaths(directoryPaths.defaultValue());
}
- public void savePreferenceValue() {
+ @Override public void savePreferenceValue() {
directoryPaths.value(directoryNames());
}
});
@@ -195,7 +195,7 @@
private void rebuildProject() {
Job job = new Job("Rebuilding project") { //$NON-NLS-1$
- protected IStatus run(IProgressMonitor monitor) {
+ @Override protected IStatus run(IProgressMonitor monitor) {
try {
project().build(FULL_BUILD, monitor);
} catch (CoreException e) {
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/PathsPreferenceStoreInitializer.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/PathsPreferenceStoreInitializer.java
index b5e8876..5957532 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/PathsPreferenceStoreInitializer.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/preferences/pages/paths/PathsPreferenceStoreInitializer.java
@@ -19,7 +19,7 @@
public class PathsPreferenceStoreInitializer implements IPreferenceStoreInitializer {
/** {@inheritDoc} */
- public void initialize(IPreferenceStoreAccess access) {
+ @Override public void initialize(IPreferenceStoreAccess access) {
IPreferenceStore store = access.getWritablePreferenceStore();
RawPreferences preferences = new RawPreferences(store);
preferences.filesInOneDirectoryOnly().defaultValue(true);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/quickfix/ProtobufQuickfixProvider.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/quickfix/ProtobufQuickfixProvider.java
index 29c9019..339a775 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/quickfix/ProtobufQuickfixProvider.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/quickfix/ProtobufQuickfixProvider.java
@@ -36,7 +36,7 @@
public void makeSyntaxProto2(Issue issue, IssueResolutionAcceptor acceptor) {
String image = images.imageFor(Syntax.class);
acceptor.accept(issue, changeToProto2Label, changeToProto2, image, new ISemanticModification() {
- public void apply(EObject element, IModificationContext context) throws Exception {
+ @Override public void apply(EObject element, IModificationContext context) throws Exception {
if (!(element instanceof Syntax)) return;
Syntax syntax = (Syntax) element;
syntax.setName("proto2");
@@ -47,7 +47,7 @@
@Fix(INVALID_FIELD_TAG_NUMBER_ERROR)
public void regenerateTagNumber(Issue issue, IssueResolutionAcceptor acceptor) {
acceptor.accept(issue, regenerateTagNumberLabel, regenerateTagNumber, "property.gif", new ISemanticModification() {
- public void apply(EObject element, IModificationContext context) throws Exception {
+ @Override public void apply(EObject element, IModificationContext context) throws Exception {
if (!(element instanceof Field)) return;
Field field = (Field) element;
long tagNumber = fields.calculateTagNumberOf(field);
@@ -60,7 +60,7 @@
public void removeDuplicatePackage(Issue issue, IssueResolutionAcceptor acceptor) {
String image = images.imageFor(Package.class);
acceptor.accept(issue, removeDuplicatePackageLabel, removeDuplicatePackage, image, new ISemanticModification() {
- public void apply(EObject element, IModificationContext context) throws Exception {
+ @Override public void apply(EObject element, IModificationContext context) throws Exception {
if (!(element instanceof Package)) return;
Package aPackage = (Package) element;
remove(aPackage);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/FileUriResolver.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/FileUriResolver.java
index df7a00e..95e2bf8 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/FileUriResolver.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/FileUriResolver.java
@@ -48,7 +48,7 @@
* If we import "folder/proto2.proto" into proto1.proto, proto1.proto will compile fine, but the editor will complain.
* We need to have the import URI as "platform:/resource/protobuf-test/folder/proto2.proto" for the editor to see it.
*/
- public String resolveUri(String importUri, Resource declaringResource) {
+ @Override public String resolveUri(String importUri, Resource declaringResource) {
if (hasScheme(importUri)) return importUri;
String resolved = resolveUri(importUri, declaringResource.getURI());
return (resolved == null) ? importUri : resolved;
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/MultipleDirectoriesFileResolver.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/MultipleDirectoriesFileResolver.java
index ebf20e4..cfd354d 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/MultipleDirectoriesFileResolver.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/MultipleDirectoriesFileResolver.java
@@ -32,7 +32,7 @@
}
/** {@inheritDoc} */
- public String resolveUri(String importUri, URI declaringResourceUri, PathsPreferences preferences) {
+ @Override public String resolveUri(String importUri, URI declaringResourceUri, PathsPreferences preferences) {
List<DirectoryPath> importRoots = preferences.importRoots();
for (DirectoryPath root : importRoots) {
String resolved = resolveUri(importUri, root);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/PathMapping.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/PathMapping.java
index 4bcab10..0ea1e38 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/PathMapping.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/PathMapping.java
@@ -26,7 +26,7 @@
}
private static class FolderPathMapper implements Function<String, String> {
- public String apply(String workspacePath) {
+ @Override public String apply(String workspacePath) {
return folder(workspacePath).getLocation().toOSString();
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/SingleDirectoryFileResolver.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/SingleDirectoryFileResolver.java
index 28f4ab9..95124f5 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/SingleDirectoryFileResolver.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/scoping/SingleDirectoryFileResolver.java
@@ -30,7 +30,7 @@
this.resources = resources;
}
- public String resolveUri(String importUri, URI declaringResourceUri, PathsPreferences preferences) {
+ @Override public String resolveUri(String importUri, URI declaringResourceUri, PathsPreferences preferences) {
List<String> resourceUriSegments = removeFirstAndLast(declaringResourceUri.segmentsList());
Pair<String, List<String>> importUriPair = pair(importUri, createURI(importUri).segmentsList());
return resolveUri(importUriPair, resourceUriSegments);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/util/editor/Editors.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/util/editor/Editors.java
index 09097e7..7fb06f8 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/util/editor/Editors.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/util/editor/Editors.java
@@ -46,13 +46,13 @@
final SimpleReference<IStatus> errorStatus = new SimpleReference<IStatus>(OK_STATUS);
try {
SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
+ @Override public void handleException(Throwable exception) {
logger.error(exception.getMessage(), exception);
errorStatus.set(new Status(ERROR, PLUGIN_ID, 0, errorCalculatingChangedRegions, exception));
result.set(null);
}
- public void run() throws Exception {
+ @Override public void run() throws Exception {
monitor.beginTask(calculatingChangedRegions, 20);
IFileStore fileStore = buffer.getFileStore();
ITextFileBufferManager fileBufferManager = createTextFileBufferManager();
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/util/editor/LineComparator.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/util/editor/LineComparator.java
index 96553c8..0e9310e 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/util/editor/LineComparator.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/util/editor/LineComparator.java
@@ -40,11 +40,11 @@
}
}
- public int getRangeCount() {
+ @Override public int getRangeCount() {
return document.getNumberOfLines();
}
- public boolean rangesEqual(int thisIndex, IRangeComparator other, int otherIndex) {
+ @Override public boolean rangesEqual(int thisIndex, IRangeComparator other, int otherIndex) {
try {
return getHash(thisIndex) == ((LineComparator) other).getHash(otherIndex);
} catch (BadLocationException e) {
@@ -53,7 +53,7 @@
}
}
- public boolean skipRangeComparison(int length, int maxLength, IRangeComparator other) {
+ @Override public boolean skipRangeComparison(int length, int maxLength, IRangeComparator other) {
return false;
}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/validation/ValidateOnActivation.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/validation/ValidateOnActivation.java
index 7fe4185..322b8a7 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/validation/ValidateOnActivation.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/validation/ValidateOnActivation.java
@@ -29,7 +29,7 @@
* Validates the active active editor in the given part that contains a .proto file in the Workspace.
* @param partRef the part that was activated.
*/
- public void partActivated(IWorkbenchPartReference partRef) {
+ @Override public void partActivated(IWorkbenchPartReference partRef) {
IEditorPart activeEditor = activeEditor(partRef);
IProject project = projectFrom(activeEditor);
if (project == null || !shouldValidateEditor(project)) return;
@@ -57,41 +57,41 @@
* This method does nothing.
* @param partRef the part that was surfaced.
*/
- public void partBroughtToTop(IWorkbenchPartReference partRef) {}
+ @Override public void partBroughtToTop(IWorkbenchPartReference partRef) {}
/**
* This method does nothing.
* @param partRef the part that was closed.
*/
- public void partClosed(IWorkbenchPartReference partRef) {}
+ @Override public void partClosed(IWorkbenchPartReference partRef) {}
/**
* This method does nothing.
* @param partRef the part that was deactivated.
*/
- public void partDeactivated(IWorkbenchPartReference partRef) {}
+ @Override public void partDeactivated(IWorkbenchPartReference partRef) {}
/**
* This method does nothing.
* @param partRef the part that was opened.
*/
- public void partOpened(IWorkbenchPartReference partRef) {}
+ @Override public void partOpened(IWorkbenchPartReference partRef) {}
/**
* This method does nothing.
* @param partRef the part that was hidden.
*/
- public void partHidden(IWorkbenchPartReference partRef) {}
+ @Override public void partHidden(IWorkbenchPartReference partRef) {}
/**
* This method does nothing.
* @param partRef the part that is visible.
*/
- public void partVisible(IWorkbenchPartReference partRef) {}
+ @Override public void partVisible(IWorkbenchPartReference partRef) {}
/**
* This method does nothing.
* @param partRef the part whose input was changed.
*/
- public void partInputChanged(IWorkbenchPartReference partRef) {}
+ @Override public void partInputChanged(IWorkbenchPartReference partRef) {}
}
diff --git a/com.google.eclipse.protobuf/.settings/org.eclipse.jdt.core.prefs b/com.google.eclipse.protobuf/.settings/org.eclipse.jdt.core.prefs
index 1b95e28..55aff13 100644
--- a/com.google.eclipse.protobuf/.settings/org.eclipse.jdt.core.prefs
+++ b/com.google.eclipse.protobuf/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Oct 18 02:12:56 PDT 2011
+#Tue Oct 18 11:00:02 PDT 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -33,7 +33,7 @@
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
@@ -47,6 +47,7 @@
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter.java
index cec6067..6c9fdeb 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/DOUBLEValueConverter.java
@@ -31,7 +31,7 @@
* @throws ValueConverterException if the given input is {@code null}, empty or does not represent a floating-point
* number.
*/
- public Double toValue(String string, INode node) throws ValueConverterException {
+ @Override public Double toValue(String string, INode node) throws ValueConverterException {
if (isEmpty(string)) throw new ValueConverterException("Couldn't convert empty string to double.", node, null);
if ("nan".equals(string)) return NaN;
if ("inf".equals(string)) return POSITIVE_INFINITY;
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/HEXValueConverter.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/HEXValueConverter.java
index 12f6261..d87eb69 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/HEXValueConverter.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/HEXValueConverter.java
@@ -31,7 +31,7 @@
* @throws ValueConverterException if the given input is {@code null}, empty or does not represent an hexadecimal
* number.
*/
- public Long toValue(String string, INode node) throws ValueConverterException {
+ @Override public Long toValue(String string, INode node) throws ValueConverterException {
if (isEmpty(string)) throw new ValueConverterException("Couldn't convert empty string to long.", node, null);
if (!string.startsWith("0x") && !string.startsWith("0X")) throw parsingError(string, node);
String withoutZeroX = string.substring(2, string.length());
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/LONGValueConverter.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/LONGValueConverter.java
index 986b90b..7205996 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/LONGValueConverter.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/LONGValueConverter.java
@@ -28,7 +28,7 @@
* @return the new {@code int}.
* @throws ValueConverterException if the given input is {@code null}, empty or does not represent an integer number.
*/
- public Long toValue(String string, INode node) throws ValueConverterException {
+ @Override public Long toValue(String string, INode node) throws ValueConverterException {
if (isEmpty(string)) throw new ValueConverterException("Couldn't convert empty string to long.", node, null);
try {
return Long.parseLong(string, 10);
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/STRINGValueConverter.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/STRINGValueConverter.java
index ae23a29..8e4f192 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/STRINGValueConverter.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/conversion/STRINGValueConverter.java
@@ -38,7 +38,7 @@
* @return the new integer.
* @throws ValueConverterException if the given input has illegal characters.
*/
- public String toValue(String string, INode node) throws ValueConverterException {
+ @Override public String toValue(String string, INode node) throws ValueConverterException {
if (string == null) return null;
try {
String clean = removeLineBreaksFrom(string).trim();
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
index d21a62c..aef001d 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
@@ -39,10 +39,10 @@
private Function<EObject, String> resolver = newResolver(String.class, "name");
- public QualifiedName getFullyQualifiedName(final EObject obj) {
+ @Override public QualifiedName getFullyQualifiedName(final EObject obj) {
Pair<EObject, String> key = pair(obj, "fqn");
return cache.get(key, obj.eResource(), new Provider<QualifiedName>() {
- public QualifiedName get() {
+ @Override public QualifiedName get() {
EObject current = obj;
String name = resolver.apply(current);
if (isEmpty(name)) return null;
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ExtensionRegistryProvider.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ExtensionRegistryProvider.java
index c88fd49..c656fac 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ExtensionRegistryProvider.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ExtensionRegistryProvider.java
@@ -20,7 +20,7 @@
@Singleton
public class ExtensionRegistryProvider implements Provider<IExtensionRegistry> {
- public IExtensionRegistry get() {
+ @Override public IExtensionRegistry get() {
return Platform.getExtensionRegistry();
}
}
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/IFileUriResolver.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/IFileUriResolver.java
index ecc39cd..fdaac22 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/IFileUriResolver.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/IFileUriResolver.java
@@ -30,7 +30,7 @@
String resolveUri(String importUri, Resource declaringResource);
class NullFileUriResolver implements IFileUriResolver {
- public String resolveUri(String importUri, Resource declaringResource) {
+ @Override public String resolveUri(String importUri, Resource declaringResource) {
throw new UnsupportedOperationException();
}
}
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ImportedNamesProvider.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ImportedNamesProvider.java
deleted file mode 100644
index 4240c6e..0000000
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ImportedNamesProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2011 Google Inc.
- *
- * 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 com.google.eclipse.protobuf.scoping;
-
-import static java.util.Collections.*;
-import static org.eclipse.xtext.util.SimpleAttributeResolver.newResolver;
-import static org.eclipse.xtext.util.Strings.isEmpty;
-import static org.eclipse.xtext.util.Tuples.pair;
-
-import java.util.*;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.naming.*;
-import org.eclipse.xtext.util.*;
-
-import com.google.common.base.Function;
-import com.google.eclipse.protobuf.model.util.ModelFinder;
-import com.google.inject.*;
-
-/**
- * Provides alternative qualified names for imported protobuf elements.
- *
- * @author alruiz@google.com (Alex Ruiz)
- */
-class ImportedNamesProvider {
-
- @Inject private final IResourceScopeCache cache = IResourceScopeCache.NullImpl.INSTANCE;
- @Inject private final IQualifiedNameConverter converter = new IQualifiedNameConverter.DefaultImpl();
-
- @Inject private ModelFinder finder;
- @Inject private QualifiedNames qualifiedNames;
-
- private final Function<EObject, String> resolver = newResolver(String.class, "name");
-
- List<QualifiedName> namesOf(final EObject obj) {
- Pair<EObject, String> key = pair(obj, "importedFqns");
- return cache.get(key, obj.eResource(), new Provider<List<QualifiedName>>() {
- public List<QualifiedName> get() {
- List<QualifiedName> allNames = new ArrayList<QualifiedName>();
- EObject current = obj;
- String name = resolver.apply(current);
- if (isEmpty(name)) return emptyList();
- QualifiedName qualifiedName = converter.toQualifiedName(name);
- allNames.add(qualifiedName);
- allNames.addAll(qualifiedNames.addPackageNameSegments(qualifiedName, finder.packageOf(obj)));
- return unmodifiableList(allNames);
- }
- });
- }
-}
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/LocalNamesProvider.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/LocalNamesProvider.java
index 108d98b..77a70b7 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/LocalNamesProvider.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/LocalNamesProvider.java
@@ -67,7 +67,7 @@
List<QualifiedName> namesOf(final EObject obj) {
Pair<EObject, String> key = pair(obj, "localFqns");
return cache.get(key, obj.eResource(), new Provider<List<QualifiedName>>() {
- public List<QualifiedName> get() {
+ @Override public List<QualifiedName> get() {
List<QualifiedName> allNames = new ArrayList<QualifiedName>();
EObject current = obj;
String name = resolver.apply(current);
