Skip to content

Commit d3c8cd3

Browse files
eclipse-platform-botakurtakov
authored andcommitted
Perform clean code of bundles/org.eclipse.ui.ide
1 parent 422bd8b commit d3c8cd3

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/part/ResourceTransfer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected void javaToNative(Object data, TransferData transferData) {
118118
return;
119119
}
120120

121-
121+
122122
/**
123123
* The resource serialization format is:
124124
* (int) number of resources

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,10 +758,9 @@ static IResourceSnapshot<? extends IResource> delete(IResource resourceToDelete,
758758
private static IResourceSnapshot<IResource> copyOverExistingResource(
759759
IResource source, IResource existing, IProgressMonitor monitor,
760760
IAdaptable uiInfo, boolean deleteSourceFile) throws CoreException {
761-
if (!(source instanceof IFile file && existing instanceof IFile)) {
761+
if (!(source instanceof IFile file && existing instanceof IFile existingFile)) {
762762
return null;
763763
}
764-
IFile existingFile = (IFile) existing;
765764
SubMonitor subMonitor = SubMonitor.convert(monitor,
766765
UndoMessages.AbstractResourcesOperation_CopyingResourcesProgress, deleteSourceFile ? 3 : 2);
767766
if (file != null) {

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceComparator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,9 @@ public int compare(Viewer viewer, Object o1, Object o2) {
8484
//have to deal with non-resources in navigator
8585
//if one or both objects are not resources, returned a comparison
8686
//based on class.
87-
if (!(o1 instanceof IResource r1 && o2 instanceof IResource)) {
87+
if (!(o1 instanceof IResource r1 && o2 instanceof IResource r2)) {
8888
return compareClass(o1, o2);
8989
}
90-
IResource r2 = (IResource) o2;
91-
9290
if (r1 instanceof IContainer && r2 instanceof IContainer) {
9391
return compareNames(r1, r2);
9492
} else if (r1 instanceof IContainer) {

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourceComparator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,9 @@ public int compare(Viewer viewer, Object o1, Object o2) {
8686
// have to deal with non-resources in navigator
8787
// if one or both objects are not resources, returned a comparison
8888
// based on class.
89-
if (!(o1 instanceof IResource r1 && o2 instanceof IResource)) {
89+
if (!(o1 instanceof IResource r1 && o2 instanceof IResource r2)) {
9090
return compareClass(o1, o2);
9191
}
92-
IResource r2 = (IResource) o2;
93-
9492
if (r1 instanceof IContainer && r2 instanceof IContainer) {
9593
return compareNames(r1, r2);
9694
} else if (r1 instanceof IContainer) {

0 commit comments

Comments
 (0)