fix Redundant null check

"The variable item cannot be null at this location"
eclipse-pde · Jan 26, 2024 · b95c6e5 · b95c6e5
1 parent d842285
commit b95c6e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategorySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategorySection.java
@@ -259,18 +259,16 @@ public void dragOver(DropTargetEvent event) {
 				 */
 				@Override
 				protected int determineLocation(DropTargetEvent event) {
-					if (!(event.item instanceof Item item)) {
-						return LOCATION_NONE;
-					}
-					Point coordinates = new Point(event.x, event.y);
-					coordinates = getViewer().getControl().toControl(coordinates);
-					if (item != null) {
+					if (event.item instanceof Item item) {
+						Point coordinates = new Point(event.x, event.y);
+						coordinates = getViewer().getControl().toControl(coordinates);
 						Rectangle bounds = getBounds(item);
 						if (bounds == null) {
 							return LOCATION_NONE;
 						}
+						return LOCATION_ON;
 					}
-					return LOCATION_ON;
+					return LOCATION_NONE;
 				}
 
 				@Override

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategorySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategorySection.java
@@ -218,18 +218,16 @@ public void dragOver(DropTargetEvent event) {
 				 */
 				@Override
 				protected int determineLocation(DropTargetEvent event) {
-					if (!(event.item instanceof Item item)) {
-						return LOCATION_NONE;
-					}
-					Point coordinates = new Point(event.x, event.y);
-					coordinates = getViewer().getControl().toControl(coordinates);
-					if (item != null) {
+					if (event.item instanceof Item item) {
+						Point coordinates = new Point(event.x, event.y);
+						coordinates = getViewer().getControl().toControl(coordinates);
 						Rectangle bounds = getBounds(item);
 						if (bounds == null) {
 							return LOCATION_NONE;
 						}
+						return LOCATION_ON;
 					}
-					return LOCATION_ON;
+					return LOCATION_NONE;
 				}
 
 				@Override