Skip to content

Avoid usage of deprecated getType() method of IClassFile interface #1184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
Merged

Avoid usage of deprecated getType() method of IClassFile interface #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/utils/jdt/core/CodeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IOrdinaryClassFile;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.ITypeHierarchy;
Expand Down Expand Up @@ -212,14 +212,14 @@ public static IType findPrimaryType(ICompilationUnit compilationUnit) {
* @return {@link IType} associated with given {@link IJavaElement}.
*/
public static IType getType(IJavaElement element) throws JavaModelException {
if (element instanceof IType) {
return (IType) element;
} else if (element instanceof IMember) {
return ((IMember) element).getDeclaringType();
} else if (element instanceof ICompilationUnit) {
return ((ICompilationUnit) element).findPrimaryType();
} else if (element instanceof IClassFile) {
return ((IClassFile) element).getType();
if (element instanceof IType type) {
return type;
} else if (element instanceof IMember member) {
return member.getDeclaringType();
} else if (element instanceof ICompilationUnit cu) {
return cu.findPrimaryType();
} else if (element instanceof IOrdinaryClassFile classFile) {
return classFile.getType();
}
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.rcp.databinding.emf/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wb.rcp.databinding.emf;singleton:=true
Bundle-Version: 1.9.800.qualifier
Bundle-Version: 1.9.900.qualifier
Bundle-Activator: org.eclipse.wb.internal.rcp.databinding.emf.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
Expand Down
8 changes: 4 additions & 4 deletions ...mf/src/org/eclipse/wb/internal/rcp/databinding/emf/model/bindables/PropertiesSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2024 Google, Inc.
* Copyright (c) 2011, 2025 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -21,9 +21,9 @@
import org.eclipse.wb.internal.rcp.databinding.model.BindableInfo;
import org.eclipse.wb.internal.rcp.databinding.model.beans.bindables.BeanSupport;

import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IOrdinaryClassFile;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
Expand Down Expand Up @@ -312,7 +312,7 @@ private PackageInfo loadPackage(String packageAnyClass) throws Exception {
IPackageFragment packageFragment = packageAnyType.getPackageFragment();
// collect all class names
{
for (IClassFile classFile : packageFragment.getClassFiles()) {
for (IOrdinaryClassFile classFile : packageFragment.getOrdinaryClassFiles()) {
IType type = classFile.getType();
if (type != null) {
allClasses.add(type.getFullyQualifiedName());
Expand All @@ -326,7 +326,7 @@ private PackageInfo loadPackage(String packageAnyClass) throws Exception {
}
}
//
for (IClassFile classFile : packageFragment.getClassFiles()) {
for (IOrdinaryClassFile classFile : packageFragment.getOrdinaryClassFiles()) {
Map<String, ClassInfo> packageClasses = getPackageClassInfos(classFile.getType(), allClasses);
if (packageClasses != null) {
return new PackageInfo(packageFragment.getElementName(), packageClasses);
Expand Down
Loading