diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsService.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsService.java index e1c0a72..f8d0fae 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsService.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsService.java @@ -40,7 +40,7 @@ public interface PerformFishAnalyticsService extends RemoteService { * @return * @throws Exception */ - PerformFishInitParameter decryptAndValidParameters( + PerformFishInitParameter validParameters( PerformFishInitParameter initParams) throws Exception; diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsServiceAsync.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsServiceAsync.java index 64485d7..9e20a4e 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsServiceAsync.java @@ -47,7 +47,7 @@ public interface PerformFishAnalyticsServiceAsync String populationTypeId, AsyncCallback callback); - void decryptAndValidParameters( + void validParameters( PerformFishInitParameter initParams, AsyncCallback callback); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java index 18892ac..ec61852 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java @@ -121,7 +121,7 @@ public class PerformFishAnalyticsController { performFishInitParams.addParameter(PerformFishAnalyticsConstant.BATCHTYPE_PARAM, batchtypeParam); performFishInitParams.addParameter(PerformFishAnalyticsConstant.FARMID_PARAM, farmidParam); - PerformFishAnalyticsServiceAsync.Util.getInstance().decryptAndValidParameters(performFishInitParams, new AsyncCallback() { + PerformFishAnalyticsServiceAsync.Util.getInstance().validParameters(performFishInitParams, new AsyncCallback() { @Override public void onSuccess(PerformFishInitParameter result) { @@ -260,7 +260,7 @@ public class PerformFishAnalyticsController { //viewController.resetBatchIdStatus(); viewController.setBatchIdStatus(ControlGroupType.INFO); viewController.enableLoadBatches(true); - viewController.showAlertForLoadBatches("Please load the batch(es) by clicking on 'Load Batches' button", AlertType.INFO, false); + viewController.showAlertForLoadBatches("Please load your batches corresponding to the selected options, by pressing the 'Load Batches' button", AlertType.INFO, false); viewController.enableAllAlgorithmsForSubmit(false); }else { diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/CopyOfCustomTreeModel.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/CopyOfCustomTreeModel.java deleted file mode 100644 index f893b6f..0000000 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/CopyOfCustomTreeModel.java +++ /dev/null @@ -1,308 +0,0 @@ -/** - * - */ - -package org.gcube.portlets.user.performfishanalytics.client.view; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.gcube.portlets.user.performfishanalytics.client.controllers.PerformFishAnalyticsController; -import org.gcube.portlets.user.performfishanalytics.client.event.SelectedKPIEvent; -import org.gcube.portlets.user.performfishanalytics.client.view.util.ExtendedCheckboxCell; -import org.gcube.portlets.user.performfishanalytics.shared.KPI; -import org.gcube.portlets.user.performfishanalytics.shared.PopulationType; - -import com.google.gwt.cell.client.AbstractCell; -import com.google.gwt.cell.client.Cell; -import com.google.gwt.cell.client.CompositeCell; -import com.google.gwt.cell.client.FieldUpdater; -import com.google.gwt.cell.client.HasCell; -import com.google.gwt.core.shared.GWT; -import com.google.gwt.dom.client.Element; -import com.google.gwt.safehtml.shared.SafeHtmlBuilder; -import com.google.gwt.view.client.ListDataProvider; -import com.google.gwt.view.client.MultiSelectionModel; -import com.google.gwt.view.client.SelectionChangeEvent; -import com.google.gwt.view.client.TreeViewModel; - -/** - * The model that defines the nodes in the tree. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * Feb 28, 2019 - */ -public class CopyOfCustomTreeModel implements TreeViewModel { - - // private final List kpis = new - // ArrayList(); - /** - * This selection model is shared across all leaf nodes. A selection model - * can also be shared across all nodes in the tree, or each set of child - * nodes can have its own instance. This gives you flexibility to determine - * how nodes are selected. - */ - - private ListDataProvider populationTypeProvider = new ListDataProvider(); - private ListDataProvider kpiProvider = new ListDataProvider(); - private MultiSelectionModel multiSelectionModel = new MultiSelectionModel(kpiProvider); - private List> listKPIAdded = new ArrayList>(); - private Map mapCheckBoxCell = new HashMap(); - //private List> hasCells; - //private ListDataProvider kpiProvider; - //private Cell kpiCell; - - - // private ListDataProvider dataProvider = new ListDataProvider(); - /** - * Instantiates a new custom tree model. - */ - public CopyOfCustomTreeModel() { - //init(); - multiSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { - - public void onSelectionChange(SelectionChangeEvent event) { - - GWT.log("Selected: " + multiSelectionModel.getSelectedSet()); - } - }); - } - - - /** - * Resync. - * - * @param selectedKPI the selected kpi - */ - public void resync(List selectedKPI){ - - for (KPI kpi : selectedKPI) { - - ExtendedCheckboxCell checkBoxCell = mapCheckBoxCell.get(kpi.getId()); - GWT.log("Checkbox is: "+checkBoxCell); - if(checkBoxCell!=null){ - GWT.log("Resetting checked"); - checkBoxCell.setChecked(true); - } - } - - } - - /** - * Builds the kpi cell. - * - * @return the composite cell - */ - public CompositeCell buildKPICell() { - - // Construct a composite cell for contacts that includes a checkbox. - ArrayList> hasCells = new ArrayList>(); - - HasCell checkBoxCell = new HasCell() { - - private ExtendedCheckboxCell cell = new ExtendedCheckboxCell(true, true); - - public Cell getCell() { - - return cell; - } - - public FieldUpdater getFieldUpdater() { - - return new FieldUpdater() { - - @Override - public void update(int index, KPI object, Boolean value) { - // TODO Auto-generated method stub - GWT.log("Checked: "+object.getName() + " value: "+value); - PerformFishAnalyticsController.eventBus.fireEvent(new SelectedKPIEvent(null, object, value)); - if(value.booleanValue()) - mapCheckBoxCell.put(object.getId(), cell); - else - mapCheckBoxCell.remove(object.getId()); -// cell.set(value); -// dataGrid.redraw(); - } - }; - } - - public Boolean getValue(KPI object) { - - return multiSelectionModel.isSelected(object); - } - - - }; - - hasCells.add(checkBoxCell); - - hasCells.add(new HasCell() { - - private KPICell cell = new KPICell(null); - - public Cell getCell() { - - return cell; - } - - public FieldUpdater getFieldUpdater() { - - return null; - } - - public KPI getValue(KPI object) { - - return object; - } - }); - - CompositeCell kpiCell = new CompositeCell(hasCells) { - - @Override - public void render(Context context, KPI value, SafeHtmlBuilder sb) { - - if(value.isLeaf()){ - sb.appendHtmlConstant(""); - super.render(context, value, sb); - sb.appendHtmlConstant("
"); - }else{ - sb.appendHtmlConstant(""); - sb.appendHtmlConstant(value.getName()); - sb.appendHtmlConstant("
"); - } - } - - @Override - protected Element getContainerElement(Element parent) { - - // Return the first TR element in the table. - if(parent!=null){ - if(parent.getFirstChildElement()!=null){ - if(parent.getFirstChildElement().getFirstChildElement()!=null){ - return parent.getFirstChildElement().getFirstChildElement().getFirstChildElement(); - } - } - } - return null; - } - - @Override - protected void render( - Context context, KPI value, SafeHtmlBuilder sb, - HasCell hasCell) { - - Cell cell = hasCell.getCell(); - sb.appendHtmlConstant(""); - cell.render(context, hasCell.getValue(value), sb); - sb.appendHtmlConstant(""); - - } - }; - - return kpiCell; - } - - - /** - * Sets the new batch type. - * - * @param populationType the new new batch type - */ - public void setNewBatchType(PopulationType populationType) { - - //GWT.log("Displayng KPI for: " + populationType.toString()); - if (this.populationTypeProvider != null) { - //removing all data from base data provider - this.populationTypeProvider.getList().clear(); - this.populationTypeProvider.getList().addAll(populationType.getListKPI()); - } - } - - /** - * Get the {@link NodeInfo} that provides the children of the specified - * value. - * - * @param the generic type - * @param value the value - * @return the node info - */ - public NodeInfo getNodeInfo(T value) { - - GWT.log("Get Node Info fired: " + value); - - if (value == null) { - // LEVEL 0. - // We passed null as the root value. Create a fake root KPIs - PopulationType rootKPI = new PopulationType("", "KPIs", "", "", null); - rootKPI.setListKPI(rootKPI.getListKPI()); - ListDataProvider rootProvider = new ListDataProvider(); - rootProvider.getList().add(rootKPI); - Cell cell = new AbstractCell() { - - @Override - public void render( - com.google.gwt.cell.client.Cell.Context context, - PopulationType value, SafeHtmlBuilder sb) { - - GWT.log("Rendering Root: " + value + " KPIs: " + - value.getListKPI()); - // sb.appendHtmlConstant(" ROOT "); - sb.appendEscaped(value.getName()); - } - }; - // Return a node info that pairs the data provider and the cell. - return new DefaultNodeInfo(rootProvider, cell); - } - else if (value instanceof PopulationType) { - // LEVEL 1. - // We want the children of PopulationType. Getting its list of KPI. - // List listOfKpi = ((PopulationType) value).getListKPI(); - GWT.log("PopulationType listOfKpi: " + populationTypeProvider.getList()); - //return new DefaultNodeInfo(populationTypeProvider, kpiCell, multiSelectionModel, null); - CompositeCell kpiCell = buildKPICell(); - listKPIAdded.add(kpiCell); - return new DefaultNodeInfo(populationTypeProvider, kpiCell); - - } - else if (value instanceof KPI) { - // LEVEL 2 - LEAF. - // We want the children of the KPI. Return them. - List listOfKpi = ((KPI) value).getListKPI(); - GWT.log("KPI type listOfKpi: " + listOfKpi.toString()); - ListDataProvider localProvider = new ListDataProvider(listOfKpi); - - kpiProvider.getList().addAll(listOfKpi); -// kpiProvider. -// multiSelectionModel. - CompositeCell kpiCell = buildKPICell(); - listKPIAdded.add(kpiCell); - return new DefaultNodeInfo(localProvider, kpiCell); - } - - return null; - } - - /** - * Check if the specified value represents a leaf node. Leaf nodes cannot be - * opened. - * - * @param value the value - * @return true, if is leaf - */ - public boolean isLeaf(Object value) { - - if(value==null) - return false; - - // The leaf nodes are the songs, which are Strings. - if (value instanceof KPI) { - KPI toKPI = (KPI) value; - return toKPI.isLeaf(); - } - return false; - } - - -} diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/Copy_2_of_CustomTreeModel.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/Copy_2_of_CustomTreeModel.java deleted file mode 100644 index c6be7b1..0000000 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/Copy_2_of_CustomTreeModel.java +++ /dev/null @@ -1,281 +0,0 @@ -/** - * - */ - -package org.gcube.portlets.user.performfishanalytics.client.view; - -import java.util.ArrayList; -import java.util.List; - -import org.gcube.portlets.user.performfishanalytics.client.controllers.PerformFishAnalyticsController; -import org.gcube.portlets.user.performfishanalytics.client.event.SelectedKPIEvent; -import org.gcube.portlets.user.performfishanalytics.shared.KPI; -import org.gcube.portlets.user.performfishanalytics.shared.PopulationType; - -import com.google.gwt.cell.client.AbstractCell; -import com.google.gwt.cell.client.Cell; -import com.google.gwt.cell.client.CheckboxCell; -import com.google.gwt.cell.client.CompositeCell; -import com.google.gwt.cell.client.FieldUpdater; -import com.google.gwt.cell.client.HasCell; -import com.google.gwt.core.shared.GWT; -import com.google.gwt.dom.client.Element; -import com.google.gwt.safehtml.shared.SafeHtmlBuilder; -import com.google.gwt.view.client.ListDataProvider; -import com.google.gwt.view.client.MultiSelectionModel; -import com.google.gwt.view.client.SelectionChangeEvent; -import com.google.gwt.view.client.TreeViewModel; - -/** - * The model that defines the nodes in the tree. - */ -public class Copy_2_of_CustomTreeModel implements TreeViewModel { - - // private final List kpis = new - // ArrayList(); - /** - * This selection model is shared across all leaf nodes. A selection model - * can also be shared across all nodes in the tree, or each set of child - * nodes can have its own instance. This gives you flexibility to determine - * how nodes are selected. - */ - private final MultiSelectionModel multiSelectionModel = - new MultiSelectionModel(); - private ListDataProvider rootProvider = - new ListDataProvider(); - private ListDataProvider populationTypeProvider = - new ListDataProvider(); - private ListDataProvider kpiProvider = new ListDataProvider(); - - private Cell kpiCell; - - // private ListDataProvider dataProvider = new ListDataProvider(); - public Copy_2_of_CustomTreeModel() { - init(); - - multiSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { - - public void onSelectionChange(SelectionChangeEvent event) { - - GWT.log("Selected: " + multiSelectionModel.getSelectedSet()); - } - }); - } - - public void init() { - - // Construct a composite cell for contacts that includes a checkbox. - final List> hasCells = new ArrayList>(); - hasCells.add(new HasCell() { - - private CheckboxCell cell = new CheckboxCell(true, false); - - public Cell getCell() { - - return cell; - } - - public FieldUpdater getFieldUpdater() { - - return new FieldUpdater() { - - @Override - public void update(int index, KPI object, Boolean value) { - // TODO Auto-generated method stub - GWT.log("Checked: "+object.getName() + " value: "+value); - PerformFishAnalyticsController.eventBus.fireEvent(new SelectedKPIEvent(null, object, value)); - } - }; - } - - public Boolean getValue(KPI object) { - - return multiSelectionModel.isSelected(object); - } - }); - - hasCells.add(new HasCell() { - - private KPICell cell = new KPICell(null); - - public Cell getCell() { - - return cell; - } - - public FieldUpdater getFieldUpdater() { - - return null; - } - - public KPI getValue(KPI object) { - - return object; - } - }); - - kpiCell = new CompositeCell(hasCells) { - - @Override - public void render(Context context, KPI value, SafeHtmlBuilder sb) { - - sb.appendHtmlConstant(""); - super.render(context, value, sb); - sb.appendHtmlConstant("
"); - - /*if(value.isLeaf()){ - sb.appendHtmlConstant(""); - //hasCells.get(0).getCell().render(context, value.getClass(), sb); - //super.render(context, value, sb); - sb.appendHtmlConstant("
"); - }else{ - sb.appendHtmlConstant(""); - //sb.appendHtmlConstant(value.getName()); - //superrender(context, value, sb); - sb.appendHtmlConstant("
"); - }*/ - } - - @Override - protected Element getContainerElement(Element parent) { - - // Return the first TR element in the table. - return parent.getFirstChildElement().getFirstChildElement().getFirstChildElement(); - } - - @Override - protected void render( - Context context, KPI value, SafeHtmlBuilder sb, - HasCell hasCell) { - - Cell cell = hasCell.getCell(); - sb.appendHtmlConstant(""); - cell.render(context, hasCell.getValue(value), sb); - sb.appendHtmlConstant(""); - } - }; - } - - public void setNewPopulationType(PopulationType populationType) { - - GWT.log("Displayng KPI for: " + populationType.toString()); - // dataProvider.getList().clear(); - // dataProvider.setList(list); - // dataProvider.refresh(); - if (this.populationTypeProvider != null) { - // this.kpis.clear(); - this.populationTypeProvider.getList().clear(); - this.populationTypeProvider.getList().addAll( - populationType.getListKPI()); - } - // fillFirstRootLevel(populationType.getListKPI()); - // - // this.getNodeInfo(populationType); - } - - // private void fillFirstRootLevel(List listKPI){ - // kpis.clear(); - // PopulationType rootKPI = new PopulationType("", "KPIs","","",null); - // rootKPI.setListKPI(rootKPI.getListKPI()); - // kpis.add(rootKPI); - // //rootProvider.refresh(); - // } - /** - * Get the {@link NodeInfo} that provides the children of the specified - * value. - */ - public NodeInfo getNodeInfo(T value) { - - GWT.log("Get Node Info fired: " + value); - if (value == null) { - // LEVEL 0. - // We passed null as the root value. Return the composers. - // Create a data provider that contains the list of composers. - // PopulationType root = fillFirstRootLevel(null); - // Create a cell to display a composer. - PopulationType rootKPI = - new PopulationType("", "KPIs", "", "", null); - rootKPI.setListKPI(rootKPI.getListKPI()); - rootProvider.getList().add(rootKPI); - Cell cell = new AbstractCell() { - - @Override - public void render( - com.google.gwt.cell.client.Cell.Context context, - PopulationType value, SafeHtmlBuilder sb) { - - GWT.log("Rendering Root: " + value + " KPIs: " + - value.getListKPI()); - // sb.appendHtmlConstant(" ROOT "); - sb.appendEscaped(value.getName()); - } - }; - // Return a node info that pairs the data provider and the cell. - return new DefaultNodeInfo(rootProvider, cell); - } - else if (value instanceof PopulationType) { - // LEVEL 1. - // We want the children of PopulationType. Getting its list of KPI. - // List listOfKpi = ((PopulationType) value).getListKPI(); - GWT.log("PopulationType listOfKpi: " + populationTypeProvider.getList()); - // populationTypeProvider = new ListDataProvider(listOfKpi); -// Cell cell = new AbstractCell() { -// -// @Override -// public void render( -// com.google.gwt.cell.client.Cell.Context context, KPI value, -// SafeHtmlBuilder sb) { -// -// GWT.log("Rendering PopulationType: " + value); -// if (value != null) { -// sb.appendHtmlConstant(" "); -// sb.appendEscaped(value.getName()); -// } -// } -// }; - return new DefaultNodeInfo(populationTypeProvider, kpiCell); - } - else if (value instanceof KPI) { - // LEVEL 2 - LEAF. - // We want the children of the KPI. Return them. - List listOfKpi = ((KPI) value).getListKPI(); - if (listOfKpi != null) { - GWT.log("KPI type listOfKpi: " + listOfKpi.toString()); - kpiProvider = new ListDataProvider(((KPI) value).getListKPI()); -// Cell cell = new AbstractCell() { -// -// @Override -// public void render( -// com.google.gwt.cell.client.Cell.Context context, -// KPI value, SafeHtmlBuilder sb) { -// -// GWT.log("Rendering KPI: " + value); -// if (value != null) { -// sb.appendHtmlConstant(" ---- "); -// sb.appendEscaped(value.getName()); -// } -// } -// }; - return new DefaultNodeInfo( - kpiProvider, kpiCell, multiSelectionModel, null); - } - } - return null; - } - - /** - * Check if the specified value represents a leaf node. Leaf nodes cannot be - * opened. - */ - public boolean isLeaf(Object value) { - - // The leaf nodes are the songs, which are Strings. - if (value instanceof KPI) { - KPI toKPI = (KPI) value; - return toKPI.isLeaf(); - } - return false; - } - - -} diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/PerformFishAnalitycsFormView.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/PerformFishAnalitycsFormView.java index bca03da..772aa0f 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/PerformFishAnalitycsFormView.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/PerformFishAnalitycsFormView.java @@ -2,7 +2,6 @@ package org.gcube.portlets.user.performfishanalytics.client.viewbinder; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -12,7 +11,6 @@ import org.gcube.portlets.user.performfishanalytics.client.event.LoadPopulationT import org.gcube.portlets.user.performfishanalytics.client.event.PerformFishFieldFormChangedEvent; import org.gcube.portlets.user.performfishanalytics.client.event.SelectedPopulationTypeEvent; import org.gcube.portlets.user.performfishanalytics.shared.Area; -import org.gcube.portlets.user.performfishanalytics.shared.KPI; import org.gcube.portlets.user.performfishanalytics.shared.Period; import org.gcube.portlets.user.performfishanalytics.shared.Population; import org.gcube.portlets.user.performfishanalytics.shared.PopulationType; diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/TabPanelView.ui.xml b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/TabPanelView.ui.xml index c85eee0..5569711 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/TabPanelView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/TabPanelView.ui.xml @@ -8,7 +8,7 @@ } - diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java index bebfc21..4fa4a06 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java @@ -14,7 +14,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -60,6 +59,7 @@ import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; +// TODO: Auto-generated Javadoc /** * The server side implementation of the RPC service. * @@ -70,9 +70,11 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; public class PerformFishAnalyticsServiceImpl extends RemoteServiceServlet implements PerformFishAnalyticsService { + /** The log. */ protected static Logger log = LoggerFactory.getLogger(PerformFishAnalyticsServiceImpl.class); + /** The date format. */ private SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy 'at' HH:mm:ss-SSS z"); /** @@ -319,46 +321,14 @@ public class PerformFishAnalyticsServiceImpl extends RemoteServiceServlet } } - /** - * Decrypt and valid parameters. - * - * @param initParams the init params - * @return the perform fish init parameter - * @throws Exception the exception + + /* (non-Javadoc) + * @see org.gcube.portlets.user.performfishanalytics.client.PerformFishAnalyticsService#validParameters(org.gcube.portlets.user.performfishanalytics.shared.performfishservice.PerformFishInitParameter) */ @Override - public PerformFishInitParameter decryptAndValidParameters(PerformFishInitParameter initParams) throws Exception{ + public PerformFishInitParameter validParameters(PerformFishInitParameter initParams) throws Exception{ Map inputParameters = initParams.getParameters(); - - try{ - //PortalContext pContext = PortalContext.getConfiguration().getCurrentUser(this.getThreadLocalRequest()); - log.info("Decrypting init parameters: "+inputParameters +" user: "+PortalContext.getConfiguration().getCurrentUser(this.getThreadLocalRequest())); - Set keyParameters = inputParameters.keySet(); - PerformFishInitParameter decrypted = new PerformFishInitParameter(); - - - //TODO UNCOMMENT THIS FOR RELEASE - /*if(!ContextUtil.isWithinPortal()){ - return initParams; - } - - for (String key : keyParameters) { - String decParam = StringEncrypter.getEncrypter().decrypt(initParams.getParameters().get(key)); - decrypted.addParameter(key, decParam); - } - - //HERE WE CAN VALIDATE THE FARM_ID - PortalContextInfo pContext = ContextUtil.getPortalContext(this.getThreadLocalRequest()); - pContext.getUsername(); - - log.info("Returning decrypted params: "+decrypted.toString()); - return decrypted;*/ - }catch(Exception e){ - log.error("Error on decripting your init parameters: "+initParams.toString(), e); - throw new Exception("Error on decripting your init parameters: "+initParams.toString()); - } - String farmID = inputParameters.get(PerformFishAnalyticsConstant.FARMID_PARAM); boolean grantAccess = checkGrantToAccessFarmID(farmID); if(!grantAccess)