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

Fixed button label on ChangeColumnTypePanel 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@119303 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-10-01 13:37:04 +00:00
parent 137dc165e2
commit 734bdb141c
9 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/tabular-data-column-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/tabular-data-column-widget-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/tabular-data-column-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/tabular-data-column-widget-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -44,5 +44,5 @@
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/> <classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/> <classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="output" path="target/tabular-data-column-widget-1.8.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/tabular-data-column-widget-1.9.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

8
config/profile.xml
View File

@ -6,20 +6,20 @@
<Description>tabular-data-column-widget allows to perform operations on the columns of a tabular resource</Description> <Description>tabular-data-column-widget allows to perform operations on the columns of a tabular resource</Description>
<Class>PortletsUser</Class> <Class>PortletsUser</Class>
<Name>tabular-data-column-widget</Name> <Name>tabular-data-column-widget</Name>
<Version>1.8.0-SNAPSHOT</Version> <Version>1.0.0</Version>
<Packages> <Packages>
<Software> <Software>
<Description>tabular-data-column-widget allows to perform operations on the columns of a tabular resource</Description> <Description>tabular-data-column-widget allows to perform operations on the columns of a tabular resource</Description>
<Name>tabular-data-column-widget</Name> <Name>tabular-data-column-widget</Name>
<Version>1.8.0-SNAPSHOT</Version> <Version>1.9.0-SNAPSHOT</Version>
<MavenCoordinates> <MavenCoordinates>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-column-widget</artifactId> <artifactId>tabular-data-column-widget</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
</MavenCoordinates> </MavenCoordinates>
<Type>library</Type> <Type>library</Type>
<Files> <Files>
<File>tabular-data-column-widget-1.8.0-SNAPSHOT.jar</File> <File>tabular-data-column-widget-1.9.0-SNAPSHOT.jar</File>
</Files> </Files>
</Software> </Software>
</Packages> </Packages>

6
distro/README
View File

@ -1,7 +1,9 @@
The gCube System - tabular-data-column-widget The gCube System - tabular-data-column-widget
------------------------------------------------------------ ------------------------------------------------------------
This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),
D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2),
and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1).
Authors Authors
------- -------
@ -13,7 +15,7 @@ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
Version and Release Date Version and Release Date
------------------------ ------------------------
v. 1.8.0-SNAPSHOT (2015-07-03) v. 1.9.0-SNAPSHOT (2015-10-15)
Description Description

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-9-0"
date="2015-10-15">
<Change>Fixed apply button on ChangeColumnTypePanel</Change>
</Changeset>
<Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-8-0" <Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-8-0"
date="2015-07-03"> date="2015-07-03">
<Change>Allow the creation and use of expressions on multi column in TDM portlet[issue #81]</Change> <Change>Allow the creation and use of expressions on multi column in TDM portlet[issue #81]</Change>

4
pom.xml
View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-column-widget</artifactId> <artifactId>tabular-data-column-widget</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
<name>tabular-data-column-widget</name> <name>tabular-data-column-widget</name>
@ -38,7 +38,7 @@
<properties> <properties>
<distroDirectory>${project.basedir}/distro</distroDirectory> <distroDirectory>${project.basedir}/distro</distroDirectory>
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory> <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
<release.date>2015-07-03</release.date> <release.date>2015-10-15</release.date>
<wikiurl>https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager</wikiurl> <wikiurl>https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager</wikiurl>
<templatesDirectory>templates</templatesDirectory> <templatesDirectory>templates</templatesDirectory>
<distroDirectory>distro</distroDirectory> <distroDirectory>distro</distroDirectory>

52
src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java
View File

@ -146,7 +146,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
private ListLoader<ListLoadConfig, ListLoadResult<ColumnData>> loader; private ListLoader<ListLoadConfig, ListLoadResult<ColumnData>> loader;
private TextButton change; private TextButton applyBtn;
private ChangeColumnTypeSession changeColumnTypeSession; private ChangeColumnTypeSession changeColumnTypeSession;
private boolean panelCreated; private boolean panelCreated;
@ -516,11 +516,11 @@ public class ChangeColumnTypePanel extends FramedPanel implements
comboValueDataFormatLabel = new FieldLabel(comboValueDataFormat, comboValueDataFormatLabel = new FieldLabel(comboValueDataFormat,
"Format"); "Format");
// Change // Apply
change = new TextButton("Change"); applyBtn = new TextButton("Apply");
change.setIcon(ResourceBundle.INSTANCE.columnType()); applyBtn.setIcon(ResourceBundle.INSTANCE.columnType());
change.setIconAlign(IconAlign.RIGHT); applyBtn.setIconAlign(IconAlign.RIGHT);
change.setToolTip("Change Column Type"); applyBtn.setToolTip("Apply Column Type");
SelectHandler changeHandler = new SelectHandler() { SelectHandler changeHandler = new SelectHandler() {
@ -529,7 +529,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
} }
}; };
change.addSelectHandler(changeHandler); applyBtn.addSelectHandler(changeHandler);
VerticalLayoutContainer v = new VerticalLayoutContainer(); VerticalLayoutContainer v = new VerticalLayoutContainer();
v.add(new FieldLabel(comboColumn, "Column"), new VerticalLayoutData(1, v.add(new FieldLabel(comboColumn, "Column"), new VerticalLayoutData(1,
@ -554,7 +554,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
new Margins(1))); new Margins(1)));
v.add(comboValueDataFormatLabel, new VerticalLayoutData(1, -1, v.add(comboValueDataFormatLabel, new VerticalLayoutData(1, -1,
new Margins(1))); new Margins(1)));
v.add(change, new VerticalLayoutData(-1, -1, new Margins(10, 0, 10, 0))); v.add(applyBtn, new VerticalLayoutData(-1, -1, new Margins(10, 0, 10, 0)));
add(v, new VerticalLayoutData(1, 1, new Margins(0))); add(v, new VerticalLayoutData(1, 1, new Margins(0)));
resetToInitialState(); resetToInitialState();
@ -965,7 +965,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
} }
} }
} else { } else {
change.disable(); applyBtn.disable();
comboColumnTypeCode.reset(); comboColumnTypeCode.reset();
comboColumnTypeCodeLabel.setVisible(false); comboColumnTypeCodeLabel.setVisible(false);
} }
@ -1124,19 +1124,19 @@ public class ChangeColumnTypePanel extends FramedPanel implements
protected void updateConfBtnChange(ColumnData columnReference) { protected void updateConfBtnChange(ColumnData columnReference) {
if (connectionColumn == null) { if (connectionColumn == null) {
if (columnReference != null) { if (columnReference != null) {
change.enable(); applyBtn.enable();
} else { } else {
change.disable(); applyBtn.disable();
} }
} else { } else {
if (columnReference == null) { if (columnReference == null) {
change.disable(); applyBtn.disable();
} else { } else {
if (columnReference.getColumnId().compareTo( if (columnReference.getColumnId().compareTo(
connectionColumn.getColumnId()) == 0) { connectionColumn.getColumnId()) == 0) {
change.disable(); applyBtn.disable();
} else { } else {
change.enable(); applyBtn.enable();
} }
} }
@ -1147,7 +1147,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements
if (columnTypeCode == null) { if (columnTypeCode == null) {
ColumnTypeCodeElement codeElement = comboColumnTypeCode.getValue(); ColumnTypeCodeElement codeElement = comboColumnTypeCode.getValue();
if (codeElement == null) { if (codeElement == null) {
change.disable(); applyBtn.disable();
} else { } else {
configureBtnChange(codeElement.getCode()); configureBtnChange(codeElement.getCode());
} }
@ -1163,41 +1163,41 @@ public class ChangeColumnTypePanel extends FramedPanel implements
switch (sourceTypeCode) { switch (sourceTypeCode) {
case ANNOTATION: case ANNOTATION:
change.enable(); applyBtn.enable();
break; break;
case ATTRIBUTE: case ATTRIBUTE:
change.enable(); applyBtn.enable();
break; break;
case CODE: case CODE:
change.enable(); applyBtn.enable();
break; break;
case CODEDESCRIPTION: case CODEDESCRIPTION:
change.enable(); applyBtn.enable();
break; break;
case CODENAME: case CODENAME:
change.enable(); applyBtn.enable();
break; break;
case DIMENSION: case DIMENSION:
if (columnTypeCode.compareTo(ColumnTypeCode.DIMENSION) == 0 if (columnTypeCode.compareTo(ColumnTypeCode.DIMENSION) == 0
|| columnTypeCode.compareTo(ColumnTypeCode.TIMEDIMENSION) == 0) { || columnTypeCode.compareTo(ColumnTypeCode.TIMEDIMENSION) == 0) {
change.disable(); applyBtn.disable();
} else { } else {
change.enable(); applyBtn.enable();
} }
break; break;
case MEASURE: case MEASURE:
change.enable(); applyBtn.enable();
break; break;
case TIMEDIMENSION: case TIMEDIMENSION:
if (columnTypeCode.compareTo(ColumnTypeCode.DIMENSION) == 0 if (columnTypeCode.compareTo(ColumnTypeCode.DIMENSION) == 0
|| columnTypeCode.compareTo(ColumnTypeCode.TIMEDIMENSION) == 0) { || columnTypeCode.compareTo(ColumnTypeCode.TIMEDIMENSION) == 0) {
change.disable(); applyBtn.disable();
} else { } else {
change.enable(); applyBtn.enable();
} }
break; break;
default: default:
change.enable(); applyBtn.enable();
break; break;
} }

4
templates/README
View File

@ -1,7 +1,9 @@
The gCube System - ${name} The gCube System - ${name}
------------------------------------------------------------ ------------------------------------------------------------
This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),
D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2),
and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1).
Authors Authors
------- -------

4
templates/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="${groupId}.${artifactId}.1-9-0"
date="2015-10-15">
<Change>Fixed apply button on ChangeColumnTypePanel</Change>
</Changeset>
<Changeset component="${groupId}.${artifactId}.1-8-0" <Changeset component="${groupId}.${artifactId}.1-8-0"
date="2015-07-03"> date="2015-07-03">
<Change>Allow the creation and use of expressions on multi column in TDM portlet[issue #81]</Change> <Change>Allow the creation and use of expressions on multi column in TDM portlet[issue #81]</Change>

2
templates/profile.xml
View File

@ -6,7 +6,7 @@
<Description>${project.description}</Description> <Description>${project.description}</Description>
<Class>PortletsUser</Class> <Class>PortletsUser</Class>
<Name>${project.name}</Name> <Name>${project.name}</Name>
<Version>${version}</Version> <Version>1.0.0</Version>
<Packages> <Packages>
<Software> <Software>
<Description>${project.description}</Description> <Description>${project.description}</Description>