Fix possible NPE if ProductInfoDataProvider not provide logo (eclipse…

…-che#4703) Signed-off-by: Vitalii Parfonov <[email protected]>
JPinkney · Apr 4, 2017 · 3aaa9f5 · 3aaa9f5
1 parent 5d3c618
commit 3aaa9f5
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.java
@@ -49,11 +49,13 @@
 import org.eclipse.che.ide.util.dom.Elements;
 import org.eclipse.che.ide.util.input.KeyMapUtil;
 import org.vectomatic.dom.svg.ui.SVGImage;
+import org.vectomatic.dom.svg.ui.SVGResource;
 
 import javax.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
 
+import static java.util.Objects.nonNull;
 import static org.eclipse.che.ide.api.resources.Resource.PROJECT;
 
 /**
@@ -98,7 +100,10 @@ public EmptyEditorsPanel(ActionManager actionManager,
 
 
         eventBus.addHandler(ResourceChangedEvent.getType(), this);
-        logo.appendChild(new SVGImage(productInfoDataProvider.getLogo()).getSvgElement().getElement());
+        final SVGResource logo = productInfoDataProvider.getLogo();
+        if (nonNull(logo)) {
+            this.logo.appendChild(new SVGImage(logo).getSvgElement().getElement());
+        }
         //Sometimes initialization of Create/Import Project actions are completed after the Empty editor page is rendered.
         //In this case we need to wait when actions will be initialized.
         Timer hoverToRenderTimer = new Timer() {

diff --git a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml
@@ -22,6 +22,10 @@
     <packaging>jar</packaging>
     <name>Che Plugin :: Help :: Client</name>
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>

diff --git a/...ext-client/src/main/java/org/eclipse/che/ide/ext/help/client/RedirectToSupportAction.java b/...ext-client/src/main/java/org/eclipse/che/ide/ext/help/client/RedirectToSupportAction.java
@@ -18,6 +18,8 @@
 import org.eclipse.che.ide.api.action.Action;
 import org.eclipse.che.ide.api.action.ActionEvent;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 /**
  * Redirect to support window
  *
@@ -40,4 +42,9 @@ public RedirectToSupportAction(HelpExtensionLocalizationConstant locale,
     public void actionPerformed(ActionEvent e) {
         Window.open(productInfoDataProvider.getSupportLink(), "_blank", null);
     }
+
+    @Override
+    public void update(ActionEvent event) {
+        event.getPresentation().setVisible(!isNullOrEmpty(productInfoDataProvider.getSupportLink()));
+    }
 }
diff --git a/...elp-ext-client/src/main/java/org/eclipse/che/ide/ext/help/client/about/AboutViewImpl.java b/...elp-ext-client/src/main/java/org/eclipse/che/ide/ext/help/client/about/AboutViewImpl.java
@@ -15,6 +15,8 @@
 import org.eclipse.che.ide.ext.help.client.HelpExtensionLocalizationConstant;
 import org.eclipse.che.ide.ui.window.Window;
 import org.vectomatic.dom.svg.ui.SVGImage;
+import org.vectomatic.dom.svg.ui.SVGResource;
+
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -26,6 +28,10 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import java.util.Objects;
+
+import static java.util.Objects.nonNull;
+
 /**
  * UI for {@link AboutView}.
  *
@@ -74,7 +80,10 @@ public void onClick(ClickEvent event) {
         });
         addButtonToFooter(btnOk);
 
-        logoPanel.add(new SVGImage(productInfoDataProvider.getLogo()));
+        final SVGResource logo = productInfoDataProvider.getLogo();
+        if (nonNull(logo)) {
+            logoPanel.add(new SVGImage(logo));
+        }
     }
 
     /** {@inheritDoc} */