Code Style - add @Override annotations
diff --git a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/internal/ui/LibraFacetUIPlugin.java b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/internal/ui/LibraFacetUIPlugin.java
index 5901513..28d67c9 100644
--- a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/internal/ui/LibraFacetUIPlugin.java
+++ b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/internal/ui/LibraFacetUIPlugin.java
@@ -34,6 +34,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -43,6 +44,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/operations/ConvertProjectToBundleOperation.java b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/operations/ConvertProjectToBundleOperation.java
index 11a0298..ed641f7 100644
--- a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/operations/ConvertProjectToBundleOperation.java
+++ b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/operations/ConvertProjectToBundleOperation.java
@@ -30,6 +30,7 @@
this.fProject = project;
}
+ @Override
protected void execute(IProgressMonitor monitor) throws CoreException,
InvocationTargetException, InterruptedException {
IFacetedProject fproj = ProjectFacetsManager.create(fProject, true, monitor);
diff --git a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizard.java b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizard.java
index 11825b6..f2ae49e 100644
--- a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizard.java
+++ b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizard.java
@@ -41,6 +41,7 @@
addPage(mainPage);
}
+ @Override
public boolean performFinish() {
IProject[] projects = mainPage.getProjects();
diff --git a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizardPage.java b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizardPage.java
index 64d4699..4a4329a 100644
--- a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizardPage.java
+++ b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizardPage.java
@@ -138,6 +138,7 @@
Button selectAllButton = new Button(buttonGroup, SWT.PUSH);
selectAllButton.setText(Messages.ConvertProjectsToBundlesWizardPage_SelectAll);
selectAllButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
fSelected.addAll(fUnconverted);
}
@@ -147,6 +148,7 @@
Button deselectAllButton = new Button(buttonGroup, SWT.PUSH);
deselectAllButton.setText(Messages.ConvertProjectsToBundlesWizardPage_DeselectAll);
deselectAllButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
for (Object o : fUnconverted) {
fSelected.remove(o);
@@ -159,6 +161,7 @@
Button addReferencesButton = new Button(buttonGroup, SWT.PUSH);
addReferencesButton.setText(Messages.ConvertProjectsToBundlesWizardPage_AddReferences);
addReferencesButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
selectReferences();
}
diff --git a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/internal/LibraFacetPlugin.java b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/internal/LibraFacetPlugin.java
index ee4ac0a..6bcfe76 100644
--- a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/internal/LibraFacetPlugin.java
+++ b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/internal/LibraFacetPlugin.java
@@ -44,6 +44,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -59,6 +60,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContextRootListener);
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkCorePlugin.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkCorePlugin.java
index 4a0bc07..80a9b18 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkCorePlugin.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkCorePlugin.java
@@ -46,6 +46,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -55,6 +56,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkDelegate.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkDelegate.java
index 3cedfe1..b4b3b24 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkDelegate.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkDelegate.java
@@ -71,6 +71,7 @@
//public abstract IStatus validate();
+ @Override
public void setDefaults(IProgressMonitor monitor) {
IRuntimeType type = getRuntimeWorkingCopy().getRuntimeType();
getRuntimeWorkingCopy()
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceConfiguration.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceConfiguration.java
index 5eeb231..077aa99 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceConfiguration.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceConfiguration.java
@@ -233,6 +233,7 @@
*
* @return java.lang.String
*/
+ @Override
public String toString() {
return "FrameworkInstanceConfiguration[" + getFolder() + "]";
}
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceDelegate.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceDelegate.java
index 61afad5..462fb28 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceDelegate.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceDelegate.java
@@ -134,6 +134,7 @@
// return null;
}
+ @Override
public IStatus canModifyModules(IModule[] add, IModule[] remove) {
if (add != null) {
int size = add.length;
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkInstanceBehaviorDelegate.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkInstanceBehaviorDelegate.java
index ac0f5a0..bd46ff2 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkInstanceBehaviorDelegate.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkInstanceBehaviorDelegate.java
@@ -241,6 +241,7 @@
* @param force
* <code>true</code> to kill the server
*/
+ @Override
public void stop(boolean force) {
if (force) {
terminate();
@@ -300,6 +301,7 @@
}
}
+ @Override
public IPath getTempDirectory() {
return super.getTempDirectory(false);
}
@@ -317,6 +319,7 @@
return confDir;
}
+ @Override
public void initialize(IProgressMonitor monitor) {
// do nothing
}
@@ -399,10 +402,12 @@
*
* @return java.lang.String
*/
+ @Override
public String toString() {
return "OSGiFrameworkInstance";
}
+ @Override
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy,
IProgressMonitor monitor) throws CoreException {
@@ -513,10 +518,12 @@
false);
}
+ @Override
protected IModuleResource[] getResources(IModule[] module) {
return super.getResources(module);
}
+ @Override
protected IModuleResourceDelta[] getPublishedResourceDelta(IModule[] module) {
return super.getPublishedResourceDelta(module);
}
@@ -524,6 +531,7 @@
/**
* @see ServerBehaviourDelegate#handleResourceChange()
*/
+ @Override
public void handleResourceChange() {
if (getServer().getServerRestartState())
return;
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkInstanceLocatorDelegate.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkInstanceLocatorDelegate.java
index 85bc5cc..c46047a 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkInstanceLocatorDelegate.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkInstanceLocatorDelegate.java
@@ -27,6 +27,7 @@
*/
@SuppressWarnings("restriction")
public class OSGIFrameworkInstanceLocatorDelegate extends ServerLocatorDelegate {
+ @Override
public void searchForServers(String host, final IServerSearchListener listener, final IProgressMonitor monitor) {
OSGIFrameworkLocatorDelegate.IRuntimeSearchListener listener2 = new OSGIFrameworkLocatorDelegate.IRuntimeSearchListener() {
public void runtimeFound(IRuntimeWorkingCopy runtime) {
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkLocatorDelegate.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkLocatorDelegate.java
index dd3b82b..b462611 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkLocatorDelegate.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/OSGIFrameworkLocatorDelegate.java
@@ -40,6 +40,7 @@
* org.eclipse.wst.server.core.model.IRuntimeFactoryDelegate#getKnownRuntimes
* ()
*/
+ @Override
public void searchForRuntimes(IPath path, IRuntimeSearchListener listener,
IProgressMonitor monitor) {
searchForRuntimes2(path, listener, monitor);
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/PingThread.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/PingThread.java
index 53a7bce..65ecc22 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/PingThread.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/PingThread.java
@@ -55,6 +55,7 @@
this.behaviour = behaviour;
this.launch = launch;
Thread t = new Thread("OSGi Framework Launchers Ping Thread") {
+ @Override
public void run() {
ping();
}
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/launching/LaunchableAdapterDelegate.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/launching/LaunchableAdapterDelegate.java
index 19baf12..5f05d58 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/launching/LaunchableAdapterDelegate.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/launching/LaunchableAdapterDelegate.java
@@ -29,6 +29,7 @@
/*
* @see LaunchableAdapterDelegate#getLaunchable(IServer, IModuleArtifact)
*/
+ @Override
public Object getLaunchable(IServer server, IModuleArtifact moduleObject) {
Trace.trace(Trace.FINER, "IOSGIFrameworkInstance Launchable Adapter " + server + "-"
+ moduleObject);
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/publish/PublishTask.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/publish/PublishTask.java
index 51fb1b5..12b0b9f 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/publish/PublishTask.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/publish/PublishTask.java
@@ -23,6 +23,7 @@
import org.eclipse.wst.server.core.model.PublishTaskDelegate;
public class PublishTask extends PublishTaskDelegate {
+ @Override
public PublishOperation[] getTasks(IServer server, int kind, List modules, List kindList) {
if (modules == null)
return null;
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/console/ServerConsoleEditorPage.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/console/ServerConsoleEditorPage.java
index ea2a413..7b07a20 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/console/ServerConsoleEditorPage.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/console/ServerConsoleEditorPage.java
@@ -107,6 +107,7 @@
GridDataFactory.fillDefaults().grab(true, false).applyTo(commandText);
commandText.addKeyListener(new KeyAdapter() {
+ @Override
public void keyPressed(KeyEvent e) {
if (e.character == SWT.CR || e.character == SWT.LF) {
history.add(commandText.getText());
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/dependencies/BundleDependencyEditorPage.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/dependencies/BundleDependencyEditorPage.java
index 841313b..542e185 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/dependencies/BundleDependencyEditorPage.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/dependencies/BundleDependencyEditorPage.java
@@ -112,6 +112,7 @@
private ServerResourceCommandManager commandManager;
+ @Override
protected void createBundleContent(Composite parent) {
mform = new ManagedForm(parent);
setManagedForm(mform);
@@ -427,6 +428,7 @@
manager.add(zoomContributionItem);
}
+ @Override
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
commandManager = ((ServerEditorPartInput) input).getServerCommandManager();
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/AbstractBundleEditorPage.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/AbstractBundleEditorPage.java
index 470675b..6f50135 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/AbstractBundleEditorPage.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/AbstractBundleEditorPage.java
@@ -120,6 +120,7 @@
protected ScrolledForm sform;
+ @Override
public final void createPartControl(Composite parent) {
createBundleContent(parent);
@@ -146,17 +147,20 @@
}
}
+ @Override
public void dispose() {
getServer().getOriginal().removeServerListener(serverListener);
super.dispose();
}
+ @Override
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
serverListener = new PageEnablementServerListener();
getServer().getOriginal().addServerListener(serverListener);
}
+ @Override
public void setFocus() {
// nothing
}
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/SearchControl.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/SearchControl.java
index ab7a419..5cc9ab7 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/SearchControl.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/SearchControl.java
@@ -39,6 +39,7 @@
return searchText;
}
+ @Override
protected Control createControl(Composite parent) {
if (parent instanceof ToolBar) {
parent.setCursor(null);
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationMasterDetailsBlock.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationMasterDetailsBlock.java
index 5092511..05f487f 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationMasterDetailsBlock.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationMasterDetailsBlock.java
@@ -218,11 +218,13 @@
super(parent, style);
}
+ @Override
public void layout(boolean changed) {
super.layout(changed);
hookSashListeners();
}
+ @Override
public void layout(Control[] children) {
super.layout(children);
hookSashListeners();
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/overview/BundleInformationEditorPage.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/overview/BundleInformationEditorPage.java
index 94c0bdc..beb716e 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/overview/BundleInformationEditorPage.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/overview/BundleInformationEditorPage.java
@@ -38,6 +38,7 @@
private ServerResourceCommandManager commandManager;
+ @Override
protected void createBundleContent(Composite parent) {
if (mform == null) {
mform = new ManagedForm(parent);
@@ -66,11 +67,13 @@
masterDetailsBlock.refresh();
}
+ @Override
protected void disablePage() {
super.disablePage();
masterDetailsBlock.clear();
}
+ @Override
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
commandManager = ((ServerEditorPartInput) input).getServerCommandManager();
diff --git a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/EquinoxFramework.java b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/EquinoxFramework.java
index 89844c3..ae23943 100644
--- a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/EquinoxFramework.java
+++ b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/EquinoxFramework.java
@@ -57,12 +57,14 @@
*
* @return boolean
*/
+ @Override
public IStatus verifyLocation() {
return getVersionHandler()
.verifyInstallPath(getRuntime().getLocation());
}
+ @Override
public IStatus validate() {
IStatus status = super.validate();
if (!status.isOK())
diff --git a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/EquinoxPlugin.java b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/EquinoxPlugin.java
index 9bedf86..0158d93 100644
--- a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/EquinoxPlugin.java
+++ b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/EquinoxPlugin.java
@@ -36,6 +36,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -45,6 +46,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxConfigurationPublishHelper.java b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxConfigurationPublishHelper.java
index a0ee01c..b72ffde 100644
--- a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxConfigurationPublishHelper.java
+++ b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxConfigurationPublishHelper.java
@@ -23,6 +23,7 @@
this.behavior = behavior;
}
+ @Override
protected IPath getPublishFolder() {
IPath configPath = behavior.getBaseDirectory();
diff --git a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkClasspathProvider.java b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkClasspathProvider.java
index e56991a..bec25f2 100644
--- a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkClasspathProvider.java
+++ b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkClasspathProvider.java
@@ -26,6 +26,7 @@
* @see RuntimeClasspathProviderDelegate#resolveClasspathContainer(IProject,
* IRuntime)
*/
+ @Override
public IClasspathEntry[] resolveClasspathContainer(IProject project,
IRuntime runtime) {
IPath installPath = runtime.getLocation();
diff --git a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkInstanceBehavior.java b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkInstanceBehavior.java
index cd83122..8c5ed6d 100644
--- a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkInstanceBehavior.java
+++ b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkInstanceBehavior.java
@@ -55,20 +55,24 @@
return (EquinoxFrameworkInstance) getServer().loadAdapter(EquinoxFrameworkInstance.class, null);
}
+ @Override
public String getFrameworkClass() {
return getEquinoxVersionHandler().getFrameworkClass();
}
+ @Override
public String[] getFrameworkProgramArguments(boolean starting) {
return getEquinoxVersionHandler().getFrameworkProgramArguments(
getBaseDirectory(), getFrameworkInstance().isDebug(), starting);
}
+ @Override
public String[] getExcludedFrameworkProgramArguments(boolean starting) {
return getEquinoxVersionHandler().getExcludedFrameworkProgramArguments(
getFrameworkInstance().isDebug(), starting);
}
+ @Override
public String[] getFrameworkVMArguments() {
IPath installPath = getServer().getRuntime().getLocation();
// If installPath is relative, convert to canonical path and hope for
@@ -102,6 +106,7 @@
return getEquinoxVersionHandler().getFrameworkVMArguments(installPath, jmxEnabled,jmxPort,javaProfileID, null, deployPath, false);
}
+ @Override
protected void publishServer(int kind, IProgressMonitor monitor)
throws CoreException {
if (getServer().getRuntime() == null)
@@ -127,6 +132,7 @@
setServerPublishState(IServer.PUBLISH_STATE_NONE);
}
+ @Override
@SuppressWarnings("rawtypes")
protected void publishModules(int kind, List modules, List deltaKind2,
MultiStatus multi, IProgressMonitor monitor) {
@@ -148,6 +154,7 @@
}
}
+ @Override
protected void publishModule(int kind, int deltaKind, IModule[] moduleTree,
IProgressMonitor monitor) throws CoreException {
if (getServer().getServerState() != IServer.STATE_STOPPED) {
diff --git a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixFramework.java b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixFramework.java
index efb7a6c..4048143 100644
--- a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixFramework.java
+++ b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixFramework.java
@@ -57,12 +57,14 @@
*
* @return boolean
*/
+ @Override
public IStatus verifyLocation() {
return getVersionHandler()
.verifyInstallPath(getRuntime().getLocation());
}
+ @Override
public IStatus validate() {
IStatus status = super.validate();
if (!status.isOK())
diff --git a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixPlugin.java b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixPlugin.java
index c67bf88..7b66740 100644
--- a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixPlugin.java
+++ b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixPlugin.java
@@ -36,6 +36,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -45,6 +46,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixConfigurationPublishHelper.java b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixConfigurationPublishHelper.java
index 7d61e00..35ff30f 100644
--- a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixConfigurationPublishHelper.java
+++ b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixConfigurationPublishHelper.java
@@ -23,6 +23,7 @@
this.behavior = behavior;
}
+ @Override
protected IPath getPublishFolder() {
IPath configPath = behavior.getBaseDirectory();
configPath = configPath.append("plugins").makeAbsolute();
diff --git a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeClasspathProvider.java b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeClasspathProvider.java
index 0a3aa12..01482a2 100644
--- a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeClasspathProvider.java
+++ b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeClasspathProvider.java
@@ -26,6 +26,7 @@
* @see RuntimeClasspathProviderDelegate#resolveClasspathContainer(IProject,
* IRuntime)
*/
+ @Override
public IClasspathEntry[] resolveClasspathContainer(IProject project,
IRuntime runtime) {
IPath installPath = runtime.getLocation();
diff --git a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeInstanceBehavior.java b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeInstanceBehavior.java
index e87e682..74f0765 100644
--- a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeInstanceBehavior.java
+++ b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeInstanceBehavior.java
@@ -55,20 +55,24 @@
return (FelixFrameworkInstance) getServer().loadAdapter(FelixFrameworkInstance.class, null);
}
+ @Override
public String getFrameworkClass() {
return getFelixVersionHandler().getFrameworkClass();
}
+ @Override
public String[] getFrameworkProgramArguments(boolean starting) {
return getFelixVersionHandler().getFrameworkProgramArguments(
getBaseDirectory(), getFrameworkInstance().isDebug(), starting);
}
+ @Override
public String[] getExcludedFrameworkProgramArguments(boolean starting) {
return getFelixVersionHandler().getExcludedFrameworkProgramArguments(
getFrameworkInstance().isDebug(), starting);
}
+ @Override
public String[] getFrameworkVMArguments() {
IPath installPath = getServer().getRuntime().getLocation();
// If installPath is relative, convert to canonical path and hope for
@@ -101,6 +105,7 @@
return getFelixVersionHandler().getFrameworkVMArguments(installPath, null, deployPath, false, jmxEnabled, jmxPort);
}
+ @Override
protected void publishServer(int kind, IProgressMonitor monitor)
throws CoreException {
if (getServer().getRuntime() == null)
@@ -126,6 +131,7 @@
setServerPublishState(IServer.PUBLISH_STATE_NONE);
}
+ @Override
@SuppressWarnings("rawtypes")
protected void publishModules(int kind, List modules, List deltaKind2,
MultiStatus multi, IProgressMonitor monitor) {
@@ -149,6 +155,7 @@
}
}
+ @Override
protected void publishModule(int kind, int deltaKind, IModule[] moduleTree,
IProgressMonitor monitor) throws CoreException {
if (getServer().getServerState() != IServer.STATE_STOPPED) {
diff --git a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/JonasFramework.java b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/JonasFramework.java
index a8d7664..ebb534a 100644
--- a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/JonasFramework.java
+++ b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/JonasFramework.java
@@ -57,12 +57,14 @@
*
* @return boolean
*/
+ @Override
public IStatus verifyLocation() {
return getVersionHandler()
.verifyInstallPath(getRuntime().getLocation());
}
+ @Override
public IStatus validate() {
IStatus status = super.validate();
if (!status.isOK())
diff --git a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/JonasPlugin.java b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/JonasPlugin.java
index c2526cc..297246d 100644
--- a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/JonasPlugin.java
+++ b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/JonasPlugin.java
@@ -36,6 +36,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -45,6 +46,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasConfigurationPublishHelper.java b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasConfigurationPublishHelper.java
index ced6f86..03bb2d6 100644
--- a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasConfigurationPublishHelper.java
+++ b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasConfigurationPublishHelper.java
@@ -23,6 +23,7 @@
this.behavior = behavior;
}
+ @Override
protected IPath getPublishFolder() {
IPath configPath = behavior.getBaseDirectory();
//configPath = configPath.append("plugins").makeAbsolute();
diff --git a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkClasspathProvider.java b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkClasspathProvider.java
index 4075bc5..2699335 100644
--- a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkClasspathProvider.java
+++ b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkClasspathProvider.java
@@ -26,6 +26,7 @@
* @see RuntimeClasspathProviderDelegate#resolveClasspathContainer(IProject,
* IRuntime)
*/
+ @Override
public IClasspathEntry[] resolveClasspathContainer(IProject project,
IRuntime runtime) {
IPath installPath = runtime.getLocation();
diff --git a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkInstanceBehavior.java b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkInstanceBehavior.java
index 9d0d6c6..9cdd113 100644
--- a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkInstanceBehavior.java
+++ b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkInstanceBehavior.java
@@ -54,20 +54,24 @@
return (JonasFrameworkInstance) getServer().loadAdapter(JonasFrameworkInstance.class, null);
}
+ @Override
public String getFrameworkClass() {
return getJonasVersionHandler().getFrameworkClass();
}
+ @Override
public String[] getFrameworkProgramArguments(boolean starting) {
return getJonasVersionHandler().getFrameworkProgramArguments(
getBaseDirectory(), getFrameworkInstance().isDebug(), starting);
}
+ @Override
public String[] getExcludedFrameworkProgramArguments(boolean starting) {
return getJonasVersionHandler().getExcludedFrameworkProgramArguments(
getFrameworkInstance().isDebug(), starting);
}
+ @Override
public String[] getFrameworkVMArguments() {
IPath installPath = getServer().getRuntime().getLocation();
// If installPath is relative, convert to canonical path and hope for
@@ -98,6 +102,7 @@
return getJonasVersionHandler().getFrameworkVMArguments(installPath, null, deployPath, false);
}
+ @Override
protected void publishServer(int kind, IProgressMonitor monitor)
throws CoreException {
if (getServer().getRuntime() == null)
@@ -124,6 +129,7 @@
setServerPublishState(IServer.PUBLISH_STATE_NONE);
}
+ @Override
@SuppressWarnings("rawtypes")
protected void publishModules(int kind, List modules, List deltaKind2,
MultiStatus multi, IProgressMonitor monitor) {
@@ -152,6 +158,7 @@
}
}
+ @Override
protected void publishModule(int kind, int deltaKind, IModule[] moduleTree,
IProgressMonitor monitor) throws CoreException {
if (getServer().getServerState() != IServer.STATE_STOPPED) {
diff --git a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/KnopflerfishFramework.java b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/KnopflerfishFramework.java
index 99ad5e0..fa29ce9 100644
--- a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/KnopflerfishFramework.java
+++ b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/KnopflerfishFramework.java
@@ -57,12 +57,14 @@
*
* @return boolean
*/
+ @Override
public IStatus verifyLocation() {
return getVersionHandler()
.verifyInstallPath(getRuntime().getLocation());
}
+ @Override
public IStatus validate() {
IStatus status = super.validate();
if (!status.isOK())
diff --git a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/KnopflerfishPlugin.java b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/KnopflerfishPlugin.java
index cc3644e..a87eefa 100644
--- a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/KnopflerfishPlugin.java
+++ b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/KnopflerfishPlugin.java
@@ -36,6 +36,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -45,6 +46,7 @@
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishConfigurationPublishHelper.java b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishConfigurationPublishHelper.java
index 3f59b99..584891b 100644
--- a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishConfigurationPublishHelper.java
+++ b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishConfigurationPublishHelper.java
@@ -23,6 +23,7 @@
this.behavior = behavior;
}
+ @Override
protected IPath getPublishFolder() {
IPath configPath = behavior.getBaseDirectory();
configPath = configPath.append("plugins").makeAbsolute();
diff --git a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkClasspathProvider.java b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkClasspathProvider.java
index f8a0ec9..83a6981 100644
--- a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkClasspathProvider.java
+++ b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkClasspathProvider.java
@@ -26,6 +26,7 @@
* @see RuntimeClasspathProviderDelegate#resolveClasspathContainer(IProject,
* IRuntime)
*/
+ @Override
public IClasspathEntry[] resolveClasspathContainer(IProject project,
IRuntime runtime) {
IPath installPath = runtime.getLocation();
diff --git a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkInstanceBehavior.java b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkInstanceBehavior.java
index 2596d2f..e9c0e34 100644
--- a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkInstanceBehavior.java
+++ b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkInstanceBehavior.java
@@ -55,20 +55,24 @@
return (KnopflerfishFrameworkInstance) getServer().loadAdapter(KnopflerfishFrameworkInstance.class, null);
}
+ @Override
public String getFrameworkClass() {
return getKnopflerfishVersionHandler().getFrameworkClass();
}
+ @Override
public String[] getFrameworkProgramArguments(boolean starting) {
return getKnopflerfishVersionHandler().getFrameworkProgramArguments(
getBaseDirectory(), getFrameworkInstance().isDebug(), starting);
}
+ @Override
public String[] getExcludedFrameworkProgramArguments(boolean starting) {
return getKnopflerfishVersionHandler().getExcludedFrameworkProgramArguments(
getFrameworkInstance().isDebug(), starting);
}
+ @Override
public String[] getFrameworkVMArguments() {
IPath installPath = getServer().getRuntime().getLocation();
// If installPath is relative, convert to canonical path and hope for
@@ -99,6 +103,7 @@
return getKnopflerfishVersionHandler().getFrameworkVMArguments(installPath, null, deployPath, false);
}
+ @Override
protected void publishServer(int kind, IProgressMonitor monitor)
throws CoreException {
if (getServer().getRuntime() == null)
@@ -124,6 +129,7 @@
setServerPublishState(IServer.PUBLISH_STATE_NONE);
}
+ @Override
@SuppressWarnings("rawtypes")
protected void publishModules(int kind, List modules, List deltaKind2,
MultiStatus multi, IProgressMonitor monitor) {
@@ -154,6 +160,7 @@
}
}
+ @Override
protected void publishModule(int kind, int deltaKind, IModule[] moduleTree,
IProgressMonitor monitor) throws CoreException {
if (getServer().getServerState() != IServer.STATE_STOPPED) {
