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.security.edit/src/org/eclipse | |
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.security.edit/src/org/eclipse')
2 files changed, 12 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityEditPlugin.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityEditPlugin.java index 4c97988cf8..c41d4acb84 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityEditPlugin.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityEditPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2013, 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 @@ -100,6 +100,7 @@ public final class SecurityEditPlugin extends EMFPlugin Collections.sort(result, new Comparator<EPackage>() { + @Override public int compare(EPackage p1, EPackage p2) { return p1.getNsURI().compareTo(p2.getNsURI()); @@ -129,6 +130,7 @@ public final class SecurityEditPlugin extends EMFPlugin Collections.sort(result, new Comparator<EClass>() { + @Override public int compare(EClass c1, EClass c2) { int comparison = c1.getName().compareTo(c2.getName()); diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java index 5d1fb9af8d..0bbc664410 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.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 @@ -585,6 +585,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory * <!-- end-user-doc --> * @generated */ + @Override public ComposeableAdapterFactory getRootAdapterFactory() { return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); @@ -596,6 +597,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory * <!-- end-user-doc --> * @generated */ + @Override public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) { this.parentAdapterFactory = parentAdapterFactory; @@ -659,6 +661,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory * <!-- end-user-doc --> * @generated */ + @Override public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) { return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain); @@ -669,6 +672,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return childCreationExtenderManager; @@ -680,6 +684,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory * <!-- end-user-doc --> * @generated */ + @Override public void addListener(INotifyChangedListener notifyChangedListener) { changeNotifier.addListener(notifyChangedListener); @@ -691,6 +696,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory * <!-- end-user-doc --> * @generated */ + @Override public void removeListener(INotifyChangedListener notifyChangedListener) { changeNotifier.removeListener(notifyChangedListener); @@ -702,6 +708,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory * <!-- end-user-doc --> * @generated */ + @Override public void fireNotifyChanged(Notification notification) { changeNotifier.fireNotifyChanged(notification); @@ -718,6 +725,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory * <!-- end-user-doc --> * @generated */ + @Override public void dispose() { if (realmItemProvider != null) |