Fix "Unnecessary cast" warnings

e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.8.400.qualifier
+Bundle-Version: 4.8.500.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17

e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.8.400-SNAPSHOT</version>
+  <version>4.8.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/Util.java

@@ -171,7 +171,7 @@
 			int index, EStructuralFeature feature) {
 		if (liveModel) {
 			final EObject container = ((EObject) element).eContainer();
 			@SuppressWarnings("unchecked")
 			final List<Object> l = (List<Object>) container.eGet(feature);
 			l.remove(element);
 
@@ -326,7 +326,7 @@
 						IResource r = rd.getResource();
 						if (r instanceof IFile)
 						{
-							if ("e4xmi".equals(((IFile) r).getFileExtension())) { //$NON-NLS-1$
+							if ("e4xmi".equals(r.getFileExtension())) { //$NON-NLS-1$
 								modelResourceSet = null;
 								break;
 							}

e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java

@@ -272,7 +272,7 @@
 		column.getColumn().setText(Messages.ControlFactory_KeyColumn);
 		column.getColumn().setWidth(200);
 		column.setLabelProvider(new ColumnLabelProvider() {
 			@SuppressWarnings("unchecked")
 			@Override
 			public String getText(Object element) {
 				final Entry<String, String> entry = (Entry<String, String>) element;
@@ -297,7 +297,7 @@
 
 			@Override
 			protected Object getValue(Object element) {
 				@SuppressWarnings("unchecked")
 				final Entry<String, String> entry = (Entry<String, String>) element;
 				return entry.getKey();
 			}
@@ -320,7 +320,7 @@
 		column.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
 				@SuppressWarnings("unchecked")
 				final Entry<String, String> entry = (Entry<String, String>) element;
 				return entry.getValue();
 			}
@@ -340,7 +340,7 @@
 				}
 			}
 
 			@SuppressWarnings("unchecked")
 			@Override
 			protected Object getValue(Object element) {
 				final Entry<String, String> entry = (Entry<String, String>) element;
@@ -358,7 +358,7 @@
 			}
 		});
 
 		@SuppressWarnings("unchecked")
 		final IListProperty<Object, Object> prop = EMFEditProperties.list(editor.getEditingDomain(), feature);
 		final IObservableList<Object> observableList = prop.observeDetail(editor.getMaster());
 		tableviewer.setInput(observableList);
@@ -569,7 +569,7 @@
 				.observeDetail(editor.getMaster());
 		final ObservableListContentProvider<E> cp = new ObservableListContentProvider<>();
 		viewer.setContentProvider(cp);
 		@SuppressWarnings({ "unchecked", "rawtypes" })
 		final IObservableMap<?, ?>[] attributeMaps = {
 				// Cast, because MUILabel is not part of E's type
 				((IValueProperty) E4Properties.label(editor.getEditingDomain())).observeDetail(cp.getKnownElements()),
@@ -674,7 +674,7 @@
 		final GridData gd = (GridData) viewer.getTable().getLayoutData();
 		gd.heightHint = 150;
 
 		@SuppressWarnings("unchecked")
 		final IListProperty<Object, Object> prop = EMFProperties.list(feature);
 		viewer.setInput(prop.observeDetail(editor.getMaster()));
 
@@ -863,9 +863,9 @@
 				lnk.setToolTipText(((Text) e.getSource()).getText());
 			}
 		});
 		@SuppressWarnings("unchecked")
 		final Binding binding = context.bindValue(textProp.observeDelayed(200, t),
-				((IValueProperty<Object, Object>) EMFEditProperties.value(editor.getEditingDomain(), feature))
+				EMFEditProperties.value(editor.getEditingDomain(), feature)
 				.observeDetail(editor.getMaster()),
 				new UpdateValueStrategy<>().setAfterConvertValidator(new ContributionURIValidator()),
 				new UpdateValueStrategy<>());

e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java

@@ -455,7 +455,7 @@ protected void handleAdd(EClass eClass, boolean separator) {
 	public List<Action> getActions(Object element) {
 		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
 		l.addAll(actions);
-		if (((MUIElement) getMaster().getValue()).getVisibleWhen() == null) {
+		if (getMaster().getValue().getVisibleWhen() == null) {
 			l.add(addExpression);
 		}
 		return l;

e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java

@@ -116,7 +116,7 @@
 		return getImage(element, ResourceProvider.IMG_MenuItem);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public Composite doGetEditor(Composite parent, Object object) {
 		if (composite == null) {
@@ -386,7 +386,7 @@
 	@Override
 	public List<Action> getActions(Object element) {
 		final ArrayList<Action> l = new ArrayList<>(super.getActions(element));
-		if (((MUIElement) getMaster().getValue()).getVisibleWhen() == null) {
+		if (getMaster().getValue().getVisibleWhen() == null) {
 			l.add(addExpression);
 		}
 		return l;
@@ -417,7 +417,7 @@
 			this.Messages = Messages;
 		}
 
 		@SuppressWarnings("unchecked")
 		@Override
 		public T convert(Object fromObject) {
 			if (fromObject == null || fromObject.toString().equals(Messages.MenuItemEditor_NoExpression)) {

features/org.eclipse.e4.core.tools.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.30.200.qualifier"
+      version="4.30.300.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">