From 0ae1ed43db467e3e77de65d19039d7ab0a657c0e Mon Sep 17 00:00:00 2001 From: "giancarlo.panichi" Date: Tue, 9 May 2017 15:35:45 +0000 Subject: [PATCH] ref 8460:AccountingManager - Support Java 8 compatibility https://support.d4science.org/issues/8460 Added support to Java 8 compatibility git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@148413 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 10 +- .settings/org.eclipse.wst.common.component | 4 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- .../client/AccountingManager.java | 5 +- .../client/AccountingManagerController.java | 5 +- .../client/PortalViewport.java | 51 +++++----- .../client/carousel/CarouselPanel.java | 4 +- .../client/custom/FormatedTimeAxis.java | 7 +- .../client/event/AccountingMenuEvent.java | 4 +- .../client/event/AccountingPeriodEvent.java | 4 +- .../event/AccountingPeriodRequestEvent.java | 4 +- .../client/event/EnableTabsEvent.java | 4 +- .../client/event/ExportRequestEvent.java | 4 +- .../client/event/FiltersChangeEvent.java | 4 +- .../client/event/SessionExpiredEvent.java | 4 +- .../client/event/StateChangeEvent.java | 4 +- .../client/event/UIStateEvent.java | 4 +- .../client/filters/AccountingPeriodPanel.java | 4 +- .../client/filters/ActiveFiltersPanel.java | 4 +- .../client/filters/FiltersPanel.java | 4 +- .../client/graphics/Vector2D.java | 4 +- .../client/maindata/ChartViewerPanel.java | 4 +- .../maindata/charts/AccountingChart4Job.java | 4 +- .../charts/AccountingChart4Portlet.java | 4 +- .../charts/AccountingChart4Service.java | 4 +- .../charts/AccountingChart4Space.java | 4 +- .../charts/AccountingChart4Storage.java | 4 +- .../maindata/charts/AccountingChart4Task.java | 4 +- .../charts/AccountingChartBuilder.java | 2 +- .../charts/AccountingChartDirector.java | 2 +- .../maindata/charts/AccountingChartPanel.java | 4 +- .../maindata/charts/AccountingChartSpec.java | 4 +- .../charts/job/JobChartBasicPanel.java | 4 +- .../charts/job/JobChartContextPanel.java | 4 +- .../maindata/charts/job/JobChartTopPanel.java | 4 +- .../service/ServiceChartBasicPanel.java | 4 +- .../service/ServiceChartContextPanel.java | 4 +- .../charts/service/ServiceChartTopPanel.java | 4 +- .../charts/space/SpaceChartSpacesPanel.java | 4 +- .../storage/StorageChartBasicPanel.java | 4 +- .../storage/StorageChartContextPanel.java | 4 +- .../charts/storage/StorageChartTopPanel.java | 4 +- .../charts/utils/ByteUnitMeasure.java | 10 +- .../charts/utils/ChartDateTimeData.java | 8 +- .../charts/utils/ChartTimeMeasure.java | 3 +- .../charts/utils/DownloadConstants.java | 3 +- .../charts/utils/JobChartMeasure.java | 9 +- .../charts/utils/ServiceChartMeasure.java | 8 +- .../charts/utils/SpaceChartMeasure.java | 7 +- .../charts/utils/StorageChartMeasure.java | 8 +- .../charts/utils/TimeUnitMeasure.java | 4 +- .../client/menu/AccountingManagerMenu.java | 4 +- .../client/monitor/AccountingMonitor.java | 4 +- .../client/monitor/MonitorRequest.java | 4 +- .../client/monitor/MonitorRequestEvent.java | 4 +- .../client/monitor/MonitorRequestType.java | 4 +- .../properties/GenresDataProperties.java | 4 +- .../client/resource/AccountingManagerCSS.java | 4 +- .../resource/AccountingManagerResources.java | 4 +- .../client/rpc/AccountingManagerService.java | 68 ++++++++------ .../rpc/AccountingManagerServiceAsync.java | 50 ++++++---- .../client/state/AccountingClientState.java | 4 +- .../state/AccountingClientStateData.java | 32 ++++--- .../client/type/FiltersChangeType.java | 4 +- .../client/type/SessionExpiredType.java | 4 +- .../client/type/StateChangeType.java | 4 +- .../client/type/UIStateType.java | 4 +- .../accountingmanager/client/util/Format.java | 4 +- .../client/util/InfoMessageBox.java | 4 +- .../client/util/UtilsGXT3.java | 4 +- .../server/AccountingClientCallable.java | 5 + .../server/AccountingClientDaemon.java | 4 +- .../server/AccountingClientListener.java | 4 +- .../server/AccountingManagerServiceImpl.java | 4 +- .../server/ExportServlet.java | 4 +- .../server/SessionConstants.java | 4 +- .../accountingmanager/server/SessionOp.java | 6 +- .../accountingmanager/server/SessionUtil.java | 17 ++-- .../server/amservice/AccountingCaller.java | 4 +- .../amservice/AccountingCallerInterface.java | 4 +- .../amservice/AccountingCallerTester.java | 4 +- .../amservice/cache/AccountingCache.java | 92 +++++++------------ .../command/AccountingCommandBasic.java | 4 +- .../command/AccountingCommandContext.java | 4 +- .../AccountingCommandGetFilterKeys.java | 4 +- .../AccountingCommandGetFilterValues.java | 4 +- .../command/AccountingCommandGetSpaces.java | 4 +- .../command/AccountingCommandSpaces.java | 4 +- .../command/AccountingCommandTop.java | 4 +- .../amservice/query/AccountingQuery.java | 4 +- .../amservice/query/AccountingQuery4Job.java | 4 +- .../query/AccountingQuery4Portlet.java | 4 +- .../query/AccountingQuery4Service.java | 4 +- .../query/AccountingQuery4Space.java | 4 +- .../query/AccountingQuery4Storage.java | 4 +- .../amservice/query/AccountingQuery4Task.java | 4 +- .../amservice/query/AccountingQueryBasic.java | 4 +- .../query/AccountingQueryBuilder.java | 2 +- .../query/AccountingQueryContext.java | 4 +- .../query/AccountingQueryDirector.java | 2 +- .../query/AccountingQuerySpaces.java | 4 +- .../amservice/query/AccountingQuerySpec.java | 2 +- .../amservice/query/AccountingQueryTop.java | 4 +- .../response/SeriesResponse4JobBasic.java | 4 +- .../response/SeriesResponse4JobContext.java | 4 +- .../response/SeriesResponse4JobTop.java | 4 +- .../response/SeriesResponse4PortletBasic.java | 4 +- .../SeriesResponse4PortletContext.java | 4 +- .../response/SeriesResponse4PortletTop.java | 4 +- .../response/SeriesResponse4ServiceBasic.java | 4 +- .../SeriesResponse4ServiceContext.java | 4 +- .../response/SeriesResponse4ServiceTop.java | 4 +- .../response/SeriesResponse4SpaceSpaces.java | 4 +- .../response/SeriesResponse4StorageBasic.java | 4 +- .../SeriesResponse4StorageContext.java | 4 +- .../response/SeriesResponse4StorageTop.java | 4 +- .../response/SeriesResponse4TaskBasic.java | 4 +- .../response/SeriesResponse4TaskContext.java | 4 +- .../response/SeriesResponse4TaskTop.java | 4 +- .../response/SeriesResponseBuilder.java | 2 +- .../response/SeriesResponseDirector.java | 2 +- .../response/SeriesResponseSpec.java | 2 +- .../server/export/CSVManager.java | 4 +- .../server/export/JSONManager.java | 4 +- .../server/export/XMLManager.java | 4 +- .../export/model/AccountingDataModel.java | 4 +- .../export/model/AccountingDataRow.java | 4 +- .../export/model/AccountingModel4Job.java | 4 +- .../export/model/AccountingModel4Service.java | 4 +- .../export/model/AccountingModel4Storage.java | 4 +- .../export/model/AccountingModelBuilder.java | 2 +- .../export/model/AccountingModelDirector.java | 2 +- .../export/model/AccountingModelSpec.java | 2 +- .../server/is/BuildEnableTabs.java | 4 +- .../server/is/BuildThreadPoolInfo.java | 4 +- .../server/is/EnableTabJAXB.java | 4 +- .../server/is/EnableTabsJAXB.java | 4 +- .../server/is/InformationSystemUtils.java | 4 +- .../server/is/ThreadPoolJAXB.java | 4 +- .../server/state/AccountingState.java | 4 +- .../server/state/AccountingStateData.java | 4 +- .../server/storage/StorageUtil.java | 71 +++++++------- .../server/util/ServiceCredentials.java | 4 +- .../server/util/TaskInProgress.java | 4 +- .../server/util/TaskRequest.java | 4 +- .../server/util/TaskStatus.java | 4 +- .../server/util/TaskWrapper.java | 4 +- .../server/util/ThreadPoolInfo.java | 6 +- .../accountingmanager/shared/Constants.java | 4 +- .../shared/data/AccountingFilter.java | 4 +- .../shared/data/AccountingFilterBasic.java | 4 +- .../shared/data/AccountingFilterContext.java | 4 +- .../shared/data/AccountingFilterSpaces.java | 10 +- .../shared/data/AccountingFilterTop.java | 4 +- .../shared/data/AccountingPeriod.java | 3 +- .../shared/data/AccountingPeriodMode.java | 44 ++++----- .../shared/data/AccountingType.java | 4 +- .../shared/data/ChartType.java | 9 +- .../shared/data/Context.java | 4 +- .../shared/data/ContextData.java | 1 - .../shared/data/FilterKey.java | 3 +- .../shared/data/FilterValue.java | 3 +- .../shared/data/FilterValuesRequest.java | 4 +- .../shared/data/FilterValuesResponse.java | 4 +- .../accountingmanager/shared/data/Genres.java | 4 +- .../shared/data/GenresData.java | 4 +- .../accountingmanager/shared/data/Spaces.java | 4 +- .../shared/data/SpacesData.java | 4 +- .../shared/data/query/SeriesRequest.java | 4 +- .../shared/data/response/SeriesJob.java | 4 +- .../shared/data/response/SeriesPortlet.java | 4 +- .../shared/data/response/SeriesResponse.java | 11 +-- .../shared/data/response/SeriesService.java | 4 +- .../shared/data/response/SeriesSpace.java | 4 +- .../shared/data/response/SeriesStorage.java | 4 +- .../shared/data/response/SeriesTask.java | 4 +- .../data/response/job/SeriesJobBasic.java | 4 +- .../data/response/job/SeriesJobContext.java | 4 +- .../data/response/job/SeriesJobData.java | 4 +- .../response/job/SeriesJobDataContext.java | 4 +- .../data/response/job/SeriesJobDataTop.java | 4 +- .../response/job/SeriesJobDefinition.java | 4 +- .../data/response/job/SeriesJobTop.java | 4 +- .../response/portlet/SeriesPortletBasic.java | 4 +- .../portlet/SeriesPortletContext.java | 4 +- .../portlet/SeriesPortletDataContext.java | 4 +- .../portlet/SeriesPortletDataTop.java | 4 +- .../portlet/SeriesPortletDefinition.java | 4 +- .../response/portlet/SeriesPortletTop.java | 4 +- .../response/service/SeriesServiceBasic.java | 4 +- .../service/SeriesServiceContext.java | 4 +- .../response/service/SeriesServiceData.java | 4 +- .../service/SeriesServiceDataContext.java | 4 +- .../service/SeriesServiceDataTop.java | 4 +- .../service/SeriesServiceDefinition.java | 4 +- .../response/service/SeriesServiceTop.java | 4 +- .../data/response/space/SeriesSpaceData.java | 4 +- .../response/space/SeriesSpaceDataSpaces.java | 9 +- .../response/space/SeriesSpaceDefinition.java | 4 +- .../response/space/SeriesSpaceSpaces.java | 4 +- .../response/storage/SeriesStorageBasic.java | 4 +- .../storage/SeriesStorageContext.java | 4 +- .../response/storage/SeriesStorageData.java | 10 +- .../storage/SeriesStorageDataContext.java | 4 +- .../storage/SeriesStorageDataTop.java | 4 +- .../storage/SeriesStorageDefinition.java | 4 +- .../response/storage/SeriesStorageTop.java | 4 +- .../data/response/task/SeriesTaskBasic.java | 4 +- .../data/response/task/SeriesTaskContext.java | 4 +- .../data/response/task/SeriesTaskData.java | 4 +- .../response/task/SeriesTaskDataContext.java | 4 +- .../data/response/task/SeriesTaskDataTop.java | 4 +- .../response/task/SeriesTaskDefinition.java | 4 +- .../data/response/task/SeriesTaskTop.java | 4 +- .../shared/exception/ChartDrawException.java | 15 ++- .../shared/exception/ServiceException.java | 15 ++- .../exception/SessionExpiredException.java | 19 ++-- .../shared/export/ExportType.java | 4 +- .../shared/session/UserInfo.java | 17 ++-- .../shared/tabs/EnableTab.java | 4 +- .../shared/tabs/EnableTabs.java | 4 +- .../shared/workspace/ItemDescription.java | 8 +- .../TestAccountingMananger.java | 4 +- .../TestAccountingManangerCache.java | 4 +- 224 files changed, 685 insertions(+), 697 deletions(-) diff --git a/.classpath b/.classpath index 4754935..4f4ba1f 100644 --- a/.classpath +++ b/.classpath @@ -22,11 +22,6 @@ - - - - - @@ -45,5 +40,10 @@ + + + + + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 8d04e81..7b4b387 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,10 @@ - + - + uses diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index c6144e8..f801044 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,7 +1,7 @@ - + diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManager.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManager.java index f668ffa..ef833fa 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManager.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManager.java @@ -24,9 +24,8 @@ import com.sencha.gxt.widget.core.client.container.Viewport; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * + * @author Giancarlo Panichi + * */ public class AccountingManager implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java index 9fdd7f9..3305cbc 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java @@ -54,9 +54,8 @@ import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * + * @author Giancarlo Panichi + * */ public class AccountingManagerController { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/PortalViewport.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/PortalViewport.java index 6c10491..b4e5b7c 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/PortalViewport.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/PortalViewport.java @@ -15,8 +15,7 @@ import com.sencha.gxt.widget.core.client.container.Viewport.ViewportAppearance; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public class PortalViewport extends SimpleContainer { @@ -24,13 +23,12 @@ public class PortalViewport extends SimpleContainer { protected int rightScrollBarSize = 17; protected boolean enableScroll; - /** * Creates a viewport layout container with the default appearance. */ public PortalViewport() { - this(GWT. create(ViewportAppearance.class)); + this(GWT.create(ViewportAppearance.class)); } /** @@ -45,15 +43,14 @@ public class PortalViewport extends SimpleContainer { SafeHtmlBuilder sb = new SafeHtmlBuilder(); appearance.render(sb); - XElement element=XDOM.create(sb.toSafeHtml()); - setElement((Element)element); + XElement element = XDOM.create(sb.toSafeHtml()); + setElement((Element) element); monitorWindowResize = true; forceLayoutOnResize = true; getFocusSupport().setIgnore(false); resize(); } catch (Exception e) { - Log.error("PortalViewport: constructor error " - + e.getLocalizedMessage()); + Log.error("PortalViewport: constructor error " + e.getLocalizedMessage()); } } @@ -102,21 +99,19 @@ public class PortalViewport extends SimpleContainer { protected void resize() { int viewWidth; - if(enableScroll){ - viewWidth= calculateWidth() - rightScrollBarSize; + if (enableScroll) { + viewWidth = calculateWidth() - rightScrollBarSize; } else { viewWidth = calculateWidth(); } - + int viewHeight = calculateHeight(); - Log.info("AM resize viewWidth: " + viewWidth + " viewHeight: " - + viewHeight + " clientWidth: " + Window.getClientWidth() - + " clientHeight: " + Window.getClientHeight()); + Log.info("AM resize viewWidth: " + viewWidth + " viewHeight: " + viewHeight + " clientWidth: " + + Window.getClientWidth() + " clientHeight: " + Window.getClientHeight()); try { setPixelSize(viewWidth, viewHeight); } catch (Exception e) { - Log.error("PortalViewport: error in resize() at setPixelSize " - + e.getLocalizedMessage()); + Log.error("PortalViewport: error in resize() at setPixelSize " + e.getLocalizedMessage()); } } @@ -127,10 +122,8 @@ public class PortalViewport extends SimpleContainer { protected void onWindowResize(int width, int height) { int viewWidth = calculateWidth(); int viewHeight = calculateHeight(); - Log.trace("AM onWindowResize viewWidth: " + viewWidth - + " viewHeight: " + viewHeight + " clientWidth: " - + Window.getClientWidth() + " clientHeight: " - + Window.getClientHeight()); + Log.trace("AM onWindowResize viewWidth: " + viewWidth + " viewHeight: " + viewHeight + " clientWidth: " + + Window.getClientWidth() + " clientHeight: " + Window.getClientHeight()); setPixelSize(viewWidth, viewHeight); } @@ -156,23 +149,29 @@ public class PortalViewport extends SimpleContainer { * int rootWidth = Window.getClientWidth() - 2* leftBorder; //- * rightScrollBar; * - * System.out.println("New workspace dimension Height: "+rootHeight+" Width: " - * +rootWidth); + * System.out.println("New workspace dimension Height: " + * +rootHeight+" Width: " +rootWidth); * * this.setHeight(rootHeight); this.setWidth(rootWidth); } */ + /** + * + * @return the with calculate + */ protected int calculateWidth() { int leftBorder = getAbsoluteLeft(); - Log.info("AM width: " - + String.valueOf(Window.getClientWidth() - 2 * leftBorder)); + Log.info("AM width: " + String.valueOf(Window.getClientWidth() - 2 * leftBorder)); return Window.getClientWidth() - 2 * leftBorder; } + /** + * + * @return the height calculate + */ protected int calculateHeight() { int topBorder = getAbsoluteTop(); - Log.info("AM height: " - + String.valueOf(Window.getClientHeight() - topBorder - 34)); + Log.info("AM height: " + String.valueOf(Window.getClientHeight() - topBorder - 34)); return Window.getClientHeight() - topBorder - 34; } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/carousel/CarouselPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/carousel/CarouselPanel.java index 6e2cd68..8844cc5 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/carousel/CarouselPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/carousel/CarouselPanel.java @@ -28,8 +28,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CarouselPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/custom/FormatedTimeAxis.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/custom/FormatedTimeAxis.java index 639e6f0..45a2f68 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/custom/FormatedTimeAxis.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/custom/FormatedTimeAxis.java @@ -12,10 +12,9 @@ import com.sencha.gxt.data.shared.Store.StoreSortInfo; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * - * @param + * @param type of axis */ public class FormatedTimeAxis extends CategoryAxis { private Date startDate; @@ -27,6 +26,8 @@ public class FormatedTimeAxis extends CategoryAxis { /** * Creates a time axis. + * + * @param dateTimeFormat date time format */ public FormatedTimeAxis(DateTimeFormat dateTimeFormat) { super(); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingMenuEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingMenuEvent.java index 14c9fe6..36f188b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingMenuEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingMenuEvent.java @@ -9,8 +9,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingMenuEvent extends diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingPeriodEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingPeriodEvent.java index 001bb54..1db3823 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingPeriodEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingPeriodEvent.java @@ -10,8 +10,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * Accounting Period Request Event * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingPeriodEvent extends diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingPeriodRequestEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingPeriodRequestEvent.java index 6c8e86d..b65818d 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingPeriodRequestEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingPeriodRequestEvent.java @@ -8,8 +8,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * Accounting Period Request Event * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingPeriodRequestEvent diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/EnableTabsEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/EnableTabsEvent.java index 9803605..8e2b4b4 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/EnableTabsEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/EnableTabsEvent.java @@ -9,8 +9,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class EnableTabsEvent extends diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/ExportRequestEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/ExportRequestEvent.java index 0dca1fb..0f6c1d2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/ExportRequestEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/ExportRequestEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExportRequestEvent extends diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/FiltersChangeEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/FiltersChangeEvent.java index c0a667f..19903d2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/FiltersChangeEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/FiltersChangeEvent.java @@ -10,8 +10,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class FiltersChangeEvent extends diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/SessionExpiredEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/SessionExpiredEvent.java index ebdde90..f10cab9 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/SessionExpiredEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/SessionExpiredEvent.java @@ -10,8 +10,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SessionExpiredEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/StateChangeEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/StateChangeEvent.java index 392c483..3d911c4 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/StateChangeEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/StateChangeEvent.java @@ -10,8 +10,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StateChangeEvent extends diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/UIStateEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/UIStateEvent.java index 4c1d033..d7a16ab 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/UIStateEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/UIStateEvent.java @@ -10,8 +10,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UIStateEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/AccountingPeriodPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/AccountingPeriodPanel.java index f2b5230..28e4348 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/AccountingPeriodPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/AccountingPeriodPanel.java @@ -38,8 +38,8 @@ import com.sencha.gxt.widget.core.client.form.validator.EmptyValidator; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingPeriodPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java index a79ec6e..6100bb8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java @@ -95,8 +95,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ActiveFiltersPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/FiltersPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/FiltersPanel.java index 40fb0f1..f45ef38 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/FiltersPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/FiltersPanel.java @@ -24,8 +24,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class FiltersPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/graphics/Vector2D.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/graphics/Vector2D.java index 4f0f4f4..914c5cf 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/graphics/Vector2D.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/graphics/Vector2D.java @@ -4,8 +4,8 @@ package org.gcube.portlets.admin.accountingmanager.client.graphics; * * Basic Vector 2D * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Vector2D { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/ChartViewerPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/ChartViewerPanel.java index 954e945..5bdc4e4 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/ChartViewerPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/ChartViewerPanel.java @@ -18,8 +18,8 @@ import com.sencha.gxt.widget.core.client.FramedPanel; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ChartViewerPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Job.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Job.java index 14316fc..8646eb1 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Job.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Job.java @@ -13,8 +13,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * Accounting Chart 4 Job * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingChart4Job extends AccountingChartBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Portlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Portlet.java index d50d1cb..8fb87b9 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Portlet.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Portlet.java @@ -9,8 +9,8 @@ import com.google.gwt.event.shared.EventBus; /** * Accounting Chart 4 Portlet * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingChart4Portlet extends AccountingChartBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Service.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Service.java index fe2577a..6db438b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Service.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Service.java @@ -13,8 +13,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * Accounting Chart 4 Service * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingChart4Service extends AccountingChartBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Space.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Space.java index 7bd96f3..cfd4f54 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Space.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Space.java @@ -11,8 +11,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * Accounting Chart 4 Space * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingChart4Space extends AccountingChartBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Storage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Storage.java index fd6139b..0b2cb46 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Storage.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Storage.java @@ -13,8 +13,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * Accounting Chart 4 Storage * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingChart4Storage extends AccountingChartBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Task.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Task.java index 7b3ff00..bcfd1dc 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Task.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChart4Task.java @@ -9,8 +9,8 @@ import com.google.gwt.event.shared.EventBus; /** * Accounting Chart 4 Task * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingChart4Task extends AccountingChartBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartBuilder.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartBuilder.java index 95169ab..6e5362d 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartBuilder.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartBuilder.java @@ -5,7 +5,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ChartDrawExce /** * Abstract class for build Accounting Chart * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartDirector.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartDirector.java index 656b0f5..75c4825 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartDirector.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartDirector.java @@ -6,7 +6,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ChartDrawExce /** * Accounting Chart Director * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartPanel.java index bcac6a8..6a007a2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartPanel.java @@ -4,8 +4,8 @@ import com.sencha.gxt.widget.core.client.container.Container; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingChartPanel { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartSpec.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartSpec.java index c04bad6..8910b56 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartSpec.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/AccountingChartSpec.java @@ -4,8 +4,8 @@ package org.gcube.portlets.admin.accountingmanager.client.maindata.charts; /** * Accounting Chart Specification * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingChartSpec { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartBasicPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartBasicPanel.java index e77c458..508479b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartBasicPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartBasicPanel.java @@ -50,8 +50,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class JobChartBasicPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartContextPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartContextPanel.java index 8fc89d3..1843e6e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartContextPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartContextPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class JobChartContextPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartTopPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartTopPanel.java index 6b69fb6..ffe4cfd 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartTopPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/job/JobChartTopPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class JobChartTopPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartBasicPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartBasicPanel.java index 48620b7..447eb00 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartBasicPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartBasicPanel.java @@ -50,8 +50,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ServiceChartBasicPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartContextPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartContextPanel.java index 71badd2..91885a2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartContextPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartContextPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ServiceChartContextPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartTopPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartTopPanel.java index 0edd2f1..4a3b173 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartTopPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/service/ServiceChartTopPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ServiceChartTopPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/space/SpaceChartSpacesPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/space/SpaceChartSpacesPanel.java index e4760a2..117f2aa 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/space/SpaceChartSpacesPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/space/SpaceChartSpacesPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SpaceChartSpacesPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartBasicPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartBasicPanel.java index d53edb8..bfd1028 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartBasicPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartBasicPanel.java @@ -47,8 +47,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StorageChartBasicPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartContextPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartContextPanel.java index 176271a..4377896 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartContextPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartContextPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StorageChartContextPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartTopPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartTopPanel.java index 452bf15..274f182 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartTopPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartTopPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StorageChartTopPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ByteUnitMeasure.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ByteUnitMeasure.java index 225e99d..b273549 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ByteUnitMeasure.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ByteUnitMeasure.java @@ -4,8 +4,8 @@ package org.gcube.portlets.admin.accountingmanager.client.maindata.charts.utils; * Note Storage Data are in kB * * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ByteUnitMeasure { @@ -35,7 +35,7 @@ public class ByteUnitMeasure { return 1000000000; } - + public static long getKiloByteDimForStorage() { return 1; } @@ -52,9 +52,5 @@ public class ByteUnitMeasure { return 1073741824; } - - - - } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ChartDateTimeData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ChartDateTimeData.java index 6db80d0..58346c2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ChartDateTimeData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ChartDateTimeData.java @@ -5,8 +5,8 @@ import java.util.Date; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ChartDateTimeData implements Serializable { @@ -21,8 +21,8 @@ public class ChartDateTimeData implements Serializable { /** * - * @param date - * @param value + * @param date date + * @param value value */ public ChartDateTimeData(Date date, Long value) { super(); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ChartTimeMeasure.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ChartTimeMeasure.java index 038f551..7625c86 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ChartTimeMeasure.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ChartTimeMeasure.java @@ -9,8 +9,7 @@ import com.google.gwt.i18n.client.DateTimeFormat; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public class ChartTimeMeasure { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/DownloadConstants.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/DownloadConstants.java index 5d904d8..84ce415 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/DownloadConstants.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/DownloadConstants.java @@ -3,7 +3,6 @@ package org.gcube.portlets.admin.accountingmanager.client.maindata.charts.utils; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it * */ public class DownloadConstants { @@ -15,5 +14,5 @@ public class DownloadConstants { public static final String DOWNLOAD_JPG = "Download JPG Image"; public static final String DOWNLOAD_PDF = "Download PDF Document"; public static final String DOWNLOAD_SVG = "Download SVG Vector Image"; - + } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/JobChartMeasure.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/JobChartMeasure.java index cb9fd07..bdde4d9 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/JobChartMeasure.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/JobChartMeasure.java @@ -7,8 +7,8 @@ import java.util.List; * Job Chart Measure * * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @@ -17,7 +17,6 @@ public enum JobChartMeasure { Duration("Duration"), MaxInvocationTime("Max Invocation Time"), MinInvocationTime( "Min Invocation Time"), OperationCount("Operation Count"); - /** * * @param id @@ -43,8 +42,8 @@ public enum JobChartMeasure { /** * - * @param id - * @return + * @param id the id + * @return job chart measure */ public static JobChartMeasure getFromId(String id) { if (id == null || id.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ServiceChartMeasure.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ServiceChartMeasure.java index 4ad8604..27c9213 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ServiceChartMeasure.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ServiceChartMeasure.java @@ -7,8 +7,8 @@ import java.util.List; * Service Chart Measure * * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @@ -42,8 +42,8 @@ public enum ServiceChartMeasure { /** * - * @param id - * @return + * @param id the id + * @return service chart measure */ public static ServiceChartMeasure getFromId(String id) { if (id == null || id.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/SpaceChartMeasure.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/SpaceChartMeasure.java index 1869aed..ce45c34 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/SpaceChartMeasure.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/SpaceChartMeasure.java @@ -7,8 +7,8 @@ import java.util.List; * Service Chart Measure * * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @@ -42,7 +42,8 @@ public enum SpaceChartMeasure { /** * * @param id - * @return + * the id + * @return space chart measure */ public static SpaceChartMeasure getFromId(String id) { if (id == null || id.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/StorageChartMeasure.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/StorageChartMeasure.java index 14914de..04d1a27 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/StorageChartMeasure.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/StorageChartMeasure.java @@ -7,8 +7,8 @@ import java.util.List; * Storage Chart Measure * * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @@ -41,8 +41,8 @@ public enum StorageChartMeasure { /** * - * @param id - * @return + * @param id the id + * @return storage chart measure */ public static StorageChartMeasure getFromId(String id) { if (id == null || id.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/TimeUnitMeasure.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/TimeUnitMeasure.java index 4b7115d..5019335 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/TimeUnitMeasure.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/TimeUnitMeasure.java @@ -4,8 +4,8 @@ package org.gcube.portlets.admin.accountingmanager.client.maindata.charts.utils; * Time Unit * * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TimeUnitMeasure { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerMenu.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerMenu.java index 02a3168..7970463 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerMenu.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerMenu.java @@ -18,8 +18,8 @@ import com.sencha.gxt.widget.core.client.TabPanel; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingManagerMenu extends TabPanel { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/AccountingMonitor.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/AccountingMonitor.java index c07fc4d..3f478ce 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/AccountingMonitor.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/AccountingMonitor.java @@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingMonitor extends AutoProgressMessageBox { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequest.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequest.java index 420d736..ba14773 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequest.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequest.java @@ -10,8 +10,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorRequest { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequestEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequestEvent.java index b2b6edf..f7854e2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequestEvent.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequestEvent.java @@ -8,8 +8,8 @@ import com.google.gwt.event.shared.HasHandlers; /** * Accounting Period Request Event * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorRequestEvent extends diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequestType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequestType.java index c6624aa..6645d59 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequestType.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/MonitorRequestType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.admin.accountingmanager.client.monitor; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum MonitorRequestType { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/properties/GenresDataProperties.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/properties/GenresDataProperties.java index d64a492..08cfbf2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/properties/GenresDataProperties.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/properties/GenresDataProperties.java @@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface GenresDataProperties extends PropertyAccess { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerCSS.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerCSS.java index 63ebffa..c3b1140 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerCSS.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerCSS.java @@ -7,8 +7,8 @@ import com.google.gwt.resources.client.CssResource; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface AccountingManagerCSS extends CssResource { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerResources.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerResources.java index b421cff..9a34a81 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerResources.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerResources.java @@ -9,8 +9,8 @@ import com.google.gwt.resources.client.ImageResource; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface AccountingManagerResources extends ClientBundle { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerService.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerService.java index 5ba93bb..cd2bedc 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerService.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerService.java @@ -20,8 +20,8 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @RemoteServiceRelativePath("ams") @@ -29,15 +29,17 @@ public interface AccountingManagerService extends RemoteService { /** * Get informations on the current user * - * @return + * @return user info * @throws ServiceException + * service exception */ public UserInfo hello() throws ServiceException; /** * - * @return + * @return timeout * @throws ServiceException + * service exception */ public Long getClientMonitorTimeout() throws ServiceException; @@ -48,11 +50,12 @@ public interface AccountingManagerService extends RemoteService { * the resource on which to accounting * @param seriesRequest * filters and constraints descriptions - * @return + * @return series * @throws ServiceException + * service exception */ - public SeriesResponse getSeriesInCache(AccountingType accountingType, - SeriesRequest seriesRequest) throws ServiceException; + public SeriesResponse getSeriesInCache(AccountingType accountingType, SeriesRequest seriesRequest) + throws ServiceException; /** * Retrieve Accounting Series @@ -61,21 +64,21 @@ public interface AccountingManagerService extends RemoteService { * the resource on which to accounting * @param seriesRequest * filters and constraints descriptions - * @return + * @return series * @throws ServiceException + * series exception */ - public String getSeries(AccountingType accountingType, - SeriesRequest seriesRequest) throws ServiceException; + public String getSeries(AccountingType accountingType, SeriesRequest seriesRequest) throws ServiceException; /** * Accounting Request Monitor * - * @param operationId - * @return + * @param operationId operation id + * @return series * @throws ServiceException + * service exception */ - public SeriesResponse operationMonitor(String operationId) - throws ServiceException; + public SeriesResponse operationMonitor(String operationId) throws ServiceException; /** * @@ -83,34 +86,36 @@ public interface AccountingManagerService extends RemoteService { * type of accounting * @return list of filter keys * @throws ServiceException + * service exception */ - public ArrayList getFilterKeys(AccountingType accountingType) - throws ServiceException; + public ArrayList getFilterKeys(AccountingType accountingType) throws ServiceException; /** * * * @param filterValuesRequest * request values available - * @return + * @return filter values * @throws ServiceException + * service exception */ - public FilterValuesResponse getFilterValues( - FilterValuesRequest filterValuesRequest) throws ServiceException; + public FilterValuesResponse getFilterValues(FilterValuesRequest filterValuesRequest) throws ServiceException; /** * Retrieve Context available * - * @return + * @return context * @throws ServiceException + * service exception */ public Context getContext() throws ServiceException; /** * Retrieve spaces available * - * @return + * @return spaces * @throws ServiceException + * service exception */ public Spaces getSpaces() throws ServiceException; @@ -118,33 +123,36 @@ public interface AccountingManagerService extends RemoteService { * * @param itemDescription * item description - * @return + * @return public link * @throws ServiceException + * service exception */ - public String getPublicLink(ItemDescription itemDescription) - throws ServiceException; + public String getPublicLink(ItemDescription itemDescription) throws ServiceException; /** * - * @param accountingStateData - * @return + * @param accountingType + * accounting type + * @return item description * @throws ServiceException + * service exception */ - public ItemDescription saveCSVOnWorkspace(AccountingType accountingType) - throws ServiceException; + public ItemDescription saveCSVOnWorkspace(AccountingType accountingType) throws ServiceException; /** * - * @return + * @return enable tabs * @throws ServiceException + * service exception */ public EnableTabs getEnableTabs() throws ServiceException; /** * Check if the user is in root scope * - * @return + * @return true if is root scope * @throws ServiceException + * service exception */ public Boolean isRootScope() throws ServiceException; diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerServiceAsync.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerServiceAsync.java index 4decd07..34ed9d2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerServiceAsync.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerServiceAsync.java @@ -22,8 +22,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface AccountingManagerServiceAsync { @@ -34,6 +34,7 @@ public interface AccountingManagerServiceAsync { /** * * @param callback + * user info callback */ void hello(AsyncCallback callback); @@ -41,6 +42,7 @@ public interface AccountingManagerServiceAsync { * Retrieve client monitor timeout * * @param callback + * client monitor timeout callback */ void getClientMonitorTimeout(AsyncCallback callback); @@ -52,9 +54,10 @@ public interface AccountingManagerServiceAsync { * @param seriesRequest * filters and constraints descriptions * @param callback + * series response callback */ - void getSeriesInCache(AccountingType accountingType, - SeriesRequest seriesRequest, AsyncCallback callback); + void getSeriesInCache(AccountingType accountingType, SeriesRequest seriesRequest, + AsyncCallback callback); /** * Retrieve Accounting Series @@ -64,40 +67,49 @@ public interface AccountingManagerServiceAsync { * @param seriesRequest * filters and constraints descriptions * @param callback + * series callback */ - void getSeries(AccountingType accountingType, SeriesRequest seriesRequest, - AsyncCallback callback); + void getSeries(AccountingType accountingType, SeriesRequest seriesRequest, AsyncCallback callback); /** * Accounting Request Monitor * * @param operationId + * operation Id * @param callback + * series response callback */ - void operationMonitor(String operationId, - AsyncCallback callback); + void operationMonitor(String operationId, AsyncCallback callback); /** * * @param accountingType * accounting type * @param callback + * array list of filter key callback */ - void getFilterKeys(AccountingType accountingType, - AsyncCallback> callback); + void getFilterKeys(AccountingType accountingType, AsyncCallback> callback); - void getFilterValues(FilterValuesRequest filterValuesRequest, - AsyncCallback callback); + /** + * + * @param filterValuesRequest + * filter value request + * @param callback + * filter value response callback + */ + void getFilterValues(FilterValuesRequest filterValuesRequest, AsyncCallback callback); /** * * @param callback + * context callback */ void getContext(AsyncCallback callback); /** * * @param callback + * spaces callback */ void getSpaces(AsyncCallback callback); @@ -106,22 +118,23 @@ public interface AccountingManagerServiceAsync { * @param itemDescription * item description * @param callback + * public link callback */ - void getPublicLink(ItemDescription itemDescription, - AsyncCallback callback); + void getPublicLink(ItemDescription itemDescription, AsyncCallback callback); /** * - * @param accountingStateData + * @param accountingType + * accounting type * @param callback + * item description callback */ - void saveCSVOnWorkspace(AccountingType accountingType, - AsyncCallback callback); + void saveCSVOnWorkspace(AccountingType accountingType, AsyncCallback callback); /** * * @param callback - * return the list of enabled tabs + * the callback that return the list of enabled tabs */ void getEnableTabs(AsyncCallback callback); @@ -129,6 +142,7 @@ public interface AccountingManagerServiceAsync { * Check if the user is in root scope * * @param callback + * the callback that return true if is root scope */ void isRootScope(AsyncCallback callback); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingClientState.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingClientState.java index 0bba8b4..bb5def6 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingClientState.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingClientState.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingClientState implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingClientStateData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingClientStateData.java index d638822..64bda61 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingClientStateData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingClientStateData.java @@ -12,8 +12,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesRes /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingClientStateData implements Serializable { @@ -34,10 +34,11 @@ public class AccountingClientStateData implements Serializable { /** * * @param accountingType + * accounting type * @param rootScope + * root scope */ - public AccountingClientStateData(AccountingType accountingType, - Boolean rootScope) { + public AccountingClientStateData(AccountingType accountingType, Boolean rootScope) { super(); this.accountingType = accountingType; this.seriesRequest = null; @@ -51,15 +52,22 @@ public class AccountingClientStateData implements Serializable { /** * * @param accountingType + * accounting type * @param seriesRequest + * series request * @param seriesResponse + * series response * @param availableFilterKeys + * available filter keys * @param availableContext + * available context + * @param availableSpaces + * available spaces * @param rootScope + * root scope */ - public AccountingClientStateData(AccountingType accountingType, - SeriesRequest seriesRequest, SeriesResponse seriesResponse, - ArrayList availableFilterKeys, Context availableContext, + public AccountingClientStateData(AccountingType accountingType, SeriesRequest seriesRequest, + SeriesResponse seriesResponse, ArrayList availableFilterKeys, Context availableContext, Spaces availableSpaces, Boolean rootScope) { super(); this.accountingType = accountingType; @@ -129,12 +137,10 @@ public class AccountingClientStateData implements Serializable { @Override public String toString() { - return "AccountingClientStateData [accountingType=" + accountingType - + ", seriesRequest=" + seriesRequest + ", seriesResponse=" - + seriesResponse + ", availableFilterKeys=" - + availableFilterKeys + ", availableContext=" - + availableContext + ", availableSpaces=" + availableSpaces - + ", rootScope=" + rootScope + "]"; + return "AccountingClientStateData [accountingType=" + accountingType + ", seriesRequest=" + seriesRequest + + ", seriesResponse=" + seriesResponse + ", availableFilterKeys=" + availableFilterKeys + + ", availableContext=" + availableContext + ", availableSpaces=" + availableSpaces + ", rootScope=" + + rootScope + "]"; } } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/FiltersChangeType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/FiltersChangeType.java index b6339c4..5d07cf1 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/FiltersChangeType.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/FiltersChangeType.java @@ -5,8 +5,8 @@ package org.gcube.portlets.admin.accountingmanager.client.type; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum FiltersChangeType { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/SessionExpiredType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/SessionExpiredType.java index c80177b..cbb84db 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/SessionExpiredType.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/SessionExpiredType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.admin.accountingmanager.client.type; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum SessionExpiredType { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/StateChangeType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/StateChangeType.java index ee126c3..cae09ca 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/StateChangeType.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/StateChangeType.java @@ -5,8 +5,8 @@ package org.gcube.portlets.admin.accountingmanager.client.type; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum StateChangeType { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/UIStateType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/UIStateType.java index 9f0a958..92d8aa5 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/UIStateType.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/UIStateType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.admin.accountingmanager.client.type; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum UIStateType { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/Format.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/Format.java index c5a438e..a3e7328 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/Format.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/Format.java @@ -5,8 +5,8 @@ package org.gcube.portlets.admin.accountingmanager.client.util; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Format { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/InfoMessageBox.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/InfoMessageBox.java index 08a8c0c..56aaac5 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/InfoMessageBox.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/InfoMessageBox.java @@ -4,8 +4,8 @@ import com.sencha.gxt.widget.core.client.box.MessageBox; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class InfoMessageBox extends MessageBox { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/UtilsGXT3.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/UtilsGXT3.java index 4387037..df51110 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/UtilsGXT3.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/util/UtilsGXT3.java @@ -11,8 +11,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UtilsGXT3 { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientCallable.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientCallable.java index 915bd28..d266c6f 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientCallable.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientCallable.java @@ -21,6 +21,11 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceExcept import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * + * @author Giancarlo Panichi + * + */ public class AccountingClientCallable implements Callable { private static Logger logger = LoggerFactory diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientDaemon.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientDaemon.java index 8b69297..71d1edd 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientDaemon.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientDaemon.java @@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingClientDaemon implements Runnable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientListener.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientListener.java index addcd8a..61c0621 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientListener.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingClientListener.java @@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @WebListener diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingManagerServiceImpl.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingManagerServiceImpl.java index 21c9b9a..eb66026 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingManagerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingManagerServiceImpl.java @@ -45,8 +45,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; * * Support service request * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @SuppressWarnings("serial") diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/ExportServlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/ExportServlet.java index 1a4323b..5810fb8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/ExportServlet.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/ExportServlet.java @@ -26,8 +26,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * * Export Servlet * diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionConstants.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionConstants.java index ac201a3..998bb9a 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionConstants.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionConstants.java @@ -2,8 +2,8 @@ package org.gcube.portlets.admin.accountingmanager.server; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SessionConstants { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionOp.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionOp.java index 3c45457..3883749 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionOp.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionOp.java @@ -11,10 +11,10 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * - * @param + * + * @param tpye */ public class SessionOp { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java index 5b0cadd..5c078a6 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java @@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SessionUtil { @@ -257,11 +257,12 @@ public class SessionUtil { } + /** * - * @param httpRequest - * @param serviceCredentials - * @return + * @param httpSession http session + * @param serviceCredentials service credentials + * @return hash map of tasks */ public static HashMap getTaskWrapperMap( HttpSession httpSession, @@ -274,9 +275,9 @@ public class SessionUtil { /** * - * @param httpRequest - * @param serviceCredentials - * @param taskWrapperMap + * @param httpSession session + * @param serviceCredentials service credentials + * @param taskWrapperMap task wrapper map */ public static void setTaskWrapperMap(HttpSession httpSession, ServiceCredentials serviceCredentials, diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java index db59d91..d6c1b82 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java @@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCaller implements AccountingCallerInterface { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerInterface.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerInterface.java index 58f2aa4..27f9e1b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerInterface.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerInterface.java @@ -13,8 +13,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceExcept /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface AccountingCallerInterface { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java index 7aed75c..4a6dc21 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java @@ -55,8 +55,8 @@ import org.slf4j.LoggerFactory; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCallerTester implements AccountingCallerInterface { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/cache/AccountingCache.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/cache/AccountingCache.java index 5fbdaa5..658fdb6 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/cache/AccountingCache.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/cache/AccountingCache.java @@ -22,15 +22,14 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCache implements Serializable { private static final long serialVersionUID = -4352823042594405108L; - private static Logger logger = LoggerFactory - .getLogger(AccountingCache.class); + private static Logger logger = LoggerFactory.getLogger(AccountingCache.class); private static final String ACCOUNTING_SERIES_CACHE = "AccountingSeriesCache"; private static final String ACCOUNTING_FILTER_VALUES_CACHE = "AccountingFilterValuesCache"; @@ -49,20 +48,15 @@ public class AccountingCache implements Serializable { cacheManager = cachingProvider.getCacheManager(); logger.info("AccountingCache URI: " + cacheManager.getURI()); - ResourcePoolsBuilder builderSeries = ResourcePoolsBuilder - .newResourcePoolsBuilder().heap(60L, MemoryUnit.MB) + ResourcePoolsBuilder builderSeries = ResourcePoolsBuilder.newResourcePoolsBuilder().heap(60L, MemoryUnit.MB) .offheap(240L, MemoryUnit.MB); // .disk(500L, MemoryUnit.KB) // .withSizeOfMaxObjectSize(1L, MemoryUnit.KB) cacheSeriesConfiguration = CacheConfigurationBuilder - .newCacheConfigurationBuilder(String.class, - SeriesResponse.class, builderSeries) - .withExpiry( - Expirations - .timeToLiveExpiration(org.ehcache.expiry.Duration - .of(30L, TimeUnit.MINUTES))) + .newCacheConfigurationBuilder(String.class, SeriesResponse.class, builderSeries) + .withExpiry(Expirations.timeToLiveExpiration(org.ehcache.expiry.Duration.of(30L, TimeUnit.MINUTES))) .withSizeOfMaxObjectSize(50L, MemoryUnit.MB).build(); // mBeanServer = ManagementFactory.getPlatformMBeanServer(); @@ -74,20 +68,15 @@ public class AccountingCache implements Serializable { * .build(true); */ - ResourcePoolsBuilder builderFilterValues = ResourcePoolsBuilder - .newResourcePoolsBuilder().heap(10L, MemoryUnit.MB) - .offheap(30L, MemoryUnit.MB); + ResourcePoolsBuilder builderFilterValues = ResourcePoolsBuilder.newResourcePoolsBuilder() + .heap(10L, MemoryUnit.MB).offheap(30L, MemoryUnit.MB); // .disk(500L, MemoryUnit.KB) // .withSizeOfMaxObjectSize(1L, MemoryUnit.KB) cacheFilterValuesConfiguration = CacheConfigurationBuilder - .newCacheConfigurationBuilder(String.class, - FilterValuesResponse.class, builderFilterValues) - .withExpiry( - Expirations - .timeToLiveExpiration(org.ehcache.expiry.Duration - .of(30L, TimeUnit.MINUTES))) + .newCacheConfigurationBuilder(String.class, FilterValuesResponse.class, builderFilterValues) + .withExpiry(Expirations.timeToLiveExpiration(org.ehcache.expiry.Duration.of(30L, TimeUnit.MINUTES))) .withSizeOfMaxObjectSize(4L, MemoryUnit.MB).build(); } catch (Throwable e) { @@ -97,14 +86,13 @@ public class AccountingCache implements Serializable { } } - private Cache initCacheSeries() - throws ServiceException { + private Cache initCacheSeries() throws ServiceException { try { String cacheSeriesName = ACCOUNTING_SERIES_CACHE; // create the cache - Cache cacheSeries = cacheManager.getCache( - cacheSeriesName, String.class, SeriesResponse.class); + Cache cacheSeries = cacheManager.getCache(cacheSeriesName, String.class, + SeriesResponse.class); if (cacheSeries == null) { /* @@ -118,11 +106,8 @@ public class AccountingCache implements Serializable { * cache = cacheManager.createCache(cacheName, config); */ - cacheSeries = cacheManager - .createCache( - cacheSeriesName, - Eh107Configuration - .fromEhcacheCacheConfiguration(cacheSeriesConfiguration)); + cacheSeries = cacheManager.createCache(cacheSeriesName, + Eh107Configuration.fromEhcacheCacheConfiguration(cacheSeriesConfiguration)); cacheManager.enableManagement(cacheSeriesName, true); cacheManager.enableStatistics(cacheSeriesName, true); @@ -148,25 +133,18 @@ public class AccountingCache implements Serializable { } - - - private Cache initCacheFilterValues() - throws ServiceException { + private Cache initCacheFilterValues() throws ServiceException { try { String cacheFilterValuesName = ACCOUNTING_FILTER_VALUES_CACHE; // create the cache - Cache cacheFilterValues = cacheManager - .getCache(cacheFilterValuesName, String.class, - FilterValuesResponse.class); + Cache cacheFilterValues = cacheManager.getCache(cacheFilterValuesName, + String.class, FilterValuesResponse.class); if (cacheFilterValues == null) { - cacheFilterValues = cacheManager - .createCache( - cacheFilterValuesName, - Eh107Configuration - .fromEhcacheCacheConfiguration(cacheFilterValuesConfiguration)); + cacheFilterValues = cacheManager.createCache(cacheFilterValuesName, + Eh107Configuration.fromEhcacheCacheConfiguration(cacheFilterValuesConfiguration)); cacheManager.enableManagement(cacheFilterValuesName, true); cacheManager.enableStatistics(cacheFilterValuesName, true); @@ -182,20 +160,21 @@ public class AccountingCache implements Serializable { } - public void putSeries(String key, SeriesResponse value) - throws ServiceException { + public void putSeries(String key, SeriesResponse value) throws ServiceException { logger.debug("Cache put: [" + key + ", " + value + "]"); Cache cacheSeries = initCacheSeries(); cacheSeries.put(key, value); logger.debug("Cached: [" + key + ", " + value + "]"); } - + /** * * @param key - * @return + * key + * @return series response * @throws ServiceException + * service exception */ public SeriesResponse getSeries(String key) throws ServiceException { logger.debug("Cache get: [" + key + "]"); @@ -204,16 +183,17 @@ public class AccountingCache implements Serializable { logger.debug("Cached value: [" + key + ", " + value + "]"); return value; } - - + /** * * @param key + * key * @param value + * value * @throws ServiceException + * service exception */ - public void putFilterValues(String key, FilterValuesResponse value) - throws ServiceException { + public void putFilterValues(String key, FilterValuesResponse value) throws ServiceException { logger.debug("Cache put: [" + key + ", " + value + "]"); Cache cacheFilterValues = initCacheFilterValues(); cacheFilterValues.put(key, value); @@ -224,8 +204,10 @@ public class AccountingCache implements Serializable { /** * * @param key - * @return + * key + * @return filter values * @throws ServiceException + * service exception */ public FilterValuesResponse getFilterValues(String key) throws ServiceException { logger.debug("Cache get: [" + key + "]"); @@ -244,17 +226,13 @@ public class AccountingCache implements Serializable { cacheManager.destroyCache(cacheName); } } catch (Throwable e) { - logger.error( - "Error destroying the AccountingCache: " - + e.getLocalizedMessage(), e); + logger.error("Error destroying the AccountingCache: " + e.getLocalizedMessage(), e); } try { cacheManager.close(); } catch (Throwable e) { - logger.error( - "Error closing AccountingCache manager: " - + e.getLocalizedMessage(), e); + logger.error("Error closing AccountingCache manager: " + e.getLocalizedMessage(), e); } } super.finalize(); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandBasic.java index 08d6284..6f94f44 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandBasic.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCommandBasic implements diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandContext.java index e0d0da2..0f44916 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandContext.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCommandContext implements AccountingCommand { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterKeys.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterKeys.java index 73a8594..60f4747 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterKeys.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterKeys.java @@ -16,8 +16,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCommandGetFilterKeys implements diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterValues.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterValues.java index 57b5d37..9e4702f 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterValues.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetFilterValues.java @@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCommandGetFilterValues implements diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetSpaces.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetSpaces.java index c931a71..7d3503e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetSpaces.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandGetSpaces.java @@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCommandGetSpaces implements diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandSpaces.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandSpaces.java index efc3505..2506803 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandSpaces.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandSpaces.java @@ -19,8 +19,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCommandSpaces implements diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandTop.java index 3494b22..8d282ae 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/command/AccountingCommandTop.java @@ -23,8 +23,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingCommandTop implements AccountingCommand { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery.java index 202bc86..5295aed 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery.java @@ -4,8 +4,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQuery { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java index 02cf81f..aaedfb7 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java @@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Query 4 Job * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQuery4Job extends AccountingQueryBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java index a737b94..49f2e58 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java @@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Query 4 Portlet * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQuery4Portlet extends AccountingQueryBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java index cfab531..25b5ccb 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java @@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Query 4 Service * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQuery4Service extends AccountingQueryBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Space.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Space.java index db73245..34aa912 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Space.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Space.java @@ -19,8 +19,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Query 4 Space * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQuery4Space extends AccountingQueryBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java index 53421e7..c440578 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java @@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Query 4 Storage * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQuery4Storage extends AccountingQueryBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java index bcd6b7b..7d16296 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java @@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Query 4 Task * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQuery4Task extends AccountingQueryBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBasic.java index 5684a89..41d557c 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBasic.java @@ -9,8 +9,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQueryBasic extends AccountingQuery { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBuilder.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBuilder.java index 3ffc61d..805ce28 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBuilder.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBuilder.java @@ -7,7 +7,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceExcept /** * Abstract class for build Accounting Query * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryContext.java index 91fae1e..9cfead1 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryContext.java @@ -10,8 +10,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.Context; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQueryContext extends AccountingQuery { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryDirector.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryDirector.java index cad4925..a2d5785 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryDirector.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryDirector.java @@ -8,7 +8,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceExcept /** * Accounting Query Director * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpaces.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpaces.java index cf2df68..8c2ba27 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpaces.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpaces.java @@ -10,8 +10,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.Spaces; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQuerySpaces extends AccountingQuery { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpec.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpec.java index 86cc6df..2d641f0 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpec.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpec.java @@ -5,7 +5,7 @@ import java.util.ArrayList; /** * Accounting Query Specification * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryTop.java index 06b54ca..1e74ed6 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryTop.java @@ -10,8 +10,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.FilterKey; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingQueryTop extends AccountingQuery { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobBasic.java index 7164bf3..ae716a8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobBasic.java @@ -16,8 +16,8 @@ import org.slf4j.LoggerFactory; /** * Series Response 4 Job Basic * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4JobBasic extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobContext.java index 9560ff8..ff9b131 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobContext.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Context Series Response 4 Job * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4JobContext extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobTop.java index 1c65e83..25f4ba9 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4JobTop.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Top Series Response 4 Job * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4JobTop extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletBasic.java index b747d6f..fac3652 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletBasic.java @@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory; /** * Series Response 4 Portlet Basic * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4PortletBasic extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletContext.java index dc110f0..30fc7fb 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletContext.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Context Series Response 4 Portlet * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4PortletContext extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletTop.java index 3590ae0..d35c622 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4PortletTop.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Top Series Response 4 Portlet * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4PortletTop extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceBasic.java index 7f9ca50..7aff2c1 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceBasic.java @@ -16,8 +16,8 @@ import org.slf4j.LoggerFactory; /** * Series Response 4 Service Basic * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4ServiceBasic extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceContext.java index e738425..7bf9e98 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceContext.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Context Series Response 4 Service * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4ServiceContext extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceTop.java index 316cce7..2b52aab 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4ServiceTop.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Top Series Response 4 Service * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4ServiceTop extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4SpaceSpaces.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4SpaceSpaces.java index b159ce3..5b92744 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4SpaceSpaces.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4SpaceSpaces.java @@ -17,8 +17,8 @@ import org.slf4j.LoggerFactory; /** * Categories Series Response 4 Space * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4SpaceSpaces extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageBasic.java index 463bd02..465681e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageBasic.java @@ -16,8 +16,8 @@ import org.slf4j.LoggerFactory; /** * Series Response 4 Storage Basic * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4StorageBasic extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageContext.java index 6d0237d..d6b587b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageContext.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Context Series Response 4 Storage * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4StorageContext extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageTop.java index 192d48e..f342151 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4StorageTop.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Top Series Response 4 Storage * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4StorageTop extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskBasic.java index a92b374..ae8b298 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskBasic.java @@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory; /** * Series Response 4 Task Basic * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4TaskBasic extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskContext.java index 2a902d1..9318d0a 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskContext.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Context Series Response 4 Task * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4TaskContext extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskTop.java index 776e794..2910d51 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4TaskTop.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * Top Series Response 4 Task * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesResponse4TaskTop extends SeriesResponseBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseBuilder.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseBuilder.java index 09da463..f5da498 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseBuilder.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseBuilder.java @@ -5,7 +5,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceExcept /** * Abstract class for build Series Response * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseDirector.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseDirector.java index b0157ad..7f628e4 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseDirector.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseDirector.java @@ -9,7 +9,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceExcept /** * Series Response Director * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseSpec.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseSpec.java index 546f63a..09e9434 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseSpec.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseSpec.java @@ -7,7 +7,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesRes /** * Series Response Specification * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/CSVManager.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/CSVManager.java index 687cd21..61cc41b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/CSVManager.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/CSVManager.java @@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory; /** * CSV Manager * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CSVManager { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/JSONManager.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/JSONManager.java index 2185288..c3ab296 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/JSONManager.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/JSONManager.java @@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory; /** * JSON Manager * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class JSONManager { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/XMLManager.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/XMLManager.java index 3ab7c63..637e168 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/XMLManager.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/XMLManager.java @@ -25,8 +25,8 @@ import org.slf4j.LoggerFactory; /** * XML Manager * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class XMLManager { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingDataModel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingDataModel.java index febf0d9..cf788df 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingDataModel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingDataModel.java @@ -6,8 +6,8 @@ import java.util.ArrayList; /** * Accounting Data Model * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingDataModel implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingDataRow.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingDataRow.java index 9841f2f..8268f6e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingDataRow.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingDataRow.java @@ -6,8 +6,8 @@ import java.util.ArrayList; /** * Accounting data row * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingDataRow implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Job.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Job.java index eb2a754..26ad7ec 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Job.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Job.java @@ -23,8 +23,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Model 4 Job * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingModel4Job extends AccountingModelBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Service.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Service.java index 0271aa7..361f51b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Service.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Service.java @@ -23,8 +23,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Model 4 Service * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingModel4Service extends AccountingModelBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Storage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Storage.java index 9747844..9d7c065 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Storage.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModel4Storage.java @@ -23,8 +23,8 @@ import org.slf4j.LoggerFactory; /** * Accounting Model 4 Storage * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingModel4Storage extends AccountingModelBuilder { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelBuilder.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelBuilder.java index 5b536fc..60da55d 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelBuilder.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelBuilder.java @@ -7,7 +7,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceExcept /** * Abstract class for build Accounting Model * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelDirector.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelDirector.java index faf28d7..30f95ff 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelDirector.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelDirector.java @@ -8,7 +8,7 @@ import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceExcept /** * Accounting Model Director * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelSpec.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelSpec.java index 7e2f969..356477c 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelSpec.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/export/model/AccountingModelSpec.java @@ -5,7 +5,7 @@ import java.util.ArrayList; /** * CSV Model Specification * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * email: g.panichi@isti.cnr.it * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java index 4241d74..6cf7674 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java @@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class BuildEnableTabs { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildThreadPoolInfo.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildThreadPoolInfo.java index 14cd77e..706ca18 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildThreadPoolInfo.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildThreadPoolInfo.java @@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class BuildThreadPoolInfo { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabJAXB.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabJAXB.java index 2dd9e86..46d629f 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabJAXB.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabJAXB.java @@ -10,8 +10,8 @@ import javax.xml.bind.annotation.XmlRootElement; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabsJAXB.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabsJAXB.java index 9559da7..f81f0b5 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabsJAXB.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabsJAXB.java @@ -9,8 +9,8 @@ import javax.xml.bind.annotation.XmlRootElement; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/InformationSystemUtils.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/InformationSystemUtils.java index e00db7b..e2c4bdc 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/InformationSystemUtils.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/InformationSystemUtils.java @@ -17,8 +17,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class InformationSystemUtils { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/ThreadPoolJAXB.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/ThreadPoolJAXB.java index a0c86d2..6ba261e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/ThreadPoolJAXB.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/ThreadPoolJAXB.java @@ -7,8 +7,8 @@ import javax.xml.bind.annotation.XmlRootElement; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/state/AccountingState.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/state/AccountingState.java index 6d14f16..ca2d9b7 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/state/AccountingState.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/state/AccountingState.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingState implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/state/AccountingStateData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/state/AccountingStateData.java index da3420d..89fe13c 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/state/AccountingStateData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/state/AccountingStateData.java @@ -8,8 +8,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesRes /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingStateData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/storage/StorageUtil.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/storage/StorageUtil.java index ade3bcd..20dab80 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/storage/StorageUtil.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/storage/StorageUtil.java @@ -13,8 +13,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.workspace.ItemDescripti /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StorageUtil { @@ -25,17 +25,17 @@ public class StorageUtil { /** * * @param user - * User + * user * @param itemId - * Item id - * @return Public link - * @throws StatAlgoImporterServiceException + * item id + * @return public link + * @throws ServiceException + * service exception */ - public static String getPublicLink(String user, String itemId) - throws ServiceException { + public static String getPublicLink(String user, String itemId) throws ServiceException { Workspace ws; try { - logger.info("Get public link: [user="+user+", itemId="+itemId+"]"); + logger.info("Get public link: [user=" + user + ", itemId=" + itemId + "]"); ws = HomeLibrary.getUserWorkspace(user); WorkspaceItem workSpaceItem = ws.getItem(itemId); @@ -46,13 +46,11 @@ public class StorageUtil { if (workSpaceItem instanceof FolderItem) { return workSpaceItem.getPublicLink(false); } else { - throw new ServiceException( - "Attention no public link for this item!"); + throw new ServiceException("Attention no public link for this item!"); } } catch (Throwable e) { - logger.error("getPublicLink: " - + e.getLocalizedMessage(),e); + logger.error("getPublicLink: " + e.getLocalizedMessage(), e); throw new ServiceException(e.getLocalizedMessage()); } @@ -61,28 +59,23 @@ public class StorageUtil { /** * * @param user - * @param destinationFolderId - * @param folderName - * @param folderDescription - * @return + * user + * @return item id * @throws ServiceException + * service exception */ - public static String createAccountingFolderOnWorkspace(String user) - throws ServiceException { + public static String createAccountingFolderOnWorkspace(String user) throws ServiceException { try { - logger.debug("CreateAccountingFolderOnWorkspace: [User=" + user - + "]"); + logger.debug("CreateAccountingFolderOnWorkspace: [User=" + user + "]"); Workspace ws = HomeLibrary.getUserWorkspace(user); WorkspaceItem workspaceItem = ws.find(ACCOUNTING_MANAGER); if (workspaceItem == null) { - workspaceItem = ws.createFolder(ACCOUNTING_MANAGER, - ACCOUNTING_MANAGER, ws.getRoot().getId()); + workspaceItem = ws.createFolder(ACCOUNTING_MANAGER, ACCOUNTING_MANAGER, ws.getRoot().getId()); } return workspaceItem.getId(); } catch (Throwable e) { - logger.error("CreateAccountingFolderOnWorkspace: " - + e.getLocalizedMessage(),e); + logger.error("CreateAccountingFolderOnWorkspace: " + e.getLocalizedMessage(), e); throw new ServiceException(e.getLocalizedMessage(), e); } @@ -91,31 +84,33 @@ public class StorageUtil { /** * * @param user + * user * @param destinationFolderId + * destination folder id * @param fileName + * file name * @param fileDescription - * @param mimeType + * file description * @param is - * @return + * input stream + * @return item description * @throws ServiceException + * service exception */ - public static ItemDescription saveOnWorkspace(String user, - String destinationFolderId, String fileName, + public static ItemDescription saveOnWorkspace(String user, String destinationFolderId, String fileName, String fileDescription, InputStream is) throws ServiceException { try { - logger.debug("saveOnWorkspace: [User=" + user + ", FolderId:" - + destinationFolderId + ", fileName=" + fileName - + ", fileDescription=" + fileDescription + "]"); + logger.debug("saveOnWorkspace: [User=" + user + ", FolderId:" + destinationFolderId + ", fileName=" + + fileName + ", fileDescription=" + fileDescription + "]"); Workspace ws = HomeLibrary.getUserWorkspace(user); WorkspaceItem workspaceItem = ws.getItem(destinationFolderId); if (workspaceItem.isFolder()) { - ExternalFile externalfile = ws.createExternalFile(fileName, - fileDescription, null, is, destinationFolderId); - ItemDescription itemDescription=new ItemDescription(externalfile.getId(), externalfile.getName(), - externalfile.getOwner().getId(), externalfile.getPath(), - externalfile.getType().name()); - + ExternalFile externalfile = ws.createExternalFile(fileName, fileDescription, null, is, + destinationFolderId); + ItemDescription itemDescription = new ItemDescription(externalfile.getId(), externalfile.getName(), + externalfile.getOwner().getId(), externalfile.getPath(), externalfile.getType().name()); + return itemDescription; } else { throw new ServiceException("Invalid destination folder!"); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/ServiceCredentials.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/ServiceCredentials.java index 073ebf4..2c791ef 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/ServiceCredentials.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/ServiceCredentials.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ServiceCredentials implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskInProgress.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskInProgress.java index dd4fe6d..c8f0569 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskInProgress.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskInProgress.java @@ -6,8 +6,8 @@ import java.util.concurrent.Future; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TaskInProgress implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskRequest.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskRequest.java index c4759a3..2d1d110 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskRequest.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskRequest.java @@ -9,8 +9,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesReques /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TaskRequest implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskStatus.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskStatus.java index d913430..35fc71f 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskStatus.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskStatus.java @@ -2,8 +2,8 @@ package org.gcube.portlets.admin.accountingmanager.server.util; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum TaskStatus { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskWrapper.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskWrapper.java index 60941ce..2482af8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskWrapper.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/TaskWrapper.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesRes /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TaskWrapper implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/ThreadPoolInfo.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/ThreadPoolInfo.java index 5b2d183..ce63f53 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/ThreadPoolInfo.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/util/ThreadPoolInfo.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ThreadPoolInfo implements Serializable { @@ -15,7 +15,7 @@ public class ThreadPoolInfo implements Serializable { /** * - * @param timeout + * @param timeout time out */ public ThreadPoolInfo(long timeout) { super(); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/Constants.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/Constants.java index 8ff7b6c..ea6189e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/Constants.java @@ -4,8 +4,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Constants { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilter.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilter.java index 14d8ed5..1e488ec 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilter.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilter.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingFilter implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterBasic.java index 4b9cbd4..468fc46 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterBasic.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingFilterBasic extends AccountingFilterDefinition implements diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterContext.java index ca457ba..8cbcf8f 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterContext.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingFilterContext extends AccountingFilterDefinition diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterSpaces.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterSpaces.java index f2ee5e7..f61d3a3 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterSpaces.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterSpaces.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingFilterSpaces extends AccountingFilterDefinition @@ -26,7 +26,7 @@ public class AccountingFilterSpaces extends AccountingFilterDefinition /** * - * @param spaces + * @param spaces spaces */ public AccountingFilterSpaces(Spaces spaces) { super(); @@ -37,8 +37,8 @@ public class AccountingFilterSpaces extends AccountingFilterDefinition /** * - * @param spaces - * @param filters + * @param spaces spaces + * @param filters filters */ public AccountingFilterSpaces(Spaces spaces, ArrayList filters) { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterTop.java index 54d9ad3..fa63bc8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingFilterTop.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AccountingFilterTop extends AccountingFilterDefinition implements diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriod.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriod.java index 4936596..caebf75 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriod.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriod.java @@ -4,8 +4,7 @@ import java.io.Serializable; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public class AccountingPeriod implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriodMode.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriodMode.java index a0e9c47..5526545 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriodMode.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriodMode.java @@ -5,22 +5,18 @@ import java.util.List; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public enum AccountingPeriodMode { - YEARLY("Yearly"), - MONTHLY("Monthly"), - DAILY("Daily"), - HOURLY("Hourly"), - MINUTELY("Minutely"); - //SECONDLY("Secondly"), - //MILLISECONDLY("Per Millisecond"); - - + YEARLY("Yearly"), MONTHLY("Monthly"), DAILY("Daily"), HOURLY("Hourly"), MINUTELY("Minutely"); + // SECONDLY("Secondly"), + // MILLISECONDLY("Per Millisecond"); + /** - * @param text + * + * @param id + * id */ private AccountingPeriodMode(final String id) { this.id = id; @@ -36,20 +32,21 @@ public enum AccountingPeriodMode { public String getLabel() { return id; } - - public String getId(){ + + public String getId() { return id; } - - + /** * * @param id - * @return + * di + * @return accounting period mode */ public static AccountingPeriodMode getAccountingPeriodModeFromId(String id) { - if(id==null||id.isEmpty()) return null; - + if (id == null || id.isEmpty()) + return null; + for (AccountingPeriodMode columnDataType : values()) { if (columnDataType.id.compareToIgnoreCase(id) == 0) { return columnDataType; @@ -57,15 +54,14 @@ public enum AccountingPeriodMode { } return null; } - + /** * - * @return + * @return list of accounting period modes */ public static List asList() { - List list=Arrays.asList(values()); + List list = Arrays.asList(values()); return list; } - - + } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingType.java index b6935a5..524a9f4 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingType.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingType.java @@ -5,8 +5,8 @@ package org.gcube.portlets.admin.accountingmanager.shared.data; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum AccountingType { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/ChartType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/ChartType.java index efa5bd0..73ea81c 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/ChartType.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/ChartType.java @@ -7,14 +7,14 @@ import java.util.List; * Chart Type * * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ChartType { - Basic("Basic"),Top("Top"), Context("Context"), Spaces("Spaces"); + Basic("Basic"), Top("Top"), Context("Context"), Spaces("Spaces"); /** * @@ -42,7 +42,8 @@ public enum ChartType { /** * * @param id - * @return + * id + * @return chart type */ public static ChartType getFromId(String id) { if (id == null || id.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Context.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Context.java index 306de05..1401e4c 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Context.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Context.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Context implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/ContextData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/ContextData.java index e78dd29..7b52958 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/ContextData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/ContextData.java @@ -5,7 +5,6 @@ import java.io.Serializable; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it * */ public class ContextData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterKey.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterKey.java index adf18b3..698a761 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterKey.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterKey.java @@ -4,8 +4,7 @@ import java.io.Serializable; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public class FilterKey implements Serializable, Comparable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValue.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValue.java index 6571a2e..85faef2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValue.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValue.java @@ -4,8 +4,7 @@ import java.io.Serializable; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public class FilterValue implements Serializable, Comparable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValuesRequest.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValuesRequest.java index a752019..a27beb1 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValuesRequest.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValuesRequest.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class FilterValuesRequest implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValuesResponse.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValuesResponse.java index 3949b34..d382676 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValuesResponse.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/FilterValuesResponse.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class FilterValuesResponse implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Genres.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Genres.java index 77de56d..b5100e8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Genres.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Genres.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Genres implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/GenresData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/GenresData.java index 5b51b98..34d8509 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/GenresData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/GenresData.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GenresData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Spaces.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Spaces.java index 27e3da5..15f9e0f 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Spaces.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/Spaces.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Spaces implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/SpacesData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/SpacesData.java index ae3b097..6ec5873 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/SpacesData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/SpacesData.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SpacesData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/query/SeriesRequest.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/query/SeriesRequest.java index 526142c..f314b99 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/query/SeriesRequest.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/query/SeriesRequest.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingPeriod; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesRequest implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJob.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJob.java index 8caba7e..213848e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJob.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJob.java @@ -4,8 +4,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.job.Serie /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesJob extends SeriesResponse { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortlet.java index 3bbac59..422090d 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortlet.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortlet.java @@ -4,8 +4,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.portlet.S /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesPortlet extends SeriesResponse { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesResponse.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesResponse.java index d4f3fcd..0f962b7 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesResponse.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesResponse.java @@ -4,16 +4,15 @@ import java.io.Serializable; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ -public class SeriesResponse implements Serializable{ - +public class SeriesResponse implements Serializable { + private static final long serialVersionUID = -2746968605225884841L; - public SeriesResponse(){ + public SeriesResponse() { super(); } - + } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesService.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesService.java index f135b69..2c38e57 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesService.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesService.java @@ -4,8 +4,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.service.S /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesService extends SeriesResponse { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesSpace.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesSpace.java index dda4dce..b65fc83 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesSpace.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesSpace.java @@ -4,8 +4,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.space.Ser /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesSpace extends SeriesResponse { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorage.java index 44ce166..69516e0 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorage.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorage.java @@ -4,8 +4,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.storage.S /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesStorage extends SeriesResponse { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTask.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTask.java index d47ae62..3adaedc 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTask.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTask.java @@ -4,8 +4,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.response.task.Seri /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesTask extends SeriesResponse { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobBasic.java index 3c2f704..a820aa5 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobBasic.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesJobBasic extends SeriesJobDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobContext.java index 52e764c..f4ebe59 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobContext.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.Context; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesJobContext extends SeriesJobDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobData.java index d9bbd8f..50c46d2 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobData.java @@ -5,8 +5,8 @@ import java.util.Date; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesJobData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDataContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDataContext.java index 12cca47..62e858d 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDataContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDataContext.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesJobDataContext implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDataTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDataTop.java index 8d8b00e..6b73c2b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDataTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDataTop.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.FilterValue; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesJobDataTop implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDefinition.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDefinition.java index cce0701..ba0b09e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDefinition.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobDefinition.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesJobDefinition implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobTop.java index 41e481c..e789c23 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/job/SeriesJobTop.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesJobTop extends SeriesJobDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletBasic.java index 0b0ecec..98d1d0b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletBasic.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesPortletBasic extends SeriesPortletDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletContext.java index fbb4ee6..18e4980 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletContext.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.Context; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesPortletContext extends SeriesPortletDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDataContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDataContext.java index 62ff394..d8bbb1e 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDataContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDataContext.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesPortletDataContext implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDataTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDataTop.java index 9f13d17..56a85d9 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDataTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDataTop.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.FilterValue; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesPortletDataTop implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDefinition.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDefinition.java index 248eadf..6317641 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDefinition.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletDefinition.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesPortletDefinition implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletTop.java index 5d52f97..d2c23ca 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/portlet/SeriesPortletTop.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesPortletTop extends SeriesPortletDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceBasic.java index df73296..74e26f1 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceBasic.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesServiceBasic extends SeriesServiceDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceContext.java index ae5d3f0..18297ef 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceContext.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.Context; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesServiceContext extends SeriesServiceDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceData.java index dad1000..d6a2761 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceData.java @@ -5,8 +5,8 @@ import java.util.Date; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesServiceData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDataContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDataContext.java index 4f85ef7..24b1c47 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDataContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDataContext.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesServiceDataContext implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDataTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDataTop.java index c06f6b3..df2002c 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDataTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDataTop.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.FilterValue; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesServiceDataTop implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDefinition.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDefinition.java index 4165cb4..dbc7809 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDefinition.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceDefinition.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesServiceDefinition implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceTop.java index 1c8b705..e061c16 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/service/SeriesServiceTop.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesServiceTop extends SeriesServiceDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceData.java index 010e497..a42f5fb 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceData.java @@ -5,8 +5,8 @@ import java.util.Date; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesSpaceData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceDataSpaces.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceDataSpaces.java index fdc86cb..68595ee 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceDataSpaces.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceDataSpaces.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesSpaceDataSpaces implements Serializable { @@ -22,7 +22,9 @@ public class SeriesSpaceDataSpaces implements Serializable { /** * * @param space + * space * @param series + * array list of series space data */ public SeriesSpaceDataSpaces(String space, ArrayList series) { super(); @@ -48,8 +50,7 @@ public class SeriesSpaceDataSpaces implements Serializable { @Override public String toString() { - return "SeriesSpaceDataSpaces [space=" + space + ", series=" + series - + "]"; + return "SeriesSpaceDataSpaces [space=" + space + ", series=" + series + "]"; } } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceDefinition.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceDefinition.java index 2947417..e53e76d 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceDefinition.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceDefinition.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesSpaceDefinition implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceSpaces.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceSpaces.java index bdecb1f..120e7b8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceSpaces.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/space/SeriesSpaceSpaces.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.Spaces; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesSpaceSpaces extends SeriesSpaceDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageBasic.java index 613342b..ae08d96 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageBasic.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesStorageBasic extends SeriesStorageDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageContext.java index 1dc595e..f12ab07 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageContext.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.Context; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesStorageContext extends SeriesStorageDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageData.java index 384d47b..79277c1 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageData.java @@ -5,8 +5,8 @@ import java.util.Date; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesStorageData implements Serializable { @@ -23,9 +23,9 @@ public class SeriesStorageData implements Serializable { /** * - * @param date - * @param dataVolume - * @param operationCount + * @param date data + * @param dataVolume data volume + * @param operationCount operation count */ public SeriesStorageData(Date date, Long dataVolume, Long operationCount) { super(); diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDataContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDataContext.java index 02a13e7..875975b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDataContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDataContext.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesStorageDataContext implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDataTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDataTop.java index e675a48..ad77496 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDataTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDataTop.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.FilterValue; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesStorageDataTop implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDefinition.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDefinition.java index e9caa72..429a117 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDefinition.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageDefinition.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesStorageDefinition implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageTop.java index 43c9f5b..37d9991 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/storage/SeriesStorageTop.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesStorageTop extends SeriesStorageDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskBasic.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskBasic.java index 2f078e6..534c0eb 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskBasic.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskBasic.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesTaskBasic extends SeriesTaskDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskContext.java index 399e37a..0319dbf 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskContext.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.Context; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesTaskContext extends SeriesTaskDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskData.java index 015dba3..320510a 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskData.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskData.java @@ -5,8 +5,8 @@ import java.util.Date; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesTaskData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDataContext.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDataContext.java index 3b80fd9..cbe5369 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDataContext.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDataContext.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesTaskDataContext implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDataTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDataTop.java index b396107..0f88372 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDataTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDataTop.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.FilterValue; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesTaskDataTop implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDefinition.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDefinition.java index 188e184..04ba28b 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDefinition.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskDefinition.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesTaskDefinition implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskTop.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskTop.java index 8c8f1f4..3a44ba8 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskTop.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/task/SeriesTaskTop.java @@ -6,8 +6,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.ChartType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SeriesTaskTop extends SeriesTaskDefinition { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/ChartDrawException.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/ChartDrawException.java index ee2e0e6..27d3e22 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/ChartDrawException.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/ChartDrawException.java @@ -5,16 +5,14 @@ package org.gcube.portlets.admin.accountingmanager.shared.exception; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ChartDrawException extends Exception { - private static final long serialVersionUID = -8737011216478988776L; - /** * */ @@ -24,15 +22,14 @@ public class ChartDrawException extends Exception { /** * @param message + * message */ public ChartDrawException(String message) { super(message); } - - - public ChartDrawException(String message,Throwable t) { - super(message,t); + + public ChartDrawException(String message, Throwable t) { + super(message, t); } - } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/ServiceException.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/ServiceException.java index b50de9f..dcf4aa0 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/ServiceException.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/ServiceException.java @@ -5,16 +5,14 @@ package org.gcube.portlets.admin.accountingmanager.shared.exception; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ServiceException extends Exception { - private static final long serialVersionUID = -2255657546267656458L; - /** * */ @@ -24,15 +22,14 @@ public class ServiceException extends Exception { /** * @param message + * message */ public ServiceException(String message) { super(message); } - - - public ServiceException(String message,Throwable t) { - super(message,t); + + public ServiceException(String message, Throwable t) { + super(message, t); } - } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/SessionExpiredException.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/SessionExpiredException.java index 96cd989..16c3ac6 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/SessionExpiredException.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/SessionExpiredException.java @@ -1,12 +1,12 @@ package org.gcube.portlets.admin.accountingmanager.shared.exception; /** - * ASL Session Expired Exception + * * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * */ -public class SessionExpiredException extends ServiceException { +public class SessionExpiredException extends ServiceException { private static final long serialVersionUID = -4831171355042165166L; @@ -19,18 +19,21 @@ public class SessionExpiredException extends ServiceException { /** * @param message + * message */ public SessionExpiredException(String message) { super(message); } - + /** * * @param message - * @param t + * message + * @param throwable + * exception */ - public SessionExpiredException(String message,Throwable t) { - super(message,t); + public SessionExpiredException(String message, Throwable throwable) { + super(message, throwable); } - + } diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/export/ExportType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/export/ExportType.java index 9c47427..37b9909 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/export/ExportType.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/export/ExportType.java @@ -5,8 +5,8 @@ package org.gcube.portlets.admin.accountingmanager.shared.export; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ExportType { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/session/UserInfo.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/session/UserInfo.java index b5ca231..9a13afd 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/session/UserInfo.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/session/UserInfo.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UserInfo implements Serializable { @@ -25,13 +25,12 @@ public class UserInfo implements Serializable { /** * - * @param username - * @param groupId - * @param groupName - * @param scope - * @param scopeName - * @param userEmailAddress - * @param userFullName + * @param username user name + * @param groupId group id + * @param groupName group name + * @param scope scope + * @param userEmailAddress email + * @param userFullName full name */ public UserInfo(String username, String groupId, String groupName, String scope, String userEmailAddress, String userFullName) { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTab.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTab.java index 2e36595..d4e4eda 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTab.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTab.java @@ -7,8 +7,8 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class EnableTab implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTabs.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTabs.java index 522662e..951b00d 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTabs.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTabs.java @@ -5,8 +5,8 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class EnableTabs implements Serializable { diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/workspace/ItemDescription.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/workspace/ItemDescription.java index a9a05c2..912ba6a 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/workspace/ItemDescription.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/workspace/ItemDescription.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ItemDescription implements Serializable { @@ -84,8 +84,8 @@ public class ItemDescription implements Serializable { /** * Compare basic information with another ItemDescription not null * - * @param itemDescription - * @return boolean + * @param itemDescription item description + * @return boolean true if item description match * */ public boolean compareInfo(ItemDescription itemDescription){ diff --git a/src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingMananger.java b/src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingMananger.java index d4a896f..7faf1e9 100644 --- a/src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingMananger.java +++ b/src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingMananger.java @@ -13,8 +13,8 @@ import org.slf4j.LoggerFactory; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TestAccountingMananger extends TestCase { diff --git a/src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingManangerCache.java b/src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingManangerCache.java index e593372..9fcf1b4 100644 --- a/src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingManangerCache.java +++ b/src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingManangerCache.java @@ -13,8 +13,8 @@ import org.slf4j.LoggerFactory; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TestAccountingManangerCache extends TestCase {