TEIIDDES-2559: Vdb Editor not displaying udf jar files

* Vdbs contain udf jar archives and retain them when saved. However, those udf files not in the workspace fail to be displayed in the Vdb Editor tables. * The TableViewer requires that each row have an image. Yet, images are obtained by finding the element in the workspace and for those Vdbs containing files not in the workspace, the image returned is null. * Fallback to a standard 'file' icon for those files not in the workspace.
Teiid-Designer · Dec 15, 2015 · a06a902 · a06a902
1 parent 5f7fd07
commit a06a902
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.java b/plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.java
@@ -79,6 +79,8 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ISelectionStatusValidator;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
@@ -1043,7 +1045,12 @@ void openEditor( final VdbEntry entry ) {
                                                    */
                                                   @Override
                                                   public Image getImage( final VdbEntry element ) {
-                                                      return workbenchLabelProvider.getImage(element.findFileInWorkspace());
+                                                      Image img = workbenchLabelProvider.getImage(element.findFileInWorkspace());
+                                                      if (img == null) {
+                                                          img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
+                                                      }
+
+                                                      return img;
                                                   }
 
                                                   /**
@@ -1280,7 +1287,12 @@ void openEditor( final VdbEntry entry ) {
                                                    */
                                                   @Override
                                                   public Image getImage( final VdbEntry element ) {
-                                                      return workbenchLabelProvider.getImage(element.findFileInWorkspace());
+                                                      Image img = workbenchLabelProvider.getImage(element.findFileInWorkspace());
+                                                      if (img == null) {
+                                                          img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
+                                                      }
+
+                                                      return img;
                                                   }
 
                                                   /**