Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@95288 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-05-02 08:16:44 +00:00
parent b811d2fa25
commit 28b8e7b5c9
21 changed files with 198 additions and 16 deletions

View File

@ -3016,3 +3016,35 @@ Compiling...
Compilation completed in 0.00 seconds Compilation completed in 0.00 seconds
Removing invalidated units Removing invalidated units
Finding entry point classes Finding entry point classes
Public resources found in...
Translatable source found in...
Found 0 cached/archived units. Used 0 / 2719 units from cache.
Compiling...
60% complete (ETR: 3 seconds)
60% complete (ETR: 3 seconds)
60% complete (ETR: 3 seconds)
60% complete (ETR: 3 seconds)
60% complete (ETR: 3 seconds)
60% complete (ETR: 3 seconds)
60% complete (ETR: 3 seconds)
70% complete (ETR: 2 seconds)
80% complete (ETR: 1 seconds)
90% complete (ETR: 1 seconds)
100% complete (ETR: 0 seconds)
Compilation completed in 10.49 seconds
Removing invalidated units
Finding entry point classes
Public resources found in...
Translatable source found in...
Found 2719 cached/archived units. Used 2719 / 2719 units from cache.
Compiling...
Compilation completed in 0.00 seconds
Removing invalidated units
Finding entry point classes
Public resources found in...
Translatable source found in...
Found 2719 cached/archived units. Used 2719 / 2719 units from cache.
Compiling...
Compilation completed in 0.00 seconds
Removing invalidated units
Finding entry point classes

View File

@ -42,18 +42,21 @@ public class ChangeColumnTypeProgressBarUpdater implements ChangeColumnTypeProgr
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public void operationFailed(Throwable caught, String reason, String failureDetails) { public void operationFailed(Throwable caught, String reason, String failureDetails) {
Log.info("Failed"); Log.info("Failed");
progressBar.updateText("Failed"); progressBar.updateText("Failed");
} }
@Override
public void operationInitializing() { public void operationInitializing() {
Log.info("Inizializing"); Log.info("Inizializing");
progressBar.updateProgress(0, "Initializing..."); progressBar.updateProgress(0, "Initializing...");
} }
@Override
public void operationUpdate(float elaborated) { public void operationUpdate(float elaborated) {
Log.info("Import elaborated: "+elaborated); Log.info("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);
@ -64,6 +67,18 @@ public class ChangeColumnTypeProgressBarUpdater implements ChangeColumnTypeProgr
} }
@Override
public void operationValidate(float elaborated) {
Log.info("Validation Elaborated: "+elaborated);
if (elaborated == 0) progressBar.updateProgress(0, "Start Validation...");
if (elaborated>0 && elaborated<1) {
Log.trace("Validation progress "+elaborated);
int elab=new Float(elaborated*100).intValue();
progressBar.updateProgress(elaborated,elab+"% Validation Progress...");
}
if (elaborated == 1) progressBar.updateProgress(1, "Validation...");
}
@Override @Override
public void operationStopped(TRId trId,String reason, String details) { public void operationStopped(TRId trId,String reason, String details) {
Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]");
@ -79,4 +94,7 @@ public class ChangeColumnTypeProgressBarUpdater implements ChangeColumnTypeProgr
} }
} }

View File

@ -133,4 +133,10 @@ public class ChangeColumnTypeProgressDialog extends Window implements ChangeColu
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void operationValidate(float elaborated) {
// TODO Auto-generated method stub
}
} }

View File

@ -27,6 +27,13 @@ public interface ChangeColumnTypeProgressListener {
public void operationUpdate(float elaborated); public void operationUpdate(float elaborated);
/**
* Called when there is a validate for the operation.
* @param elaborated the elaborated part.
*/
public void operationValidate(float elaborated);
/** /**
* Called when the operation is complete. * Called when the operation is complete.
*/ */

View File

@ -58,8 +58,7 @@ public class ChangeColumnTypeProgressUpdater extends Timer {
fireOperationUpdate(result.getProgress()); fireOperationUpdate(result.getProgress());
break; break;
case VALIDATING_RULES: case VALIDATING_RULES:
Log.info("Validating Rules..."); fireOperationValidate(result.getProgress());
fireOperationUpdate(result.getProgress());
break; break;
case GENERATING_VIEW: case GENERATING_VIEW:
Log.info("Generating View..."); Log.info("Generating View...");
@ -147,6 +146,11 @@ public class ChangeColumnTypeProgressUpdater extends Timer {
listener.operationUpdate(elaborated); listener.operationUpdate(elaborated);
} }
protected void fireOperationValidate(float elaborated) {
for (ChangeColumnTypeProgressListener listener : listeners)
listener.operationValidate(elaborated);
}
protected void fireOperationComplete(TRId trId) { protected void fireOperationComplete(TRId trId) {
for (ChangeColumnTypeProgressListener listener : listeners) for (ChangeColumnTypeProgressListener listener : listeners)
listener.operationComplete(trId); listener.operationComplete(trId);

View File

@ -53,7 +53,7 @@ public class DeleteColumnProgressBarUpdater implements DeleteColumnProgressListe
} }
public void operationUpdate(float elaborated) { public void operationUpdate(float elaborated) {
Log.info("Import elaborated: "+elaborated); Log.info("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);
@ -64,6 +64,20 @@ public class DeleteColumnProgressBarUpdater implements DeleteColumnProgressListe
} }
@Override
public void operationValidate(float elaborated) {
Log.info("Validation Elaborated: "+elaborated);
if (elaborated == 0) progressBar.updateProgress(0, "Start Validation...");
if (elaborated>0 && elaborated<1) {
Log.trace("Validation progress "+elaborated);
int elab=new Float(elaborated*100).intValue();
progressBar.updateProgress(elaborated,elab+"% Validation Progress...");
}
if (elaborated == 1) progressBar.updateProgress(1, "Validation...");
}
@Override @Override
public void operationStopped(TRId trId,String reason, String details) { public void operationStopped(TRId trId,String reason, String details) {
Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]");

View File

@ -134,4 +134,10 @@ public class DeleteColumnProgressDialog extends Window implements DeleteColumnPr
} }
@Override
public void operationValidate(float elaborated) {
// TODO Auto-generated method stub
}
} }

View File

@ -28,6 +28,13 @@ public interface DeleteColumnProgressListener {
public void operationUpdate(float elaborated); public void operationUpdate(float elaborated);
/**
* Called when there is a validate for the operation.
* @param elaborated the elaborated part.
*/
public void operationValidate(float elaborated);
/** /**
* Called when the operation is complete. * Called when the operation is complete.
*/ */

View File

@ -59,8 +59,7 @@ public class DeleteColumnProgressUpdater extends Timer {
fireOperationUpdate(result.getProgress()); fireOperationUpdate(result.getProgress());
break; break;
case VALIDATING_RULES: case VALIDATING_RULES:
Log.info("Validating Rules..."); fireOperationValidate(result.getProgress());
fireOperationUpdate(result.getProgress());
break; break;
case GENERATING_VIEW: case GENERATING_VIEW:
Log.info("Generating View..."); Log.info("Generating View...");
@ -151,6 +150,11 @@ public class DeleteColumnProgressUpdater extends Timer {
listener.operationUpdate(elaborated); listener.operationUpdate(elaborated);
} }
protected void fireOperationValidate(float elaborated) {
for (DeleteColumnProgressListener listener : listeners)
listener.operationValidate(elaborated);
}
protected void fireOperationComplete(TRId trId) { protected void fireOperationComplete(TRId trId) {
for (DeleteColumnProgressListener listener : listeners) for (DeleteColumnProgressListener listener : listeners)
listener.operationComplete(trId); listener.operationComplete(trId);

View File

@ -53,7 +53,7 @@ public class LabelColumnProgressBarUpdater implements LabelColumnProgressListene
} }
public void operationUpdate(float elaborated) { public void operationUpdate(float elaborated) {
Log.info("Import elaborated: "+elaborated); Log.info("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);
@ -64,6 +64,18 @@ public class LabelColumnProgressBarUpdater implements LabelColumnProgressListene
} }
@Override
public void operationValidate(float elaborated) {
Log.info("Validation Elaborated: "+elaborated);
if (elaborated == 0) progressBar.updateProgress(0, "Start Validation...");
if (elaborated>0 && elaborated<1) {
Log.trace("Validation progress "+elaborated);
int elab=new Float(elaborated*100).intValue();
progressBar.updateProgress(elaborated,elab+"% Validation Progress...");
}
if (elaborated == 1) progressBar.updateProgress(1, "Validation...");
}
@Override @Override
public void operationStopped(TRId trId,String reason, String details) { public void operationStopped(TRId trId,String reason, String details) {
Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]");

View File

@ -134,4 +134,10 @@ public class LabelColumnProgressDialog extends Window implements LabelColumnProg
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void operationValidate(float elaborated) {
// TODO Auto-generated method stub
}
} }

View File

@ -28,6 +28,13 @@ public interface LabelColumnProgressListener {
public void operationUpdate(float elaborated); public void operationUpdate(float elaborated);
/**
* Called when there is a validate for the operation.
* @param elaborated the elaborated part.
*/
public void operationValidate(float elaborated);
/** /**
* Called when the operation is complete. * Called when the operation is complete.
*/ */

View File

@ -59,8 +59,7 @@ public class LabelColumnProgressUpdater extends Timer {
fireOperationUpdate(result.getProgress()); fireOperationUpdate(result.getProgress());
break; break;
case VALIDATING_RULES: case VALIDATING_RULES:
Log.info("Validating Rules..."); fireOperationValidate(result.getProgress());
fireOperationUpdate(result.getProgress());
break; break;
case GENERATING_VIEW: case GENERATING_VIEW:
Log.info("Generating View..."); Log.info("Generating View...");
@ -151,6 +150,11 @@ public class LabelColumnProgressUpdater extends Timer {
listener.operationUpdate(elaborated); listener.operationUpdate(elaborated);
} }
protected void fireOperationValidate(float elaborated) {
for (LabelColumnProgressListener listener : listeners)
listener.operationValidate(elaborated);
}
protected void fireOperationComplete(TRId trId) { protected void fireOperationComplete(TRId trId) {
for (LabelColumnProgressListener listener : listeners) for (LabelColumnProgressListener listener : listeners)
listener.operationComplete(trId); listener.operationComplete(trId);

View File

@ -53,7 +53,7 @@ public class ReplaceBatchColumnProgressBarUpdater implements ReplaceBatchColumnP
} }
public void operationUpdate(float elaborated) { public void operationUpdate(float elaborated) {
Log.info("Import elaborated: "+elaborated); Log.info("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);
@ -64,6 +64,18 @@ public class ReplaceBatchColumnProgressBarUpdater implements ReplaceBatchColumnP
} }
@Override
public void operationValidate(float elaborated) {
Log.info("Validation Elaborated: "+elaborated);
if (elaborated == 0) progressBar.updateProgress(0, "Start Validation...");
if (elaborated>0 && elaborated<1) {
Log.trace("Validation progress "+elaborated);
int elab=new Float(elaborated*100).intValue();
progressBar.updateProgress(elaborated,elab+"% Validation Progress...");
}
if (elaborated == 1) progressBar.updateProgress(1, "Validation...");
}
@Override @Override
public void operationStopped(TRId trId,String reason, String details) { public void operationStopped(TRId trId,String reason, String details) {
Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]");

View File

@ -136,4 +136,10 @@ public class ReplaceBatchColumnProgressDialog extends Window implements ReplaceB
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void operationValidate(float elaborated) {
// TODO Auto-generated method stub
}
} }

View File

@ -27,6 +27,11 @@ public interface ReplaceBatchColumnProgressListener {
*/ */
public void operationUpdate(float elaborated); public void operationUpdate(float elaborated);
/**
* Called when there is a validate for the operation.
* @param elaborated the elaborated part.
*/
public void operationValidate(float elaborated);
/** /**
* Called when the operation is complete. * Called when the operation is complete.

View File

@ -59,8 +59,7 @@ public class ReplaceBatchColumnProgressUpdater extends Timer {
fireOperationUpdate(result.getProgress()); fireOperationUpdate(result.getProgress());
break; break;
case VALIDATING_RULES: case VALIDATING_RULES:
Log.info("Validating Rules..."); fireOperationValidate(result.getProgress());
fireOperationUpdate(result.getProgress());
break; break;
case GENERATING_VIEW: case GENERATING_VIEW:
Log.info("Generating View..."); Log.info("Generating View...");
@ -150,6 +149,11 @@ public class ReplaceBatchColumnProgressUpdater extends Timer {
listener.operationUpdate(elaborated); listener.operationUpdate(elaborated);
} }
protected void fireOperationValidate(float elaborated) {
for (ReplaceBatchColumnProgressListener listener : listeners)
listener.operationValidate(elaborated);
}
protected void fireOperationComplete(TRId trId) { protected void fireOperationComplete(TRId trId) {
for (ReplaceBatchColumnProgressListener listener : listeners) for (ReplaceBatchColumnProgressListener listener : listeners)
listener.operationComplete(trId); listener.operationComplete(trId);

View File

@ -64,6 +64,19 @@ public class ReplaceColumnProgressBarUpdater implements ReplaceColumnProgressLis
} }
@Override
public void operationValidate(float elaborated) {
Log.info("Validation Elaborated: "+elaborated);
if (elaborated == 0) progressBar.updateProgress(0, "Start Validation...");
if (elaborated>0 && elaborated<1) {
Log.trace("Validation progress "+elaborated);
int elab=new Float(elaborated*100).intValue();
progressBar.updateProgress(elaborated,elab+"% Validation Progress...");
}
if (elaborated == 1) progressBar.updateProgress(1, "Validation...");
}
@Override @Override
public void operationStopped(TRId trId,String reason, String details) { public void operationStopped(TRId trId,String reason, String details) {
Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]");

View File

@ -136,4 +136,10 @@ public class ReplaceColumnProgressDialog extends Window implements ReplaceColumn
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void operationValidate(float elaborated) {
// TODO Auto-generated method stub
}
} }

View File

@ -27,6 +27,11 @@ public interface ReplaceColumnProgressListener {
*/ */
public void operationUpdate(float elaborated); public void operationUpdate(float elaborated);
/**
* Called when there is a validate for the operation.
* @param elaborated the elaborated part.
*/
public void operationValidate(float elaborated);
/** /**
* Called when the operation is complete. * Called when the operation is complete.

View File

@ -59,8 +59,7 @@ public class ReplaceColumnProgressUpdater extends Timer {
fireOperationUpdate(result.getProgress()); fireOperationUpdate(result.getProgress());
break; break;
case VALIDATING_RULES: case VALIDATING_RULES:
Log.info("Validating Rules..."); fireOperationValidate(result.getProgress());
fireOperationUpdate(result.getProgress());
break; break;
case GENERATING_VIEW: case GENERATING_VIEW:
Log.info("Generating View..."); Log.info("Generating View...");
@ -150,6 +149,11 @@ public class ReplaceColumnProgressUpdater extends Timer {
listener.operationUpdate(elaborated); listener.operationUpdate(elaborated);
} }
protected void fireOperationValidate(float elaborated) {
for (ReplaceColumnProgressListener listener : listeners)
listener.operationValidate(elaborated);
}
protected void fireOperationComplete(TRId trId) { protected void fireOperationComplete(TRId trId) {
for (ReplaceColumnProgressListener listener : listeners) for (ReplaceColumnProgressListener listener : listeners)
listener.operationComplete(trId); listener.operationComplete(trId);