diff options
author | Eike Stepper | 2019-12-13 19:06:44 +0000 |
---|---|---|
committer | Eike Stepper | 2019-12-13 19:56:07 +0000 |
commit | 3057ec447b4764b8a6a9cc535e5bcc37c3e01479 (patch) | |
tree | 8859f70412e9dbc754294ec157b8c6a9f81dc40c /plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client | |
parent | 3960a2be32acacca909cdc5868d1a0f018c15827 (diff) | |
download | cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.gz cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.xz cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.zip |
[558310] [Releng] Update Bundle-RequiredExecutionEnvironment to JavaSE-1.8
https://bugs.eclipse.org/bugs/show_bug.cgi?id=558310
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client')
13 files changed, 56 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/AbstractView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/AbstractView.java index fd1af78f0e..65ba4c79ee 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/AbstractView.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/AbstractView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -75,6 +75,7 @@ public abstract class AbstractView<T extends IContainer<?>> extends ViewPart { getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { String text = events.getText(); diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java index 7af1a2fcd3..6c5e58e6d4 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,6 +36,7 @@ public class Application implements IApplication public static Node NODE; + @Override public Object start(IApplicationContext context) { Display display = PlatformUI.createDisplay(); @@ -60,6 +61,7 @@ public class Application implements IApplication System.out.println("Node: " + NODE); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { NODE.start(); @@ -98,6 +100,7 @@ public class Application implements IApplication return IApplication.EXIT_OK; } + @Override public void stop() { if (!PlatformUI.isWorkbenchRunning()) @@ -109,6 +112,7 @@ public class Application implements IApplication final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java index 39b20651da..9e62c6b796 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2016, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class ClientPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.setFixed(true); diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java index baf96c238f..2b8ceb48c4 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2016, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -94,6 +94,7 @@ public class ClientView extends AbstractView<CDOSession> IRepository repository = Application.NODE.getObject(IRepository.class); repository.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { updateEnablement(); @@ -102,6 +103,7 @@ public class ClientView extends AbstractView<CDOSession> final IListener transactionListener = new IListener() { + @Override public void notifyEvent(IEvent event) { updateEnablement(); @@ -131,6 +133,7 @@ public class ClientView extends AbstractView<CDOSession> { treeViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { ITreeSelection selection = (ITreeSelection)treeViewer.getSelection(); @@ -177,6 +180,7 @@ public class ClientView extends AbstractView<CDOSession> menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { ITreeSelection selection = (ITreeSelection)treeViewer.getSelection(); @@ -225,6 +229,7 @@ public class ClientView extends AbstractView<CDOSession> { PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { CDOTransaction transaction = Application.NODE.getObject(CDOTransaction.class); diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorPerspective.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorPerspective.java index a70f2adb78..e17fcb984f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class FailoverMonitorPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java index 18b0d01237..d4bf8bae82 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -69,6 +69,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> final Channel channel = scope.getChannel(agent.getConnectorDescription()); agent.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof SignalScheduledEvent) @@ -77,6 +78,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> { scope.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!scope.isDisposed()) @@ -192,6 +194,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> { getDisplay().syncExec(new Runnable() { + @Override public void run() { controlResized(null); @@ -204,11 +207,13 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> } } + @Override public void controlMoved(ControlEvent e) { // Do nothing } + @Override public void controlResized(ControlEvent e) { try @@ -245,6 +250,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> } } + @Override public void paintControl(PaintEvent e) { if (!resizing) @@ -260,6 +266,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> } } + @Override public void run() { if (isDisposed()) diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverRepositoryPerspective.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverRepositoryPerspective.java index c0748a519d..625a2fce84 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverRepositoryPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverRepositoryPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class FailoverRepositoryPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryPerspective.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryPerspective.java index 234892ace9..e3d2421bff 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class NormalRepositoryPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/RepositoryDetails.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/RepositoryDetails.java index 7cff333026..8f0ed500d8 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/RepositoryDetails.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/RepositoryDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -111,12 +111,14 @@ public class RepositoryDetails extends Composite updateUI(); repository.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (!isDisposed()) { getDisplay().asyncExec(new Runnable() { + @Override public void run() { updateUI(); diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/Node.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/Node.java index 6169f708de..f2d66e6f9a 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/Node.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/Node.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -60,6 +60,7 @@ public final class Node implements IElement, Comparable<Node> return settings.getProperty(NodeType.NAME_PROPERTY); } + @Override public Properties getSettings() { return settings; @@ -70,16 +71,19 @@ public final class Node implements IElement, Comparable<Node> return settings.getProperty(key); } + @Override public void showSettings() { type.showSettings(this); } + @Override public Image getImage() { return type.getInstanceImage(); } + @Override public Composite getDetailsControl() { return type.getDetailsControl(this); @@ -123,6 +127,7 @@ public final class Node implements IElement, Comparable<Node> return getName(); } + @Override public int compareTo(Node o) { return getName().compareTo(o.getName()); diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManager.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManager.java index e556d7301a..eb84db5472 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManager.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -148,6 +148,7 @@ public class NodeManager extends Container<Object> return false; } + @Override public NodeType[] getElements() { return elements; diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java index 0c914a8073..77b1de9c84 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -119,6 +119,7 @@ public class NodeManagerDialog extends TitleAreaDialog treeViewer.setContentProvider(itemProvider); treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { setCurrentElement(); @@ -127,6 +128,7 @@ public class NodeManagerDialog extends TitleAreaDialog treeViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { if (getCurrentNode() != null) diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java index 3616452de3..eeec392de7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java +++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2013, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -130,11 +130,13 @@ public abstract class NodeType extends SetContainer<Node> implements IElement return properties; } + @Override public Properties getSettings() { return settings; } + @Override public void showSettings() { showSettings(null); @@ -180,6 +182,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement return null; } + @Override public Image getImage() { return ExampleResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/Folder.gif"); @@ -202,6 +205,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement return name; } + @Override public Composite getDetailsControl() { return getDetailsControl(null); @@ -416,6 +420,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement final Text text = new Text(parent, SWT.BORDER); text.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { if (!dialog.isUpdatingDetails()) @@ -460,6 +465,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement comboViewer.setLabelProvider(new LabelProvider()); comboViewer.setContentProvider(new IStructuredContentProvider() { + @Override public Object[] getElements(Object inputElement) { List<Node> result = new ArrayList<Node>(); @@ -476,10 +482,12 @@ public abstract class NodeType extends SetContainer<Node> implements IElement return result.toArray(new Node[result.size()]); } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public void dispose() { } @@ -487,6 +495,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement comboViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { if (!dialog.isUpdatingDetails()) @@ -554,6 +563,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement { session.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (session.getRepositoryInfo().getState() != State.INITIAL) @@ -591,6 +601,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement CDOSessionConfigurationFactory factory = new CDOSessionConfigurationFactory() { + @Override public CDONet4jSessionConfiguration createSessionConfiguration() { String serverAddress = "localhost:" + serverNode.getSetting(PORT_PROPERTY); @@ -645,6 +656,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); transaction.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof CDOViewTargetChangedEvent) |