Fixed wizard navigation

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-map-widget@101455 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-11-04 17:33:31 +00:00 committed by Giancarlo Panichi
parent 1e456a2985
commit b8863b21f5
4 changed files with 22 additions and 7 deletions

View File

@ -166,7 +166,7 @@ public class MapWidgetConfigCard extends WizardCard {
getWizardWindow().addCard(mapWidgetDetailCard); getWizardWindow().addCard(mapWidgetDetailCard);
getWizardWindow().nextCard(); getWizardWindow().nextCard();
} else { } else {
MapWidgetGeometrySelectionCard mapGeometrySeslectionCard = new MapWidgetGeometrySelectionCard( MapWidgetGeometrySelectionCard mapGeometrySeslectionCard = new MapWidgetGeometrySelectionCard(
mapCreationSession); mapCreationSession);
getWizardWindow().addCard(mapGeometrySeslectionCard); getWizardWindow().addCard(mapGeometrySeslectionCard);
getWizardWindow().nextCard(); getWizardWindow().nextCard();

View File

@ -240,6 +240,7 @@ public class MapWidgetDetailCard extends WizardCard {
getWizardWindow().setPreviousButtonCommand(sayPreviousCard); getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
getWizardWindow().setEnableNextButton(true); getWizardWindow().setEnableNextButton(true);
getWizardWindow().setEnableBackButton(true);
} }
@ -251,7 +252,7 @@ public class MapWidgetDetailCard extends WizardCard {
public void onHide(HideEvent event) { public void onHide(HideEvent event) {
getWizardWindow().setEnableNextButton(true); getWizardWindow().setEnableNextButton(true);
getWizardWindow().setEnableBackButton(false); getWizardWindow().setEnableBackButton(true);
} }
}; };

View File

@ -25,13 +25,13 @@ import com.sencha.gxt.widget.core.client.form.FormPanel;
public class MapWidgetGeometrySelectionCard extends WizardCard { public class MapWidgetGeometrySelectionCard extends WizardCard {
protected MapCreationSession mapCreationSession; protected MapCreationSession mapCreationSession;
private MapWidgetGeometrySelectionCard thisCard;
private GeometrySelectionGridPanel geometrySelectionGridPanel; private GeometrySelectionGridPanel geometrySelectionGridPanel;
public MapWidgetGeometrySelectionCard( public MapWidgetGeometrySelectionCard(
final MapCreationSession mapCreationSession) { final MapCreationSession mapCreationSession) {
super("Geometry Selection", ""); super("Geometry Selection", "");
this.thisCard=this;
if (mapCreationSession == null) { if (mapCreationSession == null) {
Log.error("MapCreationSession is null"); Log.error("MapCreationSession is null");
} }
@ -78,8 +78,22 @@ public class MapWidgetGeometrySelectionCard extends WizardCard {
} }
}; };
Command sayPreviousCard = new Command() {
public void execute() {
try {
getWizardWindow().previousCard();
getWizardWindow().removeCard(thisCard);
Log.info("Remove MapWidgetGeometrySelectionCard");
} catch (Exception e) {
Log.error("sayPreviousCard :" + e.getLocalizedMessage());
}
}
};
getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
getWizardWindow().setNextButtonCommand(sayNextCard); getWizardWindow().setNextButtonCommand(sayNextCard);
setEnableBackButton(true); setEnableBackButton(true);
setEnableNextButton(true); setEnableNextButton(true);
} }
@ -112,7 +126,7 @@ public class MapWidgetGeometrySelectionCard extends WizardCard {
protected void goNext() { protected void goNext() {
try { try {
MapWidgetDetailCard mapWidgetDetailCard = new MapWidgetDetailCard( MapWidgetDetailCard mapWidgetDetailCard = new MapWidgetDetailCard(
mapCreationSession); mapCreationSession);
getWizardWindow().addCard(mapWidgetDetailCard); getWizardWindow().addCard(mapWidgetDetailCard);
getWizardWindow().nextCard(); getWizardWindow().nextCard();

View File

@ -33,7 +33,7 @@ import com.sencha.gxt.widget.core.client.grid.Grid;
public class GeometrySelectionGridPanel extends ContentPanel implements public class GeometrySelectionGridPanel extends ContentPanel implements
HasSelectionHandlers<ColumnData> { HasSelectionHandlers<ColumnData> {
//private static final String GRID_WIDTH ="524px"; //private static final String GRID_WIDTH ="524px";
private static final String GRID_HEIGHT = "320px"; private static final String GRID_HEIGHT = "340px";
protected static final ColumnDataProperties props = GWT protected static final ColumnDataProperties props = GWT
.create(ColumnDataProperties.class); .create(ColumnDataProperties.class);
protected final CheckBoxSelectionModel<ColumnData> sm; protected final CheckBoxSelectionModel<ColumnData> sm;