diff options
author | Lars Vogel | 2013-11-11 15:08:08 +0000 |
---|---|---|
committer | Lars Vogel | 2013-11-11 15:08:08 +0000 |
commit | 28484c8ca9ccf41a9dbbb883d8e6814aafd381fc (patch) | |
tree | 8f99c0380d2c4d66f363f2021878e1ce8297e9bd | |
parent | a5d400cda4d49e5913cd908c0143533e36aeb5ec (diff) | |
download | org.eclipse.e4.tools-28484c8ca9ccf41a9dbbb883d8e6814aafd381fc.tar.gz org.eclipse.e4.tools-28484c8ca9ccf41a9dbbb883d8e6814aafd381fc.tar.xz org.eclipse.e4.tools-28484c8ca9ccf41a9dbbb883d8e6814aafd381fc.zip |
Bug 421453 - Code cleanup in the e4 tools projectsI20131115-2200I20131115-0930I20131114-2200I20131113-2200I20131112-2200I20131111-2200
Change-Id: I0a2100222f73a4cd986099b2d7126f7992a82987
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
79 files changed, 291 insertions, 49 deletions
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java index f487fdef..e7b2ccb7 100644 --- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java +++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/ContextServiceFactory.java @@ -97,20 +97,20 @@ public class ContextServiceFactory extends AbstractServiceFactory { public void setClassname(Object widget, String classname) { ((Widget) widget).setData( "org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$ - engine.applyStyles((Widget) widget, true); + engine.applyStyles(widget, true); } public void setId(Object widget, String id) { ((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$ - engine.applyStyles((Widget) widget, true); + engine.applyStyles(widget, true); } public void style(Object widget) { - engine.applyStyles((Widget) widget, true); + engine.applyStyles(widget, true); } public CSSStyleDeclaration getStyle(Object widget) { - return engine.getStyle((Widget) widget); + return engine.getStyle(widget); } public void setClassnameAndId(Object widget, String classname, @@ -118,7 +118,7 @@ public class ContextServiceFactory extends AbstractServiceFactory { ((Widget) widget).setData( "org.eclipse.e4.ui.css.CssClassName", classname); //$NON-NLS-1$ ((Widget) widget).setData("org.eclipse.e4.ui.css.id", id); //$NON-NLS-1$ - engine.applyStyles((Widget) widget, true); + engine.applyStyles(widget, true); } }); diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java index b3f922b0..5f0a7a6b 100644 --- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java +++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/DefaultLoggerProvider.java @@ -15,6 +15,6 @@ public class DefaultLoggerProvider implements ILoggerProvider { public Logger getClassLogger(Class<?> clazz) { IEclipseContext childContext = context.createChild(); childContext.set("logger.bundlename", FrameworkUtil.getBundle(clazz).getSymbolicName()); //$NON-NLS-1$ - return (Logger) ContextInjectionFactory.make(WorkbenchLogger.class, childContext); + return ContextInjectionFactory.make(WorkbenchLogger.class, childContext); } }
\ No newline at end of file diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java index ff8cbf85..eb14dfa4 100644 --- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java +++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/WorkbenchLogger.java @@ -30,14 +30,17 @@ public final class WorkbenchLogger extends Logger { super(); } + @Override public void debug(Throwable t) { debug(t, null); } + @Override public void debug(Throwable t, String message) { trace(t, message); } + @Override public void error(Throwable t, String message) { log(new Status(IStatus.ERROR, bundle.getSymbolicName(), message, t)); @@ -73,27 +76,33 @@ public final class WorkbenchLogger extends Logger { status.getMessage(), stackCode, t, children); } + @Override public void info(Throwable t, String message) { log(new Status(IStatus.INFO, bundle.getSymbolicName(), message, t)); } + @Override public boolean isDebugEnabled() { return false; } + @Override public boolean isErrorEnabled() { return true; } + @Override public boolean isInfoEnabled() { return true; } + @Override public boolean isTraceEnabled() { return false; } + @Override public boolean isWarnEnabled() { return true; } @@ -129,6 +138,7 @@ public final class WorkbenchLogger extends Logger { this.log = log; } + @Override public void trace(Throwable t, String message) { if (trace != null) { trace.trace(null, message, t); @@ -138,6 +148,7 @@ public final class WorkbenchLogger extends Logger { } } + @Override public void warn(Throwable t, String message) { log(new Status(IStatus.WARNING, bundle.getSymbolicName(), message, t)); diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java index b9cb94eb..b3e591c0 100644 --- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java +++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/parts/DISaveableViewPart.java @@ -51,6 +51,7 @@ public abstract class DISaveableViewPart<C> extends DIViewPart<C> implements ISa return dirtyState; } + @Override public void init(IViewSite site) throws PartInitException { super.init(site); diff --git a/bundles/org.eclipse.e4.tools.emf.editor/images/winXPBlue.PNG b/bundles/org.eclipse.e4.tools.emf.editor/images/winXPBlue.PNG Binary files differdeleted file mode 100644 index 57e94e5d..00000000 --- a/bundles/org.eclipse.e4.tools.emf.editor/images/winXPBlue.PNG +++ /dev/null diff --git a/bundles/org.eclipse.e4.tools.emf.editor/images/winXPOlive.PNG b/bundles/org.eclipse.e4.tools.emf.editor/images/winXPOlive.PNG Binary files differdeleted file mode 100644 index c745ee1b..00000000 --- a/bundles/org.eclipse.e4.tools.emf.editor/images/winXPOlive.PNG +++ /dev/null diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java index 370dfb9c..5502f737 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/E4WorkbenchModelEditor.java @@ -44,6 +44,7 @@ public class E4WorkbenchModelEditor extends setPartName(getEditorInput().getName()); } + @Override protected void makeActions() { super.makeActions(); undoAction = new UndoAction(getComponent().getModelProvider()); diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java index ee3f1556..c0b46b87 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelExtractor.java @@ -6,6 +6,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.e4.internal.tools.wizards.model.ExtractContributionModelWizard; import org.eclipse.e4.tools.emf.ui.common.IModelExtractor; import org.eclipse.e4.ui.model.application.MApplicationElement; +import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; @@ -17,7 +18,7 @@ public class ModelExtractor implements IModelExtractor { ExtractContributionModelWizard extractContributionModelWizard = new ExtractContributionModelWizard(maes); extractContributionModelWizard.setup(project); WizardDialog wizardDialog = new WizardDialog(shell, extractContributionModelWizard); - return wizardDialog.open() == WizardDialog.OK; + return wizardDialog.open() == Window.OK; } diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java index 4ba2573e..77060deb 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/PDEClassContributionProvider.java @@ -18,7 +18,6 @@ import java.io.InputStreamReader; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider; @@ -81,6 +80,7 @@ public class PDEClassContributionProvider implements IClassContributionProvider // char[] typeName = "*".toCharArray(); TypeNameRequestor req = new TypeNameRequestor() { + @Override public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) { // Accept search results from the JDT SearchEngine String cName = new String(simpleTypeName); diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java index f38b95a1..de104ff5 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/RefactorParticipantDelegate.java @@ -42,10 +42,11 @@ class RefactorParticipantDelegate { final Map<IFile, TextFileChange> changes = new HashMap<IFile, TextFileChange>(); TextSearchRequestor searchRequestor = new TextSearchRequestor() { + @Override public boolean acceptPatternMatch(TextSearchMatchAccess matchAccess) throws CoreException { IFile file = matchAccess.getFile(); - TextFileChange change = (TextFileChange) changes.get(file); + TextFileChange change = changes.get(file); if (change == null) { TextChange textChange = p.getTextChange(file); diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java index 6b8fb1cd..6b3d9f20 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/AddonContributionEditor.java @@ -14,7 +14,6 @@ package org.eclipse.e4.tools.emf.editor3x.extension; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; import org.eclipse.e4.internal.tools.wizards.classes.NewAddonClassWizard; import org.eclipse.e4.tools.emf.ui.common.IContributionClassCreator; import org.eclipse.e4.ui.model.application.MContribution; @@ -32,14 +31,10 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.pde.core.project.IBundleProjectDescription; -import org.eclipse.pde.core.project.IBundleProjectService; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PartInitException; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceReference; public class AddonContributionEditor implements IContributionClassCreator { @@ -58,7 +53,7 @@ public class AddonContributionEditor implements IContributionClassCreator { NewAddonClassWizard wizard = new NewAddonClassWizard(contribution.getContributionURI()); wizard.init( null, new StructuredSelection(project)); WizardDialog dialog = new WizardDialog(shell, wizard); - if( dialog.open() == WizardDialog.OK ) { + if( dialog.open() == Window.OK ) { IFile f = wizard.getFile(); ICompilationUnit el = JavaCore.createCompilationUnitFrom(f); try { diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java index a9f1c3ce..a147c583 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/DynamicMenuContributionContributionEditor.java @@ -31,6 +31,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PartInitException; @@ -48,7 +49,7 @@ public class DynamicMenuContributionContributionEditor implements NewDynamicMenuContributionClassWizard wizard = new NewDynamicMenuContributionClassWizard(contribution.getContributionURI()); wizard.init( null, new StructuredSelection(project)); WizardDialog dialog = new WizardDialog(shell, wizard); - if( dialog.open() == WizardDialog.OK ) { + if( dialog.open() == Window.OK ) { IFile f = wizard.getFile(); ICompilationUnit el = JavaCore.createCompilationUnitFrom(f); try { diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java index 1d9ae41d..f1379dd0 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/HandlerContributionEditor.java @@ -31,9 +31,9 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.ui.JavaUI; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PartInitException; @@ -48,7 +48,7 @@ public class HandlerContributionEditor implements IContributionClassCreator { NewHandlerClassWizard wizard = new NewHandlerClassWizard(contribution.getContributionURI()); wizard.init( null, new StructuredSelection(project)); WizardDialog dialog = new WizardDialog(shell, wizard); - if( dialog.open() == WizardDialog.OK ) { + if( dialog.open() == Window.OK ) { IFile f = wizard.getFile(); ICompilationUnit el = JavaCore.createCompilationUnitFrom(f); try { diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java index c3d1b600..c1aa9a40 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/extension/PartContributionEditor.java @@ -32,6 +32,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PartInitException; @@ -50,7 +51,7 @@ public class PartContributionEditor implements IContributionClassCreator { NewPartClassWizard wizard = new NewPartClassWizard(contribution.getContributionURI()); wizard.init(null, new StructuredSelection(project)); WizardDialog dialog = new WizardDialog(shell, wizard); - if (dialog.open() == WizardDialog.OK) { + if (dialog.open() == Window.OK) { IFile f = wizard.getFile(); ICompilationUnit el = JavaCore.createCompilationUnitFrom(f); try { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java index 87692fbe..d3979790 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/CommandToStringConverter.java @@ -25,6 +25,7 @@ public class CommandToStringConverter extends Converter { this.Messages = Messages; } + @Override public Object convert(Object fromObject) { MCommand cmd = (MCommand) fromObject; String elementId = null; diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java index 4ec31937..ae3d97b1 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ContributionURIValidator.java @@ -17,19 +17,22 @@ import org.eclipse.emf.common.util.URI; public class ContributionURIValidator implements IValidator { + private static final String PLUGIN_ID = "org.eclipse.e4.tools.emf.ui"; + + @Override public IStatus validate(Object value) { if (value == null) { - return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The URI must not be empty!"); + return new Status(IStatus.ERROR, PLUGIN_ID, "The URI must not be empty!"); } else if (!value.toString().startsWith("bundleclass:")) { - return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The URI has to start with 'platform:/plugin'"); + return new Status(IStatus.ERROR, PLUGIN_ID, "The URI has to start with 'platform:/plugin'"); } else { try { URI uri = URI.createURI(value.toString()); if (uri.authority() == null || uri.authority().length() == 0 || uri.segmentCount() != 1) { - return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", "The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'"); + return new Status(IStatus.ERROR, PLUGIN_ID, "The uri has to have the format 'bundleclass://$$bundleId$$/$$className$$'"); } } catch (Exception e) { - return new Status(IStatus.ERROR, "org.eclipse.e4.tools.emf.ui", e.getMessage()); + return new Status(IStatus.ERROR, PLUGIN_ID, e.getMessage()); } } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java index 4e378b5c..2ee24af4 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/MemoryTransfer.java @@ -42,6 +42,7 @@ public class MemoryTransfer extends ByteArrayTransfer { return new String[] { NAME }; } + @Override public void javaToNative(Object object, TransferData transferData) { this.uid = UUID.randomUUID().toString(); this.object = object; @@ -50,6 +51,7 @@ public class MemoryTransfer extends ByteArrayTransfer { } } + @Override public Object nativeToJava(TransferData transferData) { byte[] bytes = (byte[]) super.nativeToJava(transferData); if (bytes == null) diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java index 3ea0cbf2..a3b77af4 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java @@ -200,6 +200,7 @@ public class Util { final ControlDecoration dec = new ControlDecoration(control, SWT.BOTTOM); binding.getValidationStatus().addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { IStatus s = (IStatus) event.getObservableValue().getValue(); if (s.isOK()) { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java index bca1aab9..1695e22f 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/XMIModelResource.java @@ -56,6 +56,7 @@ public class XMIModelResource implements IModelResource { BasicCommandStack commandStack = new BasicCommandStack(); commandStack.addCommandStackListener(new CommandStackListener() { + @Override public void commandStackChanged(EventObject event) { dirty = true; fireDirtyChanged(); @@ -67,6 +68,7 @@ public class XMIModelResource implements IModelResource { resource = resourceSet.getResource(uri, true); } + @Override public IObservableList getRoot() { if (list != null) { return list; @@ -77,6 +79,7 @@ public class XMIModelResource implements IModelResource { return list; } + @Override public void replaceRoot(EObject eObject) { E4XMIResource resource = (E4XMIResource) eObject.eResource(); Map<EObject, String> idMap = new HashMap<EObject, String>(); @@ -101,22 +104,27 @@ public class XMIModelResource implements IModelResource { } } + @Override public EditingDomain getEditingDomain() { return editingDomain; } + @Override public boolean isSaveable() { return true; } + @Override public void addModelListener(ModelListener listener) { listeners.add(listener); } + @Override public void removeModelListener(ModelListener listener) { listeners.remove(listener); } + @Override public boolean isDirty() { return dirty && getEditingDomain().getCommandStack().canUndo(); } @@ -133,6 +141,7 @@ public class XMIModelResource implements IModelResource { } } + @Override public IStatus save() { Map<String, String> map = new HashMap<String, String>(); try { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java index 830dde39..718c5a74 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/component/AbstractComponentEditor.java @@ -206,6 +206,7 @@ public abstract class AbstractComponentEditor { scrolling.setContent(contentContainer); scrolling.addControlListener(new ControlAdapter() { + @Override public void controlResized(ControlEvent e) { Rectangle r = scrolling.getClientArea(); scrolling.setMinSize(contentContainer.computeSize(r.width, SWT.DEFAULT)); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java index f5bdd1fe..90f011a0 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ObservableColumnLabelProvider.java @@ -25,6 +25,7 @@ public class ObservableColumnLabelProvider<M> extends CellLabelProvider { private IObservableMap[] attributeMaps; private IMapChangeListener mapChangeListener = new IMapChangeListener() { + @Override public void handleMapChange(MapChangeEvent event) { Set<?> affectedElements = event.diff.getChangedKeys(); LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent( @@ -59,6 +60,7 @@ public class ObservableColumnLabelProvider<M> extends CellLabelProvider { } } + @Override public void dispose() { for (int i = 0; i < attributeMaps.length; i++) { attributeMaps[i].removeMapChangeListener(mapChangeListener); @@ -68,6 +70,7 @@ public class ObservableColumnLabelProvider<M> extends CellLabelProvider { this.mapChangeListener = null; } + @Override @SuppressWarnings("unchecked") public void update(ViewerCell cell) { M element = (M) cell.getElement(); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java index 46953752..f9b79cb6 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java @@ -37,6 +37,7 @@ public class PatternFilter extends org.eclipse.e4.ui.workbench.swt.internal.copy * the tree element to check * @return true if the given element's label matches the filter text */ + @Override protected boolean isLeafMatch(Viewer viewer, Object element) { Object labelProvider = ((StructuredViewer) viewer).getLabelProvider(); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java index 8391c7a5..8df6d955 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ShadowComposite.java @@ -99,12 +99,14 @@ public class ShadowComposite extends Composite { this.outerKeyline = new Color(getDisplay(), new RGB(240, 240, 240)); addListener(SWT.Paint, new Listener() { + @Override public void handleEvent(Event event) { onPaint(event); } }); addListener(SWT.Dispose, new Listener() { + @Override public void handleEvent(Event event) { outerKeyline.dispose(); } @@ -120,6 +122,7 @@ public class ShadowComposite extends Composite { // }); } + @Override public Rectangle getClientArea() { Rectangle trim = computeTrim(CTabFolderRenderer.PART_BODY, SWT.NONE, 0, 0, 0, 0); // if (minimized) @@ -473,6 +476,7 @@ public class ShadowComposite extends Composite { tmpImage.dispose(); shadowColor.dispose(); display.disposeExec(new Runnable() { + @Override public void run() { Object obj = display.getData(E4_SHADOW_IMAGE); if (obj != null) { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java index da74a4d7..018080f3 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ControlHighlighter.java @@ -23,6 +23,7 @@ public class ControlHighlighter { s.open(); s.addListener(SWT.MouseDown, new Listener() { + @Override public void handleEvent(Event event) { hide(); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java index dc1a1d92..2a6143f8 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java @@ -12,6 +12,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common; +import org.eclipse.jface.viewers.AbstractTreeViewer; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -336,6 +338,7 @@ public class ModelEditor { if (viewer != null) { viewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { viewer.refresh(); } @@ -354,6 +357,7 @@ public class ModelEditor { if (project == null) { keyListener = new Listener() { + @Override public void handleEvent(Event event) { if ((event.stateMask & SWT.ALT) == SWT.ALT) { findAndHighlight(context.get(Display.class).getFocusControl()); @@ -457,6 +461,7 @@ public class ModelEditor { emfDocumentProvider.setValidationChangedCallback(new Runnable() { + @Override public void run() { model.removeAllAnnotations(); @@ -562,6 +567,7 @@ public class ModelEditor { }); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { if (!event.getSelection().isEmpty()) { final IStructuredSelection s = (IStructuredSelection) event.getSelection(); @@ -574,6 +580,7 @@ public class ModelEditor { iconLabel.setImage(editor.getImage(obj, iconLabel.getDisplay())); obsManager.runAndCollect(new Runnable() { + @Override public void run() { Composite comp = editor.getEditor(contentContainer, s.getFirstElement()); comp.setBackgroundMode(SWT.INHERIT_DEFAULT); @@ -591,6 +598,7 @@ public class ModelEditor { iconLabel.setImage(editor.getImage(entry, iconLabel.getDisplay())); obsManager.runAndCollect(new Runnable() { + @Override public void run() { Composite comp = editor.getEditor(contentContainer, s.getFirstElement()); comp.setBackgroundMode(SWT.INHERIT_DEFAULT); @@ -622,6 +630,7 @@ public class ModelEditor { mgr.setRemoveAllWhenShown(true); mgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { final IStructuredSelection s = (IStructuredSelection) viewer.getSelection(); boolean addSeparator = false; @@ -654,6 +663,7 @@ public class ModelEditor { // build the extract action if ((!((VirtualEntry<?>) s.getFirstElement()).getList().isEmpty()) && (!isModelFragment()) && modelExtractor != null) { manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) { + @Override public void run() { VirtualEntry<?> ve = (VirtualEntry<?>) s.getFirstElement(); EObject container = (EObject) ve.getOriginalParent(); @@ -721,6 +731,7 @@ public class ModelEditor { if (o.eContainer() != null) { addSeparator = true; manager.add(new Action(messages.ModelEditor_Delete, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_cross))) { + @Override public void run() { Command cmd = DeleteCommand.create(ModelEditor.this.modelProvider.getEditingDomain(), o); if (cmd.canExecute()) { @@ -779,6 +790,7 @@ public class ModelEditor { } Action nlsAction = new Action(messages.ModelEditor_ExternalizeStrings) { + @Override public void run() { ExternalizeStringHandler h = ContextInjectionFactory.make(ExternalizeStringHandler.class, context); ContextInjectionFactory.invoke(h, Execute.class, context); @@ -795,6 +807,7 @@ public class ModelEditor { if (el.getWidget() instanceof Control) { manager.add(new Action(messages.ModelEditor_ShowControl) { + @Override public void run() { ControlHighlighter.show((Control) el.getWidget()); } @@ -806,6 +819,7 @@ public class ModelEditor { } if ((s.getFirstElement() instanceof MApplicationElement) && (!isModelFragment()) && (!(s.getFirstElement() instanceof MApplication)) && modelExtractor != null) { manager.add(new Action(messages.ModelEditor_ExtractFragment, ImageDescriptor.createFromImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_ModelFragments))) { + @Override public void run() { MApplicationElement oe = (MApplicationElement) s.getFirstElement(); EObject container = ((EObject) oe).eContainer(); @@ -830,12 +844,13 @@ public class ModelEditor { } Action expandAction = new Action(messages.ModelEditor_ExpandSubtree) { + @Override public void run() { if (!s.isEmpty()) { if (viewer.getExpandedState(s.getFirstElement())) { - viewer.collapseToLevel(s.getFirstElement(), TreeViewer.ALL_LEVELS); + viewer.collapseToLevel(s.getFirstElement(), AbstractTreeViewer.ALL_LEVELS); } else { - viewer.expandToLevel(s.getFirstElement(), TreeViewer.ALL_LEVELS); + viewer.expandToLevel(s.getFirstElement(), AbstractTreeViewer.ALL_LEVELS); } } } @@ -847,12 +862,14 @@ public class ModelEditor { // Save the stateMask viewer.getTree().addKeyListener(new KeyListener() { + @Override public void keyReleased(KeyEvent e) { if (mod1Down && (e.keyCode & SWT.MOD1) == SWT.MOD1) { mod1Down = false; } } + @Override public void keyPressed(KeyEvent e) { if (!mod1Down && (e.keyCode & SWT.MOD1) == SWT.MOD1) { mod1Down = true; @@ -861,21 +878,25 @@ public class ModelEditor { }); viewer.addTreeListener(new ITreeViewerListener() { + @Override public void treeExpanded(final TreeExpansionEvent event) { if (mod1Down) { viewer.getTree().getDisplay().asyncExec(new Runnable() { + @Override public void run() { - viewer.expandToLevel(event.getElement(), TreeViewer.ALL_LEVELS); + viewer.expandToLevel(event.getElement(), AbstractTreeViewer.ALL_LEVELS); } }); } } + @Override public void treeCollapsed(final TreeExpansionEvent event) { if (mod1Down) { viewer.getTree().getDisplay().asyncExec(new Runnable() { + @Override public void run() { - viewer.collapseToLevel(event.getElement(), TreeViewer.ALL_LEVELS); + viewer.collapseToLevel(event.getElement(), AbstractTreeViewer.ALL_LEVELS); } }); } @@ -1003,6 +1024,7 @@ public class ModelEditor { contentProvider.getKnownElements().addSetChangeListener(new ISetChangeListener() { + @Override public void handleSetChange(SetChangeEvent event) { for (Object o : event.diff.getAdditions()) { if (o instanceof EObject) { @@ -1022,6 +1044,7 @@ public class ModelEditor { IObservableMap map = EMFProperties.value(p).observeDetail(clearedSet); map.addMapChangeListener(new IMapChangeListener() { + @Override public void handleMapChange(MapChangeEvent event) { viewer.update(event.diff.getChangedKeys().toArray(), null); } @@ -1033,6 +1056,7 @@ public class ModelEditor { viewer.expandToLevel(viewer.getAutoExpandLevel()); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { TreeViewer viewer = (TreeViewer) event.getViewer(); IStructuredSelection thisSelection = (IStructuredSelection) event.getSelection(); @@ -1041,7 +1065,7 @@ public class ModelEditor { if (viewer.getExpandedState(selectedNode)) viewer.setExpandedState(selectedNode, false); else - viewer.expandToLevel(selectedNode, TreeViewer.ALL_LEVELS); + viewer.expandToLevel(selectedNode, AbstractTreeViewer.ALL_LEVELS); } else { viewer.setExpandedState(selectedNode, !viewer.getExpandedState(selectedNode)); } @@ -1334,6 +1358,7 @@ public class ModelEditor { class ClipboardHandler implements Handler { + @Override public void paste() { if (editorTabFolder.getSelectionIndex() == 0) { if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) { @@ -1405,6 +1430,7 @@ public class ModelEditor { } } + @Override public void copy() { if (editorTabFolder.getSelectionIndex() == 0) { if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) { @@ -1426,6 +1452,7 @@ public class ModelEditor { } } + @Override public void cut() { if (editorTabFolder.getSelectionIndex() == 0) { if (viewer.getControl().getDisplay().getFocusControl() == viewer.getControl()) { @@ -1459,6 +1486,7 @@ public class ModelEditor { class ObservableFactoryImpl implements IObservableFactory { + @Override public IObservable createObservable(Object target) { if (target instanceof IObservableList) { return (IObservable) target; diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java index 575102da..2c03f832 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/VirtualEntry.java @@ -38,6 +38,7 @@ public abstract class VirtualEntry<M> { final IListChangeListener listener = new IListChangeListener() { + @Override public void handleListChange(ListChangeEvent event) { if (!VirtualEntry.this.list.isDisposed()) { List<Object> clean = cleanedList(event.getObservableList()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java index ae6f03c9..cd224164 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AddonsEditor.java @@ -172,6 +172,7 @@ public class AddonsEditor extends AbstractComponentEditor { t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); t.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { lnk.setToolTipText(((Text) (e.getSource())).getText()); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java index 43accfc4..8d95afc2 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java @@ -440,6 +440,7 @@ public class ApplicationEditor extends AbstractComponentEditor { super(pageName); } + @Override public void createControl(Composite parent) { setTitle("Command/Handler"); setMessage("Insert informations for Command and Handler"); @@ -464,6 +465,7 @@ public class ApplicationEditor extends AbstractComponentEditor { nameField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1)); nameField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { setPageComplete(nameField.getText().trim().length() > 0); } @@ -501,6 +503,7 @@ public class ApplicationEditor extends AbstractComponentEditor { this.application = application; } + @Override public void createControl(Composite parent) { setTitle("Keybinding"); setMessage("Insert informations for a keybinding"); @@ -517,6 +520,7 @@ public class ApplicationEditor extends AbstractComponentEditor { keyField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); keyField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { bindtableViewer.getControl().setEnabled(isPageComplete()); setPageComplete(isPageComplete()); @@ -535,6 +539,7 @@ public class ApplicationEditor extends AbstractComponentEditor { bindtableViewer.setInput(application.getBindingTables()); bindtableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { setPageComplete(isPageComplete()); } @@ -571,6 +576,7 @@ public class ApplicationEditor extends AbstractComponentEditor { this.application = application; } + @Override public void createControl(Composite parent) { setTitle("Handled Menu Item"); setMessage("Insert informations for a Handled Menu Item"); @@ -625,6 +631,7 @@ public class ApplicationEditor extends AbstractComponentEditor { menuViewer.setInput(menuList); menuViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { setPageComplete(isPageComplete()); } @@ -660,6 +667,7 @@ public class ApplicationEditor extends AbstractComponentEditor { this.application = application; } + @Override public void createControl(Composite parent) { setTitle("Handled Toolbar Item"); setMessage("Insert informations for a Toolbar Item"); @@ -714,6 +722,7 @@ public class ApplicationEditor extends AbstractComponentEditor { toolbarViewer.setInput(toolbarList); toolbarViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { setPageComplete(isPageComplete()); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java index 9e701e5b..2028bc69 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/BindingTableEditor.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -184,7 +186,7 @@ public class BindingTableEditor extends AbstractComponentEditor { @Override public void widgetSelected(SelectionEvent e) { BindingContextSelectionDialog dialog = new BindingContextSelectionDialog(b.getShell(), getEditor().getModelProvider(), Messages); - if (dialog.open() == BindingContextSelectionDialog.OK) { + if (dialog.open() == Window.OK) { Command cmd = SetCommand.create(getEditingDomain(), getMaster().getValue(), CommandsPackageImpl.Literals.BINDING_TABLE__BINDING_CONTEXT, dialog.getSelectedContext()); if (cmd.canExecute()) { getEditingDomain().getCommandStack().execute(cmd); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java index fd76e8b3..a866696b 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java @@ -115,6 +115,7 @@ public class ControlFactory { t.setData(COPY_HANDLER, new TextPasteHandler(t)); } + @Override public void paste() { Clipboard cp = new Clipboard(t.getDisplay()); Object o = cp.getContents(TextTransfer.getInstance()); @@ -128,10 +129,12 @@ public class ControlFactory { } } + @Override public void cut() { t.cut(); } + @Override public void copy() { t.copy(); } @@ -156,6 +159,7 @@ public class ControlFactory { editor.getMaster().addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { Object val = event.diff.getNewValue(); if (val != null && val instanceof EObject && !t.isDisposed()) { @@ -376,6 +380,7 @@ public class ControlFactory { controlDecoration.setImage(fieldDecoration.getImage()); IValidator iv = new IValidator() { + @Override public IStatus validate(Object value) { if (value == null) { controlDecoration.show(); @@ -476,6 +481,7 @@ public class ControlFactory { final IObservableValue mObs = EMFEditProperties.value(editor.getEditingDomain(), UiPackageImpl.Literals.ELEMENT_CONTAINER__SELECTED_ELEMENT).observeDetail(editor.getMaster()); editor.getMaster().addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (binding[0] != null) { binding[0].dispose(); @@ -516,6 +522,7 @@ public class ControlFactory { editor.getMaster().addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { binding[0] = context.bindValue(uiObs, mObs); } @@ -851,6 +858,7 @@ public class ControlFactory { public static void attachFiltering(Text searchText, final TableViewer viewer, final PatternFilter filter) { searchText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { filter.setPattern(((Text) e.widget).getText()); viewer.refresh(); @@ -862,6 +870,7 @@ public class ControlFactory { }); searchText.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.keyCode == SWT.ARROW_DOWN && viewer.getTable().getItemCount() > 0) { viewer.getControl().setFocus(); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java index 7311e8b2..34b92911 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectMenuItemEditor.java @@ -140,6 +140,7 @@ public class DirectMenuItemEditor extends MenuItemEditor { t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); t.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { lnk.setToolTipText(((Text) (e.getSource())).getText()); } @@ -171,6 +172,7 @@ public class DirectMenuItemEditor extends MenuItemEditor { UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java index 51264bfb..48ce1631 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DirectToolItemEditor.java @@ -103,6 +103,7 @@ public class DirectToolItemEditor extends ToolItemEditor { t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); t.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { lnk.setToolTipText(((Text) (e.getSource())).getText()); } @@ -123,6 +124,7 @@ public class DirectToolItemEditor extends ToolItemEditor { }); } + @Override protected CTabFolder createForm(Composite parent, EMFDataBindingContext context, WritableValue master, boolean isImport) { if (!isImport) { CTabFolder folder = super.createForm(parent, context, master, isImport); @@ -167,6 +169,7 @@ public class DirectToolItemEditor extends ToolItemEditor { UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java index d8757498..4cb2cf54 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/DynamicMenuContributionEditor.java @@ -178,6 +178,7 @@ public class DynamicMenuContributionEditor extends AbstractComponentEditor { t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); t.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { lnk.setToolTipText(((Text) (e.getSource())).getText()); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java index b07c8c69..ac3297d0 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledMenuItemEditor.java @@ -125,6 +125,7 @@ public class HandledMenuItemEditor extends MenuItemEditor { UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java index 18febd9c..9234824b 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandledToolItemEditor.java @@ -124,6 +124,7 @@ public class HandledToolItemEditor extends ToolItemEditor { UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java index 3f278c70..cd50f0e3 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java @@ -196,6 +196,7 @@ public class HandlerEditor extends AbstractComponentEditor { t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); t.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { lnk.setToolTipText(((Text) (e.getSource())).getText()); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java index 9337dd64..b713f67d 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/KeyBindingEditor.java @@ -298,6 +298,7 @@ public class KeyBindingEditor extends AbstractComponentEditor { b.setText(Messages.ModelTooling_Common_Remove); b.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { IStructuredSelection s = (IStructuredSelection) viewer.getSelection(); if (!s.isEmpty()) { @@ -348,6 +349,7 @@ public class KeyBindingEditor extends AbstractComponentEditor { class BindingValidator implements IValidator { + @Override public IStatus validate(Object value) { int statusCode = getEditor().isLiveModel() ? IStatus.ERROR : IStatus.WARNING; if (value != null && value.toString().trim().length() > 0) { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java index d90482b1..48367539 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java @@ -491,6 +491,7 @@ public class MenuEditor extends AbstractComponentEditor { UI_ELEMENT__VISIBLE_WHEN.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); @@ -505,6 +506,7 @@ public class MenuEditor extends AbstractComponentEditor { IObservableList l = ELEMENT_CONTAINER__CHILDREN.observe(element); l.addListChangeListener(new IListChangeListener() { + @Override public void handleListChange(ListChangeEvent event) { event.diff.accept(new ListDiffVisitor() { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java index 6ce12a90..ae5cd32f 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java @@ -253,6 +253,7 @@ public abstract class MenuItemEditor extends AbstractComponentEditor { UpdateValueStrategy t2m = new UpdateValueStrategy(); t2m.setConverter(new Converter(boolean.class, ItemType.class) { + @Override public Object convert(Object fromObject) { return null; } @@ -260,6 +261,7 @@ public abstract class MenuItemEditor extends AbstractComponentEditor { UpdateValueStrategy m2t = new UpdateValueStrategy(); m2t.setConverter(new Converter(ItemType.class, boolean.class) { + @Override public Object convert(Object fromObject) { return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO; } @@ -367,6 +369,7 @@ public abstract class MenuItemEditor extends AbstractComponentEditor { this.Messages = Messages; } + @Override public Object convert(Object fromObject) { if (fromObject == null) { return Messages.MenuItemEditor_NoExpression; @@ -383,6 +386,7 @@ public abstract class MenuItemEditor extends AbstractComponentEditor { this.Messages = Messages; } + @Override public Object convert(Object fromObject) { if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) { return null; diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java index 3d3f9d42..4e35cc59 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartDescriptorEditor.java @@ -373,6 +373,7 @@ public class PartDescriptorEditor extends AbstractComponentEditor { PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java index 2abc7d94..4c580691 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartEditor.java @@ -248,6 +248,7 @@ public class PartEditor extends AbstractComponentEditor { t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); t.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { // lnk might be disposed if else branch above taken if (!lnk.isDisposed()) { @@ -403,6 +404,7 @@ public class PartEditor extends AbstractComponentEditor { PART__TOOLBAR.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java index de1733f5..083b982e 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -464,7 +466,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor { if (eClass == BasicPackageImpl.Literals.PART) { ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint); WizardDialog wizardDialog = new WizardDialog(shell, wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MPart[] parts = (MPart[]) wizard.getElements(MPart.class); for (MPart part : parts) { addToModel((EObject) part); @@ -475,7 +477,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor { if (eClass == BasicPackageImpl.Literals.INPUT_PART) { ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this); WizardDialog wizardDialog = new WizardDialog(shell, wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class); for (MInputPart part : parts) { addToModel((EObject) part); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java index eea40876..c8daab87 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartStackEditor.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -404,7 +406,7 @@ public class PartStackEditor extends AbstractComponentEditor { if (eClass == BasicPackageImpl.Literals.PART) { ModelImportWizard wizard = new ModelImportWizard(MPart.class, this); WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MPart[] parts = (MPart[]) wizard.getElements(MPart.class); for (MPart part : parts) { addToModel((EObject) part); @@ -415,7 +417,7 @@ public class PartStackEditor extends AbstractComponentEditor { if (eClass == BasicPackageImpl.Literals.INPUT_PART) { ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this); WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class); for (MInputPart part : parts) { addToModel((EObject) part); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java index a9d69634..42b75f33 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -344,7 +346,7 @@ public class PerspectiveStackEditor extends AbstractComponentEditor { protected void handleImportPerspective() { ModelImportWizard wizard = new ModelImportWizard(MPerspective.class, this); WizardDialog wizardDialog = new WizardDialog(shell, wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MPerspective[] elements = (MPerspective[]) wizard.getElements(MPerspective.class); for (MPerspective category : elements) { addToModel(category); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java index 0b342f65..d74c2558 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PlaceholderEditor.java @@ -188,6 +188,7 @@ public class PlaceholderEditor extends AbstractComponentEditor { UpdateValueStrategy t2m = new UpdateValueStrategy(); t2m.setConverter(new Converter(String.class, MUIElement.class) { + @Override public Object convert(Object fromObject) { return null; } @@ -195,6 +196,7 @@ public class PlaceholderEditor extends AbstractComponentEditor { UpdateValueStrategy m2t = new UpdateValueStrategy(); m2t.setConverter(new Converter(MUIElement.class, String.class) { + @Override public Object convert(Object fromObject) { if (fromObject != null) { EObject o = (EObject) fromObject; diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java index a582674b..9c39153f 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java @@ -276,6 +276,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor { UpdateValueStrategy t2m = new UpdateValueStrategy(); t2m.setConverter(new Converter(boolean.class, ItemType.class) { + @Override public Object convert(Object fromObject) { return null; } @@ -283,6 +284,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor { UpdateValueStrategy m2t = new UpdateValueStrategy(); m2t.setConverter(new Converter(ItemType.class, boolean.class) { + @Override public Object convert(Object fromObject) { return fromObject == ItemType.CHECK || fromObject == ItemType.RADIO; } @@ -367,6 +369,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor { TOOL_ITEM__MENU.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); @@ -413,6 +416,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor { this.Messages = Messages; } + @Override public Object convert(Object fromObject) { if (fromObject == null) { return Messages.MenuItemEditor_NoExpression; @@ -429,6 +433,7 @@ public abstract class ToolItemEditor extends AbstractComponentEditor { this.Messages = Messages; } + @Override public Object convert(Object fromObject) { if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) { return null; diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java index 74ca26b6..8a2c35f7 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimmedWindowEditor.java @@ -28,6 +28,7 @@ public class TrimmedWindowEditor extends WindowEditor { super(); } + @Override public IObservableList getChildList(Object element) { IObservableList list = super.getChildList(element); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java index 952f6db1..7f4ae23b 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java @@ -369,6 +369,7 @@ public class WindowEditor extends AbstractComponentEditor { }); list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SHARED_ELEMENTS, SHARED_ELEMENTS, element, Messages.WindowEditor_SharedElements) { + @Override protected boolean accepted(Object o) { return true; } @@ -381,6 +382,7 @@ public class WindowEditor extends AbstractComponentEditor { WINDOW__MAIN_MENU.observe(element).addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getOldValue() != null) { list.remove(event.diff.getOldValue()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java index 05439915..5f96c0fd 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java @@ -75,6 +75,7 @@ public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog { setTitleImage(titleImage); getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { titleImage.dispose(); } @@ -97,6 +98,7 @@ public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog { viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -146,6 +148,7 @@ public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog { private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider { + @Override public void update(final ViewerCell cell) { MCommand cmd = (MCommand) cell.getElement(); @@ -163,10 +166,12 @@ public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog { cell.setStyleRanges(styledString.getStyleRanges()); } + @Override public Image getImage(Object element) { return null; } + @Override public String getText(Object element) { MCommand command = (MCommand) element; String s = ""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java index 814e7f4b..15cdb406 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java @@ -148,6 +148,7 @@ public abstract class AbstractIconDialog extends TitleAreaDialog { viewer.setInput(list); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -158,6 +159,7 @@ public abstract class AbstractIconDialog extends TitleAreaDialog { private Timer timer = new Timer(true); private TimerTask task; + @Override public void modifyText(ModifyEvent e) { if (callback != null) { callback.cancel = true; @@ -177,6 +179,7 @@ public abstract class AbstractIconDialog extends TitleAreaDialog { getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { clearImages(); } @@ -264,6 +267,7 @@ public abstract class AbstractIconDialog extends TitleAreaDialog { if (!cancel) { list.getRealm().exec(new Runnable() { + @Override public void run() { list.add(file); } @@ -292,6 +296,7 @@ public abstract class AbstractIconDialog extends TitleAreaDialog { try { project.accept(new IResourceVisitor() { + @Override public boolean visit(IResource resource) throws CoreException { if (callback.cancel) { return false; diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java index faadd680..85e319cf 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java @@ -72,6 +72,7 @@ public class BindingContextSelectionDialog extends TitleAreaDialog { setTitleImage(titleImage); getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { titleImage.dispose(); } @@ -94,6 +95,7 @@ public class BindingContextSelectionDialog extends TitleAreaDialog { viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -137,6 +139,7 @@ public class BindingContextSelectionDialog extends TitleAreaDialog { private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider { + @Override public void update(final ViewerCell cell) { MBindingContext cmd = (MBindingContext) cell.getElement(); @@ -159,10 +162,12 @@ public class BindingContextSelectionDialog extends TitleAreaDialog { cell.setStyleRanges(styledString.getStyleRanges()); } + @Override public Image getImage(Object element) { return null; } + @Override public String getText(Object element) { MBindingContext command = (MBindingContext) element; String s = ""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java index cdb3a163..68ff2b63 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java @@ -40,8 +40,6 @@ import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -75,6 +73,7 @@ public class CommandCategorySelectionDialog extends TitleAreaDialog { setTitleImage(titleImage); getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { titleImage.dispose(); } @@ -97,6 +96,7 @@ public class CommandCategorySelectionDialog extends TitleAreaDialog { viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -139,6 +139,7 @@ public class CommandCategorySelectionDialog extends TitleAreaDialog { private static class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider { + @Override public void update(final ViewerCell cell) { MCategory cmd = (MCategory) cell.getElement(); @@ -158,10 +159,12 @@ public class CommandCategorySelectionDialog extends TitleAreaDialog { cell.setStyleRanges(styledString.getStyleRanges()); } + @Override public Image getImage(Object element) { return null; } + @Override public String getText(Object element) { MCategory command = (MCategory) element; String s = ""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java index 9cf6c11d..93d3ae1a 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java @@ -89,6 +89,7 @@ public class ContributionClassDialog extends TitleAreaDialog { getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { javaClassImage.dispose(); titleImage.dispose(); @@ -139,6 +140,7 @@ public class ContributionClassDialog extends TitleAreaDialog { }); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -152,6 +154,7 @@ public class ContributionClassDialog extends TitleAreaDialog { t.addModifyListener(new ModifyListener() { private ContributionResultHandlerImpl currentResultHandler; + @Override public void modifyText(ModifyEvent e) { if (currentResultHandler != null) { currentResultHandler.cancled = true; @@ -161,6 +164,7 @@ public class ContributionClassDialog extends TitleAreaDialog { Filter filter = new Filter(project, t.getText()); collector.findContributions(filter, currentResultHandler); t.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.ARROW_DOWN) { if (viewer.getTable().getItemCount() > 0) { @@ -217,6 +221,7 @@ public class ContributionClassDialog extends TitleAreaDialog { this.list = list; } + @Override public void result(ContributionData data) { if (!cancled) { list.add(data); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java index 098cde86..9ed5253a 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java @@ -94,6 +94,7 @@ public class ExpressionIdDialog extends TitleAreaDialog { viewer.setInput(getElements(lookup)); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -136,10 +137,12 @@ public class ExpressionIdDialog extends TitleAreaDialog { cell.setStyleRanges(str.getStyleRanges()); } + @Override public Image getImage(Object element) { return null; } + @Override public String getText(Object element) { IConfigurationElement el = (IConfigurationElement) element; return el.getAttribute("id") + " " + el.getContributor().getName(); //$NON-NLS-1$//$NON-NLS-2$ diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java index 06668e6c..e8b80456 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java @@ -94,6 +94,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog { composite.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { packageImage.dispose(); classImage.dispose(); @@ -114,6 +115,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog { searchText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { if (filter != null) { filter.setPattern(searchText.getText()); @@ -137,6 +139,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog { viewer.setLabelProvider(new LabelProviderImpl(packageImage, classImage, featureImage)); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -155,6 +158,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog { } }); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection) event.getSelection(); Button buttonOk = getButton(IDialogConstants.OK_ID); @@ -190,18 +194,22 @@ public class FeatureSelectionDialog extends TitleAreaDialog { static class ContentProviderImpl implements ITreeContentProvider { + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public Object[] getElements(Object inputElement) { return ((List<?>) inputElement).toArray(); } + @Override public Object[] getChildren(Object parentElement) { if (parentElement.getClass() == InternalPackage.class) { return ((InternalPackage) parentElement).classes.toArray(); @@ -211,6 +219,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog { return new Object[0]; } + @Override public Object getParent(Object element) { if (element.getClass() == InternalFeature.class) { return ((InternalFeature) element).clazz; @@ -220,6 +229,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog { return null; } + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } @@ -237,6 +247,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog { this.featureImage = featureImage; } + @Override public void update(final ViewerCell cell) { if (cell.getElement().getClass() == InternalPackage.class) { InternalPackage o = (InternalPackage) cell.getElement(); @@ -266,10 +277,12 @@ public class FeatureSelectionDialog extends TitleAreaDialog { } } + @Override public Image getImage(Object element) { return null; } + @Override public String getText(Object element) { if (element.getClass() == InternalPackage.class) { InternalPackage o = (InternalPackage) element; @@ -410,7 +423,7 @@ public class FeatureSelectionDialog extends TitleAreaDialog { } i = j; } - return (String[]) words.toArray(new String[words.size()]); + return words.toArray(new String[words.size()]); } } } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java index 1a492b65..b15b5f4a 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindImportElementDialog.java @@ -74,6 +74,7 @@ public class FindImportElementDialog extends TitleAreaDialog { setTitleImage(titleImage); getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { titleImage.dispose(); } @@ -121,6 +122,7 @@ public class FindImportElementDialog extends TitleAreaDialog { viewer.setContentProvider(new ObservableListContentProvider()); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -134,6 +136,7 @@ public class FindImportElementDialog extends TitleAreaDialog { searchText.addModifyListener(new ModifyListener() { private ModelResultHandlerImpl currentResultHandler; + @Override public void modifyText(ModifyEvent e) { if (currentResultHandler != null) { currentResultHandler.cancled = true; @@ -199,6 +202,7 @@ public class FindImportElementDialog extends TitleAreaDialog { this.resource = resource; } + @Override public void result(EObject data) { if (!cancled) { if (!resource.getURI().equals(data.eResource().getURI())) diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java index 3a1077ff..89ca837b 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java @@ -96,6 +96,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog { setTitleImage(titleImage); getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { titleImage.dispose(); } @@ -137,6 +138,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog { eClassViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); eClassViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateSearch(); @@ -179,6 +181,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog { viewer.setContentProvider(new ObservableListContentProvider()); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -191,6 +194,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog { searchText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateSearch(); } @@ -262,6 +266,7 @@ public class FindParentReferenceElementDialog extends TitleAreaDialog { this.resource = resource; } + @Override public void result(EObject data) { if (!cancled) { if (!resource.getURI().equals(data.eResource().getURI())) { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java index d5b12265..d2596b0d 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java @@ -99,6 +99,7 @@ public class MenuIdDialog extends TitleAreaDialog { viewer.addFilter(filter); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java index 3c8d145c..1eb5fb66 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java @@ -99,6 +99,7 @@ public class SharedElementsDialog extends TitleAreaDialog { viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -158,6 +159,7 @@ public class SharedElementsDialog extends TitleAreaDialog { } private class LabelProviderImpl extends StyledCellLabelProvider implements ILabelProvider { + @Override public void update(final ViewerCell cell) { EObject o = (EObject) cell.getElement(); @@ -175,6 +177,7 @@ public class SharedElementsDialog extends TitleAreaDialog { cell.setImage(getImage(o)); } + @Override public String getText(Object element) { EObject o = (EObject) element; MApplicationElement el = (MApplicationElement) o; @@ -196,6 +199,7 @@ public class SharedElementsDialog extends TitleAreaDialog { } } + @Override public Image getImage(Object element) { AbstractComponentEditor editor = SharedElementsDialog.this.editor.getEditor(((EObject) element).eClass()); if (editor != null) { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java index 9dd22f59..ed1c3d38 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VApplicationCategoriesEditor.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -80,7 +82,7 @@ public class VApplicationCategoriesEditor extends AbstractComponentEditor { protected void handleImport() { ModelImportWizard wizard = new ModelImportWizard(MCategory.class, this); WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MCategory[] elements = (MCategory[]) wizard.getElements(MCategory.class); for (MCategory category : elements) { addCategory(category); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java index c57f5315..950cd5d7 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VCommandEditor.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -245,7 +247,7 @@ public class VCommandEditor extends AbstractComponentEditor { protected void handleImport() { ModelImportWizard wizard = new ModelImportWizard(MCommand.class, this); WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MCommand[] elements = (MCommand[]) wizard.getElements(MCommand.class); for (MCommand mCommand : elements) { addCommand(mCommand); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java index a612c95f..3db16793 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VHandlerEditor.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -246,7 +248,7 @@ public class VHandlerEditor extends AbstractComponentEditor { protected void handleImport() { ModelImportWizard wizard = new ModelImportWizard(MHandler.class, this); WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MHandler[] elements = (MHandler[]) wizard.getElements(MHandler.class); for (MHandler handler : elements) { addToModel(handler); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java index b60c34f4..2242cd72 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPartDescriptor.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -265,7 +267,7 @@ public class VPartDescriptor extends AbstractComponentEditor { if (eClass == BasicPackageImpl.Literals.PART_DESCRIPTOR) { ModelImportWizard wizard = new ModelImportWizard(MPartDescriptor.class, this, hint); WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MPartDescriptor[] parts = (MPartDescriptor[]) wizard.getElements(MPartDescriptor.class); for (MPartDescriptor part : parts) { addToModel(part); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java index 253b0617..1c60515c 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VWindowSharedElementsEditor.java @@ -11,6 +11,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component.virtual; +import org.eclipse.jface.window.Window; + import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; @@ -294,7 +296,7 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor { if (eClass == BasicPackageImpl.Literals.PART) { ModelImportWizard wizard = new ModelImportWizard(MPart.class, this, hint); WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MPart[] parts = (MPart[]) wizard.getElements(MPart.class); for (MPart part : parts) { addToModel((EObject) part); @@ -304,7 +306,7 @@ public class VWindowSharedElementsEditor extends AbstractComponentEditor { if (eClass == BasicPackageImpl.Literals.INPUT_PART) { ModelImportWizard wizard = new ModelImportWizard(MInputPart.class, this, hint); WizardDialog wizardDialog = new WizardDialog(viewer.getControl().getShell(), wizard); - if (wizardDialog.open() == WizardDialog.OK) { + if (wizardDialog.open() == Window.OK) { MInputPart[] parts = (MInputPart[]) wizard.getElements(MInputPart.class); for (MInputPart part : parts) { addToModel((EObject) part); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java index 27b3f11f..646673e7 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/objectdata/ObjectViewer.java @@ -52,6 +52,7 @@ public class ObjectViewer { IObservableValue value = property.observeDetail(master); value.addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getNewValue() != null) { viewer.setInput(Collections.singleton(new JavaObject(event.diff.getNewValue()))); @@ -71,6 +72,7 @@ public class ObjectViewer { mgr.setRemoveAllWhenShown(true); mgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { if (viewer.getSelection().isEmpty()) { return; @@ -252,19 +254,23 @@ public class ObjectViewer { class ContentProviderImpl implements ITreeContentProvider { + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public Object[] getElements(Object inputElement) { return ((Collection<?>) inputElement).toArray(); } + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof JavaObject) { return ((JavaObject) parentElement).getAttributes().toArray(); @@ -274,11 +280,13 @@ public class ObjectViewer { return new Object[0]; } + @Override public Object getParent(Object element) { // TODO Auto-generated method stub return null; } + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java index 1ea30b80..33c21432 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java @@ -1,5 +1,7 @@ package org.eclipse.e4.tools.emf.ui.internal.common.properties; +import org.eclipse.core.resources.IResource; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -227,10 +229,10 @@ public class ExternalizeStringHandler { ByteArrayInputStream stream = new ByteArrayInputStream(b.toString().getBytes()); if (f.exists()) { - f.appendContents(stream, IFile.KEEP_HISTORY, new NullProgressMonitor()); + f.appendContents(stream, IResource.KEEP_HISTORY, new NullProgressMonitor()); } else { createParent(f.getParent()); - f.create(stream, IFile.KEEP_HISTORY, new NullProgressMonitor()); + f.create(stream, IResource.KEEP_HISTORY, new NullProgressMonitor()); } stream.close(); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java index 016d28ba..6cefaa95 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java @@ -63,11 +63,13 @@ public class ProjectOSGiTranslationProvider extends ResourceBundleTranslationPro this.project = project; this.project.getWorkspace().addResourceChangeListener(new IResourceChangeListener() { + @Override public void resourceChanged(IResourceChangeEvent event) { if (event.getType() == IResourceChangeEvent.POST_CHANGE) { try { event.getDelta().accept(new IResourceDeltaVisitor() { + @Override public boolean visit(IResourceDelta delta) throws CoreException { return ProjectOSGiTranslationProvider.this.visit(delta); } @@ -249,6 +251,7 @@ public class ProjectOSGiTranslationProvider extends ResourceBundleTranslationPro InputStream stream = null; try { stream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() { + @Override public InputStream run() throws IOException { return getResourceAsStream(resourceName); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java index ac02009f..902d64b4 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/UIViewer.java @@ -46,6 +46,7 @@ public class UIViewer { IObservableValue value = property.observeDetail(master); value.addValueChangeListener(new IValueChangeListener() { + @Override public void handleValueChange(ValueChangeEvent event) { if (event.diff.getNewValue() != null) { viewer.setInput(Collections.singleton(event.diff.getNewValue())); @@ -60,6 +61,7 @@ public class UIViewer { mgr.setRemoveAllWhenShown(true); mgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { final Object o = ((IStructuredSelection) viewer.getSelection()).getFirstElement(); if (o instanceof Control) { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java index 94fcb0c1..6a2433fd 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java @@ -22,18 +22,22 @@ import org.eclipse.swt.widgets.Tree; public class WidgetContentProvider implements ITreeContentProvider { + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public Object[] getElements(Object inputElement) { return ((Collection<?>) inputElement).toArray(); } + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof Menu) { Menu m = (Menu) parentElement; @@ -106,11 +110,13 @@ public class WidgetContentProvider implements ITreeContentProvider { return new Object[0]; } + @Override public Object getParent(Object element) { // TODO Auto-generated method stub return null; } + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java index 0f4ccbd8..fcbc3e8b 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/AnnotationAccess.java @@ -16,43 +16,52 @@ public class AnnotationAccess implements IAnnotationAccess, IAnnotationAccessExt this.pool = pool; } + @Override public String getTypeLabel(Annotation annotation) { return annotation.getText(); } + @Override public int getLayer(Annotation annotation) { return IAnnotationAccessExtension.DEFAULT_LAYER; } + @Override public void paint(Annotation annotation, GC gc, Canvas canvas, Rectangle bounds) { gc.drawImage(pool.getImageUnchecked(ResourceProvider.IMG_Obj16_error_obj), bounds.x, bounds.y); } + @Override public boolean isPaintable(Annotation annotation) { // TODO Auto-generated method stub return false; } + @Override public boolean isSubtype(Object annotationType, Object potentialSupertype) { // TODO Auto-generated method stub return false; } + @Override public Object[] getSupertypes(Object annotationType) { // TODO Auto-generated method stub return null; } + @Override public Object getType(Annotation annotation) { // TODO Auto-generated method stub return null; } + @Override public boolean isMultiLine(Annotation annotation) { // TODO Auto-generated method stub return false; } + @Override public boolean isTemporary(Annotation annotation) { // TODO Auto-generated method stub return false; diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java index 5dd518af..5889901a 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/EMFDocumentResourceMediator.java @@ -27,6 +27,7 @@ public class EMFDocumentResourceMediator { this.document = new Document(); this.document.addDocumentListener(new IDocumentListener() { + @Override public void documentChanged(DocumentEvent event) { if (updateFromEMF) { return; @@ -50,6 +51,7 @@ public class EMFDocumentResourceMediator { } } + @Override public void documentAboutToBeChanged(DocumentEvent event) { } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java index 627ce6af..b3726387 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/NonRuleBasedDamagerRepairer.java @@ -43,6 +43,7 @@ public class NonRuleBasedDamagerRepairer /** * @see IPresentationRepairer#setDocument(IDocument) */ + @Override public void setDocument(IDocument document) { fDocument = document; } @@ -73,6 +74,7 @@ public class NonRuleBasedDamagerRepairer /** * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean) */ + @Override public IRegion getDamageRegion( ITypedRegion partition, DocumentEvent event, @@ -113,6 +115,7 @@ public class NonRuleBasedDamagerRepairer /** * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion) */ + @Override public void createPresentation( TextPresentation presentation, ITypedRegion region) { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java index 85719e91..cb588bc1 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/TagRule.java @@ -20,6 +20,7 @@ public class TagRule extends MultiLineRule { super("<", ">", token); //$NON-NLS-1$//$NON-NLS-2$ } + @Override protected boolean sequenceDetected(ICharacterScanner scanner, char[] sequence, boolean eofAllowed) { int c = scanner.read(); if (sequence[0] == '<') { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java index ea8ed3b2..804dcea4 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLConfiguration.java @@ -32,10 +32,12 @@ public class XMLConfiguration extends SourceViewerConfiguration { this.pool = pool; } + @Override public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { return new String[] { IDocument.DEFAULT_CONTENT_TYPE, XMLPartitionScanner.XML_COMMENT, XMLPartitionScanner.XML_TAG }; } + @Override public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) { if (doubleClickStrategy == null) doubleClickStrategy = new XMLDoubleClickStrategy(); @@ -58,6 +60,7 @@ public class XMLConfiguration extends SourceViewerConfiguration { return tagScanner; } + @Override public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { PresentationReconciler reconciler = new PresentationReconciler(); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java index 492d51bb..5aae8843 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLDoubleClickStrategy.java @@ -18,6 +18,7 @@ import org.eclipse.jface.text.ITextViewer; public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy { protected ITextViewer fText; + @Override public void doubleClicked(ITextViewer part) { int pos = part.getSelectedRange().x; diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java index 3ded701a..91a53aec 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/xml/XMLWhitespaceDetector.java @@ -14,6 +14,7 @@ import org.eclipse.jface.text.rules.IWhitespaceDetector; public class XMLWhitespaceDetector implements IWhitespaceDetector { + @Override public boolean isWhitespace(char c) { return (c == ' ' || c == '\t' || c == '\n' || c == '\r'); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java index a3badfda..8724ce58 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/ModelImportPage1.java @@ -41,10 +41,12 @@ import org.eclipse.swt.widgets.TableColumn; public class ModelImportPage1 extends WizardPage { private class TableLabelProvider extends LabelProvider implements ITableLabelProvider { + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } + @Override public String getColumnText(Object element, int columnIndex) { if (element instanceof IConfigurationElement) { IConfigurationElement config = (IConfigurationElement) element; @@ -59,6 +61,7 @@ public class ModelImportPage1 extends WizardPage { protected Object[] checkedElements; private class TableContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { if (!(inputElement instanceof RegistryStruct)) { @@ -70,21 +73,26 @@ public class ModelImportPage1 extends WizardPage { return RegistryUtil.getExtensions(registry, input, wizard.isLiveModel()); } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } private class ComboContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { return RegistryUtil.getProvidingBundles(registry, wizard.getExtensionPoint(), wizard.isLiveModel()); } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } @@ -105,6 +113,7 @@ public class ModelImportPage1 extends WizardPage { * * @param parent */ + @Override public void createControl(Composite parent) { Composite container = new Composite(parent, SWT.NULL); @@ -135,6 +144,7 @@ public class ModelImportPage1 extends WizardPage { comboViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { String bundle = ((IStructuredSelection) event.getSelection()).getFirstElement().toString(); RegistryStruct struct = RegistryUtil.getStruct(wizard.getApplicationElement(), wizard.getHint()); @@ -145,6 +155,7 @@ public class ModelImportPage1 extends WizardPage { }); checkboxTableViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { checkedElements = checkboxTableViewer.getCheckedElements(); if (checkedElements.length > 0) { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java index a8d1b1a9..1d74bce1 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/imp/RegistryUtil.java @@ -109,7 +109,7 @@ public class RegistryUtil { } } - result.add((MCommand) command); + result.add(command); } return result.toArray(new MCommand[0]); @@ -128,7 +128,7 @@ public class RegistryUtil { perspective.setElementId(element.getAttribute("id")); perspective.setToBeRendered(true); perspective.setVisible(true); - result.add((MPerspective) perspective); + result.add(perspective); } return result.toArray(new MPerspective[0]); @@ -298,7 +298,7 @@ public class RegistryUtil { ArrayList<MHandler> result = new ArrayList<MHandler>(); for (IConfigurationElement element : elements) { - MHandler hand = (MHandler) MCommandsFactory.INSTANCE.createHandler(); + MHandler hand = MCommandsFactory.INSTANCE.createHandler(); hand.setElementId(element.getAttribute("id")); hand.setContributionURI(getContributionURI(element, "class")); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java index 1487f116..f994c56b 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java @@ -90,6 +90,7 @@ public class ApplicationModelEditor extends ModelEditor { * the resource was deleted or the containing project was closed. */ private IResourceChangeListener listener = new IResourceChangeListener() { + @Override public void resourceChanged(IResourceChangeEvent event) { if (event.getType() == IResourceChangeEvent.PRE_CLOSE || event.getType() == IResourceChangeEvent.PRE_DELETE) { @@ -136,6 +137,7 @@ public class ApplicationModelEditor extends ModelEditor { protected void statusDialog(final Exception exc) { try { sync.syncExec(new Runnable() { + @Override public void run() { String bundle = FrameworkUtil.getBundle(getClass()).getSymbolicName(); Status status = new Status(IStatus.ERROR, bundle, exc.getMessage()); @@ -152,6 +154,7 @@ public class ApplicationModelEditor extends ModelEditor { */ protected void reloadModel() { getModelProvider().getRoot().getRealm().asyncExec(new Runnable() { + @Override public void run() { try { resource.unload(); |