Minor Updated
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-sdmx-export-widget@92262 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
dc7266564c
commit
ce493a3b4e
|
@ -47,11 +47,8 @@ public class SDMXTableDetailCard extends WizardCard {
|
||||||
protected TextField registryBaseUrl;
|
protected TextField registryBaseUrl;
|
||||||
protected TextField version;
|
protected TextField version;
|
||||||
|
|
||||||
|
|
||||||
protected TextButton checkButton;
|
protected TextButton checkButton;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public SDMXTableDetailCard(final SDMXExportSession exportSession) {
|
public SDMXTableDetailCard(final SDMXExportSession exportSession) {
|
||||||
super("SDMX Table Detail", "");
|
super("SDMX Table Detail", "");
|
||||||
|
|
||||||
|
@ -81,7 +78,6 @@ public class SDMXTableDetailCard extends WizardCard {
|
||||||
id.setValue(exportSession.getTabResource().getName());
|
id.setValue(exportSession.getTabResource().getName());
|
||||||
p.add(new FieldLabel(id, "Id"), new VerticalLayoutData(1, -1));
|
p.add(new FieldLabel(id, "Id"), new VerticalLayoutData(1, -1));
|
||||||
|
|
||||||
|
|
||||||
agencyName = new TextField();
|
agencyName = new TextField();
|
||||||
agencyName.setVisible(true);
|
agencyName.setVisible(true);
|
||||||
agencyName.setEmptyText("Enter Agency...");
|
agencyName.setEmptyText("Enter Agency...");
|
||||||
|
@ -92,13 +88,15 @@ public class SDMXTableDetailCard extends WizardCard {
|
||||||
registryBaseUrl = new TextField();
|
registryBaseUrl = new TextField();
|
||||||
registryBaseUrl.setVisible(false);
|
registryBaseUrl.setVisible(false);
|
||||||
registryBaseUrl.setEmptyText("Enter Registry URL...");
|
registryBaseUrl.setEmptyText("Enter Registry URL...");
|
||||||
String urlRegistry=((SDMXRegistrySource)exportSession.getSource()).getUrl();
|
String urlRegistry = ((SDMXRegistrySource) exportSession.getSource())
|
||||||
if(urlRegistry==null||urlRegistry.isEmpty()){
|
.getUrl();
|
||||||
|
if (urlRegistry == null || urlRegistry.isEmpty()) {
|
||||||
registryBaseUrl.setValue(null);
|
registryBaseUrl.setValue(null);
|
||||||
} else {
|
} else {
|
||||||
registryBaseUrl.setValue(urlRegistry);
|
registryBaseUrl.setValue(urlRegistry);
|
||||||
}
|
}
|
||||||
FieldLabel registryBaseUrlLabel = new FieldLabel(registryBaseUrl, "Registry URL");
|
FieldLabel registryBaseUrlLabel = new FieldLabel(registryBaseUrl,
|
||||||
|
"Registry URL");
|
||||||
registryBaseUrlLabel.setVisible(false);
|
registryBaseUrlLabel.setVisible(false);
|
||||||
p.add(registryBaseUrlLabel, new VerticalLayoutData(1, -1));
|
p.add(registryBaseUrlLabel, new VerticalLayoutData(1, -1));
|
||||||
|
|
||||||
|
@ -108,18 +106,15 @@ public class SDMXTableDetailCard extends WizardCard {
|
||||||
version.setValue("");
|
version.setValue("");
|
||||||
p.add(new FieldLabel(version, "Version"), new VerticalLayoutData(1, -1));
|
p.add(new FieldLabel(version, "Version"), new VerticalLayoutData(1, -1));
|
||||||
|
|
||||||
|
|
||||||
tableDetailPanel.add(form);
|
tableDetailPanel.add(form);
|
||||||
setContent(tableDetailPanel);
|
setContent(tableDetailPanel);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setup() {
|
public void setup() {
|
||||||
Command sayNextCard = new Command() {
|
Command sayNextCard = new Command() {
|
||||||
|
|
||||||
|
|
||||||
public void execute() {
|
public void execute() {
|
||||||
checkData();
|
checkData();
|
||||||
}
|
}
|
||||||
|
@ -158,8 +153,7 @@ public class SDMXTableDetailCard extends WizardCard {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (id.getValue() == null || id.getValue().isEmpty()
|
if (id.getValue() == null || id.getValue().isEmpty() || !id.isValid()
|
||||||
|| !id.isValid()
|
|
||||||
|| version.getValue() == null || version.getValue().isEmpty()
|
|| version.getValue() == null || version.getValue().isEmpty()
|
||||||
|| !version.isValid() || agencyName.getValue() == null
|
|| !version.isValid() || agencyName.getValue() == null
|
||||||
|| agencyName.getValue().isEmpty() || !agencyName.isValid()) {
|
|| agencyName.getValue().isEmpty() || !agencyName.isValid()) {
|
||||||
|
@ -168,11 +162,17 @@ public class SDMXTableDetailCard extends WizardCard {
|
||||||
d.addHideHandler(hideHandler);
|
d.addHideHandler(hideHandler);
|
||||||
d.show();
|
d.show();
|
||||||
} else {
|
} else {
|
||||||
id.setReadOnly(true);
|
if (!version.getValue().matches("[0-9]+\\.[0-9]+")) {
|
||||||
registryBaseUrl.setReadOnly(true);
|
d = new AlertMessageBox("Attention!", "Version must match the regular expression [0-9]+\\.[0-9]+");
|
||||||
version.setReadOnly(true);
|
d.addHideHandler(hideHandler);
|
||||||
agencyName.setReadOnly(true);
|
d.show();
|
||||||
goNext();
|
} else {
|
||||||
|
id.setReadOnly(true);
|
||||||
|
registryBaseUrl.setReadOnly(true);
|
||||||
|
version.setReadOnly(true);
|
||||||
|
agencyName.setReadOnly(true);
|
||||||
|
goNext();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue