Fix file selection widget in data import plugin

Author: ymarcon

opal-gwt-client/src/main/java/org/obiba/opal/web/gwt/app/client/magma/importdata/DataImportView.java

@@ -9,6 +9,7 @@
  */
 package org.obiba.opal.web.gwt.app.client.magma.importdata;
 
+import com.google.gwt.user.client.ui.*;
 import org.obiba.opal.web.gwt.app.client.i18n.Translations;
 import org.obiba.opal.web.gwt.app.client.i18n.TranslationsUtils;
 import org.obiba.opal.web.gwt.app.client.js.JsArrays;
@@ -40,11 +41,6 @@
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;
 import com.google.web.bindery.event.shared.EventBus;
 import com.google.web.bindery.event.shared.HandlerRegistration;
@@ -411,9 +407,13 @@ public void updateHelp() {
   private void updateHelpPanelsVisibility() {
     hideHelpPanels();
     PluginPackageDto foundPluginPackage = getPluginPackage(formatChooser.getSelectedValue());
+    helpOpalDatasourcePluginPanel.clear();
     if (foundPluginPackage != null) {
+      Label helpLabel = new Label();
+      helpLabel.getElement().setInnerHTML(foundPluginPackage.getDescription());
+      helpLabel.addStyleName("help-block");
+      helpOpalDatasourcePluginPanel.add(helpLabel);
       helpOpalDatasourcePluginPanel.setVisible(true);
-      helpOpalDatasourcePluginPanel.getElement().getFirstChildElement().setInnerHTML(foundPluginPackage.getDescription());
     } else {
       switch(ImportFormat.valueOf(getSelectedFormat())) {
         case CSV:
@@ -453,8 +453,10 @@ private void hideHelpPanels() {
     helpJDBC.setVisible(false);
     helpOpalRest.setVisible(false);
     helpRSASHaven.setVisible(false);
+    helpRXPTHaven.setVisible(false);
     helpRSPSSHaven.setVisible(false);
     helpRStataHaven.setVisible(false);
+    helpRDSHaven.setVisible(false);
     helpHealthCanada.setVisible(false);
     helpGeonamesPostalCodes.setVisible(false);
     helpOpalDatasourcePluginPanel.setVisible(false);

opal-gwt-client/src/main/java/org/obiba/opal/web/gwt/app/client/magma/importdata/DataImportView.ui.xml

@@ -118,9 +118,6 @@
           </g:FlowPanel>
 
           <g:FlowPanel addStyleNames="small-top-margin" ui:field="helpOpalDatasourcePluginPanel" visible="false">
-            <g:Label styleName="help-block">
-
-            </g:Label>
           </g:FlowPanel>
 
         </g:FlowPanel>

opal-gwt-client/src/main/java/org/obiba/opal/web/gwt/app/client/ui/FileSelection.java

@@ -67,7 +67,7 @@ private void addEventHandlers(final EventBus eventBus) {
     browseButton.addClickHandler(new ClickHandler() {
       @Override
       public void onClick(ClickEvent event) {
-        fireEvent(new FileSelectionRequestEvent(FileSelection.this, format));
+        eventBus.fireEvent(new FileSelectionRequestEvent(FileSelection.this, format));
       }
     });
 
@@ -76,7 +76,7 @@ public void onClick(ClickEvent event) {
       public void onFileSelection(FileSelectionEvent event) {
         if(FileSelection.this.equals(event.getSource())) {
           file.setValue(event.getSelectedFile().getSelectionPath());
-          fireEvent(new FileSelectionUpdatedEvent(FileSelection.this));
+          eventBus.fireEvent(new FileSelectionUpdatedEvent(FileSelection.this));
         }
       }
     });