| author | szarnekow | 2009-03-23 04:17:52 (EDT) |
|---|---|---|
| committer | sefftinge | 2009-03-23 04:17:52 (EDT) |
| commit | 36de3e1374d64ad47451c11c3a75a8628b49a6f8 (patch) (side-by-side diff) | |
| tree | 8d4d0c7ba6f4c6baaa4634c164b4da488ed7f732 | |
| parent | 3839877e72e2d73105d4b1d22674415403cc7e19 (diff) | |
| download | org.eclipse.xtext-36de3e1374d64ad47451c11c3a75a8628b49a6f8.zip org.eclipse.xtext-36de3e1374d64ad47451c11c3a75a8628b49a6f8.tar.gz org.eclipse.xtext-36de3e1374d64ad47451c11c3a75a8628b49a6f8.tar.bz2 | |
Fix broken ui test
| -rw-r--r-- | plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/DefaultLabelProvider.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/DefaultLabelProvider.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/DefaultLabelProvider.java index 3992352..eebbd2f 100644 --- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/DefaultLabelProvider.java +++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/DefaultLabelProvider.java @@ -20,20 +20,22 @@ public class DefaultLabelProvider extends LabelProvider { private final PolymorphicDispatcher<String> getText = new PolymorphicDispatcher<String>("text",1,1,Collections.singletonList(this), new PolymorphicDispatcher.ErrorHandler<String>(){ - + private final PolymorphicDispatcher<String> recoverText = new PolymorphicDispatcher<String>("error_text",2,2,Collections.singletonList(DefaultLabelProvider.this)); - public String handle(Object[] params, Throwable e) { - return recoverText.invoke(params[0],e); - } + + public String handle(Object[] params, Throwable e) { + return recoverText.invoke(params[0], e); + } }); private final PolymorphicDispatcher<Image> getImage = new PolymorphicDispatcher<Image>("image",1,1,Collections.singletonList(this), new PolymorphicDispatcher.ErrorHandler<Image>(){ private final PolymorphicDispatcher<Image> recoverImage = new PolymorphicDispatcher<Image>("error_image",2,2,Collections.singletonList(DefaultLabelProvider.this)); - public Image handle(Object[] params, Throwable e) { - return recoverImage.invoke(params[0],e); - } + + public Image handle(Object[] params, Throwable e) { + return recoverImage.invoke(params[0],e); + } }); @Override @@ -49,6 +51,7 @@ public class DefaultLabelProvider extends LabelProvider { public String error_text(Object object, Exception e) { throw new WrappedException(e); } + public String error_text(Object object, NullPointerException e) { return text(object); } |

