[530555] Removing unnecessary overrides.
diff --git a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
index 4f5ff53..19d148b 100644
--- a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
+++ b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
* Kenn Hussey (Embarcadero Technologies) - 204200, 215418, 156879, 227392, 226178, 232332, 247980
- * Kenn Hussey - 286329, 323181, 522658, 528925
+ * Kenn Hussey - 286329, 323181, 522658, 528925, 530555
* Kenn Hussey (CEA) - 327039, 351774, 364419, 292633, 397324, 204658, 173565, 408612, 414970, 427833, 433216, 443017, 434958, 433768
* Christian W. Damus - 355218
* Christian W. Damus (CEA) - 286444
@@ -1351,7 +1351,7 @@
* <!-- end-user-doc -->
* @generated not
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({"rawtypes", "unchecked"})
@Override
public Object getAdapter(Class key) {
if (key.equals(IContentOutlinePage.class)) {
@@ -1418,7 +1418,7 @@
.setSelection(
new StructuredSelection(editingDomain
.getResourceSet().getResources().get(0)),
- true);
+ true);
}
}
@@ -2138,10 +2138,11 @@
.toArray(new IPropertyDescriptor[propertyDescriptors.size()]);
}
+ @Override
protected IItemPropertyDescriptor getItemPropertyDescriptor(
Object propertyId) {
- IItemPropertyDescriptor itemPropertyDescriptor = itemPropertySource
- .getPropertyDescriptor(object, propertyId);
+ IItemPropertyDescriptor itemPropertyDescriptor = super.getItemPropertyDescriptor(
+ propertyId);
return itemPropertyDescriptor == null
&& itemPropertySource instanceof ElementItemProvider
@@ -2150,37 +2151,6 @@
propertyId)
: itemPropertyDescriptor;
}
-
- @Override
- public Object getPropertyValue(Object propertyId) {
- return getItemPropertyDescriptor(propertyId)
- .getPropertyValue(object);
- }
-
- @Override
- public boolean isPropertySet(Object propertyId) {
- return getItemPropertyDescriptor(propertyId).isPropertySet(object);
- }
-
- @Override
- public void resetPropertyValue(Object propertyId) {
- getItemPropertyDescriptor(propertyId).resetPropertyValue(object);
- }
-
- @Override
- public void setPropertyValue(Object propertyId, Object value) {
- getItemPropertyDescriptor(propertyId).setPropertyValue(object,
- value);
- }
-
- @Override
- public boolean isPropertyResettable(Object propertyId) {
- IItemPropertyDescriptor propertyDescriptor = getItemPropertyDescriptor(
- propertyId);
- return propertyDescriptor.canSetProperty(object)
- && propertyDescriptor.isPropertySet(object);
- }
-
}
protected static class UMLPropertyDescriptor
diff --git a/plugins/org.eclipse.uml2/about.properties b/plugins/org.eclipse.uml2/about.properties
index a3b1da6..b2c4fa1 100644
--- a/plugins/org.eclipse.uml2/about.properties
+++ b/plugins/org.eclipse.uml2/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2017 IBM Corporation, Embarcadero Technologies, and others.
+# Copyright (c) 2006, 2018 IBM Corporation, Embarcadero Technologies, 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
@@ -7,7 +7,7 @@
# Contributors:
# IBM - initial API and implementation
# Kenn Hussey (Embarcadero Technologies) - 219804, 204200
-# Kenn Hussey - 323181
+# Kenn Hussey - 323181, 530555
# Kenn Hussey (CEA) - 286404, 485756, 511674
#
@@ -24,5 +24,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2003, 2017. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2018. All rights reserved.\n\
Visit http://www.eclipse.org/uml2
