Attachment 108053 Details for Bug 238738 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

clipboard.txt (text/plain), 3.26 KB, created by Krzysztof Daniel

on 2008-07-22 08:49:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2008-07-22 08:49:52 EDT

Size: 3.26 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.tests
>Index: Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogManagerTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogManagerTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 StatusDialogManagerTest.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogManagerTest.java	17 Jul 2008 15:42:26 -0000	1.3
>+++ Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogManagerTest.java	22 Jul 2008 12:49:06 -0000
>@@ -363,6 +363,46 @@
> 			fail();
> 		}
> 	}
>+	
>+	public void testNullInLabelProvider(){
>+		try {
>+			final boolean [] called = new boolean[]{false};
>+			wsdm.setStatusListLabelProvider(new ITableLabelProvider(){
>+
>+				public Image getColumnImage(Object element, int columnIndex) {
>+					return null;
>+				}
>+
>+				public String getColumnText(Object element, int columnIndex) {
>+					called[0] = true;
>+					// this is important for test
>+					return null;
>+				}
>+
>+				public void addListener(ILabelProviderListener listener) {
>+					
>+				}
>+
>+				public void dispose() {
>+					
>+				}
>+
>+				public boolean isLabelProperty(Object element, String property) {
>+					return false;
>+				}
>+
>+				public void removeListener(ILabelProviderListener listener) {
>+					
>+				}
>+				
>+			});
>+			wsdm.addStatusAdapter(createStatusAdapter(MESSAGE_1), true);
>+			assertTrue(called[0]);
>+		} catch (Exception e){
>+			e.printStackTrace();
>+			fail(e.getClass().getName());
>+		}
>+	}
> 
> 	/**
> 	 * Verifies that correct status adapter is passed to the support area
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java,v
>retrieving revision 1.13
>diff -u -r1.13 WorkbenchStatusDialogManager.java
>--- Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java	17 Jul 2008 15:42:25 -0000	1.13
>+++ Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java	22 Jul 2008 12:49:10 -0000
>@@ -1272,8 +1272,9 @@
> 		labelLayoutData.widthHint = dialog.convertWidthInCharsToPixels(50);
> 		singleStatusLabel.setLayoutData(labelLayoutData);
> 		// main message set up early, to address bug 222391
>-		singleStatusLabel.setText(statusListLabelProvider.getColumnText(
>-				statusAdapter, 0));
>+		String message = statusListLabelProvider.getColumnText(
>+				statusAdapter, 0);
>+		singleStatusLabel.setText(message != null ? message : ""); //$NON-NLS-1$
> 
> 		singleStatusLabel.addMouseListener(new MouseListener() {	
> 			public void mouseDoubleClick(MouseEvent e) {
>@@ -1924,11 +1925,6 @@
> 	 * only one error.
> 	 */
> 	private void refreshSingleStatusArea() {
>-		String description = statusListLabelProvider.getColumnText(
>-				statusAdapter, 0);
>-		if (description.equals(singleStatusLabel.getText()))
>-			singleStatusLabel.setText(" "); //$NON-NLS-1$
>-		singleStatusLabel.setText(description);
> 		singleStatusDisplayArea.layout();
> 		getShell().setText(title);
> 	}

Actions: View | Diff

Attachments on bug 238738: 108053 | 108054 | 120302