gCubeSystem
/
tabular-data-csv-import-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor updated 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-csv-import-widget@84864 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-11-04 14:29:25 +00:00
parent df2d23bbf9
commit 8f7c0ba45f
4 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java
View File

@ -29,8 +29,6 @@ public class CSVImportProgressBarUpdater implements CSVImportProgressListener {
*/ */
public CSVImportProgressBarUpdater(ProgressBar progressBar) { public CSVImportProgressBarUpdater(ProgressBar progressBar) {
this.progressBar = progressBar; this.progressBar = progressBar;
//this.wizardWindow = w;
//this.operationResult = operationResult;
} }
@ -38,21 +36,9 @@ public class CSVImportProgressBarUpdater implements CSVImportProgressListener {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public void operationComplete(TRId trId) {// TODO Auto-generated method stub public void operationComplete(TRId trId) {
Log.info("Import complete"); Log.info("Import completed");
progressBar.updateProgress(1, "Import complete."); progressBar.updateProgress(1, "Import completed.");
/*final FlexTable descriptionResult = new FlexTable();
descriptionResult.setCellSpacing(10);
descriptionResult.setCellPadding(4);
descriptionResult.setBorderWidth(0);
descriptionResult.setText(0, 0, "Result: ");
descriptionResult.setText(0, 1, "Import complete");
operationResult.add(descriptionResult);
operationResult.setVisible(true);
*/
//wizardWindow.setEnableNextButton(true);
} }
@ -67,20 +53,20 @@ public class CSVImportProgressBarUpdater implements CSVImportProgressListener {
@Override @Override
public void operationInitializing() { public void operationInitializing() {
Log.info("Inport inizializing"); Log.info("Inport Inizializing");
progressBar.updateProgress(0, "initializing..."); progressBar.updateProgress(0, "Initializing...");
} }
@Override @Override
public void operationUpdate(float elaborated) { public void operationUpdate(float elaborated) {
Log.info("Import elaborated: "+elaborated); Log.info("Import elaborated: "+elaborated);
if (elaborated == 0) progressBar.updateProgress(0, "initializing..."); if (elaborated == 0) progressBar.updateProgress(0, "Initializing...");
if (elaborated>0 && elaborated<1) { if (elaborated>0 && elaborated<1) {
Log.trace("progress "+elaborated); Log.trace("progress "+elaborated);
int elab=new Float(elaborated*100).intValue(); int elab=new Float(elaborated*100).intValue();
progressBar.updateProgress(elaborated,elab+"% importing..."); progressBar.updateProgress(elaborated,elab+"% Importing...");
} }
if (elaborated == 1) progressBar.updateProgress(1, "completing..."); if (elaborated == 1) progressBar.updateProgress(1, "Completing...");
} }

9
src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressUpdater.java
View File

@ -47,11 +47,20 @@ public class CSVImportProgressUpdater extends Timer {
public void onSuccess(CSVImportMonitor result) { public void onSuccess(CSVImportMonitor result) {
Log.info("retrieved CSVImportMonitor: "+result.getStatus()); Log.info("retrieved CSVImportMonitor: "+result.getStatus());
switch (result.getStatus()) { switch (result.getStatus()) {
case INITIALIZING:
Log.info("CSV Import Initializing...");
fireOperationInitializing();
break;
case ABORTED:
cancel();
Log.info("CSV Import Operation Aborted");
break;
case IN_PROGRESS: case IN_PROGRESS:
fireOperationUpdate(result.getProgress()); fireOperationUpdate(result.getProgress());
break; break;
case FAILED: case FAILED:
cancel(); cancel();
Log.info("CSV Import Failed");
fireOperationFailed(result.getError() ,"Failed Client Library Import", result.getError().getLocalizedMessage()); fireOperationFailed(result.getError() ,"Failed Client Library Import", result.getError().getLocalizedMessage());
break; break;
case SUCCEDED: case SUCCEDED:

26
src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java
View File

@ -24,8 +24,6 @@ public class FileUploadProgressBarUpdater implements FileUploadProgressListener
*/ */
public FileUploadProgressBarUpdater(ProgressBar progressBar) { public FileUploadProgressBarUpdater(ProgressBar progressBar) {
this.progressBar = progressBar; this.progressBar = progressBar;
//this.wizardWindow = w;
//this.operationResult = operationResult;
} }
@ -33,21 +31,9 @@ public class FileUploadProgressBarUpdater implements FileUploadProgressListener
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public void operationComplete() {// TODO Auto-generated method stub public void operationComplete() {
Log.info("File upload complete"); Log.info("File upload complete");
progressBar.updateProgress(1, "File upload complete."); progressBar.updateProgress(1, "File upload completed.");
/*final FlexTable descriptionResult = new FlexTable();
descriptionResult.setCellSpacing(10);
descriptionResult.setCellPadding(4);
descriptionResult.setBorderWidth(0);
descriptionResult.setText(0, 0, "Result: ");
descriptionResult.setText(0, 1, "Import complete");
operationResult.add(descriptionResult);
operationResult.setVisible(true);
*/
//wizardWindow.setEnableNextButton(true);
} }
@ -63,19 +49,19 @@ public class FileUploadProgressBarUpdater implements FileUploadProgressListener
@Override @Override
public void operationInitializing() { public void operationInitializing() {
Log.info("File upload inizializing"); Log.info("File upload inizializing");
progressBar.updateProgress(0, "initializing..."); progressBar.updateProgress(0, "Initializing...");
} }
@Override @Override
public void operationUpdate(float elaborated) { public void operationUpdate(float elaborated) {
Log.info("File upload elaborated: "+elaborated); Log.info("File upload elaborated: "+elaborated);
if (elaborated == 0) progressBar.updateProgress(0, "initializing..."); if (elaborated == 0) progressBar.updateProgress(0, "Initializing...");
if (elaborated>0 && elaborated<1) { if (elaborated>0 && elaborated<1) {
Log.trace("progress "+elaborated); Log.trace("progress "+elaborated);
int elab=new Float(elaborated*100).intValue(); int elab=new Float(elaborated*100).intValue();
progressBar.updateProgress(elaborated,elab+"% uploading..."); progressBar.updateProgress(elaborated,elab+"% Uploading...");
} }
if (elaborated == 1) progressBar.updateProgress(1, "completing..."); if (elaborated == 1) progressBar.updateProgress(1, "Completed.");
} }

2
src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressCardUpdater.java
View File

@ -23,7 +23,7 @@ public class FileUploadProgressCardUpdater implements FileUploadProgressListener
@Override @Override
public void operationComplete() { public void operationComplete() {
Log.info("File upload complete"); Log.info("File upload completed");
} }