Fix many DnD errors related to #462

Konloch · Feb 22, 2023 · f006a3a · f006a3a
1 parent def596a
commit f006a3a
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java
@@ -127,8 +127,11 @@ public void setAcceptor(TabAcceptor a_value) {
 	}
 
 	private TabTransferData getTabTransferData(DropTargetDropEvent a_event) {
+		Transferable t = a_event.getTransferable();
+		if (!t.isDataFlavorSupported(FLAVOR)) return null;
+
 		try {
-			return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR);
+			return (TabTransferData) t.getTransferData(FLAVOR);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -137,8 +140,11 @@ private TabTransferData getTabTransferData(DropTargetDropEvent a_event) {
 	}
 
 	private TabTransferData getTabTransferData(DropTargetDragEvent a_event) {
+		Transferable t = a_event.getTransferable();
+		if (!t.isDataFlavorSupported(FLAVOR)) return null;
+
 		try {
-			return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR);
+			return (TabTransferData) t.getTransferData(FLAVOR);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -147,8 +153,11 @@ private TabTransferData getTabTransferData(DropTargetDragEvent a_event) {
 	}
 
 	private TabTransferData getTabTransferData(DragSourceDragEvent a_event) {
+		Transferable t = a_event.getDragSourceContext().getTransferable();
+		if (!t.isDataFlavorSupported(FLAVOR)) return null;
+
 		try {
-			return (TabTransferData) a_event.getDragSourceContext().getTransferable().getTransferData(FLAVOR);
+			return (TabTransferData) t.getTransferData(FLAVOR);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -266,6 +275,7 @@ public void dropActionChanged(DropTargetDragEvent e) {
 
 		public void dragOver(final DropTargetDragEvent e) {
 			TabTransferData data = getTabTransferData(e);
+			if (data == null) return;
 
 			if (getTabPlacement() == JTabbedPane.TOP
 					|| getTabPlacement() == JTabbedPane.BOTTOM) {
@@ -309,6 +319,7 @@ public boolean isDragAcceptable(DropTargetDragEvent e) {
 			} // if
 
 			TabTransferData data = getTabTransferData(e);
+			if (data == null) return false;
 
 			if (DraggableTabbedPane.this == data.getTabbedPane()
 					&& data.getTabIndex() >= 0) {
@@ -336,6 +347,7 @@ public boolean isDropAcceptable(DropTargetDropEvent e) {
 			} // if
 
 			TabTransferData data = getTabTransferData(e);
+			if (data == null) return false;
 
 			if (DraggableTabbedPane.this == data.getTabbedPane()
 					&& data.getTabIndex() >= 0) {
@@ -403,6 +415,7 @@ private int getTargetTabIndex(Point a_point) {
 	}
 
 	private void convertTab(TabTransferData a_data, int a_targetIndex) {
+		if (a_data == null) return;
 		DraggableTabbedPane source = a_data.getTabbedPane();
 		int sourceIndex = a_data.getTabIndex();
 		if (sourceIndex < 0) {
@@ -459,6 +472,7 @@ private void initTargetLeftRightLine(int next, TabTransferData a_data) {
 			m_isDrawRect = false;
 			return;
 		} // if
+        if (a_data == null) return;
 
 		if ((a_data.getTabbedPane() == this)
 				&& (a_data.getTabIndex() == next
@@ -492,6 +506,7 @@ private void initTargetTopBottomLine(int next, TabTransferData a_data) {
 			m_isDrawRect = false;
 			return;
 		} // if
+		if (a_data == null) return;
 
 		if ((a_data.getTabbedPane() == this)
 				&& (a_data.getTabIndex() == next