Fixed MonitorDetailPanel show
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-monitor-widget@100822 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
f87ca1acf0
commit
1ea254f2d0
|
@ -209,7 +209,6 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
btnAbort.setEnabled(false);
|
btnAbort.setEnabled(false);
|
||||||
fireRequestAborted();
|
fireRequestAborted();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void startBackground() {
|
protected void startBackground() {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
@ -234,8 +233,6 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public boolean isBackgroundBtnEnabled() {
|
public boolean isBackgroundBtnEnabled() {
|
||||||
if (btnBackground != null) {
|
if (btnBackground != null) {
|
||||||
return btnBackground.isEnabled();
|
return btnBackground.isEnabled();
|
||||||
|
@ -271,8 +268,12 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void monitorInitializing(OperationMonitor operationMonitor) {
|
public void monitorInitializing(OperationMonitor operationMonitor) {
|
||||||
if (monitorDetailPanel != null) {
|
try {
|
||||||
monitorDetailPanel.update(operationMonitor);
|
if (monitorDetailPanel != null) {
|
||||||
|
monitorDetailPanel.update(operationMonitor);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.debug(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
forceLayout();
|
forceLayout();
|
||||||
|
|
||||||
|
@ -280,16 +281,24 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void monitorUpdate(OperationMonitor operationMonitor) {
|
public void monitorUpdate(OperationMonitor operationMonitor) {
|
||||||
if (monitorDetailPanel != null) {
|
try {
|
||||||
monitorDetailPanel.update(operationMonitor);
|
if (monitorDetailPanel != null) {
|
||||||
|
monitorDetailPanel.update(operationMonitor);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.debug(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
forceLayout();
|
forceLayout();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void monitorComplete(TRId trId, OperationMonitor operationMonitor) {
|
public void monitorComplete(TRId trId, OperationMonitor operationMonitor) {
|
||||||
if (monitorDetailPanel != null) {
|
try {
|
||||||
monitorDetailPanel.update(operationMonitor);
|
if (monitorDetailPanel != null) {
|
||||||
|
monitorDetailPanel.update(operationMonitor);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.debug(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
Log.debug("Operation Complete return: " + trId.toString());
|
Log.debug("Operation Complete return: " + trId.toString());
|
||||||
this.trId = trId;
|
this.trId = trId;
|
||||||
|
@ -303,9 +312,13 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
@Override
|
@Override
|
||||||
public void monitorFailed(Throwable caught, String reason, String details,
|
public void monitorFailed(Throwable caught, String reason, String details,
|
||||||
OperationMonitor operationMonitor) {
|
OperationMonitor operationMonitor) {
|
||||||
if (monitorDetailPanel != null) {
|
try {
|
||||||
monitorDetailPanel.update(operationMonitor);
|
if (monitorDetailPanel != null) {
|
||||||
|
monitorDetailPanel.update(operationMonitor);
|
||||||
|
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.debug(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
forceLayout();
|
forceLayout();
|
||||||
if (caught instanceof TDGWTSessionExpiredException) {
|
if (caught instanceof TDGWTSessionExpiredException) {
|
||||||
|
@ -329,8 +342,12 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
@Override
|
@Override
|
||||||
public void monitorStopped(TRId trId, String reason, String details,
|
public void monitorStopped(TRId trId, String reason, String details,
|
||||||
OperationMonitor operationMonitor) {
|
OperationMonitor operationMonitor) {
|
||||||
if (monitorDetailPanel != null) {
|
try {
|
||||||
monitorDetailPanel.update(operationMonitor);
|
if (monitorDetailPanel != null) {
|
||||||
|
monitorDetailPanel.update(operationMonitor);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.debug(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
Log.debug("Operation Stopped: [" + trId.toString() + ", " + reason
|
Log.debug("Operation Stopped: [" + trId.toString() + ", " + reason
|
||||||
+ ", " + details + "]");
|
+ ", " + details + "]");
|
||||||
|
@ -345,8 +362,12 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void monitorGeneratingView(OperationMonitor operationMonitor) {
|
public void monitorGeneratingView(OperationMonitor operationMonitor) {
|
||||||
if (monitorDetailPanel != null) {
|
try {
|
||||||
monitorDetailPanel.update(operationMonitor);
|
if (monitorDetailPanel != null) {
|
||||||
|
monitorDetailPanel.update(operationMonitor);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.debug(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
forceLayout();
|
forceLayout();
|
||||||
|
|
||||||
|
@ -354,8 +375,12 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void monitorValidate(OperationMonitor operationMonitor) {
|
public void monitorValidate(OperationMonitor operationMonitor) {
|
||||||
if (monitorDetailPanel != null) {
|
try {
|
||||||
monitorDetailPanel.update(operationMonitor);
|
if (monitorDetailPanel != null) {
|
||||||
|
monitorDetailPanel.update(operationMonitor);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.debug(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
forceLayout();
|
forceLayout();
|
||||||
}
|
}
|
||||||
|
@ -372,7 +397,7 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
close();
|
close();
|
||||||
Log.debug("Request Background");
|
Log.debug("Request Background");
|
||||||
BackgroundRequestEvent e = new BackgroundRequestEvent(
|
BackgroundRequestEvent e = new BackgroundRequestEvent(
|
||||||
BackgroundRequestType.BACKGROUND);
|
BackgroundRequestType.BACKGROUND);
|
||||||
eventBus.fireEvent(e);
|
eventBus.fireEvent(e);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -401,11 +426,10 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
protected void fireOperationPutInBackground() {
|
protected void fireOperationPutInBackground() {
|
||||||
for (MonitorDialogListener listener : listeners)
|
for (MonitorDialogListener listener : listeners)
|
||||||
listener.operationPutInBackground();
|
listener.operationPutInBackground();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UI event Fire
|
||||||
//UI event Fire
|
|
||||||
protected void fireRequestAborted() {
|
protected void fireRequestAborted() {
|
||||||
for (MonitorDialogEventUIListener listener : monitorDialogEventUIListeners) {
|
for (MonitorDialogEventUIListener listener : monitorDialogEventUIListeners) {
|
||||||
listener.requestAborted();
|
listener.requestAborted();
|
||||||
|
@ -416,8 +440,7 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
for (MonitorDialogEventUIListener listener : monitorDialogEventUIListeners) {
|
for (MonitorDialogEventUIListener listener : monitorDialogEventUIListeners) {
|
||||||
listener.requestPutInBackground();
|
listener.requestPutInBackground();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -453,8 +476,12 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateOperationMonitor(OperationMonitor operationMonitor) {
|
public void updateOperationMonitor(OperationMonitor operationMonitor) {
|
||||||
if (monitorDetailPanel != null) {
|
try {
|
||||||
monitorDetailPanel.update(operationMonitor);
|
if (monitorDetailPanel != null) {
|
||||||
|
monitorDetailPanel.update(operationMonitor);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.debug(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
forceLayout();
|
forceLayout();
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@ import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorFolde
|
||||||
import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorTreeDataGenerator;
|
import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorTreeDataGenerator;
|
||||||
import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorValidationJobSDto;
|
import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorValidationJobSDto;
|
||||||
import org.gcube.portlets.user.td.monitorwidget.client.resources.ResourceBundle;
|
import org.gcube.portlets.user.td.monitorwidget.client.resources.ResourceBundle;
|
||||||
|
import org.gcube.portlets.user.td.monitorwidget.client.utils.UtilsGXT3;
|
||||||
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
|
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
|
||||||
|
|
||||||
import com.allen_sauer.gwt.log.client.Log;
|
import com.allen_sauer.gwt.log.client.Log;
|
||||||
|
@ -56,18 +57,16 @@ import com.sencha.gxt.widget.core.client.treegrid.TreeGrid;
|
||||||
public class MonitorBackgroundInfoPanel extends FramedPanel {
|
public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
protected static final String WIDTH = "618px";
|
protected static final String WIDTH = "618px";
|
||||||
protected static final String HEIGHT = "400px";
|
protected static final String HEIGHT = "400px";
|
||||||
protected static final String HEIGHTGRID ="290px";
|
protected static final String HEIGHTGRID = "290px";
|
||||||
|
|
||||||
protected static final int CC1WIDTH = 168;
|
protected static final int CC1WIDTH = 168;
|
||||||
protected static final int CC2WIDTH = 100;
|
protected static final int CC2WIDTH = 100;
|
||||||
protected static final int CC3WIDTH = 140;
|
protected static final int CC3WIDTH = 140;
|
||||||
protected static final int CC4WIDTH = 100;
|
protected static final int CC4WIDTH = 100;
|
||||||
|
|
||||||
protected MonitorBackgroundInfoDialog parent;
|
protected MonitorBackgroundInfoDialog parent;
|
||||||
protected MonitorBackgroundInfoPanel thisPanel;
|
protected MonitorBackgroundInfoPanel thisPanel;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected TRId trId;
|
protected TRId trId;
|
||||||
protected VerticalLayoutContainer con;
|
protected VerticalLayoutContainer con;
|
||||||
protected ValidationsTasksMetadata validationsTasksMetadata;
|
protected ValidationsTasksMetadata validationsTasksMetadata;
|
||||||
|
@ -89,12 +88,11 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public MonitorBackgroundInfoPanel(MonitorBackgroundInfoDialog parent,
|
public MonitorBackgroundInfoPanel(MonitorBackgroundInfoDialog parent,
|
||||||
OperationMonitor operationMonitor, EventBus eventBus) {
|
OperationMonitor operationMonitor, EventBus eventBus) {
|
||||||
super();
|
super();
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
this.operationMonitor=operationMonitor;
|
this.operationMonitor = operationMonitor;
|
||||||
this.eventBus = eventBus;
|
this.eventBus = eventBus;
|
||||||
forceLayoutOnResize = true;
|
forceLayoutOnResize = true;
|
||||||
init();
|
init();
|
||||||
|
@ -117,7 +115,6 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
store = new TreeStore<MonitorBaseDto>(new KeyProvider());
|
store = new TreeStore<MonitorBaseDto>(new KeyProvider());
|
||||||
|
|
||||||
addChildrensToStore();
|
addChildrensToStore();
|
||||||
|
|
||||||
|
|
||||||
ColumnConfig<MonitorBaseDto, String> cc1 = new ColumnConfig<MonitorBaseDto, String>(
|
ColumnConfig<MonitorBaseDto, String> cc1 = new ColumnConfig<MonitorBaseDto, String>(
|
||||||
new ToStringValueProvider<MonitorBaseDto>("task"), CC1WIDTH,
|
new ToStringValueProvider<MonitorBaseDto>("task"), CC1WIDTH,
|
||||||
|
@ -170,7 +167,7 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
}
|
}
|
||||||
}, CC2WIDTH, "Status");
|
}, CC2WIDTH, "Status");
|
||||||
cc2.setHeader("Status");
|
cc2.setHeader("Status");
|
||||||
|
|
||||||
ColumnConfig<MonitorBaseDto, String> cc3 = new ColumnConfig<MonitorBaseDto, String>(
|
ColumnConfig<MonitorBaseDto, String> cc3 = new ColumnConfig<MonitorBaseDto, String>(
|
||||||
new ValueProvider<MonitorBaseDto, String>() {
|
new ValueProvider<MonitorBaseDto, String>() {
|
||||||
|
|
||||||
|
@ -206,7 +203,7 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
}
|
}
|
||||||
}, CC3WIDTH, "Human Readble");
|
}, CC3WIDTH, "Human Readble");
|
||||||
cc3.setHeader("Human Readble");
|
cc3.setHeader("Human Readble");
|
||||||
|
|
||||||
ColumnConfig<MonitorBaseDto, Double> cc4 = new ColumnConfig<MonitorBaseDto, Double>(
|
ColumnConfig<MonitorBaseDto, Double> cc4 = new ColumnConfig<MonitorBaseDto, Double>(
|
||||||
new ValueProvider<MonitorBaseDto, Double>() {
|
new ValueProvider<MonitorBaseDto, Double>() {
|
||||||
|
|
||||||
|
@ -270,7 +267,7 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
tree.getView().setAutoExpandColumn(cc1);
|
tree.getView().setAutoExpandColumn(cc1);
|
||||||
tree.setHeight(HEIGHTGRID);
|
tree.setHeight(HEIGHTGRID);
|
||||||
tree.setAutoExpand(true);
|
tree.setAutoExpand(true);
|
||||||
|
|
||||||
IconProvider<MonitorBaseDto> iconProvider = new IconProvider<MonitorBaseDto>() {
|
IconProvider<MonitorBaseDto> iconProvider = new IconProvider<MonitorBaseDto>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -313,7 +310,6 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
ToolBar toolBar = new ToolBar();
|
ToolBar toolBar = new ToolBar();
|
||||||
|
|
||||||
TextButton btnExpandAll = new TextButton();
|
TextButton btnExpandAll = new TextButton();
|
||||||
|
@ -341,7 +337,7 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
toolBar.add(btnCollapseAll);
|
toolBar.add(btnCollapseAll);
|
||||||
|
|
||||||
//
|
//
|
||||||
btnClose = new TextButton("Close");
|
btnClose = new TextButton("Close");
|
||||||
btnClose.setWidth("70px");
|
btnClose.setWidth("70px");
|
||||||
|
@ -364,22 +360,18 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
flowButton.add(btnClose, new BoxLayoutData(new Margins(0, 4, 0, 4)));
|
flowButton.add(btnClose, new BoxLayoutData(new Margins(0, 4, 0, 4)));
|
||||||
|
|
||||||
//
|
//
|
||||||
con.add(toolBar, new VerticalLayoutData(1, -1, new Margins(0)));
|
con.add(toolBar, new VerticalLayoutData(1, -1, new Margins(0)));
|
||||||
con.add(tree, new VerticalLayoutData(1, -1, new Margins(0)));
|
con.add(tree, new VerticalLayoutData(1, -1, new Margins(0)));
|
||||||
con.add(flowButton,
|
con.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 5, 5,
|
||||||
new VerticalLayoutData(1, 36, new Margins(5, 5, 5, 5)));
|
5)));
|
||||||
|
|
||||||
add(con, new MarginData(0));
|
add(con, new MarginData(0));
|
||||||
|
|
||||||
forceLayout();
|
forceLayout();
|
||||||
tree.expandAll();
|
tree.expandAll();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected void close() {
|
protected void close() {
|
||||||
if (parent != null) {
|
if (parent != null) {
|
||||||
parent.close();
|
parent.close();
|
||||||
|
@ -387,42 +379,47 @@ public class MonitorBackgroundInfoPanel extends FramedPanel {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void addChildrensToStore() {
|
private void addChildrensToStore() {
|
||||||
gen = new MonitorTreeDataGenerator();
|
gen = new MonitorTreeDataGenerator();
|
||||||
try {
|
|
||||||
MonitorFolderDto root = gen.getRoot(operationMonitor);
|
MonitorFolderDto root = gen.getRoot(operationMonitor);
|
||||||
|
if (root != null) {
|
||||||
Log.debug("root childrens " + root.getChildrens().size());
|
Log.debug("root childrens " + root.getChildrens().size());
|
||||||
for (MonitorBaseDto base : root.getChildrens()) {
|
for (MonitorBaseDto base : root.getChildrens()) {
|
||||||
Log.debug("Check children: " + base);
|
try {
|
||||||
|
Log.debug("Check children: " + base);
|
||||||
|
|
||||||
store.add(base);
|
store.add(base);
|
||||||
if (base instanceof MonitorFolderDto) {
|
if (base instanceof MonitorFolderDto) {
|
||||||
processFolder((MonitorFolderDto) base);
|
processFolder((MonitorFolderDto) base);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.error("Error adding childrens to store :"
|
||||||
|
+ e.getLocalizedMessage());
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
} catch (Throwable e) {
|
} else {
|
||||||
Log.error("Error adding childrens to store :"
|
Log.error("Error generating the task informations");
|
||||||
+ e.getLocalizedMessage());
|
UtilsGXT3.alert("Error", "Error generating task informations");
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processFolder(MonitorFolderDto folder) {
|
private void processFolder(MonitorFolderDto folder) {
|
||||||
for (MonitorBaseDto child : folder.getChildrens()) {
|
for (MonitorBaseDto child : folder.getChildrens()) {
|
||||||
store.add(folder, child);
|
try {
|
||||||
if (child instanceof MonitorFolderDto) {
|
store.add(folder, child);
|
||||||
processFolder((MonitorFolderDto) child);
|
if (child instanceof MonitorFolderDto) {
|
||||||
|
processFolder((MonitorFolderDto) child);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.error("Error adding childrens to store :"
|
||||||
|
+ e.getLocalizedMessage());
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -12,6 +12,7 @@ import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorFolde
|
||||||
import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorTreeDataGenerator;
|
import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorTreeDataGenerator;
|
||||||
import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorValidationJobSDto;
|
import org.gcube.portlets.user.td.monitorwidget.client.details.tree.MonitorValidationJobSDto;
|
||||||
import org.gcube.portlets.user.td.monitorwidget.client.resources.ResourceBundle;
|
import org.gcube.portlets.user.td.monitorwidget.client.resources.ResourceBundle;
|
||||||
|
import org.gcube.portlets.user.td.monitorwidget.client.utils.UtilsGXT3;
|
||||||
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
|
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
|
||||||
|
|
||||||
import com.allen_sauer.gwt.log.client.Log;
|
import com.allen_sauer.gwt.log.client.Log;
|
||||||
|
@ -120,8 +121,8 @@ public class MonitorDetailPanel extends FramedPanel {
|
||||||
@Override
|
@Override
|
||||||
public void render(Context context, String value, SafeHtmlBuilder sb) {
|
public void render(Context context, String value, SafeHtmlBuilder sb) {
|
||||||
sb.appendHtmlConstant("<span title='"
|
sb.appendHtmlConstant("<span title='"
|
||||||
+ SafeHtmlUtils.htmlEscape(value) + "'>" + SafeHtmlUtils.htmlEscape(value)
|
+ SafeHtmlUtils.htmlEscape(value) + "'>"
|
||||||
+ "</span>");
|
+ SafeHtmlUtils.htmlEscape(value) + "</span>");
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -353,11 +354,15 @@ public class MonitorDetailPanel extends FramedPanel {
|
||||||
|
|
||||||
public void update(OperationMonitor operationMonitor) {
|
public void update(OperationMonitor operationMonitor) {
|
||||||
this.operationMonitor = operationMonitor;
|
this.operationMonitor = operationMonitor;
|
||||||
|
|
||||||
store.clear();
|
store.clear();
|
||||||
store.commitChanges();
|
store.commitChanges();
|
||||||
|
//con.remove(tree);
|
||||||
|
//con.add(tree, new VerticalLayoutData(1, -1, new Margins(0)));
|
||||||
addChildrensToStore();
|
addChildrensToStore();
|
||||||
store.commitChanges();
|
store.commitChanges();
|
||||||
tree.expandAll();
|
tree.expandAll();
|
||||||
|
|
||||||
forceLayout();
|
forceLayout();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -366,26 +371,42 @@ public class MonitorDetailPanel extends FramedPanel {
|
||||||
gen = new MonitorTreeDataGenerator();
|
gen = new MonitorTreeDataGenerator();
|
||||||
|
|
||||||
MonitorFolderDto root = gen.getRootNoTask(operationMonitor);
|
MonitorFolderDto root = gen.getRootNoTask(operationMonitor);
|
||||||
for (MonitorBaseDto base : root.getChildrens()) {
|
if (root != null) {
|
||||||
store.add(base);
|
for (MonitorBaseDto base : root.getChildrens()) {
|
||||||
if (base instanceof MonitorFolderDto) {
|
try {
|
||||||
processFolder(store, (MonitorFolderDto) base);
|
store.add(base);
|
||||||
|
if (base instanceof MonitorFolderDto) {
|
||||||
|
processFolder(store, (MonitorFolderDto) base);
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.error(e.getLocalizedMessage());
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
Log.error("Error generating the task informations");
|
||||||
|
UtilsGXT3.alert("Error", "Error generating task informations");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processFolder(TreeStore<MonitorBaseDto> store,
|
private void processFolder(TreeStore<MonitorBaseDto> store,
|
||||||
MonitorFolderDto folder) {
|
MonitorFolderDto folder) {
|
||||||
|
|
||||||
for (MonitorBaseDto child : folder.getChildrens()) {
|
for (MonitorBaseDto child : folder.getChildrens()) {
|
||||||
try {
|
try {
|
||||||
store.add(folder, child);
|
store.add(folder, child);
|
||||||
|
if (child instanceof MonitorFolderDto) {
|
||||||
|
processFolder(store, (MonitorFolderDto) child);
|
||||||
|
}
|
||||||
|
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
Log.error(e.getLocalizedMessage());
|
Log.error(e.getLocalizedMessage());
|
||||||
}
|
e.printStackTrace();
|
||||||
if (child instanceof MonitorFolderDto) {
|
|
||||||
processFolder(store, (MonitorFolderDto) child);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,88 +29,108 @@ public class MonitorTreeDataGenerator {
|
||||||
}
|
}
|
||||||
|
|
||||||
public MonitorFolderDto getRoot(OperationMonitor operationMonitor) {
|
public MonitorFolderDto getRoot(OperationMonitor operationMonitor) {
|
||||||
ArrayList<MonitorBaseDto> childrens = new ArrayList<MonitorBaseDto>();
|
root = null;
|
||||||
|
|
||||||
if (operationMonitor != null && operationMonitor.getTask() != null) {
|
try {
|
||||||
TaskS task = operationMonitor.getTask();
|
|
||||||
ArrayList<MonitorBaseDto> jobs = new ArrayList<MonitorBaseDto>();
|
|
||||||
for (JobS job : task.getJobs()) {
|
|
||||||
ArrayList<MonitorBaseDto> validations = new ArrayList<MonitorBaseDto>();
|
|
||||||
|
|
||||||
for (ValidationsJobS v : job.getValidationsJobS()) {
|
ArrayList<MonitorBaseDto> childrens = new ArrayList<MonitorBaseDto>();
|
||||||
MonitorValidationJobSDto validationDto = new MonitorValidationJobSDto(
|
|
||||||
task.getId() + "-" + job.getId() + "-" + v.getId(),
|
|
||||||
v.getWorkerState(), v.getProgress(),
|
|
||||||
v.getDescription(), v.getErrorMessage(),
|
|
||||||
v.getHumanReadableStatus(), job.getInvocation());
|
|
||||||
|
|
||||||
validations.add(validationDto);
|
if (operationMonitor != null && operationMonitor.getTask() != null) {
|
||||||
|
TaskS task = operationMonitor.getTask();
|
||||||
|
ArrayList<MonitorBaseDto> jobs = new ArrayList<MonitorBaseDto>();
|
||||||
|
for (JobS job : task.getJobs()) {
|
||||||
|
ArrayList<MonitorBaseDto> validations = new ArrayList<MonitorBaseDto>();
|
||||||
|
|
||||||
|
for (ValidationsJobS v : job.getValidationsJobS()) {
|
||||||
|
MonitorValidationJobSDto validationDto = new MonitorValidationJobSDto(
|
||||||
|
task.getId() + "-" + job.getId() + "-"
|
||||||
|
+ v.getId(), v.getWorkerState(),
|
||||||
|
v.getProgress(), v.getDescription(),
|
||||||
|
v.getErrorMessage(),
|
||||||
|
v.getHumanReadableStatus(), job.getInvocation());
|
||||||
|
|
||||||
|
validations.add(validationDto);
|
||||||
|
}
|
||||||
|
MonitorFolderDto foldJob = new MonitorFolderDto("job",
|
||||||
|
task.getId() + "-" + job.getId(),
|
||||||
|
job.getDescription(), job.getWorkerState()
|
||||||
|
.toString(), job.getHumaReadableStatus(),
|
||||||
|
job.getProgress(), validations);
|
||||||
|
jobs.add(foldJob);
|
||||||
|
}
|
||||||
|
MonitorFolderDto foldTask = new MonitorFolderDto("task",
|
||||||
|
task.getId(), operationMonitor.getOperationId()
|
||||||
|
.toString(), task.getState().toString(), "",
|
||||||
|
task.getProgress(), jobs);
|
||||||
|
if (task.getStartTime() != null) {
|
||||||
|
foldTask.setStartTime(sdf.format(task.getStartTime()));
|
||||||
|
}
|
||||||
|
if (task.getEndTime() != null) {
|
||||||
|
foldTask.setEndTime(sdf.format(task.getEndTime()));
|
||||||
}
|
}
|
||||||
MonitorFolderDto foldJob = new MonitorFolderDto("job",
|
|
||||||
task.getId() + "-" + job.getId(), job.getDescription(),
|
|
||||||
job.getWorkerState().toString(),
|
|
||||||
job.getHumaReadableStatus(), job.getProgress(),
|
|
||||||
validations);
|
|
||||||
jobs.add(foldJob);
|
|
||||||
}
|
|
||||||
MonitorFolderDto foldTask = new MonitorFolderDto("task",
|
|
||||||
task.getId(), operationMonitor.getOperationId().toString(),
|
|
||||||
task.getState().toString(), "", task.getProgress(),
|
|
||||||
jobs);
|
|
||||||
if(task.getStartTime()!=null){
|
|
||||||
foldTask.setStartTime(sdf.format(task.getStartTime()));
|
|
||||||
}
|
|
||||||
if(task.getEndTime()!=null){
|
|
||||||
foldTask.setEndTime(sdf.format(task.getEndTime()));
|
|
||||||
}
|
|
||||||
|
|
||||||
childrens.add(foldTask);
|
|
||||||
root = new MonitorFolderDto("root", "-1", "root", "root", "", 0,
|
|
||||||
childrens);
|
|
||||||
Log.debug("Generated root");
|
|
||||||
// printRecorsive(root);
|
|
||||||
|
|
||||||
} else {
|
childrens.add(foldTask);
|
||||||
root = new MonitorFolderDto("root", "-1", "root", "root", "", 0,
|
root = new MonitorFolderDto("root", "-1", "root", "root", "",
|
||||||
childrens);
|
0, childrens);
|
||||||
Log.debug("Generated root without childrens");
|
Log.debug("Generated root");
|
||||||
|
// printRecorsive(root);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
root = new MonitorFolderDto("root", "-1", "root", "root", "",
|
||||||
|
0, childrens);
|
||||||
|
Log.debug("Generated root without childrens");
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.error(e.getLocalizedMessage());
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MonitorFolderDto getRootNoTask(OperationMonitor operationMonitor) {
|
public MonitorFolderDto getRootNoTask(OperationMonitor operationMonitor) {
|
||||||
ArrayList<MonitorBaseDto> jobs = new ArrayList<MonitorBaseDto>();
|
root = null;
|
||||||
if (operationMonitor != null && operationMonitor.getTask() != null) {
|
|
||||||
TaskS task = operationMonitor.getTask();
|
|
||||||
for (JobS job : task.getJobs()) {
|
|
||||||
ArrayList<MonitorBaseDto> validations = new ArrayList<MonitorBaseDto>();
|
|
||||||
for (ValidationsJobS v : job.getValidationsJobS()) {
|
|
||||||
MonitorValidationJobSDto validationDto = new MonitorValidationJobSDto(
|
|
||||||
task.getId() + "-" + job.getId() + "-" + v.getId(),
|
|
||||||
v.getWorkerState(), v.getProgress(),
|
|
||||||
v.getDescription(), v.getErrorMessage(),
|
|
||||||
v.getHumanReadableStatus(), job.getInvocation());
|
|
||||||
|
|
||||||
validations.add(validationDto);
|
try {
|
||||||
|
|
||||||
|
ArrayList<MonitorBaseDto> jobs = new ArrayList<MonitorBaseDto>();
|
||||||
|
if (operationMonitor != null && operationMonitor.getTask() != null) {
|
||||||
|
TaskS task = operationMonitor.getTask();
|
||||||
|
for (JobS job : task.getJobs()) {
|
||||||
|
ArrayList<MonitorBaseDto> validations = new ArrayList<MonitorBaseDto>();
|
||||||
|
for (ValidationsJobS v : job.getValidationsJobS()) {
|
||||||
|
MonitorValidationJobSDto validationDto = new MonitorValidationJobSDto(
|
||||||
|
task.getId() + "-" + job.getId() + "-"
|
||||||
|
+ v.getId(), v.getWorkerState(),
|
||||||
|
v.getProgress(), v.getDescription(),
|
||||||
|
v.getErrorMessage(),
|
||||||
|
v.getHumanReadableStatus(), job.getInvocation());
|
||||||
|
|
||||||
|
validations.add(validationDto);
|
||||||
|
}
|
||||||
|
MonitorFolderDto foldJob = new MonitorFolderDto("job",
|
||||||
|
task.getId() + "-" + job.getId(),
|
||||||
|
job.getDescription(), job.getWorkerState()
|
||||||
|
.toString(), job.getHumaReadableStatus(),
|
||||||
|
job.getProgress(), validations);
|
||||||
|
jobs.add(foldJob);
|
||||||
}
|
}
|
||||||
MonitorFolderDto foldJob = new MonitorFolderDto("job",
|
|
||||||
task.getId() + "-" + job.getId(), job.getDescription(),
|
root = new MonitorFolderDto("root", "-1", "root", "root", "",
|
||||||
job.getWorkerState().toString(),
|
0, jobs);
|
||||||
job.getHumaReadableStatus(), job.getProgress(),
|
Log.debug("Generated root");
|
||||||
validations);
|
// printRecorsive(root);
|
||||||
jobs.add(foldJob);
|
|
||||||
|
} else {
|
||||||
|
root = new MonitorFolderDto("root", "-1", "root", "root", "",
|
||||||
|
0, jobs);
|
||||||
|
Log.debug("Generated root without childrens");
|
||||||
}
|
}
|
||||||
|
|
||||||
root = new MonitorFolderDto("root", "-1", "root", "root", "", 0,
|
} catch (Throwable e) {
|
||||||
jobs);
|
Log.error(e.getLocalizedMessage());
|
||||||
Log.debug("Generated root");
|
e.printStackTrace();
|
||||||
// printRecorsive(root);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
root = new MonitorFolderDto("root", "-1", "root", "root", "", 0,
|
|
||||||
jobs);
|
|
||||||
Log.debug("Generated root without childrens");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return root;
|
return root;
|
||||||
|
@ -118,61 +138,73 @@ public class MonitorTreeDataGenerator {
|
||||||
|
|
||||||
public MonitorFolderDto getRoot(
|
public MonitorFolderDto getRoot(
|
||||||
ArrayList<OperationMonitor> operationMonitorList) {
|
ArrayList<OperationMonitor> operationMonitorList) {
|
||||||
ArrayList<MonitorBaseDto> childrens = new ArrayList<MonitorBaseDto>();
|
root = null;
|
||||||
if (operationMonitorList != null && operationMonitorList.size() > 0) {
|
|
||||||
Log.debug("getRoot: "+operationMonitorList.size());
|
|
||||||
for (OperationMonitor operationMonitor : operationMonitorList) {
|
|
||||||
if (operationMonitor != null
|
|
||||||
&& operationMonitor.getTask() != null) {
|
|
||||||
Log.debug("getRoot: [TaskId="+operationMonitor.getTaskId()+"]");
|
|
||||||
TaskS task = operationMonitor.getTask();
|
|
||||||
ArrayList<MonitorBaseDto> jobs = new ArrayList<MonitorBaseDto>();
|
|
||||||
for (JobS job : task.getJobs()) {
|
|
||||||
ArrayList<MonitorBaseDto> validations = new ArrayList<MonitorBaseDto>();
|
|
||||||
|
|
||||||
for (ValidationsJobS v : job.getValidationsJobS()) {
|
try {
|
||||||
MonitorValidationJobSDto validationDto = new MonitorValidationJobSDto(
|
ArrayList<MonitorBaseDto> childrens = new ArrayList<MonitorBaseDto>();
|
||||||
task.getId() + "-" + job.getId() + "-"
|
if (operationMonitorList != null && operationMonitorList.size() > 0) {
|
||||||
+ v.getId(), v.getWorkerState(),
|
Log.debug("getRoot: " + operationMonitorList.size());
|
||||||
v.getProgress(), v.getDescription(),
|
for (OperationMonitor operationMonitor : operationMonitorList) {
|
||||||
v.getErrorMessage(),
|
if (operationMonitor != null
|
||||||
v.getHumanReadableStatus(),
|
&& operationMonitor.getTask() != null) {
|
||||||
job.getInvocation());
|
Log.debug("getRoot: [TaskId="
|
||||||
|
+ operationMonitor.getTaskId() + "]");
|
||||||
|
TaskS task = operationMonitor.getTask();
|
||||||
|
ArrayList<MonitorBaseDto> jobs = new ArrayList<MonitorBaseDto>();
|
||||||
|
for (JobS job : task.getJobs()) {
|
||||||
|
ArrayList<MonitorBaseDto> validations = new ArrayList<MonitorBaseDto>();
|
||||||
|
|
||||||
validations.add(validationDto);
|
for (ValidationsJobS v : job.getValidationsJobS()) {
|
||||||
|
MonitorValidationJobSDto validationDto = new MonitorValidationJobSDto(
|
||||||
|
task.getId() + "-" + job.getId() + "-"
|
||||||
|
+ v.getId(),
|
||||||
|
v.getWorkerState(), v.getProgress(),
|
||||||
|
v.getDescription(),
|
||||||
|
v.getErrorMessage(),
|
||||||
|
v.getHumanReadableStatus(),
|
||||||
|
job.getInvocation());
|
||||||
|
|
||||||
|
validations.add(validationDto);
|
||||||
|
}
|
||||||
|
MonitorFolderDto foldJob = new MonitorFolderDto(
|
||||||
|
"job", task.getId() + "-" + job.getId(),
|
||||||
|
job.getDescription(), job.getWorkerState()
|
||||||
|
.toString(),
|
||||||
|
job.getHumaReadableStatus(),
|
||||||
|
job.getProgress(), validations);
|
||||||
|
jobs.add(foldJob);
|
||||||
}
|
}
|
||||||
MonitorFolderDto foldJob = new MonitorFolderDto("job",
|
MonitorFolderDto foldTask = new MonitorFolderDto(
|
||||||
task.getId() + "-" + job.getId(),
|
"task", task.getId(), operationMonitor
|
||||||
job.getDescription(), job.getWorkerState()
|
.getOperationId().toString(), task
|
||||||
.toString(),
|
.getState().toString(), "",
|
||||||
job.getHumaReadableStatus(), job.getProgress(),
|
task.getProgress(), jobs);
|
||||||
validations);
|
if (task.getStartTime() != null) {
|
||||||
jobs.add(foldJob);
|
foldTask.setStartTime(sdf.format(task
|
||||||
|
.getStartTime()));
|
||||||
|
}
|
||||||
|
if (task.getEndTime() != null) {
|
||||||
|
foldTask.setEndTime(sdf.format(task.getEndTime()));
|
||||||
|
}
|
||||||
|
childrens.add(foldTask);
|
||||||
|
} else {
|
||||||
|
Log.debug("getRoot: operation null");
|
||||||
}
|
}
|
||||||
MonitorFolderDto foldTask = new MonitorFolderDto("task",
|
|
||||||
task.getId(), operationMonitor.getOperationId().toString(),
|
|
||||||
task.getState().toString(), "", task.getProgress(),
|
|
||||||
jobs);
|
|
||||||
if(task.getStartTime()!=null){
|
|
||||||
foldTask.setStartTime(sdf.format(task.getStartTime()));
|
|
||||||
}
|
|
||||||
if(task.getEndTime()!=null){
|
|
||||||
foldTask.setEndTime(sdf.format(task.getEndTime()));
|
|
||||||
}
|
|
||||||
childrens.add(foldTask);
|
|
||||||
} else {
|
|
||||||
Log.debug("getRoot: operation null");
|
|
||||||
}
|
}
|
||||||
|
Log.debug("childrens size:" + childrens.size());
|
||||||
|
root = new MonitorFolderDto("root", "-1", "root", "root", "",
|
||||||
|
0, childrens);
|
||||||
|
Log.debug("Generated root");
|
||||||
|
|
||||||
|
} else {
|
||||||
|
root = new MonitorFolderDto("root", "-1", "root", "root", "",
|
||||||
|
0, childrens);
|
||||||
|
Log.debug("Generated root without childrens");
|
||||||
}
|
}
|
||||||
Log.debug("childrens size:"+childrens.size());
|
|
||||||
root = new MonitorFolderDto("root", "-1", "root", "root",
|
} catch (Throwable e) {
|
||||||
"", 0, childrens);
|
Log.error(e.getLocalizedMessage());
|
||||||
Log.debug("Generated root");
|
e.printStackTrace();
|
||||||
|
|
||||||
} else {
|
|
||||||
root = new MonitorFolderDto("root", "-1", "root", "root",
|
|
||||||
"", 0, childrens);
|
|
||||||
Log.debug("Generated root without childrens");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return root;
|
return root;
|
||||||
|
|
Loading…
Reference in New Issue